delayed_job_active_record 4.0.0.beta2 → 4.0.0.beta3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YjhkN2JjN2FiYWVkMTM0ZWRlMjA4NjBiZWE2NjZmYWM5YzNkZTJjZQ==
+  data.tar.gz: !binary |-
+    NDFiNDA5ZTQ5MTA3ZmU3NWJmMzkzMWFhNWU4MGZmMjM1MjJkOGRmMQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    N2FhMjcwZTBmMzkyNWEzMTg0MjhlMDY1NmExNzU2NGUyMjM2MzgzMDVjMTlk
+    MjIzMDE4YTQ3MWYwZjNjZmY4NDc2MzA1MzlmMzBkNTZjYmY0YzE3NzI1ZmY2
+    NjVmZjMwZDExNjdkNDhlNDYyMjE3ZmFhMThiODk4YjRlNDNjYTc=
+  data.tar.gz: !binary |-
+    YTdjMGVhMWM1MjM5OTE5NzI1ZmZiYjlkNjcxNTg2ODkzYzRlZWQ5ZWQ4Y2I2
+    MzE1NmNjZWY3NDdiM2JmYTc4Y2RkMDJkNmM3ZWI0NDJlMjU1MTUyNjA0YWI5
+    NGZkNGE3M2U5NGI1YWQ1MzA5ODMwYzAyODA5Y2RjZDQxODlkZTE=

data/Rakefile

@@ -1,12 +1,35 @@
 # -*- encoding: utf-8 -*-
-require 'rubygems'
-require 'bundler/setup'
+require "bundler/gem_helper"
 Bundler::GemHelper.install_tasks
 
-require 'rspec/core/rake_task'
-desc 'Run the specs'
-RSpec::Core::RakeTask.new do |r|
-  r.verbose = false
+require "rspec/core/rake_task"
+
+ADAPTERS = %w(mysql postgresql sqlite3)
+
+ADAPTERS.each do |adapter|
+  desc "Run RSpec code examples for #{adapter} adapter"
+  RSpec::Core::RakeTask.new(adapter => "#{adapter}:adapter")
+
+  namespace adapter do
+    task :adapter do
+      ENV["ADAPTER"] = adapter
+    end
+  end
+end
+
+task :coverage do
+  ENV["COVERAGE"] = "true"
+end
+
+task :adapter do
+  ENV["ADAPTER"] = nil
+end
+
+Rake::Task[:spec].enhance do
+  require "simplecov"
+  require "coveralls"
+
+  Coveralls::SimpleCov::Formatter.new.format(SimpleCov.result)
 end
 
-task :default => :spec
+task default: ([:coverage] + ADAPTERS + [:adapter])

data/delayed_job_active_record.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.add_dependency   'activerecord', ['>= 3.0', '< 4.1']
-  spec.add_dependency   'delayed_job', '~> 4.0.0.beta1'
+  spec.add_dependency   'delayed_job',  ['>= 3.0', '< 4.1']
   spec.authors        = ["Brian Ryckbost", "Matt Griffin", "Erik Michaels-Ober"]
   spec.description    = 'ActiveRecord backend for Delayed::Job, originally authored by Tobias Lütke'
   spec.email          = ['bryckbost@gmail.com', 'matt@griffinonline.org', 'sferik@gmail.com']
@@ -15,5 +15,5 @@ Gem::Specification.new do |spec|
   spec.require_paths  = ['lib']
   spec.summary        = 'ActiveRecord backend for DelayedJob'
   spec.test_files     = Dir.glob("spec/**/*")
-  spec.version        = '4.0.0.beta2'
+  spec.version        = '4.0.0.beta3'
 end

data/lib/delayed/backend/active_record.rb

@@ -7,6 +7,11 @@ module Delayed
       class Job < ::ActiveRecord::Base
         include Delayed::Backend::Base
 
+        if ::ActiveRecord::VERSION::MAJOR < 4 || defined?(::ActiveRecord::MassAssignmentSecurity)
+          attr_accessible :priority, :run_at, :queue, :payload_object,
+                          :failed_at, :locked_at, :locked_by, :handler
+        end
+
         scope :by_priority, lambda { order('priority ASC, run_at ASC') }
 
         before_save :set_default_run_at
@@ -62,7 +67,18 @@ module Delayed
             # This works on MySQL and possibly some other DBs that support UPDATE...LIMIT. It uses separate queries to lock and return the job
             count = ready_scope.limit(1).update_all(:locked_at => now, :locked_by => worker.name)
             return nil if count == 0
-            self.where(:locked_at => now, :locked_by => worker.name).first
+            self.where(:locked_at => now, :locked_by => worker.name, :failed_at => nil).first
+          when "MSSQL"
+            # The MSSQL driver doesn't generate a limit clause when update_all is called directly
+            subsubquery_sql = ready_scope.limit(1).to_sql
+            # select("id") doesn't generate a subquery, so force a subquery
+            subquery_sql = "SELECT id FROM (#{subsubquery_sql}) AS x"
+            quoted_table_name = self.connection.quote_table_name(self.table_name)
+            sql = ["UPDATE #{quoted_table_name} SET locked_at = ?, locked_by = ? WHERE id IN (#{subquery_sql})", now, worker.name]
+            count = self.connection.execute(sanitize_sql(sql))
+            return nil if count == 0
+            # MSSQL JDBC doesn't support OUTPUT INSERTED.* for returning a result set, so query locked row
+            self.where(:locked_at => now, :locked_by => worker.name, :failed_at => nil).first
           else
             # This is our old fashion, tried and true, but slower lookup
             ready_scope.limit(worker.read_ahead).detect do |job|

data/lib/generators/delayed_job/active_record_generator.rb

@@ -1,4 +1,5 @@
 require 'generators/delayed_job/delayed_job_generator'
+require 'generators/delayed_job/next_migration_version'
 require 'rails/generators/migration'
 require 'rails/generators/active_record'
 
@@ -6,6 +7,7 @@ require 'rails/generators/active_record'
 module DelayedJob
   class ActiveRecordGenerator < ::DelayedJobGenerator
     include Rails::Generators::Migration
+    extend NextMigrationVersion
 
     self.source_paths << File.join(File.dirname(__FILE__), 'templates')
 

data/lib/generators/delayed_job/next_migration_version.rb

@@ -0,0 +1,14 @@
+module DelayedJob
+  module NextMigrationVersion
+    # while methods have moved around this has been the implementation
+    # since ActiveRecord 3.0
+    def next_migration_number(dirname)
+      next_migration_number = current_migration_number(dirname) + 1
+      if ActiveRecord::Base.timestamped_migrations
+        [Time.now.utc.strftime("%Y%m%d%H%M%S"), "%.14d" % next_migration_number].max
+      else
+        "%.3d" % next_migration_number
+      end
+    end
+  end
+end

data/lib/generators/delayed_job/templates/migration.rb

@@ -1,15 +1,15 @@
 class CreateDelayedJobs < ActiveRecord::Migration
   def self.up
     create_table :delayed_jobs, :force => true do |table|
-      table.integer  :priority, :default => 0      # Allows some jobs to jump to the front of the queue
-      table.integer  :attempts, :default => 0      # Provides for retries, but still fail eventually.
-      table.text     :handler                      # YAML-encoded string of the object that will do work
-      table.text     :last_error                   # reason for last failure (See Note below)
-      table.datetime :run_at                       # When to run. Could be Time.zone.now for immediately, or sometime in the future.
-      table.datetime :locked_at                    # Set when a client is working on this object
-      table.datetime :failed_at                    # Set when all retries have failed (actually, by default, the record is deleted instead)
-      table.string   :locked_by                    # Who is working on this object (if locked)
-      table.string   :queue                        # The name of the queue this job is in
+      table.integer  :priority, :default => 0, :null => false # Allows some jobs to jump to the front of the queue
+      table.integer  :attempts, :default => 0, :null => false # Provides for retries, but still fail eventually.
+      table.text     :handler, :null => false                 # YAML-encoded string of the object that will do work
+      table.text     :last_error                              # reason for last failure (See Note below)
+      table.datetime :run_at                                  # When to run. Could be Time.zone.now for immediately, or sometime in the future.
+      table.datetime :locked_at                               # Set when a client is working on this object
+      table.datetime :failed_at                               # Set when all retries have failed (actually, by default, the record is deleted instead)
+      table.string   :locked_by                               # Who is working on this object (if locked)
+      table.string   :queue                                   # The name of the queue this job is in
       table.timestamps
     end
 

data/lib/generators/delayed_job/upgrade_generator.rb

@@ -1,11 +1,12 @@
 require 'generators/delayed_job/delayed_job_generator'
+require 'generators/delayed_job/next_migration_version'
 require 'rails/generators/migration'
-require 'rails/generators/active_record'
 
 # Extend the DelayedJobGenerator so that it creates an AR migration
 module DelayedJob
   class UpgradeGenerator < ::DelayedJobGenerator
     include Rails::Generators::Migration
+    extend NextMigrationVersion
 
     self.source_paths << File.join(File.dirname(__FILE__), 'templates')
 

data/spec/delayed/backend/active_record_spec.rb

@@ -43,6 +43,23 @@ describe Delayed::Backend::ActiveRecord::Job do
     end
   end
 
+  if ::ActiveRecord::VERSION::MAJOR < 4 || defined?(::ActiveRecord::MassAssignmentSecurity)
+    context "ActiveRecord::Base.send(:attr_accessible, nil)" do
+      before do
+        Delayed::Backend::ActiveRecord::Job.send(:attr_accessible, nil)
+      end
+
+      after do
+        Delayed::Backend::ActiveRecord::Job.send(:attr_accessible, *Delayed::Backend::ActiveRecord::Job.new.attributes.keys)
+      end
+
+      it "is still accessible" do
+        job = Delayed::Backend::ActiveRecord::Job.enqueue :payload_object => EnqueueJobMod.new
+        expect(Delayed::Backend::ActiveRecord::Job.find(job.id).handler).to_not be_blank
+      end
+    end
+  end
+
   context "ActiveRecord::Base.table_name_prefix" do
     it "when prefix is not set, use 'delayed_jobs' as table name" do
       ::ActiveRecord::Base.table_name_prefix = nil

data/spec/helper.rb

@@ -10,14 +10,21 @@ SimpleCov.start
 require 'logger'
 require 'rspec'
 
+begin
+  require 'protected_attributes'
+rescue LoadError
+end
 require 'delayed_job_active_record'
 require 'delayed/backend/shared_spec'
 
 Delayed::Worker.logger = Logger.new('/tmp/dj.log')
 ENV['RAILS_ENV'] = 'test'
 
+db_adapter, gemfile = ENV["ADAPTER"], ENV["BUNDLE_GEMFILE"]
+db_adapter ||= gemfile && gemfile[%r(gemfiles/(.*?)/)] && $1
+db_adapter ||= 'sqlite3'
+
 config = YAML.load(File.read('spec/database.yml'))
-db_adapter = ENV['CI_DB_ADAPTER'] || 'sqlite3'
 ActiveRecord::Base.establish_connection config[db_adapter]
 ActiveRecord::Base.logger = Delayed::Worker.logger
 ActiveRecord::Migration.verbose = false
@@ -46,7 +53,11 @@ end
 
 # Purely useful for test cases...
 class Story < ActiveRecord::Base
-  self.primary_key = :story_id
+  if ::ActiveRecord::VERSION::MAJOR < 4 && ActiveRecord::VERSION::MINOR < 2
+    set_primary_key :story_id
+  else
+    self.primary_key = :story_id
+  end
   def tell; text; end
   def whatever(n, _); tell*n; end
   default_scope { where(:scoped => true) }

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_active_record
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta2
-  prerelease: 6
+  version: 4.0.0.beta3
 platform: ruby
 authors:
 - Brian Ryckbost
@@ -11,12 +10,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-02 00:00:00.000000000 Z
+date: 2013-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  prerelease: false
   name: activerecord
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.1'
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -25,9 +32,10 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :runtime
+- !ruby/object:Gem::Dependency
   prerelease: false
+  name: delayed_job
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -35,22 +43,15 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '4.1'
-- !ruby/object:Gem::Dependency
-  name: delayed_job
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
+        version: '3.0'
+    - - <
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta1
+        version: '4.1'
+  type: :runtime
 description: ActiveRecord backend for Delayed::Job, originally authored by Tobias
   Lütke
 email:
@@ -69,6 +70,7 @@ files:
 - lib/delayed/backend/active_record.rb
 - lib/delayed_job_active_record.rb
 - lib/generators/delayed_job/active_record_generator.rb
+- lib/generators/delayed_job/next_migration_version.rb
 - lib/generators/delayed_job/templates/migration.rb
 - lib/generators/delayed_job/templates/upgrade_migration.rb
 - lib/generators/delayed_job/upgrade_generator.rb
@@ -79,30 +81,26 @@ files:
 homepage: http://github.com/collectiveidea/delayed_job_active_record
 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: 1966467636289984878
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ActiveRecord backend for DelayedJob
 test_files:
 - spec/database.yml