Rails 5 and Rack 2

nning · Jul 29, 2016 · 92cf612 · 92cf612
1 parent 314619b
commit 92cf612
Show file tree

Hide file tree

Showing 5 changed files with 93 additions and 76 deletions.
diff --git a/Gemfile b/Gemfile
@@ -16,7 +16,9 @@ group :test do
   gem 'grape'
   gem 'hobbit'
   gem 'nyny'
-  gem 'rails', '~> 4.2.0'
+  gem 'rails', '~> 5.0.0'
   gem 'rspec-rails', '~> 3.5.0'
-  gem 'sinatra'
+
+  gem 'sinatra', github: 'sinatra'
+  gem 'rack-protection', github: 'sinatra/rack-protection'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,51 +1,70 @@
+GIT
+  remote: git://github.com/sinatra/rack-protection.git
+  revision: 8d4f9d488d0591ac7b360d9137b94f8d68901f16
+  specs:
+    rack-protection (2.0.0)
+      rack
+
+GIT
+  remote: git://github.com/sinatra/sinatra.git
+  revision: 3e2379d7175ea7f5896f7a6f9c010c56e587ff03
+  specs:
+    sinatra (2.0.0.pre.alpha)
+      mustermann (~> 0.4)
+      rack (~> 2.0)
+      rack-protection (~> 2.0)
+      tilt (~> 2.0)
+
 PATH
   remote: .
   specs:
-    david (0.4.6.pre)
+    david (0.5.0.pre)
       celluloid (~> 0.17.3)
       celluloid-io (~> 0.17.3)
       coap (~> 0.1)
-      rack (~> 1.6, >= 1.6.4)
+      rack (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.7)
-      actionpack (= 4.2.7)
-      actionview (= 4.2.7)
-      activejob (= 4.2.7)
+    actioncable (5.0.0)
+      actionpack (= 5.0.0)
+      nio4r (~> 1.2)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.0.0)
+      actionpack (= 5.0.0)
+      actionview (= 5.0.0)
+      activejob (= 5.0.0)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.7)
-      actionview (= 4.2.7)
-      activesupport (= 4.2.7)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.0.0)
+      actionview (= 5.0.0)
+      activesupport (= 5.0.0)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.7)
-      activesupport (= 4.2.7)
+    actionview (5.0.0)
+      activesupport (= 5.0.0)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.7)
-      activesupport (= 4.2.7)
-      globalid (>= 0.3.0)
-    activemodel (4.2.7)
-      activesupport (= 4.2.7)
-      builder (~> 3.1)
-    activerecord (4.2.7)
-      activemodel (= 4.2.7)
-      activesupport (= 4.2.7)
-      arel (~> 6.0)
-    activesupport (4.2.7)
+    activejob (5.0.0)
+      activesupport (= 5.0.0)
+      globalid (>= 0.3.6)
+    activemodel (5.0.0)
+      activesupport (= 5.0.0)
+    activerecord (5.0.0)
+      activemodel (= 5.0.0)
+      activesupport (= 5.0.0)
+      arel (~> 7.0)
+    activesupport (5.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.3)
+    arel (7.1.1)
     axiom-types (0.1.1)
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
@@ -80,12 +99,12 @@ GEM
       descendants_tracker (~> 0.0.1)
     concurrent-ruby (1.0.2)
     concurrent-ruby (1.0.2-java)
-    coveralls (0.8.14)
+    coveralls (0.8.15)
       json (>= 1.8, < 3)
       simplecov (~> 0.12.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
-      tins (~> 1.6.0)
+      tins (>= 1.6.0, < 2)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
@@ -111,22 +130,26 @@ GEM
       rack
     i18n (0.7.0)
     ice_nine (0.11.2)
-    json (1.8.3)
-    json (1.8.3-java)
+    json (2.0.2)
+    json (2.0.2-java)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
+    method_source (0.8.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
     minitest (5.9.0)
     multi_json (1.12.1)
     multi_xml (0.5.5)
+    mustermann (0.4.0)
+      tool (~> 0.2)
     mustermann19 (0.4.4)
       enumerable-lazy
     nio4r (1.2.1)
+    nio4r (1.2.1-java)
     nokogiri (1.6.8)
       mini_portile2 (~> 2.1.0)
       pkg-config (~> 1.1.7)
@@ -135,35 +158,32 @@ GEM
       rack
       tilt
     pkg-config (1.1.7)
-    rack (1.6.4)
+    rack (2.0.1)
     rack-accept (0.4.5)
       rack (>= 0.4)
-    rack-protection (1.5.3)
-      rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.7)
-      actionmailer (= 4.2.7)
-      actionpack (= 4.2.7)
-      actionview (= 4.2.7)
-      activejob (= 4.2.7)
-      activemodel (= 4.2.7)
-      activerecord (= 4.2.7)
-      activesupport (= 4.2.7)
+    rails (5.0.0)
+      actioncable (= 5.0.0)
+      actionmailer (= 5.0.0)
+      actionpack (= 5.0.0)
+      actionview (= 5.0.0)
+      activejob (= 5.0.0)
+      activemodel (= 5.0.0)
+      activerecord (= 5.0.0)
+      activesupport (= 5.0.0)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.7)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
-      activesupport (>= 4.2.0.beta, < 5.0)
+      railties (= 5.0.0)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.1)
+      activesupport (>= 4.2.0, < 6.0)
       nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.7)
-      actionpack (= 4.2.7)
-      activesupport (= 4.2.7)
+    railties (5.0.0)
+      actionpack (= 5.0.0)
+      activesupport (= 5.0.0)
+      method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (0.9.6)
@@ -172,7 +192,7 @@ GEM
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
       rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.1)
+    rspec-core (3.5.2)
       rspec-support (~> 3.5.0)
     rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -195,10 +215,6 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    sinatra (1.4.7)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
     sprockets (3.7.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -214,14 +230,20 @@ GEM
     tilt (2.0.5)
     timers (4.1.1)
       hitimes
-    tins (1.6.0)
+    tins (1.11.0)
+    tool (0.2.3)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
+    websocket-driver (0.6.4)
+      websocket-extensions (>= 0.1.0)
+    websocket-driver (0.6.4-java)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
 
 PLATFORMS
   java
@@ -234,12 +256,13 @@ DEPENDENCIES
   grape
   hobbit
   nyny
-  rails (~> 4.2.0)
+  rack-protection!
+  rails (~> 5.0.0)
   rake (~> 0)
   rspec (~> 3.2)
   rspec-rails (~> 3.5.0)
   ruby-prof
-  sinatra
+  sinatra!
 
 BUNDLED WITH
    1.12.5
diff --git a/david.gemspec b/david.gemspec
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'celluloid',    '~> 0.17.3'
   s.add_runtime_dependency 'celluloid-io', '~> 0.17.3'
   s.add_runtime_dependency 'coap',         '~> 0.1'
-  s.add_runtime_dependency 'rack',         '~> 1.6',    '>= 1.6.4'
+  s.add_runtime_dependency 'rack',         '~> 2.0'
 
   s.add_development_dependency 'rake',  '~> 0'
   s.add_development_dependency 'rspec', '~> 3.2'

diff --git a/lib/david/version.rb b/lib/david/version.rb
@@ -1,7 +1,7 @@
 module David
   MAJOR = 0
-  MINOR = 4
-  PATCH = 6
+  MINOR = 5
+  PATCH = 0
   SUFFIX = :pre
 
   VERSION = [MAJOR, MINOR, PATCH, SUFFIX].compact.join('.')

diff --git a/spec/dummy/config/initializers/assets.rb b/spec/dummy/config/initializers/assets.rb