alephant-publisher 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9781530bb38777e05f67c596a0f7b1226373ac03
-  data.tar.gz: cf18cba21835ae5ef44e73777d028d0cfb1656a8
+  metadata.gz: 278b7dbd7d1001987418dec5721269cab8336ec3
+  data.tar.gz: 582cc75dfce85ecef619366d75ba5e6db13c2446
 SHA512:
-  metadata.gz: 421d05fc124317bdd184db2d64c5f492c1bce4e2450ed6c2c7e4001f22be8392c1c7837eb7330f788edf38d857a415331512918252d32760e6960b27a2daf99f
-  data.tar.gz: d36a0e7c12755bfd5849a0399e4aadd5adea945b959f77e1588e2d51791c3d13392b8f319f2b9621abfb4b34c4a482b47bb640f953a60f34ca5e66d83e979397
+  metadata.gz: fb43706d6b88b6d63794d8d7256a956b52ebd21513dacd9b3a1e9f5fbfe348a2642f0fcaff29cad45326f2fb9b811cd0ba5aeb04347a212cb1f126acb08b68b0
+  data.tar.gz: 8693925153211a73d3ae5c3ac9e81663196a3d0c414e8c414ee5d67270815d329078f831f9864ca0d50b6a69cf2b5e582627932395755fd0bed800018dd2dc37

data/lib/alephant/publisher/archive.rb

@@ -0,0 +1,19 @@
+module Alephant
+  module Publisher
+    module SQSHelper
+      class Archiver
+        attr_reader :cache
+
+        def initialize(cache)
+          @cache = cache
+        end
+
+        def see(m)
+
+          m
+        end
+
+      end
+    end
+  end
+end

data/lib/alephant/publisher/sqs_helper/archive.rb

@@ -0,0 +1,36 @@
+module Alephant
+  module Publisher
+    module SQSHelper
+      class Archiver
+        attr_reader :cache
+
+        def initialize(cache)
+          @cache = cache
+        end
+
+        def see(message)
+          return if message.nil?
+
+          message.tap do |m|
+            cache.put(
+              "archive/#{m.id}",
+              m.body,
+              message_meta_for(m)
+            )
+          end
+        end
+
+        private
+
+        def message_meta_for(m)
+          {
+            :id                => m.id,
+            :md5               => m.md5,
+            :logged_at         => Time.now.to_s,
+            :queue             => m.queue.url,
+          }
+        end
+      end
+    end
+  end
+end

data/lib/alephant/publisher/sqs_helper/queue.rb

@@ -0,0 +1,45 @@
+require 'aws-sdk'
+require 'alephant/logger'
+
+module Alephant
+  module Publisher
+    module SQSHelper
+      class Queue
+        WAIT_TIME = 5
+        VISABILITY_TIMEOUT = 300
+
+        include Logger
+
+        attr_reader :queue, :timeout, :wait_time, :archiver
+
+        def initialize(queue, archiver, timeout = VISABILITY_TIMEOUT, wait_time = WAIT_TIME)
+          @queue     = queue
+          @archiver  = archiver
+          @timeout   = timeout
+          @wait_time = wait_time
+
+          logger.info("Queue#initialize: reading from #{queue.url}")
+        end
+
+        def message
+          recieve.tap do |m|
+            logger.info("Queue#message: received #{m.id}")
+            archive m
+          end
+        end
+
+        def archive(m)
+          archiver.see(m)
+        end
+
+        def recieve
+          queue.receive_message({
+            :visibility_timeout => timeout,
+            :wait_time_seconds  => wait_time
+          })
+        end
+      end
+    end
+  end
+end
+

data/lib/alephant/publisher/version.rb

@@ -1,5 +1,5 @@
 module Alephant
   module Publisher
-    VERSION = "0.2.5"
+    VERSION = "0.2.6"
   end
 end

data/lib/alephant/publisher/writer.rb

@@ -59,7 +59,7 @@ module Alephant
       end
 
       def store(id, content, location)
-        cache.put(location, content)
+        cache.put(location, content, :msg_id => message.id)
         lookup.write(id, options, seq_id, location)
       end
 

data/lib/alephant/publisher.rb

@@ -2,7 +2,8 @@ require_relative 'env'
 
 require 'alephant/publisher/version'
 require 'alephant/publisher/options'
-require 'alephant/publisher/queue'
+require 'alephant/publisher/sqs_helper/queue'
+require 'alephant/publisher/sqs_helper/archive'
 require 'alephant/publisher/writer'
 require 'alephant/logger'
 
@@ -18,13 +19,14 @@ module Alephant
       VISIBILITY_TIMEOUT = 60
       RECEIVE_WAIT_TIME  = 15
 
-      attr_reader :queue, :executor
+      attr_reader :queue, :executor, :opts
 
       def initialize(opts)
         @opts = opts
 
-        @queue = Queue.new(
-          opts.queue[:sqs_queue_url],
+        @queue = SQSHelper::Queue.new(
+          aws_queue,
+          archiver,
           opts.queue[:visibility_timeout] || VISIBILITY_TIMEOUT,
           opts.queue[:receive_wait_time]  || RECEIVE_WAIT_TIME,
         )
@@ -36,6 +38,21 @@ module Alephant
 
       private
 
+      def archiver
+        SQSHelper::Archiver.new(archive_cache)
+      end
+
+      def archive_cache
+        Cache.new(
+          opts.writer[:s3_bucket_id],
+          opts.writer[:s3_object_path]
+        )
+      end
+
+      def aws_queue
+        AWS::SQS.new.queues[opts.queue[:sqs_queue_url]]
+      end
+
       def process(msg)
         unless msg.nil?
           Writer.new(@opts.writer, msg).run!
@@ -46,3 +63,4 @@ module Alephant
     end
   end
 end
+

data/spec/publisher_spec.rb

@@ -5,12 +5,12 @@ describe Alephant::Publisher do
   let(:instance) { Alephant::Publisher.create(options) }
 
   before(:each) do
-    Alephant::Publisher::Queue.any_instance.stub(:initialize)
+    Alephant::Publisher::SQSHelper::Queue.any_instance.stub(:initialize)
   end
 
   describe "#initialize(opts = {}, logger)" do
     it "sets parser, sequencer, queue and writer" do
-      expect(instance.queue).to be_a Alephant::Publisher::Queue
+      expect(instance.queue).to be_a Alephant::Publisher::SQSHelper::Queue
     end
   end
 end

data/spec/render_mapper_spec.rb

@@ -13,13 +13,11 @@ describe Alephant::Publisher::RenderMapper do
 
   describe "initialize(view_base_path)" do
     context "view_base_path = invalid_path" do
-      it "should raise InvalidViewPath" do
+      it "should raise an error" do
         File.stub(:directory?).and_return(false)
         expect {
           subject.new(component_id, './invalid_path')
-        }.to raise_error(
-          'Invalid path'
-        )
+        }.to raise_error
       end
     end
 

data/spec/writer_spec.rb

@@ -73,7 +73,7 @@ describe Alephant::Publisher::Writer do
         "sequence" => "1",
         "vary" => "foo"
       }
-      Struct.new(:body).new(data.to_json)
+      Struct.new(:body,:id).new(data.to_json,'id')
     end
 
     let(:expected_location) do
@@ -104,7 +104,7 @@ describe Alephant::Publisher::Writer do
       Alephant::Cache
         .any_instance
         .should_receive(:put)
-        .with(expected_location, "content")
+        .with(expected_location, "content", :msg_id=>"id")
     end
 
     after do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alephant-publisher
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Integralist
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -363,9 +363,11 @@ files:
 - alephant-publisher.gemspec
 - lib/alephant/env.rb
 - lib/alephant/publisher.rb
+- lib/alephant/publisher/archive.rb
 - lib/alephant/publisher/options.rb
-- lib/alephant/publisher/queue.rb
 - lib/alephant/publisher/render_mapper.rb
+- lib/alephant/publisher/sqs_helper/archive.rb
+- lib/alephant/publisher/sqs_helper/queue.rb
 - lib/alephant/publisher/version.rb
 - lib/alephant/publisher/writer.rb
 - spec/fixtures/components/foo/models/bar.rb
@@ -373,7 +375,6 @@ files:
 - spec/fixtures/components/foo/templates/bar.mustache
 - spec/fixtures/components/foo/templates/foo.mustache
 - spec/publisher_spec.rb
-- spec/queue_spec.rb
 - spec/render_mapper_spec.rb
 - spec/spec_helper.rb
 - spec/writer_spec.rb
@@ -407,7 +408,6 @@ test_files:
 - spec/fixtures/components/foo/templates/bar.mustache
 - spec/fixtures/components/foo/templates/foo.mustache
 - spec/publisher_spec.rb
-- spec/queue_spec.rb
 - spec/render_mapper_spec.rb
 - spec/spec_helper.rb
 - spec/writer_spec.rb

data/lib/alephant/publisher/queue.rb

@@ -1,42 +0,0 @@
-require 'aws-sdk'
-require 'alephant/logger'
-
-module Alephant
-  module Publisher
-    class Queue
-      WAIT_TIME = 5
-      VISABILITY_TIMEOUT = 300
-
-      include ::Alephant::Logger
-
-      attr_reader :timeout, :wait_time
-      attr_accessor :q
-
-      def initialize(id, timeout = VISABILITY_TIMEOUT, wait_time = WAIT_TIME)
-        @timeout = timeout
-        @wait_time = wait_time
-        @sqs = AWS::SQS.new
-        @q = @sqs.queues[id]
-
-        unless @q.exists?
-          @q = @sqs.queues.create(id)
-          sleep_until_queue_exists
-          logger.info("Queue.initialize: created queue with id #{id}")
-        end
-
-        logger.info("Queue.initialize: ended with id #{id}")
-      end
-
-      def sleep_until_queue_exists
-        sleep 1 until @q.exists?
-      end
-
-      def message
-        @q.receive_message({
-          :visibility_timeout => @timeout,
-          :wait_time_seconds => @wait_time
-        })
-      end
-    end
-  end
-end

data/spec/queue_spec.rb

@@ -1,84 +0,0 @@
-require 'spec_helper'
-
-describe Alephant::Publisher::Queue do
-  subject { Alephant::Publisher::Queue }
-
-  describe "initialize(id)" do
-    it "sets @q to an instance of AWS:SQS::Queue" do
-      AWS::SQS::Queue
-        .any_instance
-        .stub(:exists?)
-        .and_return(true)
-
-      instance = subject.new(:id)
-      expect(instance.q).to be_a(AWS::SQS::Queue)
-    end
-
-    context "@q.exists? == false" do
-      it "@q = AWS::SQS.new.queues.create(id), then sleep_until_queue_exists" do
-        queue = double()
-        queue.stub(:exists?).and_return(false)
-
-        queue_collection = double()
-        queue_collection
-          .should_receive(:create)
-          .with(:id)
-          .and_return(queue)
-
-        sqs = double()
-        sqs.should_receive(:queues)
-          .and_return({ :id => queue }, queue_collection)
-
-        AWS::SQS
-          .should_receive(:new)
-          .and_return(sqs)
-
-        subject
-          .any_instance
-          .should_receive(:sleep_until_queue_exists)
-
-        instance = subject.new(:id)
-      end
-    end
-  end
-
-  describe "sleep_until_queue_exists" do
-    context "@q.exists? == true" do
-      it "should not call sleep" do
-        AWS::SQS::Queue
-          .any_instance
-          .stub(:exists?)
-          .and_return(true)
-
-        Alephant::Publisher::Queue
-          .any_instance
-          .stub(:sleep)
-
-        Alephant::Publisher::Queue
-          .any_instance
-          .should_not_receive(:sleep)
-
-        subject.new(:id).sleep_until_queue_exists
-      end
-    end
-    context "@q.exists? == false" do
-      it "should call sleep(1)" do
-        AWS::SQS::Queue
-          .any_instance
-          .stub(:exists?)
-          .and_return(true, false, true)
-
-        Alephant::Publisher::Queue
-          .any_instance
-          .stub(:sleep)
-
-        Alephant::Publisher::Queue
-          .any_instance
-          .should_receive(:sleep)
-          .with(1)
-
-        subject.new(:id).sleep_until_queue_exists
-      end
-    end
-  end
-end