alephant 0.0.9.6-java → 0.0.9.7-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9081a10b24eecb25c76b65df99114ffcfffc3b4
-  data.tar.gz: ce5f3bfafa0dc17a4bbfc0a8b5d8e65627179233
+  metadata.gz: 6ff0e13461b2cea58a931cebb4868520bbbc34df
+  data.tar.gz: 2b4b52fc0b91968f0276458a8862fe68d35c2407
 SHA512:
-  metadata.gz: 38d5f80d00324e44f1606a1de350280c5d787da28afef35be7f35cb25c935ff22550a9a8d94fe6c00eb5fed12fe6542246d885c3b034d1fd6f90c7938747a612
-  data.tar.gz: 991bbba8dfd5c6b53be18ee7a233b87b9319f3a2e39602a369bbd082865787bcab070305b773beb2f4cbe17da93bf08d1d09e79ea89218702fabb55b30d44ea6
+  metadata.gz: 437b33a9f5452daa6770c1463a2ea6928875c4cbfc533484e069554e9ad67bf29f3b21f753cf245242aa3bfb662dd4e2c567b16e94da34a26f3c88a143bc7848
+  data.tar.gz: 31930b9e797a79abda64fc91c376662c49aad4199e2fdcb82af4fb6b4576a2446d9b8eba2d993d8208f0cfddf2177d10b50e9f6ffd769f6c7924ccd7bdd5f15f

data/alephant.gemspec

@@ -35,5 +35,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'rake'
   s.add_runtime_dependency 'aws-sdk', '~> 1.0'
   s.add_runtime_dependency 'mustache', '>= 0.99.5'
+  s.add_runtime_dependency 'jsonpath'
 end
 

data/lib/alephant.rb

@@ -24,9 +24,8 @@ module Alephant
       :table_name,
       :sqs_queue_id,
       :view_path,
-      :sequential_proc,
-      :set_last_seen_proc,
-      :component_id
+      :component_id,
+      :sequence_id
     ]
 
     def initialize(opts = {}, logger = nil)
@@ -58,13 +57,11 @@ module Alephant
     end
 
     def receive(msg)
-      data = @parser.parse msg.body
-
       @logger.info("Alephant.receive: with id #{msg.id} and body digest: #{msg.md5}")
 
-      if @sequencer.sequential?(data, &@sequential_proc)
-        write data
-        @sequencer.set_last_seen(data, &@set_last_seen_proc)
+      if @sequencer.sequential?(msg, @sequence_id)
+        write @parser.parse msg.body
+        @sequencer.set_last_seen(msg, @sequence_id)
       else
         @logger.warn("Alephant.receive: out of sequence message received #{msg.id} (discarded)")
       end

data/lib/alephant/models/sequencer.rb

@@ -1,4 +1,5 @@
 require 'aws-sdk'
+require 'jsonpath'
 
 module Alephant
   class Sequencer
@@ -47,16 +48,12 @@ module Alephant
       @logger.info("Sequencer.initialize: end with id #{@id}")
     end
 
-    def sequential?(data)
-      if block_given?
-        yield(get_last_seen, data)
-      else
-        get_last_seen < data["sequence_id"].to_i
-      end
+    def sequential?(data, jsonpath = nil)
+      get_last_seen < get_sequence_id_from(data, jsonpath)
     end
 
-    def set_last_seen(data)
-      last_seen_id = block_given? ? yield(data) : data["sequence_id"]
+    def set_last_seen(data, jsonpath)
+      last_seen_id = get_sequence_id_from(data, jsonpath)
 
       batch = AWS::DynamoDB::BatchWrite.new
       batch.put(@table_name, [:key => @id,:value => last_seen_id])
@@ -64,6 +61,12 @@ module Alephant
       @logger.info("Sequencer.set_last_seen: id #{id} and last_seen_id #{last_seen_id}")
     end
 
+    def get_sequence_id_from(data, jsonpath)
+      jsonpath.nil? ?
+        data.body['sequence_id'].to_i :
+        JsonPath.on(data.body, jsonpath).first
+    end
+
     def get_last_seen
       begin
         @table.batch_get(

data/lib/alephant/version.rb

@@ -1,3 +1,3 @@
 module Alephant
-  VERSION = "0.0.9.6"
+  VERSION = "0.0.9.7"
 end

data/spec/alephant_spec.rb

@@ -18,14 +18,13 @@ describe Alephant::Alephant do
 
     it "sets specified options" do
       instance = subject.new({
-        :s3_bucket_id       => :s3_bucket_id,
-        :s3_object_path     => :s3_object_path,
-        :s3_object_id       => :s3_object_id,
-        :table_name         => :table_name,
-        :sqs_queue_id       => :sqs_queue_id,
-        :sequential_proc    => :sequential_proc,
-        :set_last_seen_proc => :set_last_seen_proc,
-        :component_id       => :component_id
+        :s3_bucket_id   => :s3_bucket_id,
+        :s3_object_path => :s3_object_path,
+        :s3_object_id   => :s3_object_id,
+        :table_name     => :table_name,
+        :sqs_queue_id   => :sqs_queue_id,
+        :component_id   => :component_id,
+        :sequence_id    => :sequence_id
       })
 
       expect(instance.s3_bucket_id).to eq(:s3_bucket_id);
@@ -33,9 +32,8 @@ describe Alephant::Alephant do
       expect(instance.s3_object_id).to eq(:s3_object_id);
       expect(instance.table_name).to eq(:table_name);
       expect(instance.sqs_queue_id).to eq(:sqs_queue_id);
-      expect(instance.sequential_proc).to eq(:sequential_proc);
-      expect(instance.set_last_seen_proc).to eq(:set_last_seen_proc);
       expect(instance.component_id).to eq(:component_id);
+      expect(instance.sequence_id).to eq(:sequence_id);
     end
 
     it "sets unspecified options to nil" do
@@ -46,14 +44,14 @@ describe Alephant::Alephant do
       expect(instance.s3_object_id).to eq(nil);
       expect(instance.table_name).to eq(nil);
       expect(instance.sqs_queue_id).to eq(nil);
-      expect(instance.sequential_proc).to eq(nil);
-      expect(instance.set_last_seen_proc).to eq(nil);
       expect(instance.component_id).to eq(nil);
+      expect(instance.sequence_id).to eq(nil);
     end
 
     context "initializes @sequencer" do
       it "with Sequencer.new({ :table_name => :table_name }, @sqs_queue_id)" do
-        Alephant::Sequencer.should_receive(:new)
+        Alephant::Sequencer
+          .should_receive(:new)
           .with({ :table_name => :table_name }, :sqs_queue_id)
 
         instance = subject.new({
@@ -65,7 +63,9 @@ describe Alephant::Alephant do
 
     context "initializes @queue" do
       it "with Queue.new(@sqs_queue_id)" do
-        Alephant::Queue.should_receive(:new).with(:sqs_queue_id)
+        Alephant::Queue
+          .should_receive(:new)
+          .with(:sqs_queue_id)
 
         instance = subject.new({
           :sqs_queue_id => :sqs_queue_id
@@ -75,7 +75,9 @@ describe Alephant::Alephant do
 
     context "initializes @cache" do
       it "with Cache.new(@s3_bucket_id, @s3_object_path)" do
-        Alephant::Cache.should_receive(:new).with(:s3_bucket_id, :s3_object_path)
+        Alephant::Cache
+          .should_receive(:new)
+          .with(:s3_bucket_id, :s3_object_path)
 
         instance = subject.new({
           :s3_bucket_id   => :s3_bucket_id,
@@ -126,7 +128,9 @@ describe Alephant::Alephant do
 
       instance.should_receive(:receive).with(:msg)
 
-      expect_any_instance_of(Alephant::Queue).to receive(:poll).and_yield(:msg)
+      expect_any_instance_of(Alephant::Queue)
+        .to receive(:poll)
+        .and_yield(:msg)
 
       t = instance.run!
       t.join
@@ -148,10 +152,12 @@ describe Alephant::Alephant do
 
     it "takes json as an argument" do
       instance = subject.new
+
       msg = double()
       msg.stub(:body).and_return('notjson')
 
-      expect { instance.receive(msg) }.to raise_error(JSON::ParserError);
+      expect { JsonPath.on(msg.body, '$.foo') }
+        .to raise_error(MultiJson::LoadError);
     end
 
     it "writes data to cache if sequential order is true" do
@@ -164,10 +170,19 @@ describe Alephant::Alephant do
 
       instance = subject.new
 
-      Alephant::Sequencer.any_instance.stub(:sequential?).and_return(true)
-      Alephant::Sequencer.any_instance.stub(:set_last_seen)
+      Alephant::Sequencer
+        .any_instance
+        .stub(:sequential?)
+        .and_return(true)
+
+      Alephant::Sequencer
+        .any_instance
+        .stub(:set_last_seen)
+
+      instance
+        .should_receive(:write)
+        .with(JSON.parse(data, :symbolize_names => true))
 
-      instance.should_receive(:write).with(JSON.parse(data, :symbolize_names => true))
       instance.receive(msg)
     end
   end
@@ -177,8 +192,15 @@ describe Alephant::Alephant do
       sequencer = double()
       queue     = double()
 
-      Alephant::Sequencer.any_instance.stub(:initialize).and_return(sequencer)
-      Alephant::Queue.any_instance.stub(:initialize).and_return(queue)
+      Alephant::Sequencer
+        .any_instance
+        .stub(:initialize)
+        .and_return(sequencer)
+
+      Alephant::Queue
+        .any_instance
+        .stub(:initialize)
+        .and_return(queue)
     end
 
     it "puts rendered data into the S3 Cache" do

data/spec/sequencer_spec.rb

@@ -60,58 +60,61 @@ describe Alephant::Sequencer do
     end
   end
 
-  describe "sequential?(data)" do
+  describe "sequential?(data, jsonpath = nil)" do
+    let(:jsonpath) { '$.sequence_id' }
+    let(:instance) { subject.new }
+    let(:id_value) { 0 }
+    let(:data)     { double() }
+
     before(:each) do
       Alephant::Sequencer
         .any_instance.stub(:initialize)
         .and_return(double())
-    end
-
-    context "block_given? == true" do
-      it "yields to block" do
-        Alephant::Sequencer
-          .any_instance
-          .stub(:get_last_seen)
-          .and_return(1)
-
-        instance = subject.new
 
-        in_sequence = instance.sequential?(:data) do |last_seen, data|
-          :foo
-        end
+      Alephant::Sequencer
+        .any_instance
+        .stub(:get_last_seen)
+        .and_return(1)
 
-        expect(in_sequence).to eq(:foo)
-      end
+      data.stub(:body).and_return('sequence_id' => id_value)
     end
 
-    context "block_given? == false" do
-      context "get_last_seen < data['sequence_id']" do
-        it "returns true" do
-          Alephant::Sequencer
-            .any_instance
-            .stub(:get_last_seen)
-            .and_return(0)
+    context "jsonpath provided" do
+      context "in sequence" do
+        let(:id_value) { 2 }
 
-          instance = subject.new
+        it "looks up data using jsonpath (returns true)" do
+          in_sequence = instance.sequential?(data, jsonpath)
+          expect(in_sequence).to eq(true)
+        end
+      end
 
-          data = { "sequence_id" => "1" }
+      context "out of sequence" do
+        let(:id_value) { 0 }
 
-          expect(instance.sequential? data).to be(true)
+        it "looks up data using jsonpath (returns false)" do
+          in_sequence = instance.sequential?(data, jsonpath)
+          expect(in_sequence).to eq(false)
         end
       end
+    end
 
-      context "get_last_seen >= data['sequence_id']" do
-        it "returns false" do
-          Alephant::Sequencer
-            .any_instance
-            .stub(:get_last_seen)
-            .and_return(1)
+    context "jsonpath NOT provided" do
+      context "in sequence" do
+        let(:id_value) { 2 }
 
-          instance = subject.new
+        it "looks up data using a fallback key (returns true)" do
+          in_sequence = instance.sequential?(data)
+          expect(in_sequence).to eq(true)
+        end
+      end
 
-          data = { "sequence_id" => "0" }
+      context "out of sequence" do
+        let(:id_value) { 0 }
 
-          expect(instance.sequential? data).to be(false)
+        it "looks up data using a fallback key (returns false)" do
+          in_sequence = instance.sequential?(data)
+          expect(in_sequence).to eq(false)
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alephant
 version: !ruby/object:Gem::Version
-  version: 0.0.9.6
+  version: 0.0.9.7
 platform: java
 authors:
 - Robert Kenny
@@ -192,6 +192,20 @@ dependencies:
         version: 0.99.5
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: jsonpath
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :runtime
 description: Static publishing to S3 based on SQS messages
 email: kenoir@gmail.com
 executables: