acts_as_removable 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f55f6c4ecc0f0ced45e825af183aad144e21a974
-  data.tar.gz: 4602fa5ebca4018257d7b799ea11cb23f4837a60
+  metadata.gz: d64a4e7fa07f7ffa3872fc9e3e39c86b1b6b1cc4
+  data.tar.gz: 37b0cad5a652328df6dc52fdd80879b16cca0253
 SHA512:
-  metadata.gz: aecc89b6b88285c230e23a58db97b9c22f7291b9266f195fd93ece71cb2b68aa0cfb1e61798f532547acde46a9e9d11970c32443b844150c40d13203958030cf
-  data.tar.gz: 57b8ea17f54ec4d3c37f354be41b666d68d0d73521ce92d78321e707a28e377acbe06b11801ba3536d3b4fdd9f0227caddf1daefedf31cdb2e40ec5d63af9021
+  metadata.gz: 3d73905579c97e93fe7f7743fb4304b7729116830b8f19af1ba793e87c1f5bc6aaa66cc0fff336ac1f2e3820efc01700b10b11b7fec49b68dedcf6996b226dd7
+  data.tar.gz: 23123253e8b3e88c184f47066b6d9948ced41868beeb5d4c8b2cfb72b5cdc5b454079818ab6ddb04c3d545ea2966560f2feaaa92d933b413af397cb708d9f19b

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Florian Schwab
+Copyright (c) 2013 SIC! Software GmbH
 
 MIT License
 

data/README.md

@@ -19,7 +19,7 @@ Or install it yourself as:
 ## Usage
 
 ```ruby
-# a column removed_at of type timestamp is required 
+# a column removed_at of type timestamp is required
 class MyModel < ActiveRecord::Base
   acts_as_removable
 end
@@ -37,6 +37,13 @@ class MyModel < ActiveRecord::Base
 end
 ```
 
+It's possible to skip the default_scope:
+```ruby
+class MyModel < ActiveRecord::Base
+  acts_as_removable without_default_scope: true
+end
+```
+
 And you can use callbacks:
 ```ruby
 class MyModel < ActiveRecord::Base
@@ -50,6 +57,15 @@ class MyModel < ActiveRecord::Base
   def after_remove_method
     puts "After removing record"
   end
+
+  before_unremove do |r|
+    puts "Before unremoving record"
+  end
+
+  after_unremove :after_unremove_method
+  def after_unremove_method
+    puts "After unremoving record"
+  end
 end
 ```
 
@@ -57,6 +73,7 @@ end
 
 * [![Build Status](https://api.travis-ci.org/SICSoftwareGmbH/acts_as_removable.png)](https://travis-ci.org/SICSoftwareGmbH/acts_as_removable)
 * [![Dependencies](https://gemnasium.com/SICSoftwareGmbH/acts_as_removable.png?travis)](https://gemnasium.com/SICSoftwareGmbH/acts_as_removable)
+* [![Code Climate](https://codeclimate.com/github/SICSoftwareGmbH/acts_as_removable.png)](https://codeclimate.com/github/SICSoftwareGmbH/acts_as_removable)
 
 ## Contributing
 

data/lib/acts_as_removable/version.rb

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

data/lib/acts_as_removable.rb

@@ -32,7 +32,7 @@ module ActsAsRemovable
         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
+        define_callbacks :remove, :unremove
 
         def self.before_remove(*args, &block)
           set_callback :remove, :before, *args, &block
@@ -42,30 +42,38 @@ module ActsAsRemovable
           set_callback :remove, :after, *args, &block
         end
 
+        def self.before_unremove(*args, &block)
+          set_callback :unremove, :before, *args, &block
+        end
+
+        def self.after_unremove(*args, &block)
+          set_callback :unremove, :after, *args, &block
+        end
+
         def removed?
           self.send(self.class._acts_as_removable_column_name).present?
         end
 
         def remove(options={})
-          _update_remove_attribute(Time.now, false, options)
+          _update_remove_attribute(:remove, Time.now, false, options)
         end
 
         def remove!(options={})
-          _update_remove_attribute(Time.now, true, options)
+          _update_remove_attribute(:remove, Time.now, true, options)
         end
 
         def unremove(options={})
-          _update_remove_attribute(nil, false, options)
+          _update_remove_attribute(:unremove, nil, false, options)
         end
 
         def unremove!(options={})
-          _update_remove_attribute(nil, true, options)
+          _update_remove_attribute(:unremove, nil, true, options)
         end
 
         private
 
-        def _update_remove_attribute(value, with_bang=false, options={})
-          run_callbacks :remove do
+        def _update_remove_attribute(callback, value, with_bang=false, options={})
+          run_callbacks callback.to_sym do
             self.send("#{self.class._acts_as_removable_column_name}=", value)
             with_bang ? self.save!(options) : self.save(options)
           end

data/spec/acts_as_removable_spec.rb

@@ -3,12 +3,19 @@ require 'spec_helper'
 describe 'acts_as_removable' do
   class MyModel < ActiveRecord::Base
     acts_as_removable
-    attr_accessor :callback_before, :callback_after
+    attr_accessor :callback_before_remove, :callback_after_remove, :callback_before_unremove, :callback_after_unremove
     before_remove do |r|
-      r.callback_before = true
+      r.callback_before_remove = true
     end
     after_remove do |r|
-      r.callback_after = true
+      r.callback_after_remove = true
+    end
+
+    before_unremove do |ur|
+      ur.callback_before_unremove = true
+    end
+    after_unremove do |ur|
+      ur.callback_after_unremove = true
     end
   end
 
@@ -68,10 +75,24 @@ describe 'acts_as_removable' do
 
   it "test callbacks" do
     r = MyModel.create!
-    r.callback_before.should be_false
-    r.callback_after.should be_false
+    r.callback_before_remove.should be_false
+    r.callback_after_remove.should be_false
+    r.callback_before_unremove.should be_false
+    r.callback_after_unremove.should be_false
+
     r.remove
-    r.callback_before.should be_true
-    r.callback_after.should be_true
+
+    r.callback_before_remove.should be_true
+    r.callback_after_remove.should be_true
+    r.callback_before_unremove.should be_false
+    r.callback_after_unremove.should be_false
+
+    r.unremove
+
+    r.callback_before_remove.should be_true
+    r.callback_after_remove.should be_true
+    r.callback_before_unremove.should be_true
+    r.callback_after_unremove.should be_true
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_removable
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Florian Schwab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-25 00:00:00.000000000 Z
+date: 2013-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport