alephant-sequencer 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da4eb17201797a629eaeeac5596eeea58c0ae5ff
-  data.tar.gz: 1ca50a3ef5e5cb822d45d8f63cb029765d24abd8
+  metadata.gz: 2cfb808e20d9d7e1ff9bf36eca6c61d3fb042152
+  data.tar.gz: 4936135a727783f3925d23ec2c018e04b6baf2f5
 SHA512:
-  metadata.gz: c50a39c7b3faab1cf4fd590c40d55188fc1400124045a52dedad92955de88ce09fa4e4000877464675e348e75c2bc9c337e9bfea674f21a7071247ac36abdf6f
-  data.tar.gz: 3b3978ea477682fe6735d1f3c1c17a9f87d957e48fae08c8409230b598705eaf9fba5a5c694aa13832b72f8cd23544c8a12a6b5814f88ba7de946764d867e859
+  metadata.gz: 83c66149df5dab3d97d6a619bbbc3b42adeb8887e1a3adc7cf39669f3a147c35fafacbf16062f91b737b9ef3123791fa7b9ee32148bd916917a329b8e3bbb7a5
+  data.tar.gz: d11b43af46a3329ac430b3e7669d054787b009370fa4957667fed40e06592e7e131e2599cd64eae7c273c91ed83de989b6f1cf475700209a0ff5823c640699c0

data/lib/alephant/sequencer/sequencer.rb

@@ -18,7 +18,7 @@ module Alephant
       end
 
       def sequential?(msg)
-        (get_last_seen || 0) < sequence_id_from(msg)
+        (get_last_seen || 0) < Sequencer.sequence_id_from(msg, jsonpath)
       end
 
       def exists?
@@ -29,7 +29,7 @@ module Alephant
         block.call(msg)
 
         last_seen_id = get_last_seen
-        if (last_seen_id || 0) < sequence_id_from(msg)
+        if (last_seen_id || 0) < Sequencer.sequence_id_from(msg, jsonpath)
           set_last_seen(msg, last_seen_id)
         else
           logger.info("Sequencer#sequence nonsequential message for #{ident}")
@@ -43,7 +43,7 @@ module Alephant
       end
 
       def set_last_seen(msg, last_seen_check = nil)
-        seen_id = sequence_id_from(msg)
+        seen_id = Sequencer.sequence_id_from(msg, jsonpath)
 
         @sequence_table.set_sequence_for(
           ident, seen_id,
@@ -55,8 +55,8 @@ module Alephant
         @sequence_table.sequence_for(ident)
       end
 
-      def sequence_id_from(msg)
-        JsonPath.on(msg.body, jsonpath).first.to_i
+      def self.sequence_id_from(msg, path)
+        JsonPath.on(msg.body, path).first.to_i
       end
     end
   end

data/lib/alephant/sequencer/version.rb

@@ -1,5 +1,5 @@
 module Alephant
   module Sequencer
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

data/spec/sequencer_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Alephant::Sequencer do
   let(:ident) { :ident }
-  let(:jsonpath) { :jsonpath }
+  let(:jsonpath) { "$.sequence_id" }
 
   describe ".create(table_name, ident, jsonpath)" do
     it "should return a Sequencer" do
@@ -42,6 +42,108 @@ describe Alephant::Sequencer do
       end
     end
 
+
+    describe "#sequence(msg, &block)" do
+      let(:message) do
+        m = double()
+        m.stub(:body)
+
+        m
+      end
+
+      let(:a_proc) do
+        a_block = double()
+        a_block.should_receive(:called).with(message)
+
+        Proc.new do |msg|
+          a_block.called(msg)
+        end
+      end
+
+      let(:stubbed_last_seen) { 2 }
+      let(:stubbed_seen_high) { 3 }
+      let(:stubbed_seen_low)  { 1 }
+
+      it "should call the passed block with msg" do
+        subject = Alephant::Sequencer::Sequencer.new(sequence_table, ident, jsonpath)
+        subject.sequence(message, &a_proc)
+      end
+
+      context "last_seen_id is nil" do
+        before(:each) do
+          Alephant::Sequencer::Sequencer.any_instance
+            .stub(:get_last_seen).and_return(nil)
+
+          Alephant::Sequencer::Sequencer
+            .stub(:sequence_id_from).and_return(stubbed_seen_high)
+        end
+
+        it "should not call set_last_seen(msg, last_seen_id)" do
+          Alephant::Sequencer::Sequencer.any_instance
+            .should_receive(:set_last_seen)
+            .with(message, nil)
+
+          subject = Alephant::Sequencer::Sequencer.new(sequence_table, ident, jsonpath)
+          subject.sequence(message, &a_proc)
+        end
+      end
+
+      context "last_seen_id == sequence_id_from(msg)" do
+        before(:each) do
+          Alephant::Sequencer::Sequencer.any_instance
+            .stub(:get_last_seen).and_return(stubbed_last_seen)
+
+          Alephant::Sequencer::Sequencer
+            .stub(:sequence_id_from).and_return(stubbed_last_seen)
+        end
+
+        it "should not call set_last_seen(msg, last_seen_id)" do
+          Alephant::Sequencer::Sequencer.any_instance
+            .should_not_receive(:set_last_seen)
+
+          subject = Alephant::Sequencer::Sequencer.new(sequence_table, ident, jsonpath)
+          subject.sequence(message, &a_proc)
+        end
+      end
+
+      context "last_seen_id > sequence_id_from(msg)" do
+        before(:each) do
+          Alephant::Sequencer::Sequencer.any_instance
+            .stub(:get_last_seen).and_return(stubbed_last_seen)
+
+          Alephant::Sequencer::Sequencer.any_instance
+            .stub(:sequence_id_from).and_return(stubbed_seen_low)
+        end
+
+        it "should not call set_last_seen(msg, last_seen_id)" do
+          Alephant::Sequencer::Sequencer.any_instance
+            .should_not_receive(:set_last_seen)
+
+          subject = Alephant::Sequencer::Sequencer.new(sequence_table, ident, jsonpath)
+          subject.sequence(message, &a_proc)
+        end
+      end
+
+      context "last_seen_id < sequence_id_from(msg)" do
+        before(:each) do
+          Alephant::Sequencer::Sequencer.any_instance
+            .stub(:get_last_seen).and_return(stubbed_last_seen)
+
+          Alephant::Sequencer::Sequencer
+            .stub(:sequence_id_from).and_return(stubbed_seen_high)
+        end
+
+        it "should call set_last_seen(msg, last_seen_id)" do
+          Alephant::Sequencer::Sequencer.any_instance
+            .should_receive(:set_last_seen)
+            .with(message, stubbed_last_seen)
+
+          subject = Alephant::Sequencer::Sequencer.new(sequence_table, ident, jsonpath)
+          subject.sequence(message, &a_proc)
+        end
+      end
+    end
+
     describe "#get_last_seen" do
       it "returns sequence_table.sequence_for(ident)" do
         table = double()
@@ -57,7 +159,7 @@ describe Alephant::Sequencer do
 
     describe "#set_last_seen(data)" do
       before(:each) do
-        Alephant::Sequencer::Sequencer.any_instance.stub(:sequence_id_from).and_return(last_seen)
+        Alephant::Sequencer::Sequencer.stub(:sequence_id_from).and_return(last_seen)
       end
 
       it "calls set_sequence_for(ident, last_seen)" do
@@ -71,11 +173,11 @@ describe Alephant::Sequencer do
       end
     end
 
-    describe "#sequence_id_from(data)" do
-      subject { Alephant::Sequencer::Sequencer.new(sequence_table, ident, '$.set_sequence_id') }
+    describe ".sequence_id_from(data)" do
+      subject { Alephant::Sequencer::Sequencer }
       it "should return the id described by the set jsonpath" do
         msg = Struct.new(:body).new({ "set_sequence_id" => 1 })
-        expect(subject.sequence_id_from msg).to eq(1)
+        expect(subject.sequence_id_from(msg,'$.set_sequence_id')).to eq(1)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alephant-sequencer
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Robert Kenny
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler