quebert 2.0.2 → 2.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 063bc22b230d2549c427562deb220554b1b6b931
+  data.tar.gz: 0f4db324c52f319abe1229112f0ea4219172f47d
+SHA512:
+  metadata.gz: b001d8710708db59714b9722c75cf0919ab1520a369ff2c3c246645450a02ba0e47235be186f805984d46693c7766b654bc579e73f8bca176c7176e37935e2ad
+  data.tar.gz: 76331a2a7b8600945285f562802b80f68954909d0b0a62f8b5ae857c8c5d782d5c364e74438f38ef542a91588ea2f2ba8dc7d46fa6abd107c59c07c46f4b5d28

data/.rbenv-version

@@ -1 +1 @@
-1.9.3-p392
+1.9.3-p484

data/.travis.yml

@@ -1,6 +1,12 @@
-script: bundle exec rspec
 language: ruby
 rvm:
   - 2.0.0
-  - 1.9.3
-  - 1.8.7
+before_install:
+  - curl -L https://github.com/kr/beanstalkd/archive/v1.9.tar.gz | tar xz -C /tmp
+  - cd /tmp/beanstalkd-1.9/
+  - make
+  - ./beanstalkd &
+  - cd $TRAVIS_BUILD_DIR
+script:
+  - bundle install
+  - bundle exec rspec

data/Gemfile

@@ -3,14 +3,8 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in quebert.gemspec
 gemspec
 
-group :development do
-  gem 'system_timer', :require => false, :platform => :ruby_18
-end
-
 group :test do
-  # gem 'ruby-debug',   :platform => :ruby_18
-  # gem 'ruby-debug19', :platform => :ruby_19
-  gem 'activerecord', '~> 2.3.0'
+  gem 'activerecord', '~> 4.0'
   gem 'sqlite3-ruby'
   gem 'guard-rspec'
   gem 'rb-fsevent'

data/lib/quebert.rb

@@ -4,7 +4,6 @@ module Quebert
   autoload :Logging,            'quebert/logging'
   autoload :Serializer,         'quebert/serializer'
   autoload :Configuration,      'quebert/configuration'
-  autoload :Timeout,            'quebert/timeout'
   autoload :Job,                'quebert/job'
   autoload :Controller,         'quebert/controller'
   autoload :Backend,            'quebert/backend'
@@ -23,11 +22,11 @@ module Quebert
     def backends
       @backends ||= Support::Registry.new
     end
-    
+
     def serializers
       @serializers ||= Support::ClassRegistry.new
     end
-    
+
     # Make this easier for elsewhere in the app
     def logger
       config.logger
@@ -39,9 +38,9 @@ module Quebert
       block.call
     end
   end
-  
+
   # Register built-in Quebert backends
   Quebert.backends.register :beanstalk,       Backend::Beanstalk
   Quebert.backends.register :in_process,      Backend::InProcess
   Quebert.backends.register :sync,            Backend::Sync
-end
+end

data/lib/quebert/backend/beanstalk.rb

@@ -5,17 +5,21 @@ module Quebert
     
     # Manage jobs on a Beanstalk queue out of process
     class Beanstalk
+      def initialize(host, tube_name)
+        @host, @tube_name = host, tube_name
+      end
+
       def put(job, *args)
         priority, delay, ttr = args
         opts = {}
         opts[:pri]   = priority unless priority.nil?
         opts[:delay] = delay    unless delay.nil?
         opts[:ttr]   = ttr      unless ttr.nil?
-        @tube.put job.to_json, opts
+        tube.put job.to_json, opts
       end
 
       def reserve_without_controller(timeout=nil)
-        @tube.reserve timeout
+        tube.reserve timeout
       end
 
       def reserve(timeout=nil)
@@ -23,7 +27,7 @@ module Quebert
       end
 
       def peek(state)
-        @tube.peek state
+        tube.peek state
       end
 
       # For testing purposes... I think there's a better way to do this though.
@@ -35,19 +39,24 @@ module Quebert
           reserve_without_controller.delete
         end
         while peek(:buried) do
-          @tube.kick
+          tube.kick
           reserve_without_controller.delete
         end
       end
       
-      def initialize(host, tube)
-        @pool = Beaneater::Pool.new Array(host)
-        @tube = @pool.tubes[tube]
-      end
       def self.configure(opts={})
         opts[:host] ||= ['127.0.0.1:11300']
         new(opts[:host], opts[:tube])
       end
+
+      private
+      def pool
+        @pool ||= Beaneater::Pool.new Array(@host)
+      end
+
+      def tube
+        @tube ||= pool.tubes[@tube_name]
+      end
     end
   end
 end

data/lib/quebert/controller/beanstalk.rb

@@ -68,7 +68,7 @@ module Quebert
           log "Manually retrying with delay"
           retry_with_delay
         rescue Exception => e
-          log "Exception caught on perform. Burrying job. #{e.inspect}", :error
+          log "Exception caught on perform. Burying job. #{e.inspect} #{e.backtrace.join("\n")}", :error
           beanstalk_job.bury
           log "Job buried", :error
           raise e
@@ -89,7 +89,7 @@ module Quebert
             beanstalk_job.release :pri => @job.priority, :delay => delay
             log "Job released"
           end
-        rescue ::Beaneater::NotFoundError => e
+        rescue ::Beaneater::NotFoundError
           log "Job ran longer than allowed. Beanstalk already deleted it!!!!", :error
           # Sometimes the timer doesn't behave correctly and this job actually runs longer than
           # allowed. At that point the beanstalk job no longer exists anymore. Lets let it go and don't blow up.
@@ -102,4 +102,4 @@ module Quebert
       end
     end
   end
-end
+end

data/lib/quebert/job.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'timeout'
 
 module Quebert
   class Job
@@ -53,7 +54,7 @@ module Quebert
       # Honor the timeout and kill the job in ruby-space. Beanstalk
       # should be cleaning up this job and returning it to the queue
       # as well.
-      Quebert::Timeout.timeout(@ttr, Job::Timeout){ perform(*args) }
+      ::Timeout.timeout(@ttr, Job::Timeout){ perform(*args) }
     end
 
     # Accepts arguments that override the job options and enqueu this stuff.

data/lib/quebert/serializer.rb

@@ -58,7 +58,7 @@ module Quebert
           hash[attr] = val
           hash
         end
-        { 'model' => record.class.model_name, 'attributes' => attrs }
+        { 'model' => record.class.model_name.to_s, 'attributes' => attrs }
       end
       
       def self.deserialize(hash)
@@ -83,4 +83,4 @@ module Quebert
     end
     
   end
-end
+end

data/lib/quebert/version.rb

@@ -1,3 +1,3 @@
 module Quebert
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

data/spec/async_sender_spec.rb

@@ -114,7 +114,7 @@ describe AsyncSender::ActiveRecord do
   it "should async_send and successfully serialize param object" do
     user = User.new(:first_name => 'Brad')
     user2 = User.new(:first_name => 'Steel')
-    user.async.email(user2)
+    user.async.email!(user2)
     @q.reserve.perform.first_name.should eql('Steel')
   end
-end
+end

data/spec/configuration_spec.rb

@@ -10,9 +10,9 @@ describe Configuration do
       backend = @config.backend
       backend.should be_instance_of(Quebert::Backend::Beanstalk)
       # Blech, gross nastiness in their lib, but we need to look in to see if this stuff as configed
-      pool = backend.instance_variable_get('@pool')
+      pool = backend.send(:pool)
       pool.connections.first.address.should eql('localhost:11300')
-      tube = backend.instance_variable_get('@tube')
+      tube = backend.send(:tube)
       tube.name.should eql('quebert-config-test')
     end
     

data/spec/consumer_spec.rb

@@ -89,11 +89,11 @@ describe Controller::Beanstalk do
     sleep(3)
 
     # lets set the max retry delay so it should bury instead of delay
-    Quebert::Controller::Beanstalk::MAX_TIMEOUT_RETRY_DELAY = 1
+    redefine_constant Quebert::Controller::Beanstalk, :MAX_TIMEOUT_RETRY_DELAY, 1
     lambda{@q.reserve.perform}.should raise_exception(Quebert::Job::Timeout)
     
     @q.peek(:ready).should be_nil
     @q.peek(:delayed).should be_nil
     @q.peek(:buried).should_not be_nil
   end
-end
+end

data/spec/job_spec.rb

@@ -109,7 +109,7 @@ describe Quebert::Job do
       describe "async promise DSL" do
         it "should enqueue and honor beanstalk options" do
           user = User.new(:first_name => "Steel")
-          user.async(:priority => 1, :delay => 2, :ttr => 300).email("somebody", nil, nil)
+          user.async(:priority => 1, :delay => 2, :ttr => 300).email!("somebody", nil, nil)
           job = @q.reserve
           job.beanstalk_job.pri.should eql(1)
           job.beanstalk_job.delay.should eql(2)
@@ -128,7 +128,7 @@ describe Quebert::Job do
       describe "legacy async_send" do
         it "should enqueue and honor beanstalk options" do
           user = User.new(:first_name => "Steel")
-          user.async_send(:email, "somebody", nil, nil, :beanstalk => {:priority => 1, :delay => 2, :ttr => 300})
+          user.async_send(:email!, "somebody", nil, nil, :beanstalk => {:priority => 1, :delay => 2, :ttr => 300})
           job = @q.reserve
           job.beanstalk_job.pri.should eql(1)
           job.beanstalk_job.delay.should eql(2)
@@ -153,4 +153,4 @@ describe Quebert::Job do
       }.should raise_exception(Quebert::Job::Timeout)
     end
   end
-end
+end

data/spec/serializer_spec.rb

@@ -90,4 +90,4 @@ describe Serializer::Job do
       deserialized.ttr.should eql(300)
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -22,6 +22,11 @@ def clean_file(path, contents=nil, &block)
   end
 end
 
+def redefine_constant(obj, const, value)
+  obj.send(:remove_const, const) if obj.const_defined?(const)
+  obj.const_set(const, value)
+end
+
 Dir[File.join(File.dirname(__FILE__), 'support/*.rb')].each {|file| require file }
 
-Quebert.serializers.register 'ActiveRecord::Base', Serializer::ActiveRecord
+Quebert.serializers.register 'ActiveRecord::Base', Serializer::ActiveRecord

data/spec/support/active_record.rb

@@ -24,7 +24,7 @@ class User < ActiveRecord::Base
     address
   end
 
-  def email(address)
+  def email!(address)
     address
   end
-end
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quebert
 version: !ruby/object:Gem::Version
-  version: 2.0.2
-  prerelease: 
+  version: 2.0.3
 platform: ruby
 authors:
 - Brad Gessler
@@ -11,42 +10,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 -07:00
-default_executable: 
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70292801264260 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70292801264260
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: beaneater
-  requirement: &70292801263460 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70292801263460
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70292801262540 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70292801262540
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.7.0
 description: A worker queue framework built around beanstalkd
 email:
 - brad@bradgessler.com
@@ -89,7 +96,6 @@ files:
 - lib/quebert/support.rb
 - lib/quebert/support/pid_file.rb
 - lib/quebert/support/registry.rb
-- lib/quebert/timeout.rb
 - lib/quebert/version.rb
 - lib/quebert/worker.rb
 - quebert.gemspec
@@ -106,30 +112,28 @@ files:
 - spec/support/jobs.rb
 - spec/support_spec.rb
 - spec/worker_spec.rb
-has_rdoc: true
 homepage: http://github.com/polleverywhere/quebert
 licenses: []
+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'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: quebert
-rubygems_version: 1.3.9.5
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A worker queue framework built around beanstalkd
 test_files:
 - spec/async_sender_spec.rb

data/lib/quebert/timeout.rb

@@ -1,12 +0,0 @@
-# Setup a namespaced Quebert::Timeout class that will deal with responsible folks in
-# 1.8.7 who use the SystemTimer gem.
-module Quebert
-  Timeout = begin
-    require 'system_timer'
-    ::SystemTimer
-  rescue LoadError
-    # Install the system_timer gem if you're running this in Ruby 1.8.7!
-    require 'timeout'
-    ::Timeout
-  end
-end