organizze_permanent_records 0.1.2 → 0.1.3

data/lib/organizze_permanent_records.rb

@@ -1,7 +1,5 @@
-require "organizze_permanent_records/version"
-
 module OrganizzePermanentRecords
-    def self.included(base)
+  def self.included(base)
 
     base.send :include, InstanceMethods
 
@@ -15,7 +13,6 @@ module OrganizzePermanentRecords
       base.named_scope :not_deleted, :conditions => { :deleted_at => nil }
       base.instance_eval { define_callbacks :before_revive, :after_revive }
       base.send :alias_method_chain, :destroy, :permanent_records
-      base.extend Rails2
     # Early Rails code
     else
       base.extend EarlyRails
@@ -33,37 +30,18 @@ module OrganizzePermanentRecords
     def deleted
       where("#{table_name}.deleted_at IS NOT NULL")
     end
-
     def not_deleted
       where("#{table_name}.deleted_at IS NULL")
     end
-
-    def with_deleted(*args)
-      if args.present?
-        unscoped.find(args)
-      else
-        unscoped
-      end
-    end
-  end
-
-  module Rails2
-    def with_deleted(*args)
-      with_exclusive_scope do
-        find(*args)
-      end
-    end
   end
- 
+  
   module EarlyRails
-
     def with_deleted
       with_scope :find => {:conditions => "#{quoted_table_name}.deleted_at IS NOT NULL"} do
         yield
       end
     end
     
-
     def with_not_deleted
       with_scope :find => {:conditions => "#{quoted_table_name}.deleted_at IS NULL"} do
         yield
@@ -129,13 +107,12 @@ module OrganizzePermanentRecords
       return self unless is_permanent?
       record = self.class
       record = record.unscoped if active_record_3?
-      record = record.with_deleted(id)
-      record.deleted_at = value
+      record = record.find(id)
       begin
         # we call save! instead of update_attribute so an ActiveRecord::RecordInvalid
         # error will be raised if the record isn't valid. (This prevents reviving records that
         # disregard validation constraints,)
-        record.send(:update_without_callbacks)
+        record.update_attribute(:deleted_at, value)
         @attributes, @attributes_cache = record.attributes, record.attributes
       rescue Exception => e
         # trigger dependent record destruction (they were revived before this record,
@@ -156,11 +133,11 @@ module OrganizzePermanentRecords
       end
       if active_record_3?
         _run_destroy_callbacks do
-          update_without_callbacks
+          save(:validate => false)
         end
       else
         run_callbacks :before_destroy
-        update_without_callbacks
+        save(false)
         run_callbacks :after_destroy
       end
       self
@@ -269,3 +246,4 @@ module OrganizzePermanentRecords
 end
 
 ActiveRecord::Base.send :include, OrganizzePermanentRecords
+

data/lib/organizze_permanent_records/version.rb

@@ -1,3 +1,3 @@
 module OrganizzePermanentRecords
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: organizze_permanent_records
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-05 00:00:00.000000000Z
+date: 2011-12-04 00:00:00.000000000Z
 dependencies: []
 description: Never Lose Data. Rather than deleting rows this sets Record#deleted_at
   and gives you all the scopes you need to work with your data.
@@ -45,7 +45,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: organizze_permanent_records
-rubygems_version: 1.8.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: This gem is a clone of https://github.com/JackDanger/permanent_records. I