delayed_job_active_record 0.4.2 → 0.4.3

data/README.md

@@ -4,6 +4,7 @@
 [![Build Status](https://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)
 [![Code Climate](https://codeclimate.com/github/collectiveidea/delayed_job_active_record.png)](https://codeclimate.com/github/collectiveidea/delayed_job_active_record)
+[![Coverage Status](https://coveralls.io/repos/collectiveidea/delayed_job_active_record/badge.png?branch=master)](https://coveralls.io/r/collectiveidea/delayed_job_active_record)
 
 ## Installation
 

data/delayed_job_active_record.gemspec

@@ -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        = '0.4.2'
+  spec.version        = '0.4.3'
 end

data/lib/delayed/backend/active_record.rb

@@ -52,22 +52,14 @@ module Delayed
           nextScope = nextScope.scoped.by_priority.limit(1)
 
           now = self.db_time_now
-
-          if ::ActiveRecord::Base.connection.adapter_name == "PostgreSQL"
-            # Custom SQL required for PostgreSQL because postgres does not support UPDATE...LIMIT
-            # This locks the single record 'FOR UPDATE' in the subquery (http://www.postgresql.org/docs/9.0/static/sql-select.html#SQL-FOR-UPDATE-SHARE)
-            # Note: active_record would attempt to generate UPDATE...LIMIT like sql for postgres if we use a .limit() filter, but it would not use
-            # 'FOR UPDATE' and we would have many locking conflicts
-            quotedTableName = ::ActiveRecord::Base.connection.quote_table_name(self.table_name)
-            subquerySql = nextScope.lock(true).select('id').to_sql
-            reserved = self.find_by_sql(["UPDATE #{quotedTableName} SET locked_at = ?, locked_by = ? WHERE id IN (#{subquerySql}) RETURNING *",now,worker.name])
-            return reserved[0]
-          else
-            # This works on MySQL and other DBs that support UPDATE...LIMIT. It uses separate queries to lock and return the job
-            count = nextScope.update_all(:locked_at => now, :locked_by => worker.name)
-            return nil if count == 0
-            return self.where(:locked_at => now, :locked_by => worker.name).first
+          job = nextScope.first
+          return unless job
+          job.with_lock do
+            job.locked_at = now
+            job.locked_by = worker.name
+            job.save!
           end
+          job
         end
 
         # Lock this job for this worker.

data/spec/delayed/backend/active_record_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'helper'
 require 'delayed/backend/active_record'
 
 describe Delayed::Backend::ActiveRecord::Job do

data/spec/delayed/serialization/active_record_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'helper'
 
 describe ActiveRecord do
   it "loads classes with non-default primary key" do

data/spec/{spec_helper.rb → helper.rb}

@@ -1,9 +1,14 @@
-$:.unshift(File.dirname(__FILE__) + '/../lib')
+require 'simplecov'
+require 'coveralls'
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+    SimpleCov::Formatter::HTMLFormatter,
+      Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start
 
-require 'rubygems'
-require 'bundler/setup'
-require 'rspec'
 require 'logger'
+require 'rspec'
 
 require 'delayed_job_active_record'
 require 'delayed/backend/shared_spec'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_active_record
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -75,7 +75,7 @@ files:
 - spec/database.yml
 - spec/delayed/backend/active_record_spec.rb
 - spec/delayed/serialization/active_record_spec.rb
-- spec/spec_helper.rb
+- spec/helper.rb
 homepage: http://github.com/collectiveidea/delayed_job_active_record
 licenses:
 - MIT
@@ -91,7 +91,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4028435250448725028
+      hash: -4151912302057659194
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4028435250448725028
+      hash: -4151912302057659194
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
@@ -111,4 +111,4 @@ test_files:
 - spec/database.yml
 - spec/delayed/backend/active_record_spec.rb
 - spec/delayed/serialization/active_record_spec.rb
-- spec/spec_helper.rb
+- spec/helper.rb