routemaster-drain 2.5.4 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8a5640a28912f9a420499c2b78e69419ac6c407
-  data.tar.gz: 9391680b0214de9146ca8572f31500c59a70f54e
+  metadata.gz: b0feb14006a0d3933006b02516a4c8a4676b338b
+  data.tar.gz: c347cbb8284e81d53f857989a620c17eecf938e7
 SHA512:
-  metadata.gz: 3ab107f957533a24219671a2191bc12356ef26484daf63dd184e1f6c8c4c40901680743801d64a5b1830259ae6dd1a84370e0732719789a779307c5ebdabfd05
-  data.tar.gz: ae7fe0e757d08b692ed15f6ee3c2bdcab205b782f472d079af720672b9fdd482afc030bd09355dff9e07b652579b668c584e0845314ea6b74e4e934678829a51
+  metadata.gz: fc38c577ba8973327205789530b3195e6a4b5a012e9a6486b9fc1bcdfa9f6ff7ed94a6e8c10d83fed398b3b9d32351937ea0fd9cf5750e8cfdd51106e733c5d3
+  data.tar.gz: f5f64de478a53d3462b6d869b9771c6c8dcf8bea0013fbfeb6de70f3095fad40434840c67e8c3fc01a1bc0ca5003b6160a9415eaf31bab5567b4ace00a66b983

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+### 3.0.0 (2017-06-22)
+
+Breaking API changes
+
+- Removes the `#with_response` API client method. (#54)
+
+Bug fixes
+
+- Remove state from api client for thread safety. (#54)
+
+
 ### 2.5.4 (2017-06-12)
 
 Bug fixes

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    routemaster-drain (2.5.4)
+    routemaster-drain (3.0.0)
       addressable
       concurrent-ruby
       faraday (>= 0.9.0)

data/gemfiles/rails_3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    routemaster-drain (2.5.4)
+    routemaster-drain (3.0.0)
       addressable
       concurrent-ruby
       faraday (>= 0.9.0)

data/gemfiles/rails_4.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    routemaster-drain (2.5.4)
+    routemaster-drain (3.0.0)
       addressable
       concurrent-ruby
       faraday (>= 0.9.0)

data/gemfiles/rails_5.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    routemaster-drain (2.5.4)
+    routemaster-drain (3.0.0)
       addressable
       concurrent-ruby
       faraday (>= 0.9.0)

data/lib/routemaster/api_client.rb

@@ -40,11 +40,11 @@ module Routemaster
                    metrics_client: nil,
                    source_peer: nil)
 
-      @listener       = listener
-      @middlewares    = middlewares
-      @response_class = response_class
-      @metrics_client = metrics_client
-      @source_peer    = source_peer
+      @listener               = listener
+      @middlewares            = middlewares
+      @default_response_class = response_class
+      @metrics_client         = metrics_client
+      @source_peer            = source_peer
 
       connection # warm up connection so Faraday does all it's magical file loading in the main thread
     end
@@ -57,12 +57,14 @@ module Routemaster
     # string otherwise.
     def get(url, params: {}, headers: {}, options: {})
       enable_caching = options.fetch(:enable_caching, true)
+      response_class = options[:response_class]
 
       _wrapped_response _request(
         :get,
         url: url,
         params: params,
-        headers: headers.merge(response_cache_opt_headers(enable_caching)))
+        headers: headers.merge(response_cache_opt_headers(enable_caching))),
+        response_class: response_class
     end
 
     # Same as {{get}}, except with
@@ -95,14 +97,6 @@ module Routemaster
       @@root_resources[url] ||= get(url)
     end
 
-    def with_response(response_class)
-      memo = @response_class
-      @response_class = response_class
-      yield self
-    ensure
-      @response_class = memo
-    end
-
     private
 
     def _assert_uri(url)
@@ -121,8 +115,9 @@ module Routemaster
       end
     end
 
-    def _wrapped_response(response)
-      @response_class ? @response_class.new(response, client: self) : response
+    def _wrapped_response(response, response_class: nil)
+      response_class = response_class || @default_response_class
+      response_class ? response_class.new(response, client: self) : response
     end
 
     def connection

data/lib/routemaster/drain.rb

@@ -1,5 +1,5 @@
 module Routemaster
   module Drain
-    VERSION = '2.5.4'
+    VERSION = '3.0.0'
   end
 end

data/lib/routemaster/resources/rest_resource.rb

@@ -13,27 +13,24 @@ module Routemaster
       end
 
       def create(params)
-        @client.with_response(Responses::HateoasResponse) do
-          @client.post(expanded_url, body: params)
-        end
+        @client.post(expanded_url, body: params)
       end
 
       def show(id=nil, enable_caching: true)
-        @client.with_response(Responses::HateoasResponse) do
-          @client.get(expanded_url(id: id), options: { enable_caching: enable_caching })
-        end
+        @client.get(expanded_url(id: id), options: { enable_caching: enable_caching })
       end
 
       def index(params: {}, filters: {}, enable_caching: false)
-        @client.with_response(Responses::HateoasEnumerableResponse) do
-          @client.get(expanded_url, params: params.merge(filters), options: { enable_caching: enable_caching })
-        end
+        @client.get(
+          expanded_url, params: params.merge(filters), options: {
+            enable_caching: enable_caching,
+            response_class: Responses::HateoasEnumerableResponse
+          }
+        )
       end
 
       def update(id=nil, params)
-        @client.with_response(Responses::HateoasResponse) do
-          @client.patch(expanded_url(id: id), body: params)
-        end
+        @client.patch(expanded_url(id: id), body: params)
       end
 
       def destroy(id=nil)

data/routemaster-drain.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Julien Letessier']
   spec.email         = ['julien.letessier@gmail.com']
   spec.summary       = %q{Event receiver for the Routemaster bus}
-  spec.homepage      = 'http://github.com/HouseTrip/routemaster_drain'
+  spec.homepage      = 'http://github.com/deliveroo/routemaster-drain'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)

data/spec/routemaster/api_client_spec.rb

@@ -210,32 +210,4 @@ describe Routemaster::APIClient do
       expect(@req).to have_been_requested
     end
   end
-
-  describe '#with_response' do
-    before { stub_request(:any, //).to_return(status: 200) }
-
-    class DummyResponseA
-      def initialize(res, client: nil); end
-      def dummy_a; true; end
-    end
-
-    class DummyResponseB
-      def initialize(res, client: nil); end
-      def dummy_b; true; end
-    end
-
-    subject { described_class.new(response_class: DummyResponseA) }
-    let(:response) { subject.get('https://example.com') }
-
-    it 'changes the response wrapper during the block' do
-      subject.with_response(DummyResponseB) do
-        expect(response).to respond_to(:dummy_b)
-      end
-    end
-
-    it 'restores the original response wrapper after the block' do
-      subject.with_response(DummyResponseB) {}
-      expect(response).to respond_to(:dummy_a)
-    end
-  end
 end

data/spec/routemaster/resources/rest_resource_spec.rb

@@ -7,8 +7,6 @@ module Routemaster
       let(:client) { double('Client') }
       let(:params) { {} }
 
-      before { allow(client).to receive(:with_response).and_yield }
-
       describe "singular resource" do
         let(:url) { '/resources/1' }
 
@@ -50,7 +48,11 @@ module Routemaster
 
         describe '#index' do
           it 'gets to the given url' do
-            expect(client).to receive(:get).with(url, params: {}, options: { enable_caching: false })
+            expect(client).to receive(:get).with(
+              url, params: {}, options: {
+                enable_caching: false, response_class: Routemaster::Responses::HateoasEnumerableResponse
+              }
+            )
             subject.index
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: routemaster-drain
 version: !ruby/object:Gem::Version
-  version: 2.5.4
+  version: 3.0.0
 platform: ruby
 authors:
 - Julien Letessier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-12 00:00:00.000000000 Z
+date: 2017-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -248,7 +248,7 @@ files:
 - spec/support/uses_dotenv.rb
 - spec/support/uses_redis.rb
 - spec/support/uses_webmock.rb
-homepage: http://github.com/HouseTrip/routemaster_drain
+homepage: http://github.com/deliveroo/routemaster-drain
 licenses:
 - MIT
 metadata: {}
@@ -268,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Event receiver for the Routemaster bus