acts_as_removable 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7668aae0ef68e4f3a34049142e66af8ae3dde45
-  data.tar.gz: 3368f24e31ebd5cc6af0a17a74424e1aec5c2a7b
+  metadata.gz: f55f6c4ecc0f0ced45e825af183aad144e21a974
+  data.tar.gz: 4602fa5ebca4018257d7b799ea11cb23f4837a60
 SHA512:
-  metadata.gz: 07025ebbedcd757e04a3e014e7811d2347b50d741b431d826db279afbcb4bd7fd96b86a6f48155163e069ac2f31a09e0cdd7b84592306ae5d8205c38d3537f1e
-  data.tar.gz: 10ed3f98b93efb322e4d22d02e0c3089fcea6e5792c9525e7f53c876f2c675a896a6b0c2cccb6f567720b852213f57785418cd4fc37ea33a76f52492f0c5b968
+  metadata.gz: aecc89b6b88285c230e23a58db97b9c22f7291b9266f195fd93ece71cb2b68aa0cfb1e61798f532547acde46a9e9d11970c32443b844150c40d13203958030cf
+  data.tar.gz: 57b8ea17f54ec4d3c37f354be41b666d68d0d73521ce92d78321e707a28e377acbe06b11801ba3536d3b4fdd9f0227caddf1daefedf31cdb2e40ec5d63af9021

data/README.md

@@ -1,4 +1,4 @@
-# ActsAsRemovable
+# acts_as_removable
 
 This gem allows you to easily manage ActiveRecord objects that are pseudo destroyed a.k.a. removed.
 
@@ -42,7 +42,7 @@ And you can use callbacks:
 class MyModel < ActiveRecord::Base
   acts_as_removable
 
-  before_save do |r|
+  before_remove do |r|
     puts "Before removing record"
   end
 

data/acts_as_removable.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activesupport", "~> 4.0.0.rc2"
-  spec.add_dependency "activerecord", "~> 4.0.0.rc2"
+  spec.add_dependency "activesupport", "~> 4.0.0"
+  spec.add_dependency "activerecord", "~> 4.0.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/acts_as_removable/version.rb

@@ -1,3 +1,3 @@
 module ActsAsRemovable
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/lib/acts_as_removable.rb

@@ -10,15 +10,27 @@ module ActsAsRemovable
   end
 
   module ClassMethods
+
+    # Add ability to remove ActiveRecord instances
+    #
+    #   acts_as_removable
+    #   acts_as_removable column_name: 'other_column_name'
+    #   acts_as_removable without_default_scope: true
+    #
+    # ===== Options
+    #
+    # * <tt>:column_name</tt> - A symbol or string with the column to use for removal timestamp.
+    # * <tt>:without_default_scope</tt> - A boolean indicating to not set a default scope.
     def acts_as_removable(options={})
       self.class_eval do
-        @_acts_as_removable_column_name = options[:column_name] || 'removed_at'
+        @_acts_as_removable_column_name = (options[:column_name] || 'removed_at').to_s
         def self._acts_as_removable_column_name
           @_acts_as_removable_column_name
         end
 
-        default_scope -> {where("#{self.table_name}.#{self._acts_as_removable_column_name} IS NULL")}
-        scope :removed, -> {where("#{self.table_name}.#{self._acts_as_removable_column_name} IS NOT NULL")}
+        scope :removed, -> {unscoped.where("#{self.table_name}.#{self._acts_as_removable_column_name} IS NOT NULL")}
+        scope :actives, -> {unscoped.where("#{self.table_name}.#{self._acts_as_removable_column_name} IS NULL")}
+        default_scope -> {actives} unless options[:without_default_scope]
 
         define_callbacks :remove
 
@@ -34,15 +46,28 @@ module ActsAsRemovable
           self.send(self.class._acts_as_removable_column_name).present?
         end
 
-        def remove
-          run_callbacks :remove do
-            self.update_attributes(self.class._acts_as_removable_column_name => Time.now)
-          end
+        def remove(options={})
+          _update_remove_attribute(Time.now, false, options)
+        end
+
+        def remove!(options={})
+          _update_remove_attribute(Time.now, true, options)
         end
 
-        def remove!
+        def unremove(options={})
+          _update_remove_attribute(nil, false, options)
+        end
+
+        def unremove!(options={})
+          _update_remove_attribute(nil, true, options)
+        end
+
+        private
+
+        def _update_remove_attribute(value, with_bang=false, options={})
           run_callbacks :remove do
-            self.update_attributes!(self.class._acts_as_removable_column_name => Time.now)
+            self.send("#{self.class._acts_as_removable_column_name}=", value)
+            with_bang ? self.save!(options) : self.save(options)
           end
         end
       end

data/spec/acts_as_removable_spec.rb

@@ -13,7 +13,7 @@ describe 'acts_as_removable' do
   end
 
   class MySecondModel < ActiveRecord::Base
-    acts_as_removable column_name: :use_this_column
+    acts_as_removable column_name: :use_this_column, without_default_scope: true
   end
 
   before do
@@ -46,6 +46,26 @@ describe 'acts_as_removable' do
     end
   end
 
+  it "test scopes" do
+    MyModel.delete_all
+    MySecondModel.delete_all
+
+    MyModel.create!
+    MyModel.create!.remove!
+    MySecondModel.create!
+    MySecondModel.create!.remove!
+
+    MyModel.count.to_i.should be(1)
+    MyModel.actives.count.should be(1)
+    MyModel.removed.count.should be(1)
+    MyModel.unscoped.count.should be(2)
+
+    MySecondModel.count.to_i.should be(2)
+    MySecondModel.actives.count.should be(1)
+    MySecondModel.removed.count.should be(1)
+    MySecondModel.unscoped.count.should be(2)
+  end
+
   it "test callbacks" do
     r = MyModel.create!
     r.callback_before.should be_false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_removable
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Florian Schwab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc2
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc2
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc2
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc2
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement