delayed_job_active_record 0.3.2 → 0.3.3

data/README.md

@@ -1,4 +1,4 @@
-# DelayedJob ActiveRecord Backend
+# DelayedJob ActiveRecord Backend [![Build Status](http://travis-ci.org/collectiveidea/delayed_job_active_record.png)](https://travis-ci.org/collectiveidea/delayed_job_active_record) [![Dependency Status](https://gemnasium.com/collectiveidea/delayed_job_active_record.png)](https://gemnasium.com/collectiveidea/delayed_job_active_record)
 
 ## Installation
 
@@ -22,15 +22,6 @@ If you're upgrading from Delayed Job 2.x, run the upgrade generator to create a
 
 That's it. Use [delayed_job as normal](http://github.com/collectiveidea/delayed_job).
 
-## Build Status
-
-[![Build Status](http://travis-ci.org/collectiveidea/delayed_job_active_record.png)](https://travis-ci.org/collectiveidea/delayed_job_active_record)
-
-
-## Dependency Status
-
-[![Dependency Status](https://gemnasium.com/collectiveidea/delayed_job_active_record.png)](https://gemnasium.com/collectiveidea/delayed_job_active_record)
-
 ## How to contribute
 
 If you find what looks like a bug:

data/lib/delayed/backend/active_record.rb

@@ -1,4 +1,3 @@
-require 'active_record'
 require 'active_record/version'
 module Delayed
   module Backend
@@ -17,14 +16,18 @@ module Delayed
           ::ActiveRecord::VERSION::MAJOR == 3
         end
 
+        delayed_job_table_name = "#{::ActiveRecord::Base.table_name_prefix}delayed_jobs"
+
         if rails3?
-          self.table_name = 'delayed_jobs'
-          scope :ready_to_run, lambda{|worker_name, max_run_time|
+          self.table_name = delayed_job_table_name
+          def self.ready_to_run(worker_name, max_run_time)
             where('(run_at <= ? AND (locked_at IS NULL OR locked_at < ?) OR locked_by = ?) AND failed_at IS NULL', db_time_now, db_time_now - max_run_time, worker_name)
-          }
-          scope :by_priority, order('priority ASC, run_at ASC')
+          end
+          def self.by_priority
+            order('priority ASC, run_at ASC')
+          end
         else
-          set_table_name :delayed_jobs
+          set_table_name delayed_job_table_name
           named_scope :ready_to_run, lambda {|worker_name, max_run_time|
             { :conditions => ['(run_at <= ? AND (locked_at IS NULL OR locked_at < ?) OR locked_by = ?) AND failed_at IS NULL', db_time_now, db_time_now - max_run_time, worker_name] }
           }

data/spec/delayed/backend/active_record_spec.rb

@@ -56,4 +56,23 @@ describe Delayed::Backend::ActiveRecord::Job do
       Delayed::Backend::ActiveRecord::Job.find(job.id).handler.should_not be_blank
     end
   end
+
+  context "ActiveRecord::Base.table_name_prefix" do
+    def reload_job_class_definition
+      # If this can be done in a more sane manner, please fix it
+      load File.join File.dirname(__FILE__), '..', '..', '..', 'lib', 'delayed', 'backend', 'active_record.rb'
+    end
+
+    it "when prefix is not set, should use 'delayed_jobs' as table name" do
+      ::ActiveRecord::Base.table_name_prefix = nil
+      reload_job_class_definition
+      Delayed::Backend::ActiveRecord::Job.table_name.should eq 'delayed_jobs'
+    end
+
+    it "when prefix is set, should prepend it before default table name" do
+      ::ActiveRecord::Base.table_name_prefix = 'custom_'
+      reload_job_class_definition
+      Delayed::Backend::ActiveRecord::Job.table_name.should eq 'custom_delayed_jobs'
+    end
+  end
 end

metadata

@@ -1,109 +1,114 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: delayed_job_active_record
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 0.3.3
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 2
-  version: 0.3.2
 platform: ruby
-authors: 
-- Matt Griffin
+authors:
 - Brian Ryckbost
+- Matt Griffin
+- Erik Michaels-Ober
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-30 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2012-09-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 1
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.1.0
-  requirement: *id001
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
-  name: activerecord
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4'
+- !ruby/object:Gem::Dependency
+  name: delayed_job
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
-  requirement: *id002
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
-  name: delayed_job
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
-  requirement: *id003
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 8
-        version: "0.8"
-  requirement: *id004
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  name: rake
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id005
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  name: sqlite3
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ActiveRecord backend for DelayedJob, originally authored by Tobias Luetke
-email: 
+email:
+- bryckbost@gmail.com
 - matt@griffinonline.org
+- sferik@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - lib/delayed/backend/active_record.rb
 - lib/delayed_job_active_record.rb
 - lib/generators/delayed_job/active_record_generator.rb
@@ -118,41 +123,39 @@ files:
 - README.md
 homepage: http://github.com/collectiveidea/delayed_job_active_record
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.md
 - --inline-source
 - --line-numbers
-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 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -4543581460881455669
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -4543581460881455669
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: ActiveRecord backend for DelayedJob
-test_files: 
+test_files:
 - spec/database.yml
 - spec/delayed/backend/active_record_spec.rb
 - spec/delayed/serialization/active_record_spec.rb