mirror of
https://github.com/danbee/danbarberphoto
synced 2025-03-04 08:49:07 +00:00
Switch to Kramdown
This commit is contained in:
parent
f00e6eb71d
commit
92d981c955
2
Gemfile
2
Gemfile
@ -61,7 +61,7 @@ gem 'monban'
|
|||||||
gem 'monban-generators'
|
gem 'monban-generators'
|
||||||
gem 'nokogiri', '~> 1.6.8.rc3'
|
gem 'nokogiri', '~> 1.6.8.rc3'
|
||||||
gem 'pg'
|
gem 'pg'
|
||||||
gem 'redcarpet'
|
gem 'kramdown'
|
||||||
gem 'simple_form'
|
gem 'simple_form'
|
||||||
gem 'slugtastic'
|
gem 'slugtastic'
|
||||||
gem 'squeel'
|
gem 'squeel'
|
||||||
|
|||||||
85
Gemfile.lock
85
Gemfile.lock
@ -37,7 +37,7 @@ GEM
|
|||||||
thread_safe (~> 0.3, >= 0.3.4)
|
thread_safe (~> 0.3, >= 0.3.4)
|
||||||
tzinfo (~> 1.1)
|
tzinfo (~> 1.1)
|
||||||
addressable (2.4.0)
|
addressable (2.4.0)
|
||||||
administrate (0.1.4)
|
administrate (0.1.5)
|
||||||
autoprefixer-rails (~> 6.0)
|
autoprefixer-rails (~> 6.0)
|
||||||
datetime_picker_rails (~> 0.0.7)
|
datetime_picker_rails (~> 0.0.7)
|
||||||
jquery-rails (~> 4.0)
|
jquery-rails (~> 4.0)
|
||||||
@ -50,14 +50,14 @@ GEM
|
|||||||
selectize-rails (~> 0.6)
|
selectize-rails (~> 0.6)
|
||||||
arel (6.0.3)
|
arel (6.0.3)
|
||||||
ast (2.2.0)
|
ast (2.2.0)
|
||||||
autoprefixer-rails (6.3.3.1)
|
autoprefixer-rails (6.3.6)
|
||||||
execjs
|
execjs
|
||||||
aws-sdk (2.2.26)
|
aws-sdk (2.2.34)
|
||||||
aws-sdk-resources (= 2.2.26)
|
aws-sdk-resources (= 2.2.34)
|
||||||
aws-sdk-core (2.2.26)
|
aws-sdk-core (2.2.34)
|
||||||
jmespath (~> 1.0)
|
jmespath (~> 1.0)
|
||||||
aws-sdk-resources (2.2.26)
|
aws-sdk-resources (2.2.34)
|
||||||
aws-sdk-core (= 2.2.26)
|
aws-sdk-core (= 2.2.34)
|
||||||
bcrypt (3.1.11)
|
bcrypt (3.1.11)
|
||||||
better_errors (2.1.1)
|
better_errors (2.1.1)
|
||||||
coderay (>= 1.0.0)
|
coderay (>= 1.0.0)
|
||||||
@ -65,18 +65,18 @@ GEM
|
|||||||
rack (>= 0.9.0)
|
rack (>= 0.9.0)
|
||||||
binding_of_caller (0.7.2)
|
binding_of_caller (0.7.2)
|
||||||
debug_inspector (>= 0.0.1)
|
debug_inspector (>= 0.0.1)
|
||||||
bourbon (4.2.6)
|
bourbon (4.2.7)
|
||||||
sass (~> 3.4)
|
sass (~> 3.4)
|
||||||
thor (~> 0.19)
|
thor (~> 0.19)
|
||||||
builder (3.2.2)
|
builder (3.2.2)
|
||||||
capybara (2.6.2)
|
capybara (2.7.0)
|
||||||
addressable
|
addressable
|
||||||
mime-types (>= 1.16)
|
mime-types (>= 1.16)
|
||||||
nokogiri (>= 1.3.3)
|
nokogiri (>= 1.3.3)
|
||||||
rack (>= 1.0.0)
|
rack (>= 1.0.0)
|
||||||
rack-test (>= 0.5.4)
|
rack-test (>= 0.5.4)
|
||||||
xpath (~> 2.0)
|
xpath (~> 2.0)
|
||||||
capybara-screenshot (1.0.11)
|
capybara-screenshot (1.0.12)
|
||||||
capybara (>= 1.0, < 3)
|
capybara (>= 1.0, < 3)
|
||||||
launchy
|
launchy
|
||||||
cliver (0.3.2)
|
cliver (0.3.2)
|
||||||
@ -89,15 +89,15 @@ GEM
|
|||||||
execjs
|
execjs
|
||||||
coffee-script-source (1.10.0)
|
coffee-script-source (1.10.0)
|
||||||
concurrent-ruby (1.0.1)
|
concurrent-ruby (1.0.1)
|
||||||
database_cleaner (1.5.1)
|
database_cleaner (1.5.2)
|
||||||
datetime_picker_rails (0.0.7)
|
datetime_picker_rails (0.0.7)
|
||||||
momentjs-rails (>= 2.8.1)
|
momentjs-rails (>= 2.8.1)
|
||||||
debug_inspector (0.0.2)
|
debug_inspector (0.0.2)
|
||||||
diff-lcs (1.2.5)
|
diff-lcs (1.2.5)
|
||||||
docile (1.1.5)
|
docile (1.1.5)
|
||||||
dotenv (2.1.0)
|
dotenv (2.1.1)
|
||||||
dotenv-rails (2.1.0)
|
dotenv-rails (2.1.1)
|
||||||
dotenv (= 2.1.0)
|
dotenv (= 2.1.1)
|
||||||
railties (>= 4.0, < 5.1)
|
railties (>= 4.0, < 5.1)
|
||||||
dragonfly (1.0.12)
|
dragonfly (1.0.12)
|
||||||
addressable (~> 2.3)
|
addressable (~> 2.3)
|
||||||
@ -107,20 +107,20 @@ GEM
|
|||||||
dragonfly (~> 1.0)
|
dragonfly (~> 1.0)
|
||||||
fog-aws
|
fog-aws
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
excon (0.48.0)
|
excon (0.49.0)
|
||||||
execjs (2.6.0)
|
execjs (2.6.0)
|
||||||
factory_girl (4.5.0)
|
factory_girl (4.7.0)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
factory_girl_rails (4.6.0)
|
factory_girl_rails (4.7.0)
|
||||||
factory_girl (~> 4.5.0)
|
factory_girl (~> 4.7.0)
|
||||||
railties (>= 3.0.0)
|
railties (>= 3.0.0)
|
||||||
fivemat (1.3.2)
|
fivemat (1.3.2)
|
||||||
fog-aws (0.9.1)
|
fog-aws (0.9.2)
|
||||||
fog-core (~> 1.27)
|
fog-core (~> 1.27)
|
||||||
fog-json (~> 1.0)
|
fog-json (~> 1.0)
|
||||||
fog-xml (~> 0.1)
|
fog-xml (~> 0.1)
|
||||||
ipaddress (~> 0.8)
|
ipaddress (~> 0.8)
|
||||||
fog-core (1.36.0)
|
fog-core (1.37.0)
|
||||||
builder
|
builder
|
||||||
excon (~> 0.45)
|
excon (~> 0.45)
|
||||||
formatador (~> 0.2)
|
formatador (~> 0.2)
|
||||||
@ -137,30 +137,35 @@ GEM
|
|||||||
tilt
|
tilt
|
||||||
i18n (0.7.0)
|
i18n (0.7.0)
|
||||||
ipaddress (0.8.3)
|
ipaddress (0.8.3)
|
||||||
jmespath (1.1.3)
|
jmespath (1.2.4)
|
||||||
|
json_pure (>= 1.8.1)
|
||||||
jquery-rails (4.1.1)
|
jquery-rails (4.1.1)
|
||||||
rails-dom-testing (>= 1, < 3)
|
rails-dom-testing (>= 1, < 3)
|
||||||
railties (>= 4.2.0)
|
railties (>= 4.2.0)
|
||||||
thor (>= 0.14, < 2.0)
|
thor (>= 0.14, < 2.0)
|
||||||
json (1.8.3)
|
json (1.8.3)
|
||||||
|
json_pure (1.8.3)
|
||||||
kaminari (0.16.3)
|
kaminari (0.16.3)
|
||||||
actionpack (>= 3.0.0)
|
actionpack (>= 3.0.0)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
|
kramdown (1.10.0)
|
||||||
launchy (2.4.3)
|
launchy (2.4.3)
|
||||||
addressable (~> 2.3)
|
addressable (~> 2.3)
|
||||||
letter_opener (1.4.1)
|
letter_opener (1.4.1)
|
||||||
launchy (~> 2.2)
|
launchy (~> 2.2)
|
||||||
loofah (2.0.3)
|
loofah (2.0.3)
|
||||||
nokogiri (>= 1.5.9)
|
nokogiri (>= 1.5.9)
|
||||||
mail (2.6.3)
|
mail (2.6.4)
|
||||||
mime-types (>= 1.16, < 3)
|
mime-types (>= 1.16, < 4)
|
||||||
method_source (0.8.2)
|
method_source (0.8.2)
|
||||||
mime-types (2.99.1)
|
mime-types (3.0)
|
||||||
|
mime-types-data (~> 3.2015)
|
||||||
|
mime-types-data (3.2016.0221)
|
||||||
mini_portile2 (2.1.0)
|
mini_portile2 (2.1.0)
|
||||||
minitest (5.8.4)
|
minitest (5.8.4)
|
||||||
momentjs-rails (2.11.0)
|
momentjs-rails (2.11.1)
|
||||||
railties (>= 3.1)
|
railties (>= 3.1)
|
||||||
monban (0.2.1)
|
monban (0.3.1)
|
||||||
bcrypt
|
bcrypt
|
||||||
rails
|
rails
|
||||||
warden
|
warden
|
||||||
@ -174,7 +179,7 @@ GEM
|
|||||||
mini_portile2 (~> 2.1.0)
|
mini_portile2 (~> 2.1.0)
|
||||||
pkg-config (~> 1.1.7)
|
pkg-config (~> 1.1.7)
|
||||||
normalize-rails (3.0.3)
|
normalize-rails (3.0.3)
|
||||||
parser (2.3.0.6)
|
parser (2.3.0.7)
|
||||||
ast (~> 2.2)
|
ast (~> 2.2)
|
||||||
pg (0.18.4)
|
pg (0.18.4)
|
||||||
pkg-config (1.1.7)
|
pkg-config (1.1.7)
|
||||||
@ -192,7 +197,7 @@ GEM
|
|||||||
coderay (~> 1.1.0)
|
coderay (~> 1.1.0)
|
||||||
method_source (~> 0.8.1)
|
method_source (~> 0.8.1)
|
||||||
slop (~> 3.4)
|
slop (~> 3.4)
|
||||||
puma (3.1.0)
|
puma (3.4.0)
|
||||||
rack (1.6.4)
|
rack (1.6.4)
|
||||||
rack-test (0.6.3)
|
rack-test (0.6.3)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
@ -219,15 +224,14 @@ GEM
|
|||||||
rails_serve_static_assets
|
rails_serve_static_assets
|
||||||
rails_stdout_logging
|
rails_stdout_logging
|
||||||
rails_serve_static_assets (0.0.5)
|
rails_serve_static_assets (0.0.5)
|
||||||
rails_stdout_logging (0.0.4)
|
rails_stdout_logging (0.0.5)
|
||||||
railties (4.2.6)
|
railties (4.2.6)
|
||||||
actionpack (= 4.2.6)
|
actionpack (= 4.2.6)
|
||||||
activesupport (= 4.2.6)
|
activesupport (= 4.2.6)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.18.1, < 2.0)
|
thor (>= 0.18.1, < 2.0)
|
||||||
rainbow (2.1.0)
|
rainbow (2.1.0)
|
||||||
rake (11.1.0)
|
rake (11.1.2)
|
||||||
redcarpet (3.3.4)
|
|
||||||
rspec-core (3.4.4)
|
rspec-core (3.4.4)
|
||||||
rspec-support (~> 3.4.0)
|
rspec-support (~> 3.4.0)
|
||||||
rspec-expectations (3.4.0)
|
rspec-expectations (3.4.0)
|
||||||
@ -245,8 +249,8 @@ GEM
|
|||||||
rspec-mocks (~> 3.4.0)
|
rspec-mocks (~> 3.4.0)
|
||||||
rspec-support (~> 3.4.0)
|
rspec-support (~> 3.4.0)
|
||||||
rspec-support (3.4.1)
|
rspec-support (3.4.1)
|
||||||
rubocop (0.38.0)
|
rubocop (0.39.0)
|
||||||
parser (>= 2.3.0.6, < 3.0)
|
parser (>= 2.3.0.7, < 3.0)
|
||||||
powerpack (~> 0.1)
|
powerpack (~> 0.1)
|
||||||
rainbow (>= 1.99.1, < 3.0)
|
rainbow (>= 1.99.1, < 3.0)
|
||||||
ruby-progressbar (~> 1.7)
|
ruby-progressbar (~> 1.7)
|
||||||
@ -254,7 +258,7 @@ GEM
|
|||||||
ruby-progressbar (1.7.5)
|
ruby-progressbar (1.7.5)
|
||||||
ruby_parser (3.8.1)
|
ruby_parser (3.8.1)
|
||||||
sexp_processor (~> 4.1)
|
sexp_processor (~> 4.1)
|
||||||
sass (3.4.21)
|
sass (3.4.22)
|
||||||
sass-rails (5.0.4)
|
sass-rails (5.0.4)
|
||||||
railties (>= 4.0.0, < 5.0)
|
railties (>= 4.0.0, < 5.0)
|
||||||
sass (~> 3.1)
|
sass (~> 3.1)
|
||||||
@ -278,8 +282,8 @@ GEM
|
|||||||
simplecov-html (~> 0.10.0)
|
simplecov-html (~> 0.10.0)
|
||||||
simplecov-html (0.10.0)
|
simplecov-html (0.10.0)
|
||||||
slop (3.6.0)
|
slop (3.6.0)
|
||||||
slugtastic (1.2.1)
|
slugtastic (1.3.1)
|
||||||
sprockets (3.5.2)
|
sprockets (3.6.0)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
rack (> 1, < 3)
|
rack (> 1, < 3)
|
||||||
sprockets-rails (3.0.4)
|
sprockets-rails (3.0.4)
|
||||||
@ -295,13 +299,12 @@ GEM
|
|||||||
tilt (2.0.2)
|
tilt (2.0.2)
|
||||||
tzinfo (1.2.2)
|
tzinfo (1.2.2)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
uglifier (2.7.2)
|
uglifier (3.0.0)
|
||||||
execjs (>= 0.3.0)
|
execjs (>= 0.3.0, < 3)
|
||||||
json (>= 1.8.0)
|
|
||||||
unf (0.1.4)
|
unf (0.1.4)
|
||||||
unf_ext
|
unf_ext
|
||||||
unf_ext (0.0.7.2)
|
unf_ext (0.0.7.2)
|
||||||
unicode-display_width (1.0.2)
|
unicode-display_width (1.0.3)
|
||||||
warden (1.2.6)
|
warden (1.2.6)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
websocket-driver (0.6.3)
|
websocket-driver (0.6.3)
|
||||||
@ -330,6 +333,7 @@ DEPENDENCIES
|
|||||||
haml
|
haml
|
||||||
jquery-rails
|
jquery-rails
|
||||||
kaminari
|
kaminari
|
||||||
|
kramdown
|
||||||
letter_opener
|
letter_opener
|
||||||
monban
|
monban
|
||||||
monban-generators
|
monban-generators
|
||||||
@ -341,7 +345,6 @@ DEPENDENCIES
|
|||||||
puma
|
puma
|
||||||
rails (~> 4.2.0)
|
rails (~> 4.2.0)
|
||||||
rails_12factor
|
rails_12factor
|
||||||
redcarpet
|
|
||||||
rspec-rails
|
rspec-rails
|
||||||
rubocop
|
rubocop
|
||||||
ruby_parser
|
ruby_parser
|
||||||
|
|||||||
@ -1,9 +1,5 @@
|
|||||||
class PagePresenter < SimpleDelegator
|
class PagePresenter < SimpleDelegator
|
||||||
def content_as_html
|
def content_as_html
|
||||||
PagePresenter.markdown.render(content).html_safe
|
Kramdown::Document.new(content).to_html.html_safe
|
||||||
end
|
|
||||||
|
|
||||||
def self.markdown
|
|
||||||
@markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML, extensions: {})
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user