delayed_job_mongoid 1.0.0.rc → 1.0.0

data/README.md

@@ -2,9 +2,13 @@
 
 ## Installation
 
-Add the gems to you Gemfile:
+Add the gems to your Gemfile:
+
+    gem 'delayed_job', '2.1.0.pre2'
+    gem 'delayed_job_mongoid', '1.0.0.rc'
+
+Create the indexes:
+
+    script/rails runner 'Delayed::Backend::Mongoid::Job.create_indexes'
 
-  gem 'delayed_job', '2.1.0.pre2'
-  gem 'delayed_job_mongoid', '1.0.0.rc'
-  
 That's it. Use [delayed_job as normal](http://github.com/collectiveidea/delayed_job).

data/lib/delayed/backend/mongoid.rb

@@ -10,33 +10,34 @@ module Delayed
         field :handler,     :type=> String
         field :run_at,      :type=> Time
         field :locked_at,   :type=> Time
-        field :locked_by,   :type=> String, :index => true
+        field :locked_by,   :type=> String
         field :failed_at,   :type=> Time
         field :last_error,  :type=> String
-      
-      
+
+        index :locked_by
+
         before_save :set_default_run_at
-        
+
         def self.before_fork
           ::Mongoid.master.connection.close
         end
 
         def self.after_fork
-          ::Mongoid.master.connection.connect_to_master
+          ::Mongoid.master.connection.connect
         end
-        
+
         def self.db_time_now
           Time.now.utc
         end
-        
+
         def self.find_available(worker_name, limit = 5, max_run_time = Worker.max_run_time)
           right_now = db_time_now
 
           conditions = {:run_at  => {"$lte" => right_now}, :failed_at => nil}
           (conditions[:priority] ||= {})['$gte'] = Worker.min_priority.to_i if Worker.min_priority
           (conditions[:priority] ||= {})['$lte'] = Worker.max_priority.to_i if Worker.max_priority
-         
-          
+
+
           where = "this.locked_at == null || this.locked_at < #{make_date(right_now - max_run_time)}"
           results = self.where(conditions.merge(:locked_by => worker_name)).limit(-limit).order_by([['priority', 1], ['run_at', 1]]).to_a
           results += self.where(conditions.merge('$where' => where)).limit(-limit+results.size).order_by([['priority', 1], ['run_at', 1]]).to_a if results.size < limit
@@ -46,16 +47,16 @@ module Delayed
         def self.clear_locks!(worker_name)
           self.collection.update({:locked_by => worker_name}, {"$set" => {:locked_at => nil, :locked_by => nil}}, :multi => true)
         end
-        
+
         # Lock this job for this worker.
         # Returns true if we have the lock, false otherwise.
         def lock_exclusively!(max_run_time, worker = worker_name)
           right_now = self.class.db_time_now
           overtime = right_now - max_run_time.to_i
-          
+
           query = "this.locked_at == null || this.locked_at < #{make_date(overtime)} || this.locked_by == #{worker.to_json}"
           conditions = {:_id => id, :run_at => {"$lte" => right_now}, "$where" => query}
-          
+
           self.collection.update(conditions, {"$set" => {:locked_at => right_now, :locked_by => worker}})
           affected_rows = self.collection.find({:_id => id, :locked_by => worker}).count
           if affected_rows == 1
@@ -66,7 +67,7 @@ module Delayed
             return false
           end
         end
-        
+
         private
 
         def self.make_date(date_or_seconds)

data/lib/delayed/serialization/mongoid.rb

@@ -1,14 +1,14 @@
 Mongoid::Document.class_eval do
   yaml_as "tag:ruby.yaml.org,2002:Mongoid"
-  
+
   def self.yaml_new(klass, tag, val)
     begin
       klass.find(val['attributes']['_id'])
     rescue Mongoid::Errors::DocumentNotFound
-      nil
+      raise Delayed::DeserializationError
     end
   end
-  
+
   def to_yaml_properties
     ['@attributes']
   end

data/spec/spec_helper.rb

@@ -2,22 +2,17 @@ require 'rubygems'
 require 'bundler/setup'
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
 require 'delayed_job_mongoid'
 require 'delayed/backend/shared_spec'
 
-Spec::Runner.configure do |config|
-  
-end
-
 Mongoid.configure do |config|
-  config.master = config.master = Mongo::Connection.new.db('dl_spec') 
+  config.master = config.master = Mongo::Connection.new.db('dl_spec')
 end
 
 class Story
   include ::Mongoid::Document
-  def tell; text; end       
+  def tell; text; end
   def whatever(n, _); tell*n; end
   def self.count; end
 

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: delayed_job_mongoid
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 1
   - 0
   - 0
-  - rc
-  version: 1.0.0.rc
+  version: 1.0.0
 platform: ruby
 authors: 
 - Brandon Keepers
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-05 00:00:00 -04:00
+date: 2010-11-14 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,7 +40,8 @@ dependencies:
         segments: 
         - 2
         - 1
-        version: "2.1"
+        - 1
+        version: 2.1.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -52,10 +52,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
         - 2
-        - 9
-        version: 1.2.9
+        - 0
+        version: "2.0"
   type: :development
   version_requirements: *id003
 description: 
@@ -94,13 +93,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: