lhs 14.3.2 → 14.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23918846d8c64e8753d97597980490a1e81727db
-  data.tar.gz: 0b7aa7f5dc6a6621959f76391aab092b69655b46
+  metadata.gz: faac20a893bc5f0b14a162d5d2aa558c47d6939e
+  data.tar.gz: e821d49493af8481912155de04685e493125f6e6
 SHA512:
-  metadata.gz: ed8155be2929a3ba33c54f3f26b8f3c7d3dc55ab86a71b235eda98001e4132e4b979d2e294c6e066950aa770fc839ee9498461a554ae69123f5354fd4df15dfe
-  data.tar.gz: 85f20098c747b9e2f3596169ef1f48e2577f95e5f53cc0b97c39aeaaaa86c226b62a5db6c9d97357bf8f99c04624e9c677d9f41b9f248946396cba412c83ad65
+  metadata.gz: 7b2e761d4b8354dfc417c09f88b581c420773bad5206e7581f1e969f50cb661590a70776acef43ae84d753b3d7daabb08f31d42314f5eed82c14f84fbe3fce5a
+  data.tar.gz: 7804df813f9ed2e795c8323307a911d47b1eaaf5ec93a308cf1dc893ca2ac7a34a18504faecb0ab11c219c69ae24d32c5edfb713a477c4117d9392dc8a48d987

data/lib/lhs/concerns/record/request.rb

@@ -434,7 +434,7 @@ class LHS::Record
         options[:ignored_errors] = ignored_errors if ignored_errors.present?
         options[:params].deep_symbolize_keys! if options[:params]
         options[:error_handler] = merge_error_handlers(options[:error_handler]) if options[:error_handler]
-        options = (endpoint.options || {}).merge(options)
+        options = (endpoint.options || {}).deep_merge(options)
         options[:url] = compute_url!(options[:params]) unless options.key?(:url)
         merge_explicit_params!(options[:params])
         options.delete(:params) if options[:params] && options[:params].empty?

data/lib/lhs/version.rb

@@ -1,3 +1,3 @@
 module LHS
-  VERSION = '14.3.2'
+  VERSION = '14.3.3'
 end

data/spec/record/endpoint_options_spec.rb

@@ -17,5 +17,27 @@ describe LHS::Record do
       stub_request(:get, "http://backend/v2/feedbacks/1").to_return(status: 200)
       Record.find(1)
     end
+
+    context 'deep merge endpoint options' do
+
+      before(:each) do
+        class Location < LHS::Record
+          endpoint 'http://uberall/locations', headers: { privateKey: '123' }
+        end
+      end
+
+      it 'deep merges options to not overwrite endpoint options' do
+        stub_request(:get, "http://uberall/locations")
+          .with(
+            headers: {
+              'Privatekey' => '123',
+              'Accept' => 'application/json'
+            }
+          )
+          .to_return(body: [].to_json)
+
+        Location.options(headers: { 'Accept' => 'application/json' }).fetch
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhs
 version: !ruby/object:Gem::Version
-  version: 14.3.2
+  version: 14.3.3
 platform: ruby
 authors:
 - https://github.com/local-ch/lhs/graphs/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-04 00:00:00.000000000 Z
+date: 2017-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lhc