delayed_job 3.0.0.pre → 3.0.0.pre2

data/README.textile

@@ -228,7 +228,7 @@ You can invoke @rake jobs:clear@ to delete all jobs in the queue.
 
 h2. Mailing List
 
-Join us on the mailing list at http://groups.google.com/group/delayed_job
+Join us on the "mailing list":http://groups.google.com/group/delayed_job
 
 h2. How to contribute
 

data/lib/delayed/command.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'daemons'
 require 'optparse'
 

data/lib/delayed/plugin.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/class/attribute'
+
 module Delayed
   class Plugin
     class_attribute :callback_block

data/lib/delayed/psych_ext.rb

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

data/lib/delayed/serialization/active_record.rb

@@ -1,17 +1,19 @@
-class ActiveRecord::Base
-  yaml_as "tag:ruby.yaml.org,2002:ActiveRecord"
+if defined?(ActiveRecord)
+  class ActiveRecord::Base
+    yaml_as "tag:ruby.yaml.org,2002:ActiveRecord"
 
-  def self.yaml_new(klass, tag, val)
-    if ActiveRecord::VERSION::MAJOR == 3
-      klass.unscoped.find(val['attributes'][klass.primary_key])
-    else # Rails 2
-      klass.with_exclusive_scope { klass.find(val['attributes'][klass.primary_key]) }
+    def self.yaml_new(klass, tag, val)
+      if ActiveRecord::VERSION::MAJOR == 3
+        klass.unscoped.find(val['attributes'][klass.primary_key])
+      else # Rails 2
+        klass.with_exclusive_scope { klass.find(val['attributes'][klass.primary_key]) }
+      end
+    rescue ActiveRecord::RecordNotFound
+      raise Delayed::DeserializationError
     end
-  rescue ActiveRecord::RecordNotFound
-    raise Delayed::DeserializationError
-  end
 
-  def to_yaml_properties
-    ['@attributes']
+    def to_yaml_properties
+      ['@attributes']
+    end
   end
-end
+end

data/lib/delayed/worker.rb

@@ -165,7 +165,7 @@ module Delayed
       say "#{job.name} completed after %.4f" % runtime
       return true  # did work
     rescue DeserializationError => error
-      job.last_error = "{#{error.message}\n#{error.backtrace.join('\n')}"
+      job.last_error = "{#{error.message}\n#{error.backtrace.join("\n")}"
       failed(job)
     rescue Exception => error
       self.class.lifecycle.run_callbacks(:error, self, job){ handle_failed_job(job, error) }
@@ -206,7 +206,7 @@ module Delayed
   protected
 
     def handle_failed_job(job, error)
-      job.last_error = "{#{error.message}\n#{error.backtrace.join('\n')}"
+      job.last_error = "{#{error.message}\n#{error.backtrace.join("\n")}"
       say "#{job.name} failed with #{error.class.name}: #{error.message} - #{job.attempts} failed attempts", Logger::ERROR
       reschedule(job)
     end

data/spec/fixtures/bad_alias.yml

@@ -0,0 +1 @@
+foo: *bar

data/spec/spec_helper.rb

@@ -1,8 +1,6 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 
-require 'rubygems'
 require 'bundler/setup'
-require 'rspec'
 require 'logger'
 
 require 'rails'

data/spec/yaml_ext_spec.rb

@@ -28,4 +28,14 @@ describe "YAML" do
       YAML.load(yaml).class.should == Autoloaded::InstanceClazz
     }.should_not raise_error
   end
+
+  it "should not throw an uninitialized constant Syck::Syck when using YAML.load_file with poorly formed yaml" do
+    lambda {
+      YAML.load_file(File.expand_path('spec/fixtures/bad_alias.yml'))
+    }.should_not raise_error
+  end
+
+  it "should not throw an uninitialized constant Syck::Syck when using YAML.load with poorly formed yaml" do
+    lambda { YAML.load(YAML.dump("foo: *bar"))}.should_not raise_error
+  end
 end

metadata

@@ -1,32 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre
+  version: 3.0.0.pre2
   prerelease: 6
 platform: ruby
 authors:
+- Matt Griffin
+- Brian Ryckbost
+- Steve Richert
 - Chris Gaffney
 - Brandon Keepers
 - Tobias Lütke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-28 00:00:00.000000000Z
+date: 2011-10-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &70127307821420 !ruby/object:Gem::Requirement
+  requirement: &70297904377440 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - =
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *70127307821420
+  version_requirements: *70297904377440
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70127307819760 !ruby/object:Gem::Requirement
+  requirement: &70297904376800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +37,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70127307819760
+  version_requirements: *70297904376800
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70127307818840 !ruby/object:Gem::Requirement
+  requirement: &70297904376300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +48,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70127307818840
+  version_requirements: *70297904376300
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70127307818160 !ruby/object:Gem::Requirement
+  requirement: &70297904375900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +59,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70127307818160
+  version_requirements: *70297904375900
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70127307817220 !ruby/object:Gem::Requirement
+  requirement: &70297904375200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +70,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70127307817220
+  version_requirements: *70297904375200
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70127307816440 !ruby/object:Gem::Requirement
+  requirement: &70297904374660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +81,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70127307816440
+  version_requirements: *70297904374660
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70127307815820 !ruby/object:Gem::Requirement
+  requirement: &70297904374280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,7 +92,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70127307815820
+  version_requirements: *70297904374280
 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.
@@ -134,6 +137,7 @@ files:
 - spec/autoloaded/struct.rb
 - spec/delayed/backend/test.rb
 - spec/delayed/serialization/test.rb
+- spec/fixtures/bad_alias.yml
 - spec/lifecycle_spec.rb
 - spec/message_sending_spec.rb
 - spec/performable_mailer_spec.rb
@@ -163,7 +167,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -811957530217889269
+      hash: 544689823949566531
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -172,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Database-backed asynchronous priority queue system -- Extracted from Shopify
@@ -183,6 +187,7 @@ test_files:
 - spec/autoloaded/struct.rb
 - spec/delayed/backend/test.rb
 - spec/delayed/serialization/test.rb
+- spec/fixtures/bad_alias.yml
 - spec/lifecycle_spec.rb
 - spec/message_sending_spec.rb
 - spec/performable_mailer_spec.rb