RubyGems - delayed_job_data_mapper - Versions diffs - 1.0.0.rc → 1.0.0 - Mend

delayed_job_data_mapper 1.0.0.rc → 1.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

checksums.yaml +7 -0
data/{LICENSE → LICENSE.md} +0 -0
data/README.md +13 -6
data/lib/delayed/backend/data_mapper.rb +76 -55
data/lib/delayed/serialization/data_mapper.rb +25 -7
data/lib/delayed_job_data_mapper.rb +2 -2
data/spec/delayed_job_data_mapper_spec.rb +1 -1
data/spec/{spec_helper.rb → helper.rb} +8 -12
metadata +143 -99
data/spec/spec.opts +0 -1

checksums.yaml ADDED

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fb3c7603f72adbb6055edf919f048e3620fba1b6
+  data.tar.gz: e1550974885a9268c8e218a2622caec0fa5d7365
+SHA512:
+  metadata.gz: b102e87531a09b32698a2e76a26baf00fd3b8965783257f6be37b0b209e40d7a1ece7b6dff5145d2f681543a7a94358582a3fcd5e0ba90502492ec713080a5d1
+  data.tar.gz: d0a1cbc5cc189cdaf39cd713837303f10686acff6d4f822951a3a62838a143e425f3becfa170fc99691a1ffd188eac4614d1d022d03cd65e4fd1c159282f4190

data/{LICENSE → LICENSE.md} RENAMED

File without changes

data/README.md CHANGED

@@ -2,14 +2,21 @@
 ## Installation
-Add the gems to you Gemfile:
+Add the gems to your Gemfile:
-  gem 'delayed_job', '2.1.0.pre2'
-  gem 'delayed_job_data_mapper', '1.0.0.rc'
-Add this in an initializer:
+    gem 'delayed_job', '2.1.0.pre2'
+    gem 'delayed_job_data_mapper', '1.0.0.rc'
+If you're using dm-rails gem, add this to your environment.rb:
+    XXX::Application::configure do
+     config.after_initialize do
+       Delayed::Worker.backend.auto_upgrade!
+     end
+    end
+Otherwise, add an initializer:
-    # config/initializers/delayed_job.rb
     Delayed::Worker.backend.auto_upgrade!
 That's it. Use [delayed_job as normal](http://github.com/collectiveidea/delayed_job).

data/lib/delayed/backend/data_mapper.rb CHANGED

@@ -1,104 +1,125 @@
+# encoding: utf-8
 module Delayed
   module Backend
     module DataMapper
       class Job
         include ::DataMapper::Resource
         include Delayed::Backend::Base
         storage_names[:default] = 'delayed_jobs'
         property :id,          Serial
-        property :priority,    Integer, :default => 0, :index => :run_at_priority
-        property :attempts,    Integer, :default => 0
-        property :handler,     Text, :lazy => false
-        property :run_at,      Time, :index => :run_at_priority
-        property :locked_at,   Time, :index => true
-        property :locked_by,   String
-        property :failed_at,   Time
-        property :last_error,  Text
+        property :priority,    Integer,   :default => 0,  :index => :run_at_priority
+        property :attempts,    Integer,   :default => 0
+        property :handler,     Text,      :lazy => false
+        property :run_at,      DateTime,  :index => :run_at_priority
+        property :locked_at,   DateTime,  :index => true, :lazy => false
+        property :locked_by,   Text,      :lazy => false
+        property :failed_at,   DateTime,  :lazy => false
+        property :last_error,  Text,      :lazy => false
+        property :queue,       String
+        before :save, :set_default_run_at
         def self.db_time_now
-          Time.now
+          Time.now.utc.to_datetime
+        end
+        def self.lockable(worker_name, max_run_time = Worker.max_run_time)
+          never_failed &
+          never_run &
+          (locked_by(worker_name) | expired(max_run_time))
+        end
+        def self.expired(max_run_time = Worker.max_run_time)
+          (
+            all(:locked_at => nil) | # never locked
+            all(:locked_at.lt => db_time_now - max_run_time) # lock expired
+          )
         end
-        def self.find_available(worker_name, limit = 5, max_run_time = Worker.max_run_time)
-          simple_conditions = { :run_at.lte => db_time_now, :limit => limit, :failed_at => nil, :order => [:priority.asc, :run_at.asc]  }
-          # respect priorities
+        def self.locked_by(worker_name)
+          all(:locked_by => worker_name)
+        end
+        def self.never_run
+          (all(:run_at => nil) | all(:run_at.lte => db_time_now))
+        end
+        def self.never_failed
+          all(:failed_at => nil)
+        end
+        def self.find_available(worker_name, limit = 5, max_run_time = Worker.max_run_time)
+          simple_conditions = {:limit => limit, :order => [:priority.asc, :run_at.asc]}
           simple_conditions[:priority.gte] = Worker.min_priority if Worker.min_priority
           simple_conditions[:priority.lte] = Worker.max_priority if Worker.max_priority
-          # lockable
-          lockable = (
-            # not locked or past the max time
-            ( all(:locked_at => nil ) | all(:locked_at.lt => db_time_now - max_run_time)) |
-            # OR locked by our worker
-            all(:locked_by => worker_name))
-          # plus some other boring junk
-          (lockable).all( simple_conditions )
+          simple_conditions[:queue] = Worker.queues if Worker.queues.any?
+          lockable(worker_name, max_run_time).all(simple_conditions)
         end
         # When a worker is exiting, make sure we don't have any locked jobs.
         def self.clear_locks!(worker_name)
           all(:locked_by => worker_name).update(:locked_at => nil, :locked_by => nil)
         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)
           now = self.class.db_time_now
-          overtime = now - max_run_time
           # FIXME - this is a bit gross
           # DM doesn't give us the number of rows affected by a collection update
           # so we have to circumvent some niceness in DM::Collection here
-          collection = locked_by != worker ?
-            (self.class.all(:id => id, :run_at.lte => now) & ( self.class.all(:locked_at => nil) | self.class.all(:locked_at.lt => overtime) ) ) :
-            self.class.all(:id => id, :locked_by => worker)
+          collection = if locked_by != worker
+            self.class.expired(max_run_time).never_run.all(:id => id)
+          else
+            self.class.locked_by(worker).all(:id => id)
+          end
           attributes = collection.model.new(:locked_at => now, :locked_by => worker).dirty_attributes
           affected_rows = self.repository.update(attributes, collection)
           if affected_rows == 1
-            self.locked_at = now
-            self.locked_by = worker
-            return true
+            reload # pick up the updates above
+            true
           else
-            return false
+            # does this mean > 1 was locked, or none?
+            false
           end
         end
+        def reschedule_at
+          payload_object.respond_to?(:reschedule_at) ?
+            payload_object.reschedule_at(self.class.db_time_now, attempts) :
+            self.class.db_time_now + ((attempts ** 4) + 5).seconds
+        end
         # these are common to the other backends, so we provide an implementation
         def self.delete_all
           Delayed::Job.auto_migrate!
         end
         def self.find id
           get id
         end
         def update_attributes(attributes)
           attributes.each do |k,v|
             self[k] = v
           end
           self.save
         end
-      end
-      class JobObserver
-        include ::DataMapper::Observer
-        observe Job
+        def reload(*args)
+          reset
+          super
+        end
-        before :save do
-          self.run_at ||= self.class.db_time_now
-        end
+        def ==(other)
+          id == other.id
+        end
       end
     end
   end

data/lib/delayed/serialization/data_mapper.rb CHANGED

@@ -1,11 +1,29 @@
-DataMapper::Resource.class_eval do
-  yaml_as "tag:ruby.yaml.org,2002:DataMapper"
+# encoding: utf-8
+if YAML.parser.class.name =~ /syck/i
+  DataMapper::Resource.class_eval do
+    yaml_as "tag:ruby.yaml.org,2002:DataMapper"
-  def self.yaml_new(klass, tag, val)
-    klass.find(val['id'])
-  end
+    def self.yaml_new(klass, tag, val)
+      begin
+        primary_keys = klass.properties.select { |p| p.key? }
+        key_names = primary_keys.map { |p| p.name.to_s }
+        klass.get!(*key_names.map { |k| val[k] })
+      rescue DataMapper::ObjectNotFoundError
+        raise Delayed::DeserializationError
+      end
+    end
+    def to_yaml_properties
+      primary_keys = self.class.properties.select { |p| p.key? }
+      primary_keys.map { |p| "@#{p.name}" }
+    end
-  def to_yaml_properties
-    ['@id']
+  end
+else
+  DataMapper::Resource.class_eval do
+    def encode_with(coder)
+      coder["attributes"] = attributes.stringify_keys
+      coder.tag = ['!ruby/DataMapper', self.class.name].join(':')
+    end
   end
 end

data/lib/delayed_job_data_mapper.rb CHANGED

@@ -1,6 +1,6 @@
+# encoding: utf-8
 require 'dm-core'
-require 'dm-observer'
-require 'dm-aggregates'
+require 'dm-active_model' # for persisted? alias for DJ 4.0.1
 require 'delayed_job'
 require 'delayed/serialization/data_mapper'
 require 'delayed/backend/data_mapper'

data/spec/delayed_job_data_mapper_spec.rb CHANGED

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'helper'
 describe Delayed::Backend::DataMapper::Job do
   it_should_behave_like 'a delayed_job backend'

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

@@ -1,16 +1,6 @@
-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_data_mapper'
 require 'delayed/backend/shared_spec'
-Spec::Runner.configure do |config|
-end
 require 'dm-migrations'
 DataMapper.setup(:default, "sqlite3::memory:")
@@ -18,9 +8,15 @@ class Story
   include DataMapper::Resource
   property :id, Serial
   property :text, String
-  def tell; text; end
+  def tell; text; end
   def whatever(n, _); tell*n; end
   def self.count; end
+  def update_attributes(attributes)
+    attributes.each do |k,v|
+      self[k] = v
+    end
+    self.save
+  end
   handle_asynchronously :whatever
 end

metadata CHANGED

@@ -1,137 +1,181 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification
 name: delayed_job_data_mapper
-version: !ruby/object:Gem::Version
-  prerelease: true
-  segments:
-  - 1
-  - 0
-  - 0
-  - rc
-  version: 1.0.0.rc
+version: !ruby/object:Gem::Version
+  version: 1.0.0
 platform: ruby
-authors:
+authors:
 - Brandon Keepers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-09-05 00:00:00 -04:00
-default_executable:
-dependencies:
-- !ruby/object:Gem::Dependency
+date: 2014-08-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: delayed_job
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
   name: dm-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        segments:
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: dm-active_model
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency
-  name: dm-observer
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement
-    requirements:
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        segments:
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency
-  name: dm-aggregates
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement
-    requirements:
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: tzinfo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        segments:
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency
-  name: delayed_job
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        segments:
-        - 2
-        - 1
-        version: "2.1"
-  type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: dm-migrations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement
-    requirements:
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version
-        segments:
-        - 1
-        - 2
-        - 9
-        version: 1.2.9
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: dm-sqlite-adapter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description:
 email: brandon@collectiveidea.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE
+extra_rdoc_files:
+- LICENSE.md
+- README.md
+files:
+- LICENSE.md
 - README.md
-files:
 - lib/delayed/backend/data_mapper.rb
 - lib/delayed/serialization/data_mapper.rb
 - lib/delayed_job_data_mapper.rb
 - spec/delayed_job_data_mapper_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
-- LICENSE
-- README.md
-has_rdoc: true
+- spec/helper.rb
 homepage: http://github.com/collectiveidea/delayed_job_data_mapper
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message:
-rdoc_options:
-- --charset=UTF-8
-require_paths:
+rdoc_options:
+- "--charset=UTF-8"
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version
-      segments:
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">"
-    - !ruby/object:Gem::Version
-      segments:
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 1.3.6
+rubygems_version: 2.4.1
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: DataMapper backend for delayed_job
-test_files:
+test_files:
 - spec/delayed_job_data_mapper_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
+- spec/helper.rb

data/spec/spec.opts DELETED

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