acts_as_soft_delete_by_field 1.0.2 → 1.0.3

data/README

@@ -18,6 +18,12 @@ The model object needs to have a datetime field, that on
 delete will be set to the current time. By default, this field should
 be :deleted_at, but you can also specify your own field.
 
+Installation
+------------
+Add this to your Gemfile:
+
+  gem "acts_as_soft_delete_by_field"
+
 Usage
 -----
 
@@ -105,7 +111,7 @@ it is used.
    class ThingTest < ActiveSupport::TestCase
 
      def test_soft_delete
-       assert_soft_delete_working_for(Thing.first)
+       assert_soft_delete_by_field_working_for(Thing.first)
      end
 
    end

data/Rakefile

@@ -21,3 +21,6 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('README')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+require 'standalone_migrations'
+StandaloneMigrations::Tasks.load_tasks

data/lib/acts_as_soft_delete_by_field_assertions.rb

@@ -13,6 +13,7 @@
 module ActsAsSoftDeleteByFieldAssertions
 
   def assert_soft_delete_by_field_working_for(item)
+    assert_soft_delete_enabled_for_class(item)
     # Using clones, as otherwise other assertions affected
     @starting_number = item.class.count
     assert_before_soft_delete_all_correct_for(item)
@@ -28,6 +29,13 @@ module ActsAsSoftDeleteByFieldAssertions
     assert_before_soft_delete(item.clone)
     assert_after_soft_delete(item.clone)
   end
+
+  def assert_soft_delete_enabled_for_class(item)
+    assert(
+      item.class.ancestors.include?(ActiveRecord::Acts::SoftDeleteByField::InstanceMethods),
+      "#{item.class} should have acts_as_soft_delete_by_field defined"
+    )
+  end
   
   def assert_soft_deleted(item)
     assert_equal(true, item.reload.is_deleted?, error_messages_for(item, "Not deleted: #{item.inspect}"))
@@ -237,4 +245,5 @@ EOF
 
 end
 
+require 'active_support'
 ActiveSupport::TestCase.send(:include, ActsAsSoftDeleteByFieldAssertions)

data/lib/soft_delete_by_field.rb

@@ -10,16 +10,27 @@ module ActiveRecord #:nodoc:
       module ClassMethods
 
         def soft_delete_by_field_name
-          @soft_delete_by_field_name
+          @soft_delete_by_field_name || parents_soft_delete_by_field_name || DEFAULT_FIELD_NAME
         end
 
-        def acts_as_soft_delete_by_field(field_name = nil)
-          attr_accessor :reasons_not_to_delete
-          field_name ||= DEFAULT_FIELD_NAME
+        def soft_delete_by_field_name=(field_name)
           @soft_delete_by_field_name = field_name.to_sym
+        end
+
+        def acts_as_soft_delete_by_field(field_name = DEFAULT_FIELD_NAME)
+          attr_accessor :reasons_not_to_delete
+          self.soft_delete_by_field_name = field_name
           send :include, SoftDeleteByField::InstanceMethods
-          scope :extant, where(["#{(self.class.name.tableize + ".") if self.class.kind_of?(SoftDeleteByField)}#{field_name} IS NULL"])
-          scope :deleted, where(["#{(self.class.name.tableize + ".") if self.class.kind_of?(SoftDeleteByField)}#{field_name} IS NOT NULL"])
+          scope :extant, where(arel_table[soft_delete_by_field_name].eq(nil))
+          scope :deleted, where(arel_table[soft_delete_by_field_name].not_eq(nil))
+        end
+
+        def soft_delete_class_table_name
+          (self.class.name.tableize + ".") if self.class.kind_of?(SoftDeleteByField)
+        end
+
+        def parents_soft_delete_by_field_name
+          superclass.soft_delete_by_field_name if superclass.respond_to? :soft_delete_by_field_name
         end
   
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_soft_delete_by_field
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Rob Nichols
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-05 00:00:00 +01:00
-default_executable: 
+date: 2013-06-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -34,6 +33,36 @@ dependencies:
         version: 3.0.0
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: standalone_migrations
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 1
+        - 1
+        version: 2.1.1
+  type: :development
+  version_requirements: *id003
 description: "Acts as Soft Delete by Field: Provides soft deletion for ActiveRecord models using a field to flag the datetime of deletion"
 email: rob@nicholshayes.co.uk
 executables: []
@@ -48,7 +77,6 @@ files:
 - lib/acts_as_soft_delete_by_field_assertions.rb
 - lib/acts_as_soft_delete_by_field.rb
 - lib/soft_delete_by_field.rb
-has_rdoc: true
 homepage: https://github.com/reggieb/acts_as_soft_delete_by_field
 licenses: []
 
@@ -78,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Provides soft deletion for ActiveRecord models