hoodoo 1.16.0 → 1.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab07823823bf92d1cfdd5070eb71585b95d7adbe
-  data.tar.gz: a9249d7aa4765ca5979eee0cf58d6919fc6f8a27
+  metadata.gz: 5c9903a7189fc118fdbc3deae1277da2602c64b9
+  data.tar.gz: b5b04be6a1c82e1958cf70863270a282256a51bc
 SHA512:
-  metadata.gz: 8fe35486b496e980d15d58cb2c353b86692833612a89cee9349b00bfac3fe5e54ae6cdb2fcd2591dd99454d66034e13b7fce01c6234c05ef0f5bcb7ea9dd0da1
-  data.tar.gz: 7101a2bc7914f19ab92fc338a74c16cb3f045b8d39985137dc177aae2bc1eb256a9f9af812be3eecd6eab78c2654302f853033c8bbf2bb88f7ab23e3767192fd
+  metadata.gz: 333ed5e667ade4ab94ee3f16dfb37e84351ab8678a09d5ffc325021b07e56e6bd3c95f820cec9ede6586c542de8abcad1746418f99e17c1ded693afb873efc51
+  data.tar.gz: 912f44dce0110b695c2815f969aa3a6a00e5ad88caf48e65578cb6097ef45f91446b59748523a8d8a65770b0d60f203f462ad5b479382feee4058e5e7a96d2a7

data/lib/hoodoo/services/services/session.rb

@@ -10,7 +10,6 @@
 
 require 'ostruct'
 require 'hoodoo/transient_store'
-require 'hoodoo/transient_store/mocks/dalli_client'
 
 module Hoodoo
   module Services

data/lib/hoodoo/transient_store.rb

@@ -17,3 +17,8 @@ require 'hoodoo/transient_store/transient_store/base'
 require 'hoodoo/transient_store/transient_store/memcached'
 require 'hoodoo/transient_store/transient_store/redis'
 require 'hoodoo/transient_store/transient_store/memcached_redis_mirror'
+
+# Mock plugin back-ends for test or other stubbing purposes.
+
+require 'hoodoo/transient_store/mocks/dalli_client'
+require 'hoodoo/transient_store/mocks/redis'

data/lib/hoodoo/transient_store/transient_store/memcached.rb

@@ -78,13 +78,20 @@ module Hoodoo
       # Connect to Memcached if possible and return the connected Dalli client
       # instance, else raise an exception.
       #
-      # +host+:: Connection URI, e.g. <tt>localhost:11211</tt>.
+      # +host+::      Connection URI, e.g. <tt>localhost:11211</tt>.
+      # +namespace+:: Key namespace (prefix), as a String or Symbol; e.g.
+      #               <tt>"nz_co_loyalty_hoodoo_transient_store_"</tt>.
       #
       def connect_to_memcached( host, namespace )
         exception = nil
         stats     = nil
         client    = nil
 
+        if Hoodoo::Services::Middleware.environment.test? &&
+           ( host.nil? || host.empty? )
+           return Hoodoo::TransientStore::Mocks::DalliClient.new
+        end
+
         begin
           client = ::Dalli::Client.new(
             host,

data/lib/hoodoo/transient_store/transient_store/redis.rb

@@ -91,6 +91,11 @@ module Hoodoo
         info      = nil
         client    = nil
 
+        if Hoodoo::Services::Middleware.environment.test? &&
+           ( host.nil? || host.empty? )
+           return Hoodoo::TransientStore::Mocks::Redis.new
+        end
+
         begin
           client = ::Redis.new(
             :url           => host,

data/lib/hoodoo/version.rb

@@ -12,6 +12,6 @@ module Hoodoo
   # The Hoodoo gem version. If this changes, ensure that the date in
   # "hoodoo.gemspec" is correct and run "bundle install" (or "update").
   #
-  VERSION = '1.16.0'
+  VERSION = '1.16.1'
 
 end

data/spec/services/services/session_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'hoodoo/transient_store/mocks/dalli_client'
 
 describe Hoodoo::Services::Session do
 

data/spec/spec_helper.rb

@@ -197,7 +197,27 @@ end
 # &block:: Block of code to call while +STDOUT+ is disabled.
 #
 def spec_helper_silence_stdout( &block )
-  Kernel.silence_stream( STDOUT, &block )
+  spec_helper_silence_stream( $stdout, &block )
+end
+
+# Back-end to #spec_helper_silence_stdout; can silence arbitrary streams.
+#
+# +stream+:: The output stream to silence, e.g. <tt>$stdout</tt>
+# &block::   Block of code to call while output stream is disabled.
+#
+def spec_helper_silence_stream( stream, &block )
+  begin
+    old_stream = stream.dup
+    stream.reopen( File::NULL )
+    stream.sync = true
+
+    yield
+
+  ensure
+    stream.reopen( old_stream )
+    old_stream.close
+
+  end
 end
 
 # Start up a service application under WEBrick via Rack on localhost, using

data/spec/transient_store/transient_store/memcached_redis_mirror_spec.rb

@@ -1,8 +1,5 @@
 require 'spec_helper'
 
-require 'hoodoo/transient_store/mocks/dalli_client'
-require 'hoodoo/transient_store/mocks/redis'
-
 # These tests make sure that the mirror class calls down to the Memcached and
 # Redis abstractions, but assumes those abstractions are thoroughly tested by
 # their own unit tests. So it makes sure it gets expected call and result

data/spec/transient_store/transient_store/memcached_spec.rb

@@ -1,7 +1,5 @@
 require 'spec_helper'
-
 require 'dalli'
-require 'hoodoo/transient_store/mocks/dalli_client'
 
 # ============================================================================
 

data/spec/transient_store/transient_store/mocks/dalli_client_spec.rb

@@ -41,4 +41,41 @@ describe Hoodoo::TransientStore::Mocks::DalliClient do
     end
   end
 
+  context 'approximate old behaviour by' do
+    it 'using the mock client in test mode if there is an empty host' do
+      expect_any_instance_of( Hoodoo::TransientStore::Mocks::DalliClient ).to receive( :initialize ).once.and_call_original()
+
+      Hoodoo::TransientStore::Memcached.new(
+        storage_host_uri: '',
+        namespace:        'test_namespace_'
+      )
+    end
+
+    it 'using the mock client in test mode if there is a "nil" host' do
+      expect_any_instance_of( Hoodoo::TransientStore::Mocks::DalliClient ).to receive( :initialize ).once.and_call_original()
+
+      Hoodoo::TransientStore::Memcached.new(
+        storage_host_uri: nil,
+        namespace:        'test_namespace_'
+      )
+    end
+
+    it 'using a real client in test mode if there is a defined host' do
+      expect_any_instance_of( ::Dalli::Client ).to receive( :initialize ).once.and_call_original()
+
+      # Silence 'Errno::ECONNREFUSED' warnings if Memcached is not actually
+      # running at the given URI. That's fine; it's the initializer test
+      # above which is important.
+      #
+      spec_helper_silence_stream( $stdout ) do
+        spec_helper_silence_stream( $stderr ) do
+          Hoodoo::TransientStore::Memcached.new(
+            storage_host_uri: 'localhost:11211',
+            namespace:        'test_namespace_'
+          )
+        end
+      end
+    end
+  end
+
 end

data/spec/transient_store/transient_store/mocks/redis_spec.rb

@@ -25,4 +25,41 @@ describe Hoodoo::TransientStore::Mocks::Redis do
     end
   end
 
+  context 'mimic approcimated old behaviour of its Memcached counterpart by' do
+    it 'using the mock client in test mode if there is an empty host' do
+      expect_any_instance_of( Hoodoo::TransientStore::Mocks::Redis ).to receive( :initialize ).once.and_call_original()
+
+      Hoodoo::TransientStore::Redis.new(
+        storage_host_uri: '',
+        namespace:        'test_namespace_'
+      )
+    end
+
+    it 'using the mock client in test mode if there is a "nil" host' do
+      expect_any_instance_of( Hoodoo::TransientStore::Mocks::Redis ).to receive( :initialize ).once.and_call_original()
+
+      Hoodoo::TransientStore::Redis.new(
+        storage_host_uri: nil,
+        namespace:        'test_namespace_'
+      )
+    end
+
+    it 'using a real client in test mode if there is a defined host' do
+      expect_any_instance_of( ::Redis ).to receive( :initialize ).once.and_call_original()
+
+      # Silence 'Errno::ECONNREFUSED' warnings if Memcached is not actually
+      # running at the given URI. That's fine; it's the initializer test
+      # above which is important.
+      #
+      spec_helper_silence_stream( $stdout ) do
+        spec_helper_silence_stream( $stderr ) do
+          Hoodoo::TransientStore::Redis.new(
+            storage_host_uri: 'redis://localhost:6379',
+            namespace:        'test_namespace_'
+          )
+        end
+      end
+    end
+  end
+
 end

data/spec/transient_store/transient_store/redis_spec.rb

@@ -1,7 +1,5 @@
 require 'spec_helper'
-
 require 'redis'
-require 'hoodoo/transient_store/mocks/redis'
 
 # ============================================================================
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hoodoo
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.16.1
 platform: ruby
 authors:
 - Loyalty New Zealand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-23 00:00:00.000000000 Z
+date: 2017-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dalli