GitBlixt
teagles/steam

upgrade all the gems to their latest working versions (fix issue #99)

did committed Jan 22, 2018
commit df46f1bc1f3ba90cdc20c3616024cf70b7e8bd9b
Showing 5 changed files with 100 additions and 98 deletions
Gemfile +5 -5
@@ @@ -12,7 +12,7 @@ group :development do
# gem 'duktape', github: 'judofyr/duktape.rb', ref: '20ef6a5'
# gem 'thin'
gem 'puma'
- gem 'haml', '~> 4.0.6'
+ gem 'haml', '~> 5.0.4'
gem 'rack-mini-profiler', '~> 0.10.1'
gem 'flamegraph'
@@ @@ -21,15 +21,15 @@ group :development do
end
group :test do
- gem 'rspec', '~> 3.4.0'
- gem 'json_spec', '~> 1.1.4'
+ gem 'rspec', '~> 3.7.0'
+ gem 'json_spec', '~> 1.1.5'
gem 'i18n-spec', '~> 0.6.0'
- gem 'timecop', '~> 0.8.0'
+ gem 'timecop', '~> 0.9.1'
gem 'pry-byebug', '~> 3.3.0'
- gem 'rack-test', '~> 0.6.3'
+ gem 'rack-test', '~> 0.8.2'
gem 'codeclimate-test-reporter', '~> 0.4.7', require: false
gem 'coveralls', '~> 0.8.1', require: false
Gemfile.lock +83 -81
@@ @@ -8,48 +8,48 @@ PATH
chronic (~> 0.10.2)
coffee-script (~> 2.4.1)
compass (~> 1.0.3)
- dragonfly (~> 1.1.1)
+ dragonfly (~> 1.1.4)
duktape (~> 1.6.1.0)
- httparty (~> 0.14.0)
- kramdown (~> 1.13.2)
+ httparty (~> 0.15.6)
+ kramdown (~> 1.16.2)
locomotivecms-solid (~> 4.0.1)
locomotivecms_common (~> 0.2.0)
mime-types (~> 3.1.0)
mimetype-fu (~> 0.1.2)
moneta (~> 1.0.0)
morphine (~> 0.1.1)
- nokogiri (~> 1.7.0.1)
- pony (~> 1.11)
+ nokogiri (~> 1.8.1)
+ pony (~> 1.12)
rack-cache (~> 1.7.0)
rack-rewrite (~> 1.5.1)
rack_csrf (~> 2.6.0)
- sanitize (~> 4.4.0)
- sass (~> 3.4.23)
+ sanitize (~> 4.5.0)
+ sass (~> 3.4.25)
sprockets (~> 3.7.1)
- uglifier (~> 3.1.6)
+ uglifier (~> 4.1.3)
GEM
remote: https://rubygems.org/
specs:
RedCloth (4.3.2)
- activesupport (4.2.8)
+ activesupport (4.2.10)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
- addressable (2.5.1)
- public_suffix (~> 2.0, >= 2.0.2)
+ addressable (2.5.2)
+ public_suffix (>= 2.0.2, < 4.0)
attr_extras (4.4.0)
autoprefixer-rails (6.7.7.2)
execjs
bcrypt (3.1.11)
- bson (4.2.1)
+ bson (4.3.0)
byebug (8.2.5)
chronic (0.10.2)
chunky_png (1.3.8)
codeclimate-test-reporter (0.4.8)
simplecov (>= 0.7.1, < 1.0.0)
- coderay (1.1.1)
+ coderay (1.1.2)
coffee-script (2.4.1)
coffee-script-source
execjs
@@ @@ -68,16 +68,16 @@ GEM
compass-import-once (1.0.5)
sass (>= 3.2, < 3.5)
concurrent-ruby (1.0.5)
- coveralls (0.8.19)
+ coveralls (0.8.21)
json (>= 1.8, < 3)
- simplecov (~> 0.12.0)
+ simplecov (~> 0.14.1)
term-ansicolor (~> 1.3)
- thor (~> 0.19.1)
+ thor (~> 0.19.4)
tins (~> 1.6)
- crass (1.0.2)
+ crass (1.0.3)
diff-lcs (1.3)
docile (1.1.5)
- dragonfly (1.1.1)
+ dragonfly (1.1.4)
addressable (~> 2.3)
multi_json (~> 1.0)
rack (>= 1.3)
@@ @@ -85,20 +85,22 @@ GEM
execjs (2.7.0)
ffi (1.9.18)
flamegraph (0.9.5)
- haml (4.0.7)
+ haml (5.0.4)
+ temple (>= 0.8.0)
tilt
- httparty (0.14.0)
+ httparty (0.15.6)
multi_xml (>= 0.5.2)
- i18n (0.8.0)
+ i18n (0.9.1)
+ concurrent-ruby (~> 1.0)
i18n-spec (0.6.0)
iso
iso (0.2.2)
i18n
- json (1.8.6)
- json_spec (1.1.4)
+ json (2.1.0)
+ json_spec (1.1.5)
multi_json (~> 1.0)
rspec (>= 2.0, < 4.0)
- kramdown (1.13.2)
+ kramdown (1.16.2)
locomotivecms-liquid (4.0.0)
locomotivecms-solid (4.0.1)
locomotivecms-liquid (~> 4.0.0)
@@ @@ -107,91 +109,91 @@ GEM
attr_extras (~> 4.4.0)
colorize
stringex (~> 2.6.0)
- mail (2.6.5)
- mime-types (>= 1.16, < 4)
- memory_profiler (0.9.7)
- method_source (0.8.2)
+ mail (2.7.0)
+ mini_mime (>= 0.1.1)
+ memory_profiler (0.9.8)
+ method_source (0.9.0)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mimetype-fu (0.1.2)
- mini_portile2 (2.1.0)
- minitest (5.10.2)
+ mini_mime (1.0.0)
+ mini_portile2 (2.3.0)
+ minitest (5.11.1)
moneta (1.0.0)
- mongo (2.4.1)
+ mongo (2.4.3)
bson (>= 4.2.1, < 5.0.0)
morphine (0.1.1)
- multi_json (1.12.1)
+ multi_json (1.13.1)
multi_xml (0.6.0)
- nokogiri (1.7.0.1)
- mini_portile2 (~> 2.1.0)
- nokogumbo (1.4.12)
+ nokogiri (1.8.1)
+ mini_portile2 (~> 2.3.0)
+ nokogumbo (1.4.13)
nokogiri
- origin (2.3.0)
- pony (1.11)
+ origin (2.3.1)
+ pony (1.12)
mail (>= 2.0)
- pry (0.10.4)
+ pry (0.11.3)
coderay (~> 1.1.0)
- method_source (~> 0.8.1)
- slop (~> 3.4)
+ method_source (~> 0.9.0)
pry-byebug (3.3.0)
byebug (~> 8.0)
pry (~> 0.10)
- public_suffix (2.0.5)
- puma (3.7.0)
- rack (2.0.1)
- rack-cache (1.7.0)
+ public_suffix (3.0.1)
+ puma (3.11.2)
+ rack (2.0.3)
+ rack-cache (1.7.1)
rack (>= 0.4)
- rack-mini-profiler (0.10.2)
+ rack-mini-profiler (0.10.7)
rack (>= 1.2.0)
rack-rewrite (1.5.1)
- rack-test (0.6.3)
- rack (>= 1.0)
+ rack-test (0.8.2)
+ rack (>= 1.0, < 3)
rack_csrf (2.6.0)
rack (>= 1.1.0)
rake (10.4.2)
- rb-fsevent (0.9.8)
- rb-inotify (0.9.8)
- ffi (>= 0.5.0)
- rspec (3.4.0)
- rspec-core (~> 3.4.0)
- rspec-expectations (~> 3.4.0)
- rspec-mocks (~> 3.4.0)
- rspec-core (3.4.4)
- rspec-support (~> 3.4.0)
- rspec-expectations (3.4.0)
+ rb-fsevent (0.10.2)
+ rb-inotify (0.9.10)
+ ffi (>= 0.5.0, < 2)
+ rspec (3.7.0)
+ rspec-core (~> 3.7.0)
+ rspec-expectations (~> 3.7.0)
+ rspec-mocks (~> 3.7.0)
+ rspec-core (3.7.1)
+ rspec-support (~> 3.7.0)
+ rspec-expectations (3.7.0)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.4.0)
- rspec-mocks (3.4.1)
+ rspec-support (~> 3.7.0)
+ rspec-mocks (3.7.0)
diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.4.0)
- rspec-support (3.4.1)
- sanitize (4.4.0)
+ rspec-support (~> 3.7.0)
+ rspec-support (3.7.0)
+ sanitize (4.5.0)
crass (~> 1.0.2)
nokogiri (>= 1.4.4)
nokogumbo (~> 1.4.1)
- sass (3.4.24)
- simplecov (0.12.0)
+ sass (3.4.25)
+ simplecov (0.14.1)
docile (~> 1.1.0)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
- simplecov-html (0.10.0)
- slop (3.6.0)
+ simplecov-html (0.10.2)
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
- stackprof (0.2.10)
+ stackprof (0.2.11)
stringex (2.6.1)
- term-ansicolor (1.4.0)
+ temple (0.8.0)
+ term-ansicolor (1.6.0)
tins (~> 1.0)
thor (0.19.4)
thread_safe (0.3.6)
- tilt (2.0.6)
- timecop (0.8.1)
- tins (1.13.2)
- tzinfo (1.2.3)
+ tilt (2.0.8)
+ timecop (0.9.1)
+ tins (1.16.3)
+ tzinfo (1.2.4)
thread_safe (~> 0.1)
- uglifier (3.1.13)
+ uglifier (4.1.3)
execjs (>= 0.3.0, < 3)
PLATFORMS
@@ @@ -202,24 +204,24 @@ DEPENDENCIES
codeclimate-test-reporter (~> 0.4.7)
coveralls (~> 0.8.1)
flamegraph
- haml (~> 4.0.6)
+ haml (~> 5.0.4)
i18n-spec (~> 0.6.0)
- json_spec (~> 1.1.4)
+ json_spec (~> 1.1.5)
locomotivecms_steam!
memory_profiler
- mongo (~> 2.4.1)
- origin (~> 2.3.0)
+ mongo (~> 2.4.3)
+ origin (~> 2.3.1)
pry-byebug (~> 3.3.0)
puma
rack-mini-profiler (~> 0.10.1)
- rack-test (~> 0.6.3)
+ rack-test (~> 0.8.2)
rake (~> 10.4.2)
- rspec (~> 3.4.0)
+ rspec (~> 3.7.0)
stackprof
- timecop (~> 0.8.0)
+ timecop (~> 0.9.1)
RUBY VERSION
ruby 2.3.3p222
BUNDLED WITH
- 1.14.6
+ 1.16.0
locomotive/steam/decorators/template_decorator.rb b/lib/locomotive/steam/decorators/template_decorator.rb +1 -1
@@ @@ -36,7 +36,7 @@ module Locomotive
def render_haml(source, template_path)
begin
- Haml::Engine.new(source).render
+ Haml::Engine.new(source, escape_attrs: false).render
rescue Haml::SyntaxError => e
raise Steam::RenderError.new(e, template_path, source)
end
locomotivecms_steam.gemspec +10 -10
@@ @@ -18,35 +18,35 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'bundler', '~> 1.7'
spec.add_development_dependency 'rake', '~> 10.4.2'
- spec.add_development_dependency 'mongo', '~> 2.4.1'
- spec.add_development_dependency 'origin', '~> 2.3.0'
+ spec.add_development_dependency 'mongo', '~> 2.4.3'
+ spec.add_development_dependency 'origin', '~> 2.3.1'
- spec.add_dependency 'nokogiri', '~> 1.7.0.1'
- spec.add_dependency 'sanitize', '~> 4.4.0'
+ spec.add_dependency 'nokogiri', '~> 1.8.1'
+ spec.add_dependency 'sanitize', '~> 4.5.0'
spec.add_dependency 'morphine', '~> 0.1.1'
- spec.add_dependency 'httparty', '~> 0.14.0'
+ spec.add_dependency 'httparty', '~> 0.15.6'
spec.add_dependency 'chronic', '~> 0.10.2'
spec.add_dependency 'bcrypt', '~> 3.1.11'
spec.add_dependency 'rack-rewrite', '~> 1.5.1'
spec.add_dependency 'rack-cache', '~> 1.7.0'
spec.add_dependency 'rack_csrf', '~> 2.6.0'
- spec.add_dependency 'dragonfly', '~> 1.1.1'
+ spec.add_dependency 'dragonfly', '~> 1.1.4'
spec.add_dependency 'moneta', '~> 1.0.0'
spec.add_dependency 'sprockets', '~> 3.7.1'
- spec.add_dependency 'sass', '~> 3.4.23'
- spec.add_dependency 'uglifier', '~> 3.1.6'
+ spec.add_dependency 'sass', '~> 3.4.25'
+ spec.add_dependency 'uglifier', '~> 4.1.3'
spec.add_dependency 'coffee-script', '~> 2.4.1'
spec.add_dependency 'compass', '~> 1.0.3'
spec.add_dependency 'autoprefixer-rails', '~> 6.7.2'
- spec.add_dependency 'kramdown', '~> 1.13.2'
+ spec.add_dependency 'kramdown', '~> 1.16.2'
spec.add_dependency 'RedCloth', '~> 4.3.2'
spec.add_dependency 'mimetype-fu', '~> 0.1.2'
spec.add_dependency 'mime-types', '~> 3.1.0'
spec.add_dependency 'duktape', '~> 1.6.1.0'
- spec.add_dependency 'pony', '~> 1.11'
+ spec.add_dependency 'pony', '~> 1.12'
spec.add_dependency 'locomotivecms-solid', '~> 4.0.1'
spec.add_dependency 'locomotivecms_common', '~> 0.2.0'
spec/integration/server/assets_spec.rb +1 -1
@@ @@ -21,7 +21,7 @@ describe Locomotive::Steam::Server do
subject { get '/all'; last_response.body }
it { is_expected.to include('<link href="/stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />') }
- it { is_expected.to include('<script src="/javascripts/application.js" type=\'text/javascript\'></script>') }
+ it { is_expected.to include("<script src='/javascripts/application.js' type=\'text/javascript\'></script>") }
it { is_expected.to include('<link rel="alternate" type="application/atom+xml" title="A title" href="/foo/bar" />') }
end