Move ActiveRecord serialization to syck_ext

JDutil · Sep 28, 2011 · 79cce65 · 79cce65
1 parent 34acf1e
commit 79cce65
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/lib/delayed/serialization/active_record.rb b/lib/delayed/serialization/active_record.rb
diff --git a/lib/delayed/syck_ext.rb b/lib/delayed/syck_ext.rb
@@ -1,3 +1,21 @@
+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]) }
+    end
+  rescue ActiveRecord::RecordNotFound
+    raise Delayed::DeserializationError
+  end
+
+  def to_yaml_properties
+    ['@attributes']
+  end
+end
+
 class Module
   yaml_as "tag:ruby.yaml.org,2002:module"
 

diff --git a/lib/delayed_job.rb b/lib/delayed_job.rb
@@ -17,7 +17,6 @@
 require File.dirname(__FILE__) + '/delayed/worker'
 require File.dirname(__FILE__) + '/delayed/deserialization_error'
 require File.dirname(__FILE__) + '/delayed/railtie' if defined?(Rails::Railtie)
-require File.dirname(__FILE__) + '/delayed/serialization/active_record' if defined?(ActiveRecord)
 
 Object.send(:include, Delayed::MessageSending)
 Module.send(:include, Delayed::MessageSending::ClassMethods)