acts_as_paranoid 0.3.1 → 0.4.0

data/lib/acts_as_paranoid/relation.rb

@@ -0,0 +1,36 @@
+module ActsAsParanoid
+  module Relation
+    def self.included(base)
+      base.class_eval do
+        def paranoid?
+          klass.try(:paranoid?) ? true : false
+        end
+        
+        def paranoid_deletion_attributes
+          { klass.paranoid_column => klass.delete_now_value }
+        end
+
+        alias_method :orig_delete_all, :delete_all
+        def delete_all!(conditions = nil)
+          if conditions
+            where(conditions).delete_all!
+          else
+            orig_delete_all
+          end
+        end
+        
+        def delete_all(conditions = nil)
+          if paranoid?
+            update_all(paranoid_deletion_attributes, conditions)
+          else
+            delete_all!(conditions)
+          end
+        end
+
+        def destroy!(id_or_array)
+          where(primary_key => id_or_array).orig_delete_all
+        end
+      end
+    end
+  end
+end

data/lib/acts_as_paranoid/validations.rb

@@ -0,0 +1,43 @@
+require 'active_support/core_ext/array/wrap'
+
+module ActsAsParanoid
+  module Validations
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
+    class UniquenessWithoutDeletedValidator < ActiveRecord::Validations::UniquenessValidator
+      def validate_each(record, attribute, value)
+        finder_class = find_finder_class_for(record)
+        table = finder_class.arel_table
+
+        coder = record.class.serialized_attributes[attribute.to_s]
+
+        if value && coder
+          value = coder.dump value
+        end
+
+        relation = build_relation(finder_class, table, attribute, value)
+        [Array(finder_class.primary_key), Array(record.send(:id))].transpose.each do |pk_key, pk_value|
+          relation = relation.and(table[pk_key.to_sym].not_eq(pk_value))
+        end if record.persisted?
+
+        Array.wrap(options[:scope]).each do |scope_item|
+          scope_value = record.send(scope_item)
+          relation = relation.and(table[scope_item].eq(scope_value))
+        end
+
+        # 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
+      end
+    end
+
+    module ClassMethods
+      def validates_uniqueness_of_without_deleted(*attr_names)
+        validates_with UniquenessWithoutDeletedValidator, _merge_attributes(attr_names)
+      end
+    end
+  end
+end

data/lib/rails3_acts_as_paranoid.rb

@@ -0,0 +1,61 @@
+require 'active_record/base'
+require 'active_record/relation'
+require 'active_record/callbacks'
+require 'acts_as_paranoid/core'
+require 'acts_as_paranoid/associations'
+require 'acts_as_paranoid/validations'
+require 'acts_as_paranoid/relation'
+
+
+module ActsAsParanoid
+  
+  def paranoid?
+    self.included_modules.include?(ActsAsParanoid::Core)
+  end
+  
+  def validates_as_paranoid
+    include ActsAsParanoid::Validations
+  end
+  
+  def acts_as_paranoid(options = {})
+    raise ArgumentError, "Hash expected, got #{options.class.name}" if not options.is_a?(Hash) and not options.empty?
+    
+    class_attribute :paranoid_configuration, :paranoid_column_reference
+    
+    self.paranoid_configuration = { :column => "deleted_at", :column_type => "time", :recover_dependent_associations => true, :dependent_recovery_window => 2.minutes }
+    self.paranoid_configuration.merge!({ :deleted_value => "deleted" }) if options[:column_type] == "string"
+    self.paranoid_configuration.merge!(options) # user options
+
+    raise ArgumentError, "'time', 'boolean' or 'string' expected for :column_type option, got #{paranoid_configuration[:column_type]}" unless ['time', 'boolean', 'string'].include? paranoid_configuration[:column_type]
+
+    self.paranoid_column_reference = "#{self.table_name}.#{paranoid_configuration[:column]}"
+    
+    return if paranoid?
+    
+    include ActsAsParanoid::Core
+    
+    # Magic!
+    default_scope { where(paranoid_default_scope_sql) }
+
+    if paranoid_configuration[:column_type] == 'time'
+      scope :deleted_inside_time_window, lambda {|time, window|
+        deleted_after_time((time - window)).deleted_before_time((time + window))
+      }
+
+      scope :deleted_after_time, lambda  { |time| where("#{paranoid_column} > ?", time) }
+      scope :deleted_before_time, lambda { |time| where("#{paranoid_column} < ?", time) }
+    end
+  end
+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
+
+# Push the recover callback onto the activerecord callback list
+ActiveRecord::Callbacks::CALLBACKS.push(:before_recover, :after_recover)

metadata

@@ -1,51 +1,70 @@
---- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.10
-specification_version: 1
+--- !ruby/object:Gem::Specification
 name: acts_as_paranoid
-version: !ruby/object:Gem::Version 
-  version: 0.3.1
-date: 2005-12-20
-summary: acts_as_paranoid keeps models from actually being deleted by setting a deleted_at field.
-require_paths: 
-  - lib
-email: technoweenie@gmail.com
-homepage: http://techno-weenie.net
-rubyforge_project: 
-description: 
-autorequire: acts_as_paranoid
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-    - 
-      - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-  version: 
+version: !ruby/object:Gem::Version
+  version: 0.4.0
+  prerelease: 
 platform: ruby
-authors: 
-  - Rick Olson
-files: 
-  - lib/acts_as_paranoid.rb
-  - test/database.yml
-  - test/debug.log
-  - test/fixtures
-  - test/paranoid_test.rb
-  - test/schema.rb
-  - test/test_helper.rb
-  - test/fixtures/categories.yml
-  - test/fixtures/categories_widgets.yml
-  - test/fixtures/widgets.yml
-  - README
-  - MIT-LICENSE
-  - CHANGELOG
-  - RUNNING_UNIT_TESTS
-test_files: 
-  - test/paranoid_test.rb
-rdoc_options: []
-extra_rdoc_files: []
+authors:
+- Goncalo Silva
+- Charles G.
+- Rick Olson
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2012-12-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &70256076943380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70256076943380
+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:
+- goncalossilva@gmail.com
 executables: []
 extensions: []
+extra_rdoc_files: []
+files:
+- lib/acts_as_paranoid/associations.rb
+- lib/acts_as_paranoid/core.rb
+- lib/acts_as_paranoid/relation.rb
+- lib/acts_as_paranoid/validations.rb
+- lib/rails3_acts_as_paranoid.rb
+- LICENSE
+- README.markdown
+homepage: https://github.com/goncalossilva/rails3_acts_as_paranoid
+licenses: []
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: -309367461026455685
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: 1.3.6
 requirements: []
-dependencies: []
+rubyforge_project: acts_as_paranoid
+rubygems_version: 1.8.17
+signing_key: 
+specification_version: 3
+summary: Active Record (~>3.2) plugin which allows you to hide and restore records
+  without actually deleting them.
+test_files: []

data/CHANGELOG

@@ -1,47 +0,0 @@
-*0.3.1* (20 Dec 2005)
-
-* took out deleted association code for 'chainsaw butchery of base classes' [sorry Erik Terpstra]
-* verified tests pass on Rails 1.0
-
-*0.3* (27 Nov 2005)
-
-* Deleted models will find deleted associations by default now [Erik Terpstra]
-* Added :group as valid option for find [Michael Dabney]
-* Changed the module namespace to Caboose::Acts::Paranoid
-
-*0.2.0* (6 Nov 2005)
-
-* Upgrade to Rails 1.0 RC4.  ActiveRecord::Base#constrain has been replaced with scope_with.
-
-*0.1.7* (22 Oct 2005)
-
-* Added :with_deleted as a valid option of ActiveRecord::Base#find
-
-*0.1.6* (25 Sep 2005)
-
-* Fixed bug where nested constrains would get clobbered after multiple queries
-
-*0.1.5* (22 Sep 2005)
-
-* Fixed bug where acts_as_paranoid would clobber other constrains
-* Simplified acts_as_paranoid mixin including.
-
-*0.1.4* (18 Sep 2005)
-
-* First RubyForge release
-
-*0.1.3* (18 Sep 2005)
-
-* ignore multiple calls to acts_as_paranoid on the same model
-
-*0.1.2* (18 Sep 2005)
-
-* fixed a bug that kept you from selecting the first deleted record
-
-*0.1.1* (18 Sep 2005)
-
-* Fixed bug that kept you from selecting deleted records by ID
-
-*0.1* (17 Sep 2005)
-
-* Initial gem

data/README

@@ -1,26 +0,0 @@
-= acts_as_paranoid
-
-Overrides some basic methods for the current model so that calling #destroy sets a 'deleted_at' field to the 
-current timestamp.  ActiveRecord is required.
-
-== Resources
-
-Install
-
-* gem install acts_as_paranoid
-
-Rubyforge project
-
-* http://rubyforge.org/projects/ar-paranoid
-
-RDocs
-
-* http://ar-paranoid.rubyforge.org
-
-Subversion
-
-* http://techno-weenie.net/svn/projects/acts_as_paranoid
-
-Collaboa
-
-* http://collaboa.techno-weenie.net/repository/browse/acts_as_paranoid

data/RUNNING_UNIT_TESTS

@@ -1,41 +0,0 @@
-== Creating the test database
-
-The default name for the test databases is "activerecord_paranoid". If you 
-want to use another database name then be sure to update the connection 
-adapter setups you want to test with in test/connections/<your database>/connection.rb. 
-When you have the database online, you can import the fixture tables with 
-the test/fixtures/db_definitions/*.sql files.
-
-Make sure that you create database objects with the same user that you specified in i
-connection.rb otherwise (on Postgres, at least) tests for default values will fail.
-
-== Running with Rake
-
-The easiest way to run the unit tests is through Rake. The default task runs
-the entire test suite for all the adapters. You can also run the suite on just
-one adapter by using the tasks test_mysql_ruby, test_ruby_mysql, test_sqlite, 
-or test_postresql. For more information, checkout the full array of rake tasks with "rake -T"
-
-Rake can be found at http://rake.rubyforge.org
-
-== Running by hand
-
-Unit tests are located in test directory. If you only want to run a single test suite, 
-or don't want to bother with Rake, you can do so with something like:
-
-   cd test; ruby -I "connections/native_mysql" base_test.rb
-   
-That'll run the base suite using the MySQL-Ruby adapter. Change the adapter
-and test suite name as needed.
-
-== Faster tests
-
-If you are using a database that supports transactions, you can set the
-"AR_TX_FIXTURES" environment variable to "yes" to use transactional fixtures.
-This gives a very large speed boost. With rake:
-
-  rake AR_TX_FIXTURES=yes
-
-Or, by hand:
-
-  AR_TX_FIXTURES=yes ruby -I connections/native_sqlite3 base_test.rb

data/lib/acts_as_paranoid.rb

@@ -1,166 +0,0 @@
-module Caboose #:nodoc:
-  module Acts #:nodoc:
-    # Overrides some basic methods for the current model so that calling #destroy sets a 'deleted_at' field to the current timestamp.
-    # This assumes the table has a deleted_at date/time field.  Most normal model operations will work, but there will be some oddities.
-    #
-    #   class Widget < ActiveRecord::Base
-    #     acts_as_paranoid
-    #   end
-    #
-    #   Widget.find(:all)
-    #   # SELECT * FROM widgets WHERE widgets.deleted_at IS NULL
-    #
-    #   Widget.find(:first, :conditions => ['title = ?', 'test'], :order => 'title')
-    #   # SELECT * FROM widgets WHERE widgets.deleted_at IS NULL AND title = 'test' ORDER BY title LIMIT 1
-    #
-    #   Widget.find_with_deleted(:all)
-    #   # SELECT * FROM widgets
-    #
-    #   Widget.find(:all, :with_deleted => true)
-    #   # SELECT * FROM widgets
-    #
-    #   Widget.count
-    #   # SELECT COUNT(*) FROM widgets WHERE widgets.deleted_at IS NULL
-    #
-    #   Widget.count ['title = ?', 'test']
-    #   # SELECT COUNT(*) FROM widgets WHERE widgets.deleted_at IS NULL AND title = 'test'
-    #
-    #   Widget.count_with_deleted
-    #   # SELECT COUNT(*) FROM widgets
-    #
-    #   @widget.destroy
-    #   # UPDATE widgets SET deleted_at = '2005-09-17 17:46:36' WHERE id = 1
-    #
-    #   @widget.destroy!
-    #   # DELETE FROM widgets WHERE id = 1
-    # 
-    module Paranoid
-      module ActiveRecord
-        def self.included(base) # :nodoc:
-          base.extend ClassMethods
-          class << base
-            alias_method :validate_find_options_without_deleted, :validate_find_options
-            alias_method :validate_find_options, :validate_find_options_with_deleted
-          end
-        end
-
-        module ClassMethods
-          def acts_as_paranoid
-            unless paranoid? # don't let AR call this twice
-              alias_method :destroy_without_callbacks!, :destroy_without_callbacks
-              class << self
-                alias_method :original_find, :find
-                alias_method :count_with_deleted, :count
-                alias_method :clobbering_with_scope, :with_scope
-              end
-            end
-            include InstanceMethods
-          end
-          
-          def paranoid?
-            self.included_modules.include?(InstanceMethods)
-          end
-          
-          protected
-          def validate_find_options_with_deleted(options)
-            options.assert_valid_keys [:conditions, :group, :include, :joins, :limit, :offset, :order, :select, :readonly, :with_deleted]
-          end
-        end
-    
-        module InstanceMethods #:nodoc:
-          def self.included(base) # :nodoc:
-            base.extend ClassMethods
-          end
-      
-          module ClassMethods
-            def find(*args)
-              options = extract_options_from_args!(args)
-              call_original_find = lambda { original_find(*(args << options)) }
-            
-              if !options[:with_deleted]
-                with_deleted_scope { return call_original_find.call }
-              end
-            
-              call_original_find.call
-            end
-
-            def find_with_deleted(*args)
-              original_find(*(args << extract_options_from_args!(args).merge(:with_deleted => true)))
-            end
-
-            def count(conditions = nil, joins = nil)
-              with_deleted_scope { count_with_deleted(conditions, joins) }
-            end
-
-            def with_scope(method_scoping = {}, is_new_scope = true)
-              # Dup first and second level of hash (method and params).
-              method_scoping = method_scoping.inject({}) do |hash, (method, params)|
-                hash[method] = params.dup
-                hash
-              end
-
-              method_scoping.assert_valid_keys [:find, :create]
-              if f = method_scoping[:find]
-                f.assert_valid_keys [:conditions, :joins, :offset, :limit, :readonly]
-                f[:readonly] = true if !f[:joins].blank? && !f.has_key?(:readonly)
-              end
-
-              raise ArgumentError, "Nested scopes are not yet supported: #{scoped_methods.inspect}" unless scoped_methods.nil?
-
-              self.scoped_methods = method_scoping
-              yield
-            ensure
-              self.scoped_methods = nil if is_new_scope
-            end
-
-            protected
-            def with_deleted_scope(&block)
-              deleted_cond = "#{table_name}.deleted_at IS NULL"
-              if scoped_methods.nil?
-                is_new_scope = true
-                current_scope = {}
-              else
-                is_new_scope = false
-                current_scope = scoped_methods.clone
-                self.scoped_methods = nil
-              end
-            
-              current_scope ||= {}
-              current_scope[:find] ||= {}
-              if not current_scope[:find][:conditions] =~ /#{deleted_cond}/
-                current_scope[:find][:conditions] = current_scope[:find][:conditions].nil? ?
-                  deleted_cond :
-                  "(#{current_scope[:find][:conditions]}) AND #{deleted_cond}"
-              end
-            
-              with_scope(current_scope, is_new_scope, &block)
-            end
-          end
-
-          def destroy_without_callbacks
-            unless new_record?
-              sql = self.class.send(:sanitize_sql,
-                ["UPDATE #{self.class.table_name} SET deleted_at = ? WHERE id = ?", 
-                  self.class.default_timezone == :utc ? Time.now.utc : Time.now, id])
-              self.connection.update(sql)
-            end
-            freeze
-          end
-        
-          def destroy_with_callbacks!
-            return false if callback(:before_destroy) == false
-            result = destroy_without_callbacks!
-            callback(:after_destroy)
-            result
-          end
-        
-          def destroy!
-            transaction { destroy_with_callbacks! }
-          end
-        end
-      end
-    end
-  end
-end
-
-ActiveRecord::Base.send :include, Caboose::Acts::Paranoid::ActiveRecord