Merging connection details instead of update

samlown · Feb 13, 2017 · 855e5cd · 855e5cd
1 parent 7b6064c
commit 855e5cd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -5,4 +5,4 @@ gemspec
 gem "guard-rspec", "~> 4.7.0", group: :test
 
 # Enable for testing against local couchrest
-gem "couchrest", path: "/Users/sam/workspace/couchrest"
+# gem "couchrest", path: "/Users/sam/workspace/couchrest"
diff --git a/couchrest_model.gemspec b/couchrest_model.gemspec
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_dependency("hashdiff",    "~> 0.3")
   s.add_development_dependency("rspec", "~> 3.5.0")
   s.add_development_dependency("rack-test", ">= 0.5.7")
-  s.add_development_dependency("rake", ">= 0.8.0")
+  s.add_development_dependency("rake", ">= 0.8.0", "< 11.0")
   s.add_development_dependency("test-unit")
   s.add_development_dependency("minitest", "> 4.1") #, "< 5.0") # For Kaminari and activesupport, pending removal
   s.add_development_dependency("kaminari", ">= 0.14.1", "< 0.16.0")

diff --git a/lib/couchrest/model/connection.rb b/lib/couchrest/model/connection.rb
@@ -54,7 +54,7 @@ def prepare_server_uri
 
         def connection_configuration
           @connection_configuration ||=
-            self.connection.update(
+            self.connection.merge(
               (load_connection_config_file[environment.to_sym] || {}).symbolize_keys
             )
         end