delayed_job_loner 0.0.3 → 0.0.4

data/README.md

@@ -16,6 +16,15 @@ Or install it yourself as:
 
     $ gem install delayed_job_loner
 
+### Migration
+
+The jobs table requires a migration to add the loner_hash string field.
+
+<pre>
+$ script/rails generate delayed_job_loner
+$ rake db:migrate
+</pre>
+
 ## Usage
 
 Pass the option `:unique_on` to any method that you would provide `:priority` or `:run_at`. `:unique_on` should be an array of attributes that you want to check the uniqueness of the job against.

data/delayed_job_loner.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'delayed_job'
 
   gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'activerecord'
+  gem.add_development_dependency 'rails'
   gem.add_development_dependency 'sqlite3-ruby'
   gem.add_development_dependency 'sqlite3_ar_regexp'
   gem.add_development_dependency 'delayed_job_active_record'

data/lib/delayed_job_loner.rb

@@ -1,2 +1,2 @@
 require "delayed_job_loner/version"
-require "delayed_job_loner/init"
+require "delayed_job_loner/init"

data/lib/delayed_job_loner/init.rb

@@ -1,22 +1,33 @@
+require 'digest/md5'
+
 module Delayed
   module Backend
     module ActiveRecord
       class Job < ::ActiveRecord::Base
+        attr_accessor :loner
         attr_accessor :unique_on
-        # attr_accessible :unique_on
 
         validate :check_uniqueness
 
         def check_uniqueness
+          self.loner_hash = generate_loner_hash
+          if loner || unique_on
+            self.errors.add(:base, "Job already exists") unless self.class.where(loner_hash: self.loner_hash, locked_by: nil).first.nil?
+          else
+            true
+          end
+        end
+
+        def generate_loner_hash
           if unique_on
-            scope = self.class.where("handler REGEXP '\\nmethod_name: :#{payload_object.method_name}\\n'").where(:locked_by => nil)
+            hashable_string = "#{payload_object.method_name}"
             unique_on.each do |attribute_name|
-              scope = scope.where("handler REGEXP ' +#{attribute_name}: #{payload_object.send(attribute_name)}\\n'")
+              hashable_string += "::#{attribute_name}:#{payload_object.send(attribute_name)}"
             end
-            self.errors.add(:base, "Job already exists") unless scope.first.nil?
           else
-            true
+            hashable_string = "#{payload_object.method_name}::id:#{payload_object.id}"
           end
+          Digest::MD5.base64digest(hashable_string)
         end
 
       end

data/lib/delayed_job_loner/version.rb

@@ -1,3 +1,3 @@
 module DelayedJobLoner
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/generators/delayed_job_loner/delayed_job_loner_generator.rb

@@ -0,0 +1,29 @@
+require 'rails/generators'
+require 'rails/generators/migration'
+
+class DelayedJobLonerGenerator < Rails::Generators::Base
+
+  include Rails::Generators::Migration
+  
+  def self.source_root
+     @source_root ||= File.join(File.dirname(__FILE__), 'templates')
+  end
+
+  # Implement the required interface for Rails::Generators::Migration.
+  #
+  def self.next_migration_number(dirname) #:nodoc:
+    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
+  
+  def create_migration_file
+    if defined?(ActiveRecord)
+      migration_template 'migration.rb', 'db/migrate/add_loner_hash_column_to_delayed_jobs.rb'
+    end
+  end
+
+end

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

@@ -0,0 +1,11 @@
+class AddLonerHashColumnToDelayedJobs < ActiveRecord::Migration
+  def self.up
+    add_column :delayed_jobs, :loner_hash, :string
+    add_index :delayed_jobs, :loner_hash
+  end
+  
+  def self.down
+    remove_index :delayed_jobs, :loner_hash
+    remove_column :delayed_jobs, :loner_hash
+  end
+end

data/spec/delayed_job_loner_spec.rb

@@ -21,15 +21,28 @@ describe DelayedJobLoner do
 
   # This test is broken right now because of an issue with attr_accessor not being able to be set by mass assignment in my tests.
   # It works in real life...
-  it "should not create a job if :unique_on is specified and a similar job exists" do
+  it "should not create a job if :loner is specified and a similar job exists" do
     story = Story.create(:text => "foo")
     story.reload
 
     story.whatever.persisted?.should eql true
     story.whatever.persisted?.should eql false
 
-    story.delay(:unique_on => [:id]).tell.persisted?.should eql true
-    story.delay(:unique_on => [:id]).tell.persisted?.should eql false
+    story.delay(:loner => true).tell.persisted?.should eql true
+    story.delay(:loner => true).tell.persisted?.should eql false
+  end
+
+  it "should return a unique md5 hash" do
+    story = Story.create(:text => "foo")
+    story2 = Story.create(:text => "foo")
+    story.reload
+    story2.reload
+
+    dj_object = story.whatever
+    dj_object2 = story2.whatever
+    
+    dj_object.generate_loner_hash.should_not eql dj_object2.generate_loner_hash
+    dj_object.loner_hash.should eql dj_object.generate_loner_hash
   end
 
 end

data/spec/story.rb

@@ -1,4 +1,4 @@
-require 'active_record'
+require 'rails'
 require 'delayed_job'
 require 'delayed_job_active_record'
 require 'delayed_job_loner'
@@ -20,7 +20,9 @@ ActiveRecord::Schema.define do
     table.datetime :locked_at
     table.string   :locked_by
     table.datetime :failed_at
+    table.string   :loner_hash
     table.timestamps
+
   end
 
   create_table :stories, :force => true do |table|
@@ -40,6 +42,6 @@ class Story < ActiveRecord::Base
   def whatever
     tell
   end
-  handle_asynchronously :whatever, :unique_on => [:id], :priority => 10
+  handle_asynchronously :whatever, :loner => true, :priority => 10
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_loner
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
+date: 2012-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: delayed_job
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -125,6 +125,8 @@ files:
 - lib/delayed_job_loner.rb
 - lib/delayed_job_loner/init.rb
 - lib/delayed_job_loner/version.rb
+- lib/generators/delayed_job_loner/delayed_job_loner_generator.rb
+- lib/generators/delayed_job_loner/templates/migration.rb
 - spec/delayed_job_loner_spec.rb
 - spec/spec_helper.rb
 - spec/story.rb