routemaster-drain 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b2b697edbd498992119a65a84728e882d7887f4
-  data.tar.gz: becfe51f7378b6ef526f30df85cc0ba99e988506
+  metadata.gz: 07bdffea2f172347e8aca46c2f75dab8634447ee
+  data.tar.gz: f44e9ef9b5aeaf94603639fa29d6d2e25b787be2
 SHA512:
-  metadata.gz: 97304f92aca0207ed65ebed6448f16da4a95c35b220be95a4397e85642a244fce6ae299cbd613859245b09d3e892b4c60e7c8c4d0ae2a6b2f54bd7bb1ebdccb9
-  data.tar.gz: 5e8b39950919c0d6df02399a1579940a0b8f0c88c7e2c5cd332193e01f683b9201253a267b17a0ecd19e18d050a749ba0f832e37f863e27b74ea8ae526c412d7
+  metadata.gz: 797d4f36d492a81ca180237eca1f0e8a0124f6e5f0a6445ca1f769f0b9ec9023f54d507f3f9b73a00370b383ef926758e528fe02fdb6403246945202ed7ddfa1
+  data.tar.gz: 672da230fb723af0edd3ed714316272919d0ecf20159497200a3fb78a4bb39ee8d594dcab2b024f72d55f931a8d8d9174343e636fb08906365eaa4a01626bc7f

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 2.4.2 (2017-03-21)
+
+Bug fixes:
+
+- APIClient#discover now memoizes the root response at class level (#35)
+
 ### 2.4.1 (2017-03-15)
 
 Features:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    routemaster-drain (2.4.1)
+    routemaster-drain (2.4.2)
       concurrent-ruby
       faraday (>= 0.9.0)
       faraday_middleware

data/gemfiles/rails_3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    routemaster-drain (2.4.1)
+    routemaster-drain (2.4.2)
       concurrent-ruby
       faraday (>= 0.9.0)
       faraday_middleware

data/gemfiles/rails_4.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    routemaster-drain (2.4.1)
+    routemaster-drain (2.4.2)
       concurrent-ruby
       faraday (>= 0.9.0)
       faraday_middleware

data/gemfiles/rails_5.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    routemaster-drain (2.4.1)
+    routemaster-drain (2.4.2)
       concurrent-ruby
       faraday (>= 0.9.0)
       faraday_middleware

data/lib/routemaster/api_client.rb

@@ -25,16 +25,22 @@ require 'hashie/mash'
 
 module Routemaster
   class APIClient
+
+    # Memoize the root resources at Class level so that we don't hit the cache
+    # all the time to fetch the root resource before doing anything else.
+    @@root_resources = {}
+
     def initialize(middlewares: [],
                    listener: nil,
                    response_class: nil,
                    metrics_client: nil,
                    source_peer: nil)
-      @listener = listener
-      @middlewares = middlewares
+
+      @listener       = listener
+      @middlewares    = middlewares
       @response_class = response_class
       @metrics_client = metrics_client
-      @source_peer = source_peer
+      @source_peer    = source_peer
 
       connection # warm up connection so Faraday does all it's magical file loading in the main thread
     end
@@ -74,7 +80,7 @@ module Routemaster
     end
 
     def discover(url)
-      get(url)
+      @@root_resources[url] ||= get(url)
     end
 
     def with_response(response_class)

data/lib/routemaster/drain.rb

@@ -1,5 +1,5 @@
 module Routemaster
   module Drain
-    VERSION = '2.4.1'
+    VERSION = '2.4.2'
   end
 end

data/spec/routemaster/integration/api_client_spec.rb

@@ -5,6 +5,7 @@ require 'spec/support/uses_webmock'
 require 'spec/support/server'
 require 'spec/support/breakpoint_class'
 require 'routemaster/api_client'
+require 'routemaster/resources/rest_resource'
 require 'routemaster/cache'
 require 'dogstatsd'
 
@@ -297,14 +298,43 @@ describe Routemaster::APIClient do
 
     it 'traverses through pagination next all links that match the request params' do
       res = subject.discover(url)
+
       expect(res.resources.index(filters: { first_name: 'roo' }).count).to eq(5)
     end
 
-    it 'does not make any http requests to fetch resources any if just the index method is called' do
-      resources = subject.discover(url).resources
+    it 'does not make any http requests to fetch individual resources if just the index method is called' do
+      res = subject.discover(url)
+
+      expect(subject).not_to receive(:get).with("http://localhost:#{port}/resources/#{anything}", anything)
+      res.resources.index
+    end
+  end
+
+  describe 'DISCOVER request' do
+    let(:url) { "http://localhost:#{port}/discover" }
 
-      expect(subject).to receive(:get).with("http://localhost:#{port}/resources", anything).once
-      resources.index
+    subject do
+      Routemaster::APIClient.new(response_class: Routemaster::Responses::HateoasResponse)
+    end
+
+    before { subject.class.class_variable_set :@@root_resources, {} }
+
+    context 'when the method is called for the first time' do
+      it 'fetches the information using the GET method' do
+        expect(subject).to receive(:get).with(url)
+
+        subject.discover(url)
+      end
+    end
+
+    context 'when the method is called for the n-th time' do
+      before { subject.discover(url) }
+
+      it 'fetches the information from the class variable' do
+        expect(subject).not_to receive(:get).with(url)
+
+        subject.discover(url)
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: routemaster-drain
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Julien Letessier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -247,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Event receiver for the Routemaster bus