alephant-sequencer 3.1.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e18b0c6e698768dce4f614890d9ce4bef61f0cb7
-  data.tar.gz: c644ddf1987bef172626151badd5834c2d0af925
+  metadata.gz: 1b2c61c50eec14f883e1e41e4c9aa0400c933692
+  data.tar.gz: 80da5a3eb098c7c7313fe1e39e3d670011c77503
 SHA512:
-  metadata.gz: 7972baac0d4095ab9e5add8bee3ead2ccbc733003d179cf1246a72efe622e436c8f3aafb5ee71a886e3ac46f69f94de1741e1386b63cdc24ca3a1efbfbdc6c8f
-  data.tar.gz: 3531b8a5734af6f6d49cce71c401e28168537359383e76901ec08d31ddf1394c3c7094d07e6e15766a30c9623c4720a3cffd842ba28682b26af7695f0a95c1d1
+  metadata.gz: 0fd622b775ff450bed1d556d2203351a4d08ee105f4e9a0f8703eddb140e3f725c8d59cfaaf1528429ee9ab6ed1f690f35235030d320cb85d2f94edfb68af957
+  data.tar.gz: af672d1682a7e6d89396c6fc6f6d97341fb9ad616eb551c2efac798249ce0595d5d63338f050dbe682450659019bb15eb77b666227781b93cdfccff139673c67

data/alephant-sequencer.gemspec

@@ -35,5 +35,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "alephant-logger"
   spec.add_runtime_dependency "alephant-support"
   spec.add_runtime_dependency "jsonpath"
-  spec.add_runtime_dependency "dalli-elasticache"
+  spec.add_runtime_dependency "dalli"
 end

data/lib/alephant/sequencer/sequence_cache.rb

@@ -1,4 +1,4 @@
-require 'dalli-elasticache'
+require 'dalli'
 require 'alephant/logger'
 
 module Alephant
@@ -18,8 +18,7 @@ module Alephant
           logger.metric 'NoConfigEndpoint'
           @client = NullClient.new
         else
-          @elasticache ||= ::Dalli::ElastiCache.new(config_endpoint, expires_in: ttl)
-          @client ||= @elasticache.client
+          @client ||= ::Dalli::Client.new(config_endpoint, expires_in: ttl)
         end
       end
 

data/lib/alephant/sequencer/version.rb

@@ -1,5 +1,5 @@
 module Alephant
   module Sequencer
-    VERSION = '3.1.1'.freeze
+    VERSION = '3.2.0'.freeze
   end
 end

data/spec/sequencer_spec.rb

@@ -7,6 +7,7 @@ describe Alephant::Sequencer do
   let(:keep_all) { true }
   let(:config) { { 'elasticache_config_endpoint' => '/foo' } }
   let(:cache) { Alephant::Sequencer::SequenceCache.new(config) }
+  let(:cache_client) { Dalli::Client.new }
   let(:opts) do
     {
       id:       ident,
@@ -15,12 +16,13 @@ describe Alephant::Sequencer do
       cache:    cache
     }
   end
+  
+  before do
+    allow(Dalli::Client).to receive(:new).and_return(cache_client)
+  end
 
   describe '.create' do
     it 'should return a Sequencer' do
-      expect_any_instance_of(Dalli::ElastiCache).to receive(:initialize)
-      expect_any_instance_of(Dalli::ElastiCache).to receive(:client).and_return(Dalli::Client.new)
-
       expect_any_instance_of(Alephant::Sequencer::SequenceTable).to receive(:initialize)
       expect_any_instance_of(Alephant::Sequencer::SequenceTable).to receive(:sequence_exists)
 
@@ -63,9 +65,6 @@ describe Alephant::Sequencer do
       it 'sets @jsonpath, @ident' do
         expect(sequence_table).to receive(:sequence_exists)
 
-        expect_any_instance_of(Dalli::ElastiCache).to receive(:initialize)
-        expect_any_instance_of(Dalli::ElastiCache).to receive(:client).and_return(Dalli::Client.new)
-
         expect(instance.jsonpath).to eq(jsonpath)
         expect(instance.ident).to eq(ident)
         expect(instance.keep_all).to eq(true)
@@ -105,11 +104,8 @@ describe Alephant::Sequencer do
         expect(sequence_table).to receive(:sequence_exists)
         expect(sequence_table).to receive(:sequence_for).with(ident)
 
-        expect_any_instance_of(Dalli::ElastiCache).to receive(:initialize)
-        expect_any_instance_of(Dalli::ElastiCache).to receive(:client).and_return(Dalli::Client.new)
-
-        expect_any_instance_of(Dalli::Client).to receive(:get).twice
-        expect_any_instance_of(Dalli::Client).to receive(:set).twice
+        expect(cache_client).to receive(:get).twice
+        expect(cache_client).to receive(:set).twice
 
         expect(message).to receive(:body)
 
@@ -122,11 +118,8 @@ describe Alephant::Sequencer do
 
           expect(described_class).to receive(:sequence_id_from).and_return(stubbed_seen_high)
 
-          expect_any_instance_of(Dalli::ElastiCache).to receive(:initialize)
-          expect_any_instance_of(Dalli::ElastiCache).to receive(:client).and_return(Dalli::Client.new)
-
-          expect_any_instance_of(Dalli::Client).to receive(:get)
-          expect_any_instance_of(Dalli::Client).to receive(:set)
+          expect(cache_client).to receive(:get)
+          expect(cache_client).to receive(:set)
         end
 
         it 'should not call set_last_seen' do
@@ -144,11 +137,8 @@ describe Alephant::Sequencer do
 
           expect(described_class).to receive(:sequence_id_from).and_return(stubbed_last_seen)
 
-          expect_any_instance_of(Dalli::ElastiCache).to receive(:initialize)
-          expect_any_instance_of(Dalli::ElastiCache).to receive(:client).and_return(Dalli::Client.new)
-
-          expect_any_instance_of(Dalli::Client).to receive(:get)
-          expect_any_instance_of(Dalli::Client).to receive(:set)
+          expect(cache_client).to receive(:get)
+          expect(cache_client).to receive(:set)
         end
 
         it 'should not call set_last_seen(msg, last_seen_id)' do
@@ -166,11 +156,8 @@ describe Alephant::Sequencer do
 
           expect(described_class).to receive(:sequence_id_from).and_return(stubbed_seen_low)
 
-          expect_any_instance_of(Dalli::ElastiCache).to receive(:initialize)
-          expect_any_instance_of(Dalli::ElastiCache).to receive(:client).and_return(Dalli::Client.new)
-
-          expect_any_instance_of(Dalli::Client).to receive(:get)
-          expect_any_instance_of(Dalli::Client).to receive(:set)
+          expect(cache_client).to receive(:get)
+          expect(cache_client).to receive(:set)
         end
 
         it 'should not call set_last_seen' do
@@ -206,11 +193,8 @@ describe Alephant::Sequencer do
 
           expect(described_class).to receive(:sequence_id_from).and_return(stubbed_seen_high)
 
-          expect_any_instance_of(Dalli::ElastiCache).to receive(:initialize)
-          expect_any_instance_of(Dalli::ElastiCache).to receive(:client).and_return(Dalli::Client.new)
-
-          expect_any_instance_of(Dalli::Client).to receive(:get)
-          expect_any_instance_of(Dalli::Client).to receive(:set)
+          expect(cache_client).to receive(:get)
+          expect(cache_client).to receive(:set)
         end
 
         it 'should call set_last_seen(msg, last_seen_id)' do
@@ -226,11 +210,8 @@ describe Alephant::Sequencer do
         before(:each) do
           expect(message).to receive(:body).and_return('sequence_id' => 5)
 
-          expect_any_instance_of(Dalli::ElastiCache).to receive(:initialize)
-          expect_any_instance_of(Dalli::ElastiCache).to receive(:client).and_return(Dalli::Client.new)
-
-          expect_any_instance_of(Dalli::Client).to receive(:get).twice.with('ident').and_return(stubbed_last_seen)
-          expect_any_instance_of(Dalli::Client).to_not receive(:set)
+          expect(cache_client).to receive(:get).twice.with('ident').and_return(stubbed_last_seen)
+          expect(cache_client).to_not receive(:set)
         end
 
         it 'should read values from cache and not database' do
@@ -250,11 +231,8 @@ describe Alephant::Sequencer do
       end
 
       it 'returns sequence_table.sequence_for(ident)' do
-        expect_any_instance_of(Dalli::ElastiCache).to receive(:initialize)
-        expect_any_instance_of(Dalli::ElastiCache).to receive(:client).and_return(Dalli::Client.new)
-
-        expect_any_instance_of(Dalli::Client).to receive(:get).twice
-        expect_any_instance_of(Dalli::Client).to receive(:set).twice
+        expect(cache_client).to receive(:get).twice
+        expect(cache_client).to receive(:set).twice
 
         expect(sequence_table).to receive(:sequence_exists)
 
@@ -270,11 +248,8 @@ describe Alephant::Sequencer do
       before(:each) do
         expect(described_class).to receive(:sequence_id_from).and_return(last_seen)
 
-        expect_any_instance_of(Dalli::ElastiCache).to receive(:initialize)
-        expect_any_instance_of(Dalli::ElastiCache).to receive(:client).and_return(Dalli::Client.new)
-
-        expect_any_instance_of(Dalli::Client).to receive(:get).twice
-        expect_any_instance_of(Dalli::Client).to receive(:set).twice
+        expect(cache_client).to receive(:get).twice
+        expect(cache_client).to receive(:set).twice
       end
 
       subject (:instance) do
@@ -308,11 +283,8 @@ describe Alephant::Sequencer do
 
         expect(sequence_table).to receive(:sequence_exists)
 
-        expect_any_instance_of(Dalli::ElastiCache).to receive(:initialize)
-        expect_any_instance_of(Dalli::ElastiCache).to receive(:client).and_return(Dalli::Client.new)
-
-        expect_any_instance_of(Dalli::Client).to receive(:get)
-        expect_any_instance_of(Dalli::Client).to receive(:set)
+        expect(cache_client).to receive(:get)
+        expect(cache_client).to receive(:set)
       end
 
       subject (:instance) do
@@ -366,9 +338,6 @@ describe Alephant::Sequencer do
       end
 
       it 'verify SequenceTable#truncate!' do
-        expect_any_instance_of(Dalli::ElastiCache).to receive(:initialize)
-        expect_any_instance_of(Dalli::ElastiCache).to receive(:client).and_return(Dalli::Client.new)
-
         expect(sequence_table).to receive(:sequence_exists)
         expect(sequence_table).to receive(:truncate!)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alephant-sequencer
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0
 platform: ruby
 authors:
 - BBC News
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-04 00:00:00.000000000 Z
+date: 2018-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -221,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dalli-elasticache
+  name: dalli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -277,7 +277,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Adds sequencing functionality to Alephant.