lhc 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9340ca162d9f5d5ad49d6a703e327d849f5b3ef
-  data.tar.gz: dbcbccfb870b4f438669b02f388f1e8eeb96ea69
+  metadata.gz: a313eb836f98fd351f84b17f9fced2f0d3c89dde
+  data.tar.gz: 3d694a9a7b02371bad5accbbacfb3b90e2895de4
 SHA512:
-  metadata.gz: 90f2ebae04ec5b322858cda86ac30bc985863c26aad6aab7478d615844a7676827caa7b4ecd5fe78982ec8a3d3be6198ad2b61d87ae918cc0a9e97d807c42b7c
-  data.tar.gz: 5854c0038f5ae2190a4175279b1ea8d8ffc46480efd2adeffbe6ba0062390851df2621003e2357d865e4a66fe7c829014c069b6c9b36f48fa8499beae5643cab
+  metadata.gz: a831f27b91dfdb214d7e65767d3ce8b2775d6dd0b2646ebff14fd71bc54d27f1ed8a99c64b601d6294a6db57a9bf88522854f06d13aff9dae3b0e8d6bdff4451
+  data.tar.gz: b507a4579cba072c5e47a2d8053e11403ba9f9232919ccd6d32f56a05a3cd25612c508d8651b14cf1ca0ebdcf36a80662c3a732547136446ac499d88ffde91fd

data/lib/lhc/endpoint.rb

@@ -22,6 +22,11 @@ class LHC::Endpoint
     end
   end
 
+  # Endpoint options are immutable
+  def options
+    @options.deep_dup
+  end
+
   # Removes keys from provided params hash
   # when they are used for interpolation.
   def remove_interpolated_params!(params)

data/lib/lhc/request.rb

@@ -12,7 +12,7 @@ class LHC::Request
   attr_accessor :response, :options, :raw
 
   def initialize(options, self_executing = true)
-    self.options = options.deep_dup
+    self.options = options.deep_dup || {}
     use_configured_endpoint!
     generate_url_from_template!
     self.iprocessor = LHC::InterceptorProcessor.new(self)
@@ -71,10 +71,13 @@ class LHC::Request
   # Get configured endpoint and use it for doing the request.
   # Explicit request options are overriding configured options.
   def use_configured_endpoint!
-    return unless (endpoint = LHC.config.endpoints[options[:url]])
-    endpoint.options.deep_merge!(options)
-    options.deep_merge!(endpoint.options)
-    options[:url] = endpoint.url
+    endpoint = LHC.config.endpoints[self.options[:url]]
+    return unless endpoint
+    # explicit options override endpoint options
+    new_options = endpoint.options.deep_merge(self.options)
+    # set new options
+    self.options = new_options
+    self.options[:url] = endpoint.url
   end
 
   # Generates URL from a URL template

data/lib/lhc/version.rb

@@ -1,3 +1,3 @@
 module LHC
-  VERSION = "3.1.0"
+  VERSION = "3.1.1"
 end

data/spec/config/endpoints_spec.rb

@@ -46,4 +46,19 @@ describe LHC do
       expect(LHC.config.endpoints[:datastore].url).to eq 'http://datastore.lb-service'
     end
   end
+
+  context 'configured enpoints with default params' do
+
+    before(:each) do
+      LHC.config.endpoint(:telemarketers, 'http://datastore.lb-service/v2/spamnumbers?order_by=-user_frequency&swiss_number=true&offset=0&limit=:limit', params: { limit: 200 })
+      stub_request(:get, 'http://datastore.lb-service/v2/spamnumbers?limit=200&offset=0&order_by=-user_frequency&swiss_number=true')
+        .to_return(status: 200)
+    end
+
+    it 'is possible to call them multiple times with default params' do
+      LHC.get(:telemarketers)
+      LHC.get(:telemarketers)
+      LHC.get(:telemarketers)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhc
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - local.ch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-29 00:00:00.000000000 Z
+date: 2015-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus