bandiera-client 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d59a3e5cb3cf23e4137715345e15df7499e00e48
-  data.tar.gz: 1165f18f168f53e8695c575859b0ae841d9ac789
+  metadata.gz: 0231e248ad75e4dd5762406ce09fbb937853babf
+  data.tar.gz: cfacb3426cc40e772fc2e357f4ff870c99412f60
 SHA512:
-  metadata.gz: e7b6ace839926487e8f938c4511e71ee7e96aaf69521094187e4005e73d548ffe6c1ce5dcd51f1a66309b199c15a573011abc84ed28abda38a36f61ce1e38bc0
-  data.tar.gz: ae4a2f37b35d439ede1d9de7965665d6ddd443f544efb5c3ffa3549faba78c204f33ccb1b40461f6a2556b7b3ae991517cba8714cf78793efb735eaf3ee9d3e8
+  metadata.gz: 9e4dfec63215c440d81ebe4f1cbdbe5f7465cd36340b1fa27cfa72f3577f51fb04fc55ee6048a5b660637b8dcbc146f561df640fa177cf0bba3bbf9e94bb6f49
+  data.tar.gz: ec1efc0dd1c3cf895515c1481ed8bdcf6311db2b3034e093524043e9041e3776ef42e6e1c766ddafb2732a9341092eb414de4dd0ced9c8fdc75ec97890ed0165

data/.hound.yml

@@ -0,0 +1,39 @@
+Metrics/LineLength:
+  Description: 'Limit lines to 120 characters.'
+  Max: 120
+
+Style/Documentation:
+  Enabled: false
+
+Style/SpaceBeforeFirstArg:
+  Enabled: false
+
+Style/BracesAroundHashParameters:
+  Enabled: false
+
+Style/IndentHash:
+  EnforcedStyle: consistent
+
+Style/AlignHash:
+  EnforcedHashRocketStyle: table
+  EnforcedColonStyle: table
+
+Style/AlignParameters:
+  EnforcedStyle: with_fixed_indentation
+
+Style/StringLiterals:
+  EnforcedStyle: single_quotes
+
+Style/CollectionMethods:
+  PreferredMethods:
+    collect: 'map'
+    collect!: 'map!'
+    inject: 'reduce'
+    detect: 'find'
+    find_all: 'select'
+
+Style/DotPosition:
+  EnforcedStyle: leading
+
+Style/DoubleNegation:
+  Enabled: false

data/.travis.yml

@@ -8,8 +8,7 @@ rvm:
   - 2.1
   - 2.2
   - 2.3.0
-  - ruby
-  - jruby
+  - jruby-9.0.0.0
 
 # Ensure we don't build for *every* commit (doesn't apply to PR builds)
 branches:

data/bandiera-client.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'webmock'
   spec.add_development_dependency 'rack-test'
+  spec.add_development_dependency 'rack', '< 2.0.0' # NOTE for the time being, don't force us to use ruby 2.2.2 please.
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'pry'
 

data/lib/bandiera/client.rb

@@ -108,7 +108,7 @@ module Bandiera
     end
 
     EXCEPTIONS_TO_HANDLE = (
-      Errno.constants.map { |cla| Errno.const_get(cla) } + [RestClient::Exception, JSON::ParserError]
+      Errno.constants.map { |cla| Errno.const_get(cla) } + [RestClient::Exception, JSON::ParserError, SocketError]
     ).flatten
 
     def get_and_handle_exceptions(path, params, http_opts, return_upon_error, error_msg_prefix, &block)
@@ -116,8 +116,14 @@ module Bandiera
       logger.debug("#{error_msg_prefix} - #{res['warning']}") if res['warning']
       block.call(res['response']) if block
       res['response']
-    rescue *EXCEPTIONS_TO_HANDLE
+    rescue *EXCEPTIONS_TO_HANDLE => e
+      message = "Bandiera::Client - HANDLED EXCEPTION #{e.inspect} - CLASS #{e.class.name}"
+      logger.warn(message)
       return_upon_error
+    rescue => e
+      message = "Bandiera::Client - UNHANDLED EXCEPTION #{e.inspect} - CLASS #{e.class.name}"
+      logger.error(message)
+      raise
     end
 
     def get(path, params, passed_http_opts)

data/lib/bandiera/client/version.rb

@@ -1,5 +1,5 @@
 module Bandiera
   class Client
-    VERSION = '3.0.3'.freeze
+    VERSION = '3.0.4'.freeze
   end
 end

data/spec/lib/bandiera/client_spec.rb

@@ -6,6 +6,40 @@ describe Bandiera::Client do
   let(:logger)    { double.as_null_object }
   subject         { Bandiera::Client.new(api_uri, logger) }
 
+  shared_examples_for 'a robust request' do
+    context 'bandiera is down' do
+      it 'returns a default response' do
+        stub_request(:get, url).to_return(status: [0, ''])
+
+        expect(response).to eq expected_error_response
+      end
+    end
+
+    context 'bandiera is having some problems' do
+      it 'returns a default response' do
+        stub_request(:get, url).to_return(status: 500, body: '')
+
+        expect(response).to eq expected_error_response
+      end
+    end
+
+    context 'bandiera times out' do
+      it 'returns a default response' do
+        stub_request(:get, url).to_timeout
+
+        expect(response).to eq expected_error_response
+      end
+    end
+
+    context 'bandiera cannot be contacted' do
+      it 'returns a default response' do
+        stub_request(:get, url).to_raise(::SocketError)
+
+        expect(response).to eq expected_error_response
+      end
+    end
+  end
+
   context 'when a client name is provided' do
     let(:group)   { 'pubserv' }
     let(:feature) { 'log-stats' }
@@ -40,11 +74,12 @@ describe Bandiera::Client do
     let(:group)   { 'pubserv' }
     let(:feature) { 'log-stats' }
     let(:url)     { "#{api_uri}/v2/groups/#{group}/features/#{feature}" }
+    let(:response) { subject.get_feature(group, feature) }
+    let(:expected_error_response) { false }
 
     context 'all is ok' do
       it 'returns the bandiera response' do
         stub     = stub_api_request(url, 'response' => true)
-        response = subject.get_feature(group, feature)
 
         expect(response).to be true
         expect(stub).to have_been_requested
@@ -72,54 +107,26 @@ describe Bandiera::Client do
           # 2 calls - one for the request, one for the warning
           expect(logger).to receive(:debug).twice
 
-          response = subject.get_feature(group, feature)
-
           expect(response).to be false
           expect(stub).to have_been_requested
         end
       end
     end
 
-    context 'bandiera is down' do
-      it 'returns a default response' do
-        stub_request(:get, url).to_return(status: [0, ''])
-
-        response = subject.get_feature(group, feature)
-
-        expect(response).to be false
-      end
-    end
-
-    context 'bandiera is having some problems' do
-      it 'returns a default response' do
-        stub_request(:get, url).to_return(status: 500, body: '')
-
-        response = subject.get_feature(group, feature)
-
-        expect(response).to be false
-      end
-    end
-
-    context 'bandiera times out' do
-      it 'returns a default response' do
-        stub_request(:get, url).to_timeout
-
-        response = subject.get_feature(group, feature)
+    it_behaves_like 'a robust request'
 
-        expect(response).to be false
-      end
-    end
   end
 
   describe '#get_features_for_group' do
     let(:group) { 'pubserv' }
     let(:url)   { "#{api_uri}/v2/groups/#{group}/features" }
+    let(:response) { subject.get_features_for_group(group) }
+    let(:expected_error_response) { {} }
 
     context 'all is ok' do
       it 'returns the bandiera response' do
         feature_hash = { 'show-stuff' => true, 'show-other-stuff' => false }
         stub         = stub_api_request(url, 'response' => feature_hash)
-        response     = subject.get_features_for_group(group)
 
         expect(response).to eq(feature_hash)
         expect(stub).to have_been_requested
@@ -147,53 +154,24 @@ describe Bandiera::Client do
           # 2 calls - one for the request, one for the warning
           expect(logger).to receive(:debug).twice
 
-          response = subject.get_features_for_group(group)
-
           expect(response).to be {}
           expect(stub).to have_been_requested
         end
       end
     end
 
-    context 'bandiera is down' do
-      it 'returns a default response' do
-        stub_request(:get, url).to_return(status: [0, ''])
-
-        response = subject.get_features_for_group(group)
-
-        expect(response).to be {}
-      end
-    end
-
-    context 'bandiera is having some problems' do
-      it 'returns a default response' do
-        stub_request(:get, url).to_return(status: 500, body: '')
-
-        response = subject.get_features_for_group(group)
-
-        expect(response).to be {}
-      end
-    end
-
-    context 'bandiera times out' do
-      it 'returns a default response' do
-        stub_request(:get, url).to_timeout
-
-        response = subject.get_features_for_group(group)
-
-        expect(response).to be {}
-      end
-    end
+    it_behaves_like 'a robust request'
   end
 
   describe '#get_all' do
     let(:url) { "#{api_uri}/v2/all" }
+    let(:response) { subject.get_all }
+    let(:expected_error_response) { {} }
 
     context 'all is ok' do
       it 'returns the bandiera response' do
         feature_hash = { 'pubserv' => { 'show-stuff' => true, 'show-other-stuff' => false } }
         stub         = stub_api_request(url, 'response' => feature_hash)
-        response     = subject.get_all
 
         expect(response).to eq(feature_hash)
         expect(stub).to have_been_requested
@@ -221,43 +199,13 @@ describe Bandiera::Client do
           # 2 calls - one for the request, one for the warning
           expect(logger).to receive(:debug).twice
 
-          response = subject.get_all
-
           expect(response).to be {}
           expect(stub).to have_been_requested
         end
       end
     end
 
-    context 'bandiera is down' do
-      it 'returns a default response' do
-        stub_request(:get, url).to_return(status: [0, ''])
-
-        response = subject.get_all
-
-        expect(response).to be {}
-      end
-    end
-
-    context 'bandiera is having some problems' do
-      it 'returns a default response' do
-        stub_request(:get, url).to_return(status: 200, body: '<html></html>')
-
-        response = subject.get_all
-
-        expect(response).to be {}
-      end
-    end
-
-    context 'bandiera times out' do
-      it 'returns a default response' do
-        stub_request(:get, url).to_timeout
-
-        response = subject.get_all
-
-        expect(response).to be {}
-      end
-    end
+    it_behaves_like 'a robust request'
   end
 
   private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bandiera-client
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Springer Nature
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -168,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Simple feature flagging API client.

data/.hound.yml

@@ -1 +0,0 @@
-.rubocop.yml