Merge pull request #490 from hasimo/rails4

support for rails 4.0

Gemfile

@@ -12,8 +12,8 @@ platforms :jruby do
 end
 
 group :test do
-  gem 'activerecord', '~> 3.0'
-  gem 'actionmailer', '~> 3.0'
+  gem 'activerecord', '>= 3.0'
+  gem 'actionmailer', '>= 3.0'
   gem 'rspec', '>= 2.11'
   gem 'simplecov', :require => false
   gem 'coveralls', :require => false

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'
   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']

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

lib/delayed_job.rb

@@ -6,7 +6,7 @@
 # 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' if ActionMailer::VERSION::MAJOR >= 3
 end
 
 require 'delayed/yaml_ext'

spec/performable_mailer_spec.rb

@@ -3,7 +3,7 @@
 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