delayed_job_mongoid 1.0.4 → 1.0.5

data/lib/delayed/backend/mongoid.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Delayed
   module Backend
     module Mongoid
@@ -5,14 +6,15 @@ module Delayed
         include ::Mongoid::Document
         include ::Mongoid::Timestamps
         include Delayed::Backend::Base
-        field :priority,    :type=> Integer, :default => 0
-        field :attempts,    :type=> Integer, :default => 0
-        field :handler,     :type=> String
-        field :run_at,      :type=> Time
-        field :locked_at,   :type=> Time
-        field :locked_by,   :type=> String
-        field :failed_at,   :type=> Time
-        field :last_error,  :type=> String
+        field :priority,    :type => Integer, :default => 0
+        field :attempts,    :type => Integer, :default => 0
+        field :handler,     :type => String
+        field :run_at,      :type => Time
+        field :locked_at,   :type => Time
+        field :locked_by,   :type => String
+        field :failed_at,   :type => Time
+        field :last_error,  :type => String
+        field :queue,       :type => String
 
         index ([[:locked_by, -1], [:priority, 1], [:run_at, 1]])
 
@@ -41,6 +43,7 @@ module Delayed
           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
+          (conditions[:queue] ||= {})['$in'] = Worker.queues if Worker.queues.any?
 
           conditions['$or'] = [
             { :locked_by => worker.name },
@@ -57,7 +60,7 @@ module Delayed
 
             # Return result as a Mongoid document.
             # When Mongoid starts supporting findAndModify, this extra step should no longer be necessary.
-            self.find(:first, :conditions => {:_id => result["_id"]})
+            self.find(:first, :conditions => {:_id => result["_id"]}) unless result.nil?
           rescue Mongo::OperationFailure
             nil # no jobs available
           end
@@ -68,6 +71,10 @@ module Delayed
           self.collection.update({:locked_by => worker_name}, {"$set" => {:locked_at => nil, :locked_by => nil}}, :multi => true)
         end
 
+        def reload(*args)
+          reset
+          super
+        end
       end
     end
   end

data/lib/delayed/serialization/mongoid.rb

@@ -1,16 +1,25 @@
-Mongoid::Document.class_eval do
-  yaml_as "tag:ruby.yaml.org,2002:Mongoid"
+# encoding: utf-8
+if YAML.parser.class.name =~ /syck/i
+  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
-      raise Delayed::DeserializationError
+    def self.yaml_new(klass, tag, val)
+      begin
+        klass.find(val['attributes']['_id'])
+      rescue Mongoid::Errors::DocumentNotFound
+        raise Delayed::DeserializationError
+      end
     end
-  end
 
-  def to_yaml_properties
-    ['@attributes']
+    def to_yaml_properties
+      ['@attributes']
+    end
+  end
+else
+  Mongoid::Document.class_eval do
+    def encode_with(coder)
+      coder["attributes"] = @attributes
+      coder.tag = ['!ruby/Mongoid', self.class.name].join(':')
+    end
   end
 end
-

data/lib/delayed_job_mongoid.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'mongoid'
 require 'delayed_job'
 require 'delayed/serialization/mongoid'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_mongoid
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-23 00:00:00.000000000Z
+date: 2011-11-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70295558175360 !ruby/object:Gem::Requirement
+  requirement: &70328152463320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,21 +22,21 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70295558175360
+  version_requirements: *70328152463320
 - !ruby/object:Gem::Dependency
   name: delayed_job
-  requirement: &70295558138700 !ruby/object:Gem::Requirement
+  requirement: &70328152462420 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - =
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 3.0.0.pre3
   type: :runtime
   prerelease: false
-  version_requirements: *70295558138700
+  version_requirements: *70328152462420
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70295558137480 !ruby/object:Gem::Requirement
+  requirement: &70328152461720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70295558137480
+  version_requirements: *70328152461720
 description: 
 email:
 - chris@collectiveidea.com
@@ -59,7 +59,6 @@ files:
 - lib/delayed/serialization/mongoid.rb
 - lib/delayed_job_mongoid.rb
 - spec/delayed_job_mongoid_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - LICENSE
 - README.md
@@ -78,7 +77,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4466304754731282186
+      hash: -3515724282109696220
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -87,14 +86,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4466304754731282186
+      hash: -3515724282109696220
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Mongoid backend for delayed_job
 test_files:
 - spec/delayed_job_mongoid_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb

data/spec/spec.opts

@@ -1 +0,0 @@
---color