px-service-client 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a10d1168c3cd74e1fb75eb062481a9aa8dfa25d
-  data.tar.gz: 81dd905f9e51020552ed8c655c11678e8fe5fdc5
+  metadata.gz: 19e7ec8a32fa4b49f0fac0e10eab3b1a38e373f2
+  data.tar.gz: b583bc1b97b2ad936e30242238184ce2d4241034
 SHA512:
-  metadata.gz: 53fce4eecc310c99c01ccf635de6616d46dc61edcfb40362657caf28390a99a3b6b51dc502812dbb5c4e006cd90d735295d812bfee4903452ceb2f4fe1069e5e
-  data.tar.gz: 43d57237b4ab1e3b8f2882baa419ad14fb784cce1f270690d11fcd72268ff046bb1b012c4b96236b08546666a5525e8817671e4b5a6f837bd2a2549eaf122833
+  metadata.gz: afe66390c4020a0896b7d882e9bcf78463ab3a932b4373f428f16b96f5c84d0250d8eabd57df4e12f6ca27c0c4ceb05a33281b721f4cad51973de50f321f024e
+  data.tar.gz: cc9b24b80f6945371bfc339cb73e75a48473860e18a3a60bbfdac6554aa643ee5152c6421de579fb23f166e8db73aebaf2c5188bcda5a563027766e272ac3f55

data/lib/px/service/client/base.rb

@@ -1,6 +1,6 @@
 module Px::Service::Client
   class Base
-    cattr_accessor :logger
+    class_attribute :logger, :config
 
     class DefaultConfig < OpenStruct
       def initialize
@@ -9,21 +9,19 @@ module Px::Service::Client
       end
     end
 
+    self.config = DefaultConfig.new
+
     ##
     # Configure the client
-    def self.config
-      @config ||= DefaultConfig.new
-      yield(@config) if block_given?
-      @config
+    def self.configure
+      c = self.config.dup
+      yield(c) if block_given?
+      self.config = c
     end
 
     # Make class config available to instances
-    def config
-      if block_given?
-        self.class.config { |c| yield(c) }
-      else
-        self.class.config
-      end
+    def configure
+      self.class.configure { |c| yield(c) }
     end
 
     private

data/lib/px/service/client/caching.rb

@@ -19,15 +19,15 @@ module Px::Service::Client
     included do
       cattr_accessor :cache_client, :cache_logger
 
-      config do |config|
+      configure do |config|
         config.cache_expiry = 30.seconds
         config.cache_default_policy_group = 'general'
         config.cache_logger = nil
         config.cache_client = nil
       end
 
-      # DEPRECATED: Use .config (base class method) instead
-      alias_method :caching, :config
+      # DEPRECATED: Use .configure (base class method) instead
+      alias_method :caching, :configure
     end
 
     def cache_request(url, strategy: nil, policy_group: config.cache_default_policy_group, expires_in: config.cache_expiry, refresh_probability: 1)

data/lib/px/service/client/hmac_signing.rb

@@ -13,14 +13,14 @@ module Px::Service::Client
       end
 
       # Default config for signing
-      config do |config|
+      configure do |config|
         config.hmac_secret = DEFAULT_SECRET
         config.hmac_keyspan = DEFAULT_KEYSPAN
       end
 
       ##
       # DEPRECATED: Use .config (base class method) instead
-      alias_method :hmac_signing, :config
+      alias_method :hmac_signing, :configure
     end
 
     module ClassMethods

data/lib/px/service/client/version.rb

@@ -1,7 +1,7 @@
 module Px
   module Service
     module Client
-      VERSION = "2.0.0"
+      VERSION = "2.0.1"
     end
   end
 end

data/spec/px/service/client/base_spec.rb

@@ -8,7 +8,7 @@ describe Px::Service::Client::Base do
   subject {
     Class.new(Px::Service::Client::Base).tap do |c|
       c.include(Px::Service::Client::Caching)
-      c.config do |config|
+      c.configure do |config|
         config.cache_client = dalli
       end
     end.new
@@ -30,7 +30,7 @@ describe Px::Service::Client::Base do
 
     context "when there are separate subclasses" do
       before :each do
-        subject.config do |c|
+        subject.configure do |c|
           c.subject_field = "value"
         end
       end
@@ -43,6 +43,42 @@ describe Px::Service::Client::Base do
         expect(other_subclass.config.subject_field).not_to eq("value")
       end
     end
+
+    context "when the subclass is itself inherited" do
+      let(:subsubclass) {
+        Class.new(subject.class).new
+      }
+
+      before :each do
+        subject.configure do |c|
+          c.subject_field = "value"
+        end
+      end
+
+      it "sets the config value on the subject" do
+        expect(subject.config.subject_field).to eq("value")
+      end
+
+      it "inherits the config value on the sub-subclass" do
+        expect(subsubclass.config.subject_field).to eq("value")
+      end
+
+      context "when the config value is changed on the sub-subclass" do
+        before :each do
+          subsubclass.configure do |c|
+            c.subject_field = "other"
+          end
+        end
+
+        it "does not change the config value on the subject" do
+          expect(subject.config.subject_field).to eq("value")
+        end
+
+        it "changes the config value on the sub-subclass" do
+          expect(subsubclass.config.subject_field).to eq("other")
+        end
+      end
+    end
   end
 
   describe '#make_request' do

data/spec/px/service/client/caching/caching_spec.rb

@@ -9,11 +9,11 @@ describe Px::Service::Client::Caching do
   subject {
     Class.new(Px::Service::Client::Base).tap do |c|
       c.include(Px::Service::Client::Caching)
-      
+
       # Anonymous classes don't have a name.  Stub out :name so that things work
       allow(c).to receive(:name).and_return("Caching")
 
-      c.config do |config|
+      c.configure do |config|
         config.cache_client = dalli
       end
     end.new
@@ -87,7 +87,7 @@ describe Px::Service::Client::Caching do
 
     context 'when cache client is not set' do
       before :each do
-        subject.config do |config|
+        subject.configure do |config|
           config.cache_client = nil
         end
       end
@@ -111,7 +111,7 @@ describe Px::Service::Client::Caching do
     context "when there is a cached response" do
       context 'when cache client is not set' do
         before :each do
-          subject.config do |config|
+          subject.configure do |config|
             config.cache_client = nil
           end
         end
@@ -166,7 +166,7 @@ describe Px::Service::Client::Caching do
     context "when there is a cached response" do
       context 'when cache client is not set' do
         before :each do
-          subject.config do |config|
+          subject.configure do |config|
             config.cache_client = nil
           end
         end

data/spec/px/service/client/hmac_signing_spec.rb

@@ -13,7 +13,7 @@ describe Px::Service::Client::HmacSigning do
     Class.new(Px::Service::Client::Base).tap do |c|
       c.include(Px::Service::Client::HmacSigning)
 
-      c.config do |config|
+      c.configure do |config|
         config.hmac_secret = "different secret"
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: px-service-client
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Chris Micacchi