sidekiq-sqs 0.0.7 → 0.0.8

data/Guardfile

@@ -1,7 +1,7 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard 'rspec', :version => 2 do
+guard 'rspec', :version => 2, :cli => "--format nested" do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }

data/lib/sidekiq-sqs/fetcher.rb

@@ -16,16 +16,6 @@ module Sidekiq
         @unique_queues = @queues.uniq
       end
 
-      # TODO Since there's only one fetcher per manager, we run into the issue
-      #      where it takes longer to fetch a single job that it does to process,
-      #      on average, so that we have waiting workers even if we have jobs in the
-      #      queue because, with the HTTP round trip, fetching single messages is too
-      #      slow.
-      #
-      #      We could fetch 10 at a time, but then we have to worry about stuffing them
-      #      into a "cache", and pushing them back into SQS if we die or exit. We could,
-      #      I guess, just let the "hold" on them expire, and then they would be picked
-      #      up again.  I wonder if that would be 'good enough'
       def fetch
         watchdog('Fetcher#fetch died') do
           return if Sidekiq::Fetcher.done?
@@ -39,9 +29,7 @@ module Sidekiq
             queues.pop # Last entry is TIMEOUT
 
             msg = queues.inject(nil) do |message, queue|
-              next if message
-
-              Sidekiq.sqs.queues.named(queue).receive_message
+              message || Sidekiq.sqs.queues.named(queue).receive_message
             end
 
             if msg

data/lib/sidekiq-sqs/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Sqs
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

data/sidekiq-sqs.gemspec

@@ -22,6 +22,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'aws-sdk', '~> 1.6.6'
 
   gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rb-fsevent', '~> 0.9.1'
   gem.add_development_dependency 'guard'
   gem.add_development_dependency 'guard-rspec'
+  gem.add_development_dependency 'mocha', '~> 0.12.3'
 end

data/spec/sidekiq-sqs/client_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+class StubClient
+  def self.push(*args)
+  end
+
+  def self.push_bulk(*args)
+  end
+
+  def self.process_single(*args)
+  end
+
+  include Sidekiq::Sqs::Client
+end
+
+describe Sidekiq::Sqs::Client do
+  subject { StubClient }
+
+  describe ".process_single_with_sqs" do
+    it "base64 encodes and compresses the payload" do
+      subject.expects(:process_single_without_sqs).with(:worker_class, :item).returns([:item, "payload"])
+
+      subject.process_single_with_sqs(:worker_class, :item).should eq([:item, "eJwrSKzMyU9MAQAL3QLr\n"])
+    end
+  end
+
+  describe ".queue_or_create" do
+    let(:queue) { 'queue' }
+    let(:queues) { stub }
+    before { Sidekiq.stubs(sqs: stub(queues: queues)) }
+
+    it "returns the queue if it exists" do
+      queues.expects(:named).with(queue).returns(:queue)
+
+      subject.queue_or_create(queue).should eq(:queue)
+    end
+
+    it "creates the queue if it doesn't exists" do
+      queues.expects(:named).with(queue).raises(AWS::SQS::Errors::NonExistentQueue.new)
+      queues.expects(:create).with(queue).returns(:queue)
+
+      subject.queue_or_create(queue).should eq(:queue)
+    end
+  end
+end

data/spec/sidekiq-sqs/processor_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+class StubProcessor
+  def process(msg, queue)
+  end
+
+  include Sidekiq::Sqs::Processor
+end
+
+describe Sidekiq::Sqs::Processor do
+  subject { StubProcessor.new }
+
+  describe "#process_with_sqs" do
+    let(:body) { "eJxLTEo2NDIGAAbsAb0=\n" }
+    let(:message) { stub(body: body) }
+    let(:queue) { stub }
+
+    it "expands the message, delegates to the base class and deletes the message" do
+      subject.expects(:process_without_sqs).with('abc123', queue).returns(:processed)
+      message.expects(:delete)
+
+      subject.process(message, queue).should eq(:processed)
+    end
+  end
+end

data/spec/sidekiq-sqs/worker_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+class StubWorker
+  include Sidekiq::Sqs::Worker
+end
+
+describe Sidekiq::Sqs::Worker do
+  subject { StubWorker.new }
+
+  describe "#perform_async_bulk" do
+    it "formats the arguments" do
+      subject.expects(:client_push_bulk).with('class' => subject, 'args' => :args)
+
+      subject.perform_async_bulk(:args)
+    end
+  end
+
+  describe "#client_push_bulk" do
+    it "delegates to Client" do
+      Sidekiq::Client.expects(:push_bulk).with(:args)
+
+      subject.client_push_bulk(:args)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,8 @@
 $: << 'lib'
+require 'sidekiq'
 require 'sidekiq-sqs'
 
+RSpec.configure do |config|
+  config.mock_framework = :mocha
+end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-sqs
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-01 00:00:00.000000000 Z
+date: 2012-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +123,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.12.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.12.3
 description: SQS backed job store for Sidekiq. Redis is still used for stats/job worker
   tracking
 email:
@@ -130,7 +162,9 @@ files:
 - lib/sidekiq-sqs/worker.rb
 - lib/top_level.rb
 - sidekiq-sqs.gemspec
-- spec/sidekiq-sqs/middleware/compression_spec.rb
+- spec/sidekiq-sqs/client_spec.rb
+- spec/sidekiq-sqs/processor_spec.rb
+- spec/sidekiq-sqs/worker_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/jmoses/sidekiq-sqs
 licenses: []
@@ -157,5 +191,7 @@ signing_key:
 specification_version: 3
 summary: SQS backed job store for Sidekiq
 test_files:
-- spec/sidekiq-sqs/middleware/compression_spec.rb
+- spec/sidekiq-sqs/client_spec.rb
+- spec/sidekiq-sqs/processor_spec.rb
+- spec/sidekiq-sqs/worker_spec.rb
 - spec/spec_helper.rb

data/spec/sidekiq-sqs/middleware/compression_spec.rb

@@ -1,26 +0,0 @@
-require 'spec_helper'
-
-describe Sidekiq::Sqs::Middleware::Compression do
-  context "Server" do
-    subject { Sidekiq::Sqs::Middleware::Compression::Server.new }
-    let(:message) { stub(body: "eJzLTS0uTkxPBQALwQLm\n") }
-
-    it "decompresses the message" do
-      subject.call(nil, message, nil)
-
-      message.body.should eq('message')
-    end
-  end
-
-#  context "Client" do
-#    subject { Sidekiq::Sqs::Middleware::Compression::Client.new }
-#    let(:message) { 'message' }
-#
-#    it "compresses the message and yields" do
-#      expect {|b| subject.call(nil, message, :queue, &b) }.to yield_control 
-#
-#      message.should eq(Base64.encode64(Zlib::Deflate.deflate('message')))
-#    end
-#  end
-end
-