happi 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4609eaf1588e9e857af6526d060c052773fbbece
-  data.tar.gz: 82c6dca31274a713b4d0f3078df6d8ba650c184b
+  metadata.gz: 299cad5f6062c82230763027fc28c972166fac65
+  data.tar.gz: 7f569b830deebb62102547e9a14840c01de4f7e5
 SHA512:
-  metadata.gz: e54212b486bfe57ae4635b3867b96735c930e9fea1a15458e2001c9ac61bc7e797ac64ad896442ee0bd51fe06f2a4b9687b58705dc1e6733ed3a262aac3a1d94
-  data.tar.gz: 7740cff68f3442b7ac303bc3cc3cbd24fdb911c133b714b41e8d4c8e4cf6d000650086bbfd7fc29afb4e5777f7eb523d5c2ba5019285f5bde578666eee3cc466
+  metadata.gz: 6e89dee05f976a673fd030894a41de63bdb4f4a5e9df7e54db2b1cb7053f6390d20a2d695eed838e0ea054a755f97e91c5ad50ddfe34e7c8abfb194ad0a86abd
+  data.tar.gz: 88aef7e42786f035d5993464806794e9dedcad31601a4b4d2b1792ff560d7c3dd7993b06c53c84d88ab940c1a0aa5df7756a9fddaa30a311fc16b294ba740330

data/lib/happi/client.rb

@@ -4,10 +4,12 @@ require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/hash'
 
 class Happi::Client
-  delegate :config, to: self
+  def config
+    @config ||= self.class.config.dup
+  end
 
   def self.config
-    @config ||= Happi::Configuration.new
+    @global_config ||= Happi::Configuration.new
   end
 
   def self.configure

data/lib/happi/version.rb

@@ -1,3 +1,3 @@
 module Happi
-  VERSION = '0.0.11'
+  VERSION = '0.0.12'
 end

data/spec/client_spec.rb

@@ -1,11 +1,82 @@
 require 'spec_helper'
 
+class DerivedClient < Happi::Client; end
+
 describe Happi::Client do
-  describe 'call' do
+  describe '.new' do
+    let(:default_port) { Happi::Configuration.defaults[:port] }
+    let(:class_level_port) { 80 }
+    let(:instance_level_port) { 8080 }
+    let(:derived_class_level_port) { 8081 }
+    let(:config_port) { described_class.new.config.port }
+    let(:derived_config_port) { DerivedClient.new.config.port }
 
-  end
+    context 'with no supplied config' do
+      it 'uses the default config for the base class' do
+        expect(config_port).to eq(default_port)
+      end
+
+      it 'uses the default config for the derived class' do
+        expect(derived_config_port).to eq(default_port)
+      end
+    end
+
+    context 'with class level config for the base class' do
+      before do
+        described_class.configure { |config| config.port = class_level_port }
+      end
+
+      it 'overrides the default config for the base class' do
+        expect(config_port).to eq(class_level_port)
+      end
+
+      it 'does not override the default config for the derived class' do
+        expect(derived_config_port).to_not eq(class_level_port)
+      end
+    end
+
+    context 'with class level config for the derived class' do
+      before do
+        DerivedClient.configure { |config| config.port = derived_class_level_port }
+      end
+
+      it 'does not affect the config for the base class' do
+        expect(config_port).to_not eq(derived_class_level_port)
+      end
+
+      it 'overrides the default config for the derived class' do
+        expect(derived_config_port).to eq(derived_class_level_port)
+      end
+    end
+
+    context 'with instance level config for the base class' do
+      before do
+        described_class.configure { |config| config.port = class_level_port }
+      end
+
+      it 'overrides the class config for only that base class instance' do
+        expect(Happi::Client.new(port: instance_level_port).config.port).to eq(instance_level_port)
+        expect(config_port).to_not eq(instance_level_port)
+      end
+
+      it 'does not affect the config for an instance of the derived class' do
+        expect(derived_config_port).to_not eq(instance_level_port)
+      end
+    end
+
+    context 'with instance level config for the derived class' do
+      before do
+        described_class.configure { |config| config.port = class_level_port }
+      end
 
-  describe 'raise_error' do
+      it 'does not affect the config for an instance of the base class' do
+        expect(config_port).to_not eq(instance_level_port)
+      end
 
+      it 'overrides the class config for only that derived class instance' do
+        expect(DerivedClient.new(port: instance_level_port).config.port).to eq(instance_level_port)
+        expect(derived_config_port).to_not eq(instance_level_port)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: happi
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - John D'Agostino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday