beanstalk_farmer 0.3.0 → 0.3.1

data/Changelog.md

@@ -1,3 +1,7 @@
+## 0.3.1
+
+* Updated beanstalk-client gem
+
 ## 0.3.0
 
 * Allow for job handlers to return instructions on how to complete the job at

data/lib/beanstalk_farmer/dsl.rb

@@ -1,16 +1,19 @@
 module BeanstalkFarmer
   # @private Provides a clean slate object that we can safely instance eval on.
   class DSL
-    def tube(tube_name, job_handler=nil, &block)
-      job_handler = block.to_proc if block_given?
+    attr_accessor :handler_pool
+
+    def initialize(handler_pool)
+      self.handler_pool = handler_pool
+    end
 
-      Job.handler_pool[tube_name] = job_handler
+    def eval(&block)
+      instance_eval &block
     end
 
-    def self.execute!(&block)
-      new.tap do |dsl|
-        dsl.instance_eval(&block)
-      end
+    def tube(tube_name, job_handler=nil, &block)
+      job_handler = block.to_proc if block_given?
+      handler_pool[tube_name] = job_handler
     end
   end
 end

data/lib/beanstalk_farmer/job.rb

@@ -29,6 +29,14 @@ module BeanstalkFarmer
       handle_job_response
     end
 
+    def method_missing(name, *args, &block)
+      if job.respond_to?(name)
+        job.public_send(name, args, &block)
+      else
+        super
+      end
+    end
+
     # A pool of job handlers that can work on jobs in our queue
     #
     # @param [Boolean] reset (false) When true, our collection of job handlers
@@ -64,11 +72,11 @@ module BeanstalkFarmer
         job.public_send(*response)
       else
         logger.info "JOB (#{name}) done. Deleting by default."
-        job.delete
+        delete
       end
     rescue NoMethodError => e
       logger.info "JOB (#{name}) done. Assuming delete from response: #{response.inspect}"
-      job.delete
+      delete
     end
   end
 end

data/lib/beanstalk_farmer/runner.rb

@@ -11,9 +11,10 @@ module BeanstalkFarmer
   #
   #   runner.run!
   class Runner
-    # @see Farmer::Job.handler_pool
-    def handler_pool
-      Job.handler_pool
+    attr_reader :handler_pool
+
+    def initialize
+      @handler_pool = Hash.new
     end
 
     # @return [Farmer::BeanstalkService] a connection to the Beanstalk queue
@@ -54,7 +55,9 @@ module BeanstalkFarmer
     #     tube 'mine',  Proc.new { |args| puts args }
     #   end
     def register_handlers(&block)
-      DSL.execute!(&block)
+      dsl = DSL.new(handler_pool)
+      dsl.eval(&block)
+      dsl
     end
 
     # Looks for jobs to reserve, and applies handlers to them

data/lib/beanstalk_farmer/service.rb

@@ -76,8 +76,11 @@ module BeanstalkFarmer
 
     # Helper method. Used when testing to see if our queue works
     def enqueue(tube_name, args={})
-      connection.use(tube_name)
-      connection.put MultiJson.encode([tube_name, args]), DEFAULT_PRIORITY, DEFAULT_DELAY, DEFAULT_TTR
+      encoded_message = MultiJson.encode([tube_name, args])
+
+      connection.on_tube(tube_name) do |conn|
+        conn.put(encoded_message, DEFAULT_PRIORITY, DEFAULT_DELAY, DEFAULT_TTR)
+      end
     end
 
     # @param [Integer, nil] timeout When nil, a job is reserved indefinitely,

data/lib/beanstalk_farmer/version.rb

@@ -1,3 +1,3 @@
 module BeanstalkFarmer
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/spec/beanstalk_farmer/dsl_spec.rb

@@ -1,25 +1,26 @@
 require 'spec_helper'
 
 describe BeanstalkFarmer::DSL do
+  let(:handler_pool) { Hash.new }
+
+  subject { described_class.new(handler_pool) }
+
+  describe '#intialize' do
+    its(:handler_pool) { should == handler_pool }
+  end
+
   describe '#tube' do
     let(:tube_name) { 'my_tube' }
     let(:handler)   { Proc.new { |args| args } }
 
-    after(:each) do
-      BeanstalkFarmer::Job.handler_pool(true)
-    end
-
-    it 'correctly adds job handlers for some tube' do
+    it 'adds a handler to the pool for the named tube' do
       subject.tube(tube_name, handler)
-      BeanstalkFarmer::Job.handler_pool[tube_name].should == handler
+      subject.handler_pool[tube_name].should == handler
     end
 
-    it 'can add a block as a handler' do
-      subject.tube 'block', do |args|
-        args
-      end
-
-      BeanstalkFarmer::Job.handler_pool['block'].should be_a(Proc)
+    it 'accepts a block argument to define a handler' do
+      subject.tube(tube_name) { |args| args }
+      subject.handler_pool[tube_name].should be_a(Proc)
     end
   end
 end

data/spec/beanstalk_farmer/runner_spec.rb

@@ -5,11 +5,8 @@ describe BeanstalkFarmer::Runner do
 
   its(:service) { should be_a_kind_of(BeanstalkFarmer::Service) }
 
-  describe '#handler_pool' do
-    it 'is the job handler pool' do
-      BeanstalkFarmer::Job.should_receive(:handler_pool)
-      subject.handler_pool
-    end
+  describe '#initialize' do
+    its(:handler_pool) { should be_a(Hash) }
   end
 
   describe '#prep_tubes' do

metadata

@@ -1,82 +1,78 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: beanstalk_farmer
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.1
   prerelease: 
-  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - James Herdamn
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-28 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: beanstalk-client
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70289652643300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.1.0
+      - !ruby/object:Gem::Version
+        version: 1.1.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: multi_json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70289652643300
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: &70289652642200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.2
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70289652642200
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70289652640240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.6"
+      - !ruby/object:Gem::Version
+        version: '2.6'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70289652640240
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70289652657600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.9.0
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: simplecov
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70289652657600
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &70289652655340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.4.2
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: *70289652655340
 description: Farmer is a nice little kit to manage a Beanstalk job queue
-email: 
+email:
 - james.herdman@me.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/beanstalk_farmer/config.rb
 - lib/beanstalk_farmer/dsl.rb
 - lib/beanstalk_farmer/errors.rb
@@ -99,33 +95,37 @@ files:
 - spec/spec_helper.rb
 - spec/support/have_tube_named.rb
 homepage: https://github.com/jherdman/beanstalk_farmer
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 1192104180556587290
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 1192104180556587290
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A nice little kit to manage a Beanstalk job queue
-test_files: 
+test_files:
 - spec/beanstalk_farmer/config_spec.rb
 - spec/beanstalk_farmer/dsl_spec.rb
 - spec/beanstalk_farmer/job_spec.rb