hoodoo 1.14.0 → 1.15.0

data/spec/spec_helper.rb

@@ -307,21 +307,42 @@ def spec_helper_http( path:,
   return http.request( request )
 end
 
+# Stub out Memcached with a TransientStore mock client instead. Call via
+# a "before :each" block.
+#
+def spec_helper_use_mock_memcached
+  Hoodoo::TransientStore::Mocks::DalliClient.reset()
+
+  allow( Dalli::Client ).to(
+    receive( :new ).
+    and_return( Hoodoo::TransientStore::Mocks::DalliClient.new )
+  )
+end
+
+# Stub out Redis with a TransientStore mock client instead. Call via
+# a "before :each" block.
+#
+def spec_helper_use_mock_redis
+  Hoodoo::TransientStore::Mocks::Redis.reset()
+
+  allow( Redis ).to(
+    receive( :new ).
+    and_return( Hoodoo::TransientStore::Mocks::Redis.new )
+  )
+end
+
 # Add support to count the database queries run within a
 # given block. Returns the number of queries run.
 #
-def count_database_calls_in( &block )
+def spec_helper_count_database_calls_in( &block )
   count = 0
+  cb    = ->( name, start_time, finish_time, id, query ) {
 
-  cb = ->(name, start_time, finish_time, id, query) {
-    # only bump the count if the database call is not to
-    #  CACHE or SCHEMA
-    unless [ 'CACHE', 'SCHEMA' ].include?( query[:name] )
-      count += 1
-    end
+    # Only bump the count if the database call is not to CACHE or SCHEMA
+    #
+    count += 1 unless [ 'CACHE', 'SCHEMA' ].include?( query[ :name ] )
   }
 
-  ActiveSupport::Notifications.subscribed( cb, "sql.active_record", &block )
-
-  count
+  ActiveSupport::Notifications.subscribed( cb, 'sql.active_record', &block )
+  return count
 end

data/spec/transient_store/transient_store/memcached_redis_mirror_spec.rb

@@ -25,19 +25,9 @@ describe Hoodoo::TransientStore::MemcachedRedisMirror do
 
     # Use pure mock back-ends behind the Memcached and Redis abstraction
     # layers; real back-end tests are done for them in their unit tests.
-
-    Hoodoo::TransientStore::Mocks::DalliClient.reset()
-    Hoodoo::TransientStore::Mocks::Redis.reset()
-
-    allow( Dalli::Client ).to(
-      receive( :new ).
-      and_return( Hoodoo::TransientStore::Mocks::DalliClient.new )
-    )
-
-    allow( Redis ).to(
-      receive( :new ).
-      and_return( Hoodoo::TransientStore::Mocks::Redis.new )
-    )
+    #
+    spec_helper_use_mock_memcached()
+    spec_helper_use_mock_redis()
 
     @instance = Hoodoo::TransientStore::MemcachedRedisMirror.new(
       storage_host_uri: @storage_engine_uri,

data/spec/transient_store/transient_store/memcached_spec.rb

@@ -138,6 +138,21 @@ describe Hoodoo::TransientStore::Memcached do
         @ttl      = 120
       end
 
+      context '#client' do
+        it 'returns the Dalli::Client in use' do
+          expect( [
+            @mock_dalli_client_instance.class,
+            ::Dalli::Client
+          ] ).to include( @instance.client.class )
+        end
+
+        it 'sets the Dalli::Client in use' do
+          new_client = Hoodoo::TransientStore::Mocks::DalliClient.new
+          @instance.client = new_client
+          expect( @instance.client ).to eq( new_client )
+        end
+      end
+
       context '#set' do
         it 'sets' do
           expect_dalli_client( backend ).to receive( :set ).with( @key, @payload, @ttl ).and_call_original()

data/spec/transient_store/transient_store_spec.rb

@@ -300,7 +300,7 @@ describe Hoodoo::TransientStore do
         expect( @store.get( key: random_key ) ).to be_nil
       end
 
-      it 'consumes exceptions' do
+      it 'consumes exceptions by default' do
         expect_any_instance_of( TestTransientStore ).to receive( :get ) do
           raise 'Hello world'
         end
@@ -308,6 +308,16 @@ describe Hoodoo::TransientStore do
         expect( @store.get( key: @key ) ).to be_nil
       end
 
+      it 'throws exceptions if asked' do
+        expect_any_instance_of( TestTransientStore ).to receive( :get ) do
+          raise 'Hello world'
+        end
+
+        expect {
+          @store.get( key: @key, allow_throw: true )
+        }.to raise_error( RuntimeError, 'Hello world' )
+      end
+
       context 'key normalisation' do
         it 'normalises the key' do
           key = :some_symbol

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hoodoo
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.15.0
 platform: ruby
 authors:
 - Loyalty New Zealand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dalli