Merge pull request #298 from tpitale/handle-addressable-2.4

Restore addressable v2.4
datamapper · May 25, 2016 · 226c5af · 226c5af
2 parents fc68d0e + 4c24125
commit 226c5af
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/dm-core.gemspec b/dm-core.gemspec
@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.test_files       = `git ls-files -- spec/*`.split($/)
   gem.extra_rdoc_files = %w[LICENSE README.md]
 
-  gem.add_runtime_dependency('addressable', '~> 2.3.0', '>= 2.3.5')
+  gem.add_runtime_dependency('addressable', '~> 2.3', '>= 2.3.5')
 
   gem.add_development_dependency('rake',  '~> 10.0.3')
   gem.add_development_dependency('rspec', '~> 1.3.2')

diff --git a/lib/dm-core/adapters.rb b/lib/dm-core/adapters.rb
@@ -237,7 +237,14 @@ def legacy_path(name)
       #
       # @api private
       def normalize_adapter_name(name)
-        (original = name.to_s) == 'sqlite3' ? 'sqlite' : original
+        case (original = name.to_s)
+        when 'sqlite3'
+          'sqlite'
+        when 'inmemory' # Addressable >= v2.4 does not support underscores in scheme
+          'in_memory'
+        else
+          original
+        end
       end
 
     end

diff --git a/spec/public/setup_spec.rb b/spec/public/setup_spec.rb
@@ -4,7 +4,7 @@
   describe '.setup' do
     describe 'using connection string' do
       before :all do
-        @return = DataMapper.setup(:setup_test, 'in_memory://user:pass@hostname:1234/path?foo=bar&baz=foo#fragment')
+        @return = DataMapper.setup(:setup_test, 'inmemory://user:pass@hostname:1234/path?foo=bar&baz=foo#fragment')
 
         @options = @return.options
       end
@@ -22,7 +22,7 @@
       end
 
       {
-        :adapter  => 'in_memory',
+        :adapter  => 'inmemory',
         :user     => 'user',
         :password => 'pass',
         :host     => 'hostname',