Merge pull request lokka#197 from 1syo/fix-broken-spec-in-2.0

Fix broken spec in ruby 2.0

Gemfile

@@ -5,9 +5,9 @@ gem 'rack'
 gem 'rack-flash', '~> 0.1.2'
 gem 'sinatra-flash', '~> 0.3.0'
 gem 'i18n', '0.6.0'
-gem 'sinatra', '1.3.4'
-gem 'sinatra-contrib', '1.3.2'
-gem 'dm-core',          '1.2.0'
+gem 'sinatra', '~> 1.4.2'
+gem 'sinatra-contrib', '~> 1.4.0'
+gem 'dm-core',          :git => 'git://github.com/datamapper/dm-core.git', :branch => 'release-1.2'
 gem 'dm-migrations',    '1.2.0'
 gem 'dm-timestamps',    '1.2.0'
 gem 'dm-validations',   '1.2.0'
@@ -28,7 +28,7 @@ gem 'erubis', '~> 2.6.6'
 gem 'activesupport', '~> 3.1.1'
 gem 'nokogiri', '~> 1.5.2'
 gem 'tux'
-gem 'padrino-helpers', '0.10.5'
+gem 'padrino-helpers', '0.11.2'
 gem 'coderay', '1.0.5'
 gem 'kramdown'
 gem 'RedCloth', '4.2.9'

Gemfile.lock

@@ -1,3 +1,11 @@
+GIT
+  remote: git://github.com/datamapper/dm-core.git
+  revision: 9224447f73ff861a0870135564d1aa5df37b6eaa
+  branch: release-1.2
+  specs:
+    dm-core (1.2.1)
+      addressable (~> 2.3.3)
+
 GIT
   remote: git://github.com/datamapper/do.git
   revision: d7cb262d89a16eca86f85c10b88613529e1a992b
@@ -25,7 +33,7 @@ GEM
     abstract (1.0.0)
     activesupport (3.1.12)
       multi_json (~> 1.0)
-    addressable (2.2.8)
+    addressable (2.3.4)
     backports (2.3.0)
     bcrypt-ruby (3.0.1)
     bond (0.4.3)
@@ -40,8 +48,6 @@ GEM
     diff-lcs (1.1.3)
     dm-aggregates (1.2.0)
       dm-core (~> 1.2.0)
-    dm-core (1.2.0)
-      addressable (~> 2.2.6)
     dm-do-adapter (1.2.0)
       data_objects (~> 0.10.6)
       dm-core (~> 1.2.0)
@@ -83,23 +89,24 @@ GEM
     fastercsv (1.5.5)
     fssm (0.2.10)
     haml (3.1.8)
-    http_router (0.5.4)
+    http_router (0.11.0)
       rack (>= 1.0.0)
       url_mount (~> 0.2.1)
     i18n (0.6.0)
     json (1.5.5)
-    kramdown (1.0.1)
+    kramdown (1.0.2)
     multi_json (1.0.4)
     nokogiri (1.5.9)
-    padrino-core (0.10.5)
-      activesupport (~> 3.1.0)
-      http_router (~> 0.10.2)
-      sinatra (~> 1.3.1)
-      thor (~> 0.14.3)
-      tilt (~> 1.3.0)
-    padrino-helpers (0.10.5)
+    padrino-core (0.11.2)
+      activesupport (>= 3.1.0)
+      http_router (~> 0.11.0)
+      rack-protection (>= 1.5.0)
+      sinatra (~> 1.4.2)
+      thor (~> 0.17.0)
+      tilt (~> 1.3.7)
+    padrino-helpers (0.11.2)
       i18n (~> 0.6)
-      padrino-core (= 0.10.5)
+      padrino-core (= 0.11.2)
     rack (1.5.2)
     rack-flash (0.1.2)
       rack
@@ -108,7 +115,7 @@ GEM
     rack-test (0.6.1)
       rack (>= 1.0)
     rake (10.0.4)
-    redcarpet (2.2.2)
+    redcarpet (2.3.0)
     ripl (0.7.0)
       bond (~> 0.4.2)
     ripl-multi_line (0.3.1)
@@ -125,21 +132,21 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
-    sass (3.2.8)
+    sass (3.2.9)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    sinatra (1.3.4)
-      rack (~> 1.4)
-      rack-protection (~> 1.3)
-      tilt (~> 1.3, >= 1.3.3)
-    sinatra-contrib (1.3.2)
+    sinatra (1.4.2)
+      rack (~> 1.5, >= 1.5.2)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
+    sinatra-contrib (1.4.0)
       backports (>= 2.0)
       eventmachine
       rack-protection
       rack-test
-      sinatra (~> 1.3.0)
+      sinatra (~> 1.4.2)
       tilt (~> 1.3)
     sinatra-flash (0.3.0)
       sinatra (>= 1.0.0)
@@ -150,8 +157,8 @@ GEM
     tapp (1.3.0)
       thor
     temple (0.3.5)
-    thor (0.14.6)
-    tilt (1.3.4)
+    thor (0.17.0)
+    tilt (1.3.7)
     tux (0.3.0)
       ripl (>= 0.3.5)
       ripl-multi_line (>= 0.2.4)
@@ -181,7 +188,7 @@ DEPENDENCIES
   data_objects!
   database_cleaner (= 0.7.1)
   dm-aggregates (= 1.2.0)
-  dm-core (= 1.2.0)
+  dm-core!
   dm-is-searchable (= 1.2.0)
   dm-is-tree (= 1.2.0)
   dm-migrations (= 1.2.0)
@@ -199,7 +206,7 @@ DEPENDENCIES
   i18n (= 0.6.0)
   kramdown
   nokogiri (~> 1.5.2)
-  padrino-helpers (= 0.10.5)
+  padrino-helpers (= 0.11.2)
   rack
   rack-flash (~> 0.1.2)
   rack-test (= 0.6.1)
@@ -208,8 +215,8 @@ DEPENDENCIES
   rspec (= 2.8.0)
   sass (~> 3.2.8)
   simplecov
-  sinatra (= 1.3.4)
-  sinatra-contrib (= 1.3.2)
+  sinatra (~> 1.4.2)
+  sinatra-contrib (~> 1.4.0)
   sinatra-flash (~> 0.3.0)
   slim (~> 0.9.2)
   stringex (= 1.3.2)