rails3_acts_as_paranoid 0.2.2 → 0.2.3

data/lib/acts_as_paranoid/associations.rb

@@ -2,10 +2,8 @@ module ActsAsParanoid
   module Associations
     def self.included(base)
       base.extend ClassMethods
-      base.class_eval do
-        class << self
-          alias_method_chain :belongs_to, :deleted
-        end
+      class << base
+        alias_method_chain :belongs_to, :deleted
       end
     end
 
@@ -13,12 +11,14 @@ module ActsAsParanoid
       def belongs_to_with_deleted(target, options = {})
         with_deleted = options.delete(:with_deleted)
         result = belongs_to_without_deleted(target, options)
-      
+
         if with_deleted
           class_eval <<-RUBY, __FILE__, __LINE__
             def #{target}_with_unscoped(*args)
-              return #{target}_without_unscoped(*args) unless association(:#{target}).klass.paranoid?
-              association(:#{target}).klass.with_deleted.scoping { #{target}_without_unscoped(*args) }
+              association = association(:#{target})
+              return nil if association.options[:polymorphic] && association.klass.nil?
+              return #{target}_without_unscoped(*args) unless association.klass.paranoid?
+              association.klass.with_deleted.scoping { #{target}_without_unscoped(*args) }
             end
             alias_method_chain :#{target}, :unscoped
           RUBY

data/lib/acts_as_paranoid/relation.rb

@@ -2,7 +2,6 @@ module ActsAsParanoid
   module Relation
     def self.included(base)
       base.class_eval do
-        
         def paranoid?
           klass.try(:paranoid?) ? true : false
         end

data/lib/acts_as_paranoid/validations.rb

@@ -25,7 +25,7 @@ module ActsAsParanoid
           relation = relation.and(table[scope_item].eq(scope_value))
         end
 
-        # Re-add ActsAsParanoid default scope conditions manually. 
+        # Re-add ActsAsParanoid default scope conditions manually.
         if finder_class.unscoped.where(finder_class.paranoid_default_scope_sql).where(relation).exists?
           record.errors.add(attribute, :taken, options.except(:case_sensitive, :scope).merge(:value => value))
         end

data/lib/rails3_acts_as_paranoid.rb

@@ -33,7 +33,6 @@ module ActsAsParanoid
     return if paranoid?
     
     include ActsAsParanoid::Core
-    include ActsAsParanoid::Associations
     
     # Magic!
     default_scope { where(paranoid_default_scope_sql) }
@@ -52,6 +51,9 @@ end
 # Extend ActiveRecord's functionality
 ActiveRecord::Base.send :extend, ActsAsParanoid
 
+# Extend ActiveRecord::Base with paranoid associations
+ActiveRecord::Base.send :include, ActsAsParanoid::Associations
+
 # Override ActiveRecord::Relation's behavior
 ActiveRecord::Relation.send :include, ActsAsParanoid::Relation
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails3_acts_as_paranoid
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-15 00:00:00.000000000 Z
+date: 2012-05-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70127635131740 !ruby/object:Gem::Requirement
+  requirement: &70257574323260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70127635131740
+  version_requirements: *70257574323260
 description: Active Record (~>3.2) plugin which allows you to hide and restore records
   without actually deleting them. Check its GitHub page for more in-depth information.
 email:
@@ -51,7 +51,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -64246137281541820
+      hash: -4511554032521980208
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: