macmillan-utils 1.0.22 → 1.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb22ff44444f327f1ad8b6b86fbf0a5459c8dbe5
-  data.tar.gz: e4dc24cc3545a2f066a144ffe0b2ac03419d3d7c
+  metadata.gz: 42d0f124530989afb7adc2d6f009fc4a0c597e35
+  data.tar.gz: 3ea996731cb2a41a629a776027eb32c9f6184d3d
 SHA512:
-  metadata.gz: 2ae1c641868cdcc139a20707fcf37a24de37d3d5ccf9028e6162bc795435106535b6602d7a8dbd79754fe081c5137188f76b036dc9c69158c5e735b5f3e8f5a7
-  data.tar.gz: 3ba354ceeaba0b362d21664551e6761aee2567ce309a6a16a8270b2aa066cd630f39421a9efa317338ed0f132b4dfccf1836f0cd20badf0a86aa9408917b9102
+  metadata.gz: 2d6b78bd871148f5373b17fa53887abcd9045e41d5ab9de1784d0d1c9dbe55056650a8ae57bb0981dcd7caddd2e2be7cf6bef8d54e11d448839ac4e190d28a28
+  data.tar.gz: 4bdbe4cd33a6a30308bcca4750c3f594136f80f28956f665fe840f800a477f1a2f28e5d2f32ca9d738638b8c093fe3e2390a2f3ad37325273b3424f79d563fb9

data/lib/macmillan/utils/settings/lookup.rb

@@ -7,17 +7,12 @@ module Macmillan
         end
 
         def lookup(key)
-          value = nil
-
           @backends.each do |backend|
-            break if value
             result = backend.get(key)
-            value  = result.value unless result.is_a?(KeyNotFound)
+            return result.value unless result.is_a?(KeyNotFound)
           end
 
-          fail KeyNotFoundError.new("Cannot find a settings value for #{key}") unless value
-
-          value
+          fail KeyNotFoundError.new("Cannot find a settings value for #{key}")
         end
 
         # Backwards compatibility: in the past this has been used like a Hash

data/spec/lib/macmillan/utils/logger/factory_spec.rb

@@ -32,7 +32,9 @@ describe Macmillan::Utils::Logger::Factory do
       end
 
       it 'allows you to configure the log target' do
-        expect(Logger).to receive(:new).with('foo.log').and_call_original
+        logger = double('logger').as_null_object
+        expect(Logger).to receive(:new).with('foo.log').and_return(logger)
+
         Macmillan::Utils::Logger::Factory.build_logger(:logger, target: 'foo.log')
       end
     end

data/spec/lib/macmillan/utils/settings/lookup_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe Macmillan::Utils::Settings::Lookup do
+  let(:backend1) { double('Backend One') }
+  let(:backend2) { double('Backend Two') }
+
+  subject { described_class.new([backend1, backend2]) }
+
+  it 'returns the first value it finds' do
+    true_value = Macmillan::Utils::Settings::Value.new('is_craigw_trolling_us', true, backend1, 'is_craigw_trolling_us')
+    allow(backend1).to receive(:get).with('is_craigw_trolling_us').and_return(true_value)
+
+    expect(backend2).to_not receive(:get)
+    expect(subject.lookup('is_craigw_trolling_us')).to eq(true)
+  end
+
+  it 'tries successive backends' do
+    not_found_value = Macmillan::Utils::Settings::KeyNotFound.new('is_craigw_trolling_us', backend1, 'is_craigw_trolling_us')
+    true_value = Macmillan::Utils::Settings::Value.new('is_craigw_trolling_us', true, backend2, 'is_craigw_trolling_us')
+
+    allow(backend1).to receive(:get).with('is_craigw_trolling_us').and_return(not_found_value)
+    allow(backend2).to receive(:get).with('is_craigw_trolling_us').and_return(true_value)
+
+    expect(subject.lookup('is_craigw_trolling_us')).to eq(true)
+  end
+
+  it 'returns a falsey value if it is actually set' do
+    not_found_value = Macmillan::Utils::Settings::KeyNotFound.new('is_it_good_code', backend1, 'is_it_good_code')
+    false_value = Macmillan::Utils::Settings::Value.new('is_it_good_code', false, backend2, 'is_it_good_code')
+
+    allow(backend1).to receive(:get).with('is_it_good_code').and_return(not_found_value)
+    allow(backend2).to receive(:get).with('is_it_good_code').and_return(false_value)
+
+    expect(subject.lookup('is_it_good_code')).to eq(false)
+  end
+
+  it 'raises an error if it cannot find a value in any backend' do
+    not_found_value1 = Macmillan::Utils::Settings::KeyNotFound.new('not_found', backend1, 'not_found')
+    not_found_value2 = Macmillan::Utils::Settings::KeyNotFound.new('not_found', backend2, 'not_found')
+
+    allow(backend1).to receive(:get).with('not_found').and_return(not_found_value1)
+    allow(backend2).to receive(:get).with('not_found').and_return(not_found_value2)
+
+    expect { subject.lookup('not_found') }.to raise_error(Macmillan::Utils::Settings::KeyNotFoundError)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: macmillan-utils
 version: !ruby/object:Gem::Version
-  version: 1.0.22
+  version: 1.0.23
 platform: ruby
 authors:
 - Macmillan Science and Education (New Publsihing Platforms)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-06 00:00:00.000000000 Z
+date: 2015-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -245,6 +245,7 @@ files:
 - spec/lib/macmillan/utils/logger/formatter_spec.rb
 - spec/lib/macmillan/utils/middleware/uuid_spec.rb
 - spec/lib/macmillan/utils/middleware/weak_etags_spec.rb
+- spec/lib/macmillan/utils/settings/lookup_spec.rb
 - spec/lib/macmillan/utils/settings_spec.rb
 - spec/lib/macmillan/utils/statsd_controller_helper_spec.rb
 - spec/lib/macmillan/utils/statsd_decorator_spec.rb
@@ -283,6 +284,7 @@ test_files:
 - spec/lib/macmillan/utils/logger/formatter_spec.rb
 - spec/lib/macmillan/utils/middleware/uuid_spec.rb
 - spec/lib/macmillan/utils/middleware/weak_etags_spec.rb
+- spec/lib/macmillan/utils/settings/lookup_spec.rb
 - spec/lib/macmillan/utils/settings_spec.rb
 - spec/lib/macmillan/utils/statsd_controller_helper_spec.rb
 - spec/lib/macmillan/utils/statsd_decorator_spec.rb