alephant-sequencer 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9469dfac1eb96f8c9386bf691836cf8f3017f59
-  data.tar.gz: c97554d0a0b758413c9024f4ee4d2fd5f9167faf
+  metadata.gz: f3a700631c4ac5a7dcbb393c5b646c94ff570507
+  data.tar.gz: 231923e71aa7e8f0d4af03e5f3088b14d8c365d1
 SHA512:
-  metadata.gz: 10ef0ab3836211d83e502690620f7d38b10c44761dd99abe9b43f47eca517de9908b54b971c3287ffecef54ef9b693c03837489e6a422e427d74d86d5c16b0c4
-  data.tar.gz: be84f7081d5ab556ee69fe5fd96d6adb5db862e69ca6ea5b387db3b9915f812bde4df8e9dc5cf6c11fc96e1a2cbf6bb09f83fbe2c39ca4430b87525c525737f4
+  metadata.gz: 6ee44b240e0007b839b23069601ace6a2221991f12ca560cdc6ca6c372c9ab20db526f7545a06a56ff337a433fe6fd44cce7b3c8d1a91a03ca26d1e9513104bf
+  data.tar.gz: a34a2e07fe1b5184ca238a385e29dbbc17a90bc99de6251bffd7a37952500e6549bbe3c1431dc3e153d1fedb2f6bf356ce23d335720d2df674845d96e6daa971

data/Guardfile

@@ -0,0 +1,6 @@
+guard 'rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/.+\.rb$})
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch('spec/spec_helper.rb')                        { "spec" }
+end

data/lib/alephant/sequencer/sequence_table.rb

@@ -2,9 +2,13 @@ require 'aws-sdk'
 require 'thread'
 require 'timeout'
 
+require 'alephant/logger'
+
 module Alephant
   module Sequencer
     class SequenceTable
+      include ::Alephant::Logger
+
       attr_reader :table_name
 
       TIMEOUT = 120
@@ -37,19 +41,25 @@ module Alephant
         @table ||= @dynamo_db.tables[@table_name]
       end
 
+      def sequence_exists(ident)
+        !(table.items.where(:key => ident) == 0)
+      end
+
       def sequence_for(ident)
         rows = batch_get_value_for(ident)
-        rows.count >= 1 ? rows.first['value'].to_i : 0
+        rows.count >= 1 ? rows.first['value'].to_i : nil
       end
 
-      def set_sequence_for(ident,value)
-        @mutex.synchronize do
-          AWS::DynamoDB::BatchWrite.new.tap { |batch|
-            batch.put(
-              table_name,
-              [:key => ident,:value => value]
+      def set_sequence_for(ident, value, last_seen_check = nil)
+        begin
+          @mutex.synchronize do
+            table.items.put(
+              {:key => ident, :value => value },
+              put_condition(last_seen_check)
             )
-          }.process!
+          end
+        rescue AWS::DynamoDB::Errors::ConditionalCheckFailedException => e
+          logger.warn("SequenceTable#set_sequence_for: #{e.message}")
         end
       end
 
@@ -58,10 +68,22 @@ module Alephant
       end
 
       private
+      def put_condition(last_seen_check)
+        last_seen_check.nil? ? unless_exists(:key) : if_value(last_seen_check)
+      end
+
       def batch_get_value_for(ident)
         table.batch_get(['value'],[ident],batch_get_opts)
       end
 
+      def unless_exists(key)
+        { :unless_exists => key }
+      end
+
+      def if_value(value)
+        { :if => { :value => value.to_i } }
+      end
+
       def batch_get_opts
         { :consistent_read => true }
       end

data/lib/alephant/sequencer/sequencer.rb

@@ -1,4 +1,5 @@
 require 'jsonpath'
+
 require 'alephant/logger'
 
 module Alephant
@@ -8,28 +9,45 @@ module Alephant
       attr_reader :ident, :jsonpath
 
       def initialize(sequence_table, id, sequence_path)
-        @mutex = Mutex.new
         @sequence_table = sequence_table
+        @sequence_table.create
+
+        @exists = exists?
         @jsonpath = sequence_path
         @ident = id
-
-        @sequence_table.create
       end
 
       def sequential?(msg)
-        get_last_seen < sequence_id_from(msg)
+        (get_last_seen || 0) < sequence_id_from(msg)
+      end
+
+      def exists?
+        @exists || @sequence_table.sequence_exists(ident)
+      end
+
+      def sequence(msg, &block)
+        last_seen_id = get_last_seen
+        block.call(msg)
+
+        if sequential?(msg)
+          set_last_seen(msg, last_seen_id)
+        end
       end
 
       def delete!
-        logger.info("Sequencer.delete!: #{ident}")
+        logger.info("Sequencer#delete!: #{ident}")
+        @exists = false
         @sequence_table.delete_item!(ident)
       end
 
-      def set_last_seen(msg)
-        last_seen_id = sequence_id_from(msg)
-        logger.info("Sequencer.set_last_seen: #{last_seen_id}")
+      def set_last_seen(msg, last_seen_check = nil)
+        seen_id = sequence_id_from(msg)
+        logger.info("Sequencer#set_last_seen: #{seen_id}")
 
-        @sequence_table.set_sequence_for(ident, last_seen_id)
+        @sequence_table.set_sequence_for(
+          ident, seen_id,
+          (exists? ? last_seen_check : nil)
+        )
       end
 
       def get_last_seen
@@ -37,7 +55,7 @@ module Alephant
       end
 
       def sequence_id_from(msg)
-        JsonPath.on(msg.body, jsonpath).first
+        JsonPath.on(msg.body, jsonpath).first.to_i
       end
     end
   end

data/lib/alephant/sequencer/version.rb

@@ -1,5 +1,5 @@
 module Alephant
   module Sequencer
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/spec/sequencer_spec.rb

@@ -14,17 +14,28 @@ describe Alephant::Sequencer do
   describe Alephant::Sequencer::Sequencer do
     let(:data)     { double() }
     let(:last_seen) { 42 }
-    let(:sequence_table) { double().tap { |o| o.stub(:create) } }
-    subject { Alephant::Sequencer::Sequencer.new(sequence_table, ident, jsonpath) }
+
+    def sequence_table
+      table = double()
+      table.stub(:create)
+      table.stub(:sequence_exists)
+      table.stub(:sequence_for)
+      table.stub(:set_sequence_for)
+
+      table
+    end
 
     describe "#initialize(opts, id)" do
       it "sets @jsonpath, @ident" do
+        subject = Alephant::Sequencer::Sequencer.new(sequence_table, ident, jsonpath)
+
         expect(subject.jsonpath).to eq(jsonpath)
         expect(subject.ident).to eq(ident)
       end
 
       it "calls create on sequence_table" do
         table = double()
+        table.stub(:sequence_exists)
         table.should_receive(:create)
 
         Alephant::Sequencer::Sequencer.new(table, ident, jsonpath)
@@ -34,6 +45,7 @@ describe Alephant::Sequencer do
     describe "#get_last_seen" do
       it "returns sequence_table.sequence_for(ident)" do
         table = double()
+        table.stub(:sequence_exists)
         table.stub(:create)
         table.should_receive(:sequence_for).with(ident).and_return(:expected_value)
 
@@ -50,8 +62,10 @@ describe Alephant::Sequencer do
 
       it "calls set_sequence_for(ident, last_seen)" do
         table = double()
+        table.stub(:sequence_exists)
         table.stub(:create)
-        table.should_receive(:set_sequence_for).with(ident, last_seen)
+        table.stub(:sequence_for)
+        table.should_receive(:set_sequence_for).with(ident, last_seen, nil)
 
         Alephant::Sequencer::Sequencer.new(table, ident, jsonpath).set_last_seen(data)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alephant-sequencer
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Robert Kenny
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -188,6 +188,7 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile