delayed_job 3.0.5 → 4.0.0.beta1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+4.0.0.beta1 - 2013-03-02
+========================
+* Rails 4 compatibility
+
 3.0.5 - 2013-01-28
 ==================
 * Better job timeout error logging

data/README.md

@@ -3,11 +3,14 @@ Delayed::Job
 [![Gem Version](https://badge.fury.io/rb/delayed_job.png)][gem]
 [![Build Status](https://secure.travis-ci.org/collectiveidea/delayed_job.png?branch=master)][travis]
 [![Dependency Status](https://gemnasium.com/collectiveidea/delayed_job.png?travis)][gemnasium]
-[![Code Climate](https://codeclimate.com/badge.png)][codeclimate]
+[![Code Climate](https://codeclimate.com/github/collectiveidea/delayed_job.png)][codeclimate]
+[![Coverage Status](https://coveralls.io/repos/collectiveidea/delayed_job/badge.png?branch=master)][coveralls]
+
 [gem]: https://rubygems.org/gems/delayed_job
 [travis]: http://travis-ci.org/collectiveidea/delayed_job
 [gemnasium]: https://gemnasium.com/collectiveidea/delayed_job
 [codeclimate]: https://codeclimate.com/github/collectiveidea/delayed_job
+[coveralls]: https://coveralls.io/r/collectiveidea/delayed_job
 
 Delayed::Job (or DJ) encapsulates the common pattern of asynchronously executing
 longer tasks in the background.

data/contrib/delayed_job_multiple.monitrc

@@ -4,7 +4,7 @@
 # 1. copy to /var/www/apps/{app_name}/shared/delayed_job.monitrc
 # 2. replace {app_name} as appropriate
 #    you might also need to change the program strings to
-#           "/bin/su - {username} -c '/usr/bin/env ...'" 
+#           "/bin/su - {username} -c '/usr/bin/env ...'"
 #    to load your shell environment.
 #
 # 3. add this to your /etc/monit/monitrc

data/delayed_job.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |spec|
-  spec.add_dependency   'activesupport', '~> 3.0'
+  spec.add_dependency   'activesupport', ['>= 3.0', '< 4.1']
   spec.authors        = ["Brandon Keepers", "Brian Ryckbost", "Chris Gaffney", "David Genord II", "Erik Michaels-Ober", "Matt Griffin", "Steve Richert", "Tobias Lütke"]
   spec.description    = "Delayed_job (or DJ) encapsulates the common pattern of asynchronously executing longer tasks in the background. It is a direct extraction from Shopify where the job table is responsible for a multitude of core tasks."
   spec.email          = ['brian@collectiveidea.com']
@@ -13,5 +13,5 @@ Gem::Specification.new do |spec|
   spec.require_paths  = ['lib']
   spec.summary        = 'Database-backed asynchronous priority queue system -- Extracted from Shopify'
   spec.test_files     = Dir.glob('spec/**/*')
-  spec.version        = '3.0.5'
+  spec.version        = '4.0.0.beta1'
 end

data/lib/delayed/message_sending.rb

@@ -1,8 +1,19 @@
-require 'active_support/basic_object'
+if ActiveSupport::VERSION::MAJOR == 4
+  require 'active_support/proxy_object'
+else
+  require 'active_support/basic_object'
+end
+
 require 'active_support/core_ext/module/aliasing'
 
 module Delayed
-  class DelayProxy < ActiveSupport::BasicObject
+  if ActiveSupport::VERSION::MAJOR == 4
+    klass = ActiveSupport::ProxyObject
+  else
+    klass = ActiveSupport::BasicObject
+  end
+
+  class DelayProxy < klass
     def initialize(payload_class, target, options)
       @payload_class = payload_class
       @target = target

data/lib/delayed/psych_ext.rb

@@ -1,10 +1,11 @@
 if defined?(ActiveRecord)
-  class ActiveRecord::Base
-    # serialize to YAML
-    def encode_with(coder)
-      coder["attributes"] = @attributes
-      coder.tag = ['!ruby/ActiveRecord', self.class.name].join(':')
+  ActiveRecord::Base.class_eval do
+    def encode_with_override(coder)
+      encode_with_without_override(coder)
+      coder.tag = "!ruby/ActiveRecord:#{self.class.name}"
     end
+    alias_method :encode_with_without_override, :encode_with
+    alias_method :encode_with, :encode_with_override
   end
 end
 

data/lib/delayed/recipes.rb

@@ -31,7 +31,7 @@ Capistrano::Configuration.instance.load do
     def roles
       fetch(:delayed_job_server_role, :app)
     end
-    
+
     def delayed_job_command
       fetch(:delayed_job_command, "script/delayed_job")
     end

data/lib/delayed_job.rb

@@ -3,10 +3,9 @@ require 'delayed/exceptions'
 require 'delayed/message_sending'
 require 'delayed/performable_method'
 
-# PerformableMailer is compatible with ActionMailer 3 (and possibly 3.1)
 if defined?(ActionMailer)
   require 'action_mailer/version'
-  require 'delayed/performable_mailer' if 3 == ActionMailer::VERSION::MAJOR
+  require 'delayed/performable_mailer'
 end
 
 require 'delayed/yaml_ext'

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

@@ -1,10 +1,14 @@
-unless ENV['CI']
-  require 'simplecov'
-  SimpleCov.start
-end
+require 'simplecov'
+require 'coveralls'
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start
 
-require 'bundler/setup'
 require 'logger'
+require 'rspec'
 
 require 'action_mailer'
 require 'active_support/dependencies'
@@ -41,7 +45,7 @@ class Story < ActiveRecord::Base
   self.primary_key = 'story_id'
   def tell; text; end
   def whatever(n, _); tell*n; end
-  default_scope where(:scoped => true)
+  default_scope { where(:scoped => true) }
 
   handle_asynchronously :whatever
 end

data/spec/lifecycle_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'helper'
 
 describe Delayed::Lifecycle do
   let(:lifecycle) { Delayed::Lifecycle.new }

data/spec/message_sending_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'helper'
 
 describe Delayed::MessageSending do
   describe "handle_asynchronously" do

data/spec/performable_mailer_spec.rb

@@ -1,9 +1,9 @@
-require 'spec_helper'
+require 'helper'
 
 require 'action_mailer'
 class MyMailer < ActionMailer::Base
   def signup(email)
-    mail :to => email, :subject => "Delaying Emails", :from => "delayedjob@example.com"
+    mail :to => email, :subject => "Delaying Emails", :from => "delayedjob@example.com",:body => 'Delaying Emails Body'
   end
 end
 

data/spec/performable_method_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'helper'
 
 describe Delayed::PerformableMethod do
   describe "perform" do

data/spec/test_backend_spec.rb

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

data/spec/worker_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'helper'
 
 describe Delayed::Worker do
   describe "backend=" do

data/spec/yaml_ext_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'helper'
 
 describe "YAML" do
   it "autoloads classes" do

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 3.0.5
+  version: 4.0.0.beta1
+  prerelease: 6
 platform: ruby
 authors:
 - Brandon Keepers
@@ -16,24 +16,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
-  name: activesupport
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.1'
+  type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.1'
 description: Delayed_job (or DJ) encapsulates the common pattern of asynchronously
   executing longer tasks in the background. It is a direct extraction from Shopify
   where the job table is responsible for a multitude of core tasks.
@@ -80,12 +86,12 @@ files:
 - spec/autoloaded/struct.rb
 - spec/delayed/backend/test.rb
 - spec/delayed/serialization/test.rb
+- spec/helper.rb
 - spec/lifecycle_spec.rb
 - spec/message_sending_spec.rb
 - spec/performable_mailer_spec.rb
 - spec/performable_method_spec.rb
 - spec/sample_jobs.rb
-- spec/spec_helper.rb
 - spec/test_backend_spec.rb
 - spec/worker_spec.rb
 - spec/yaml_ext_spec.rb
@@ -101,22 +107,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      version: '0'
       segments:
       - 0
-      hash: -2181840438794321912
-      version: '0'
+      hash: -646849104774513769
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: -2181840438794321912
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Database-backed asynchronous priority queue system -- Extracted from Shopify
@@ -127,12 +130,12 @@ test_files:
 - spec/autoloaded/struct.rb
 - spec/delayed/backend/test.rb
 - spec/delayed/serialization/test.rb
+- spec/helper.rb
 - spec/lifecycle_spec.rb
 - spec/message_sending_spec.rb
 - spec/performable_mailer_spec.rb
 - spec/performable_method_spec.rb
 - spec/sample_jobs.rb
-- spec/spec_helper.rb
 - spec/test_backend_spec.rb
 - spec/worker_spec.rb
 - spec/yaml_ext_spec.rb