ayl-beanstalk 0.3.0 → 0.4.0

data/spec/spec_helper.rb

@@ -6,7 +6,34 @@ require 'ayl-beanstalk'
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
-
 RSpec.configure do |config|
   
 end
+#
+# The new RSpec exit_with_code handler doesn't support a block 
+# context, so we have to re-implement it.
+RSpec::Matchers.define :exit_with_code do |exp_code|
+  actual = nil
+  match do |block|
+    begin
+      block.call
+    rescue SystemExit => e
+      actual = e.status
+    end
+    actual and actual == exp_code
+  end
+  failure_message_for_should do |block|
+    "expected block to call exit(#{exp_code}) but exit" +
+      (actual.nil? ? " not called" : "(#{actual}) was called")
+  end
+  failure_message_for_should_not do |block|
+    "expected block not to call exit(#{exp_code})"
+  end
+  description do
+    "expect block to call exit(#{exp_code})"
+  end
+  def supports_block_expectations? 
+    true
+  end
+end
+

data/spec/worker_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'beanstalk-client'
 require 'active_record'
 require 'active_record/errors'
 
@@ -14,21 +13,24 @@ describe Ayl::Beanstalk::Worker do
       @worker.stub_chain(:logger, :error)
       @worker.stub_chain(:logger, :debug)
 
-      @mock_pool = mock("Beanstalk::Pool")
+      @mock_pool = double("Beanstalk::Pool")
       
-      ::Beanstalk::Pool.should_receive(:new).with([ "localhost:11300" ]).and_return(@mock_pool)
+      expect(Beaneater).to receive(:new).with("localhost:11300").and_return(@mock_pool)
     end
 
     it "should loop until there are no more jobs from beanstalk" do
-      mock_job1 = mock("Beanstalk::Job")
-      mock_job2 = mock("Beanstalk::Job")
+      mock_job1 = double("Beanstalk::Job")
+      mock_job2 = double("Beanstalk::Job")
 
-      @mock_pool.should_receive(:reserve).and_return(mock_job1, mock_job2, nil)
+      mock_tubes = double("Tubes")
+      expect(mock_tubes).to receive(:reserve).and_return(mock_job1, mock_job2, nil)
+
+      expect(@mock_pool).to receive(:tubes).exactly(3).times.and_return(mock_tubes)
 
       index = 0
 
       @worker.send(:reserve_job) do | job |
-        job.should == [ mock_job1, mock_job2 ][index]
+        expect(job).to eq([ mock_job1, mock_job2 ][index])
         index += 1
       end
 
@@ -37,12 +39,14 @@ describe Ayl::Beanstalk::Worker do
     end
 
     it "should report any exception while waiting for a job" do
-      @mock_pool.should_receive(:reserve).and_raise('It blew')
+      mock_tubes = double("Tubes")
+      expect(mock_tubes).to receive(:reserve).and_raise('It blew')
+      expect(@mock_pool).to receive(:tubes).and_return(mock_tubes)
 
-      mock_mailer = mock("Mailer")
-      mock_mailer.should_receive(:deliver_message).with(any_args())
+      mock_mailer = double("Mailer")
+      expect(mock_mailer).to receive(:deliver_message).with(any_args())
 
-      Ayl::Mailer.should_receive(:instance).and_return(mock_mailer)
+      expect(Ayl::Mailer).to receive(:instance).and_return(mock_mailer)
 
       @worker.send(:reserve_job) do | job |
       end
@@ -61,68 +65,65 @@ describe Ayl::Beanstalk::Worker do
     end
       
     it "should call the job's handle_decay method if the message requires the job to decay" do
-      mock_job = mock("Beanstalk::Job")
-      mock_job.should_receive(:ayl_message).and_return do 
-        mock("message").tap do | mock_message |
-          mock_message.should_receive(:options).and_return do
-            mock("options").tap do | mock_options |
-              mock_options.should_receive(:failed_job_handler).and_return('decay')
-            end
-          end
-        end
-      end
+      mock_job = double("Beanstalk::Job")
+
+      mock_options = double("options")
+      expect(mock_options).to receive(:failed_job_handler).and_return('decay')
+
+      mock_message = double("message")
+      mock_message.should_receive(:options).and_return(mock_options)
 
-      mock_exception = mock("Exception")
-      mock_exception.should_receive(:backtrace).and_return([])
-      mock_job.should_receive(:handle_decay).with(mock_exception)
+      expect(mock_job).to receive(:ayl_message).and_return(mock_message)
+
+      mock_exception = double("Exception")
+      expect(mock_exception).to receive(:backtrace).and_return([])
+      expect(mock_job).to receive(:handle_decay).with(mock_exception)
 
       @worker.send(:deal_with_unexpected_exception, mock_job, mock_exception)
     end
 
     it "should call the job's ayl_delete method if the message requires the job to be deleted" do
-      mock_job = mock("Beanstalk::Job")
-      mock_job.should_receive(:ayl_message).and_return do 
-        mock("message").tap do | mock_message |
-          mock_message.should_receive(:options).and_return do
-            mock("options").tap do | mock_options |
-              mock_options.should_receive(:failed_job_handler).and_return('delete')
-            end
-          end
-        end
-      end
+      mock_job = double("Beanstalk::Job")
+
+      mock_options = double("options")
+      expect(mock_options).to receive(:failed_job_handler).and_return('delete')
 
-      mock_exception = mock("Exception")
-      mock_exception.should_receive(:backtrace).and_return([])
-      mock_job.should_receive(:ayl_delete)
+      mock_message = double("message")
+      expect(mock_message).to receive(:options).and_return(mock_options)
 
-      mock_mailer = mock("Mailer")
-      mock_mailer.should_receive(:deliver_message).with(any_args())
+      expect(mock_job).to receive(:ayl_message).and_return(mock_message)
 
-      Ayl::Mailer.should_receive(:instance).and_return(mock_mailer)
+      mock_exception = double("Exception")
+      expect(mock_exception).to receive(:backtrace).and_return([])
+      expect(mock_job).to receive(:ayl_delete)
+
+      mock_mailer = double("Mailer")
+      expect(mock_mailer).to receive(:deliver_message).with(any_args())
+
+      expect(Ayl::Mailer).to receive(:instance).and_return(mock_mailer)
 
       @worker.send(:deal_with_unexpected_exception, mock_job, mock_exception)
     end
 
     it "should call the job's ayl_bury method if the message requires the job to be buried" do
-      mock_job = mock("Beanstalk::Job")
-      mock_job.should_receive(:ayl_message).and_return do 
-        mock("message").tap do | mock_message |
-          mock_message.should_receive(:options).and_return do
-            mock("options").tap do | mock_options |
-              mock_options.should_receive(:failed_job_handler).and_return('bury')
-            end
-          end
-        end
-      end
+      mock_job = double("Beanstalk::Job")
+
+      mock_options = double("options")
+      expect(mock_options).to receive(:failed_job_handler).and_return('bury')
 
-      mock_exception = mock("Exception")
-      mock_exception.should_receive(:backtrace).and_return([])
-      mock_job.should_receive(:ayl_bury)
+      mock_message = double("message")
+      expect(mock_message).to receive(:options).and_return(mock_options)
 
-      mock_mailer = mock("Mailer")
-      mock_mailer.should_receive(:deliver_message).with(any_args())
+      mock_job.should_receive(:ayl_message).and_return(mock_message)
 
-      Ayl::Mailer.should_receive(:instance).and_return(mock_mailer)
+      mock_exception = double("Exception")
+      expect(mock_exception).to receive(:backtrace).and_return([])
+      expect(mock_job).to receive(:ayl_bury)
+
+      mock_mailer = double("Mailer")
+      expect(mock_mailer).to receive(:deliver_message).with(any_args())
+
+      expect(Ayl::Mailer).to receive(:instance).and_return(mock_mailer)
 
       @worker.send(:deal_with_unexpected_exception, mock_job, mock_exception)
     end
@@ -139,91 +140,94 @@ describe Ayl::Beanstalk::Worker do
       @worker.stub_chain(:logger, :debug)
       Ayl::MessageOptions.default_queue_name = 'the queue name'
 
-      @mock_pool = mock("Beanstalk::Pool")
-      @mock_pool.should_receive(:watch).with('the queue name')
+      mock_tubes = double("Tubes")
+      expect(mock_tubes).to receive(:watch!).with('the queue name')
+      @mock_pool = double("Beanstalk::Pool")
+      expect(@mock_pool).to receive(:tubes).and_return(mock_tubes)
       @worker.stub(:pool).and_return(@mock_pool)
     end
 
     it "should process a message received from beanstalk" do
-      mock_message = mock("Ayl::Message")
+      mock_message = double("Ayl::Message")
+
+      mock_job = double("Beanstalk::Job")
+      expect(mock_job).to receive(:ayl_message).at_least(1).times.and_return(mock_message)
+      expect(mock_job).to receive(:ayl_delete)
 
-      mock_job = mock("Beanstalk::Job")
-      mock_job.should_receive(:ayl_message).at_least(1).times.and_return(mock_message)
-      mock_job.should_receive(:ayl_delete)
+      expect(@worker).to receive(:process_message).with(mock_message)
 
-      @worker.should_receive(:process_message).with(mock_message)
+      expect(@worker).to receive(:reserve_job).and_yield(mock_job)
 
-      @worker.should_receive(:reserve_job).and_yield(mock_job)
 
       @worker.process_messages
     end
 
     it "should do nothing if the received message is invalid (nil)" do
-      mock_job = mock("Beanstalk::Job")
-      mock_job.should_receive(:ayl_message).at_least(1).times.and_return(nil)
-      mock_job.should_receive(:ayl_delete)
+      mock_job = double("Beanstalk::Job")
+      expect(mock_job).to receive(:ayl_message).at_least(1).times.and_return(nil)
+      expect(mock_job).to receive(:ayl_delete)
 
-      @worker.should_not_receive(:process_message)
+      expect(@worker).not_to receive(:process_message)
 
-      @worker.should_receive(:reserve_job).and_yield(mock_job)
+      expect(@worker).to receive(:reserve_job).and_yield(mock_job)
 
       @worker.process_messages
     end
 
     it "should delete the job and re-raise the exception on a SystemExit" do
-      mock_message = mock("Ayl::Message")
+      mock_message = double("Ayl::Message")
 
-      mock_job = mock("Beanstalk::Job")
-      mock_job.should_receive(:ayl_message).at_least(1).times.and_return(mock_message)
-      mock_job.should_receive(:ayl_delete)
+      mock_job = double("Beanstalk::Job")
+      expect(mock_job).to receive(:ayl_message).at_least(1).times.and_return(mock_message)
+      expect(mock_job).to receive(:ayl_delete)
 
-      @worker.should_receive(:process_message).with(mock_message).and_raise(SystemExit)
+      expect(@worker).to receive(:process_message).with(mock_message).and_raise(SystemExit)
 
-      @worker.should_receive(:reserve_job).and_yield(mock_job)
+      expect(@worker).to receive(:reserve_job).and_yield(mock_job)
 
-      lambda { @worker.process_messages }.should raise_error(SystemExit)
+      expect { @worker.process_messages }.to raise_error(SystemExit)
     end
 
     it "should decay the job if the message requires it" do
-      mock_message = mock("Ayl::Message")
+      mock_message = double("Ayl::Message")
 
-      mock_job = mock("Beanstalk::Job")
-      mock_job.should_receive(:ayl_message).at_least(1).times.and_return(mock_message)
-      mock_job.should_receive(:ayl_decay).with(20)
+      mock_job = double("Beanstalk::Job")
+      expect(mock_job).to receive(:ayl_message).at_least(1).times.and_return(mock_message)
+      expect(mock_job).to receive(:ayl_decay).with(20)
 
-      @worker.should_receive(:process_message).with(mock_message).and_raise(Ayl::Beanstalk::RequiresJobDecay.new(20))
+      expect(@worker).to receive(:process_message).with(mock_message).and_raise(Ayl::Beanstalk::RequiresJobDecay.new(20))
 
-      @worker.should_receive(:reserve_job).and_yield(mock_job)
+      expect(@worker).to receive(:reserve_job).and_yield(mock_job)
 
       @worker.process_messages
     end
 
     it "should bury the job if the message requires it" do
-      mock_message = mock("Ayl::Message")
+      mock_message = double("Ayl::Message")
 
-      mock_job = mock("Beanstalk::Job")
-      mock_job.should_receive(:ayl_message).at_least(1).times.and_return(mock_message)
-      mock_job.should_receive(:ayl_bury)
+      mock_job = double("Beanstalk::Job")
+      expect(mock_job).to receive(:ayl_message).at_least(1).times.and_return(mock_message)
+      expect(mock_job).to receive(:ayl_bury)
 
-      @worker.should_receive(:process_message).with(mock_message).and_raise(Ayl::Beanstalk::RequiresJobBury)
+      expect(@worker).to receive(:process_message).with(mock_message).and_raise(Ayl::Beanstalk::RequiresJobBury)
 
-      @worker.should_receive(:reserve_job).and_yield(mock_job)
+      expect(@worker).to receive(:reserve_job).and_yield(mock_job)
 
       @worker.process_messages
     end
 
     it "should handle all other unexpected exceptions" do
-      mock_message = mock("Ayl::Message")
+      mock_message = double("Ayl::Message")
 
-      mock_job = mock("Beanstalk::Job")
-      mock_job.should_receive(:ayl_message).at_least(1).times.and_return(mock_message)
+      mock_job = double("Beanstalk::Job")
+      expect(mock_job).to receive(:ayl_message).at_least(1).times.and_return(mock_message)
 
       ex = Exception.new
 
-      @worker.should_receive(:process_message).with(mock_message).and_raise(ex)
+      expect(@worker).to receive(:process_message).with(mock_message).and_raise(ex)
 
-      @worker.should_receive(:reserve_job).and_yield(mock_job)
-      @worker.should_receive(:deal_with_unexpected_exception).with(mock_job, ex)
+      expect(@worker).to receive(:reserve_job).and_yield(mock_job)
+      expect(@worker).to receive(:deal_with_unexpected_exception).with(mock_job, ex)
 
       @worker.process_messages
     end

metadata

@@ -1,145 +1,129 @@
 --- !ruby/object:Gem::Specification
 name: ayl-beanstalk
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors:
 - j0hnds@gmail.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2015-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ayl
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: beanstalk-client
+  name: beaneater
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rcov
+  name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: Ayl extension to provide beanstalk support.
+        version: '0.9'
+description: Ayl extension to provide beanstalk support for applications requiring
+  async processing.
 email: j0hnds@gmail.com
 executables:
 - ayl_beanstalk
@@ -150,8 +134,8 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
-- .document
-- .rspec
+- ".document"
+- ".rspec"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -181,29 +165,25 @@ files:
 homepage: http://github.com/j0hnds/ayl-beanstalk
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3806134538379917538
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ayl extension to provide beanstalk support.
 test_files: []