soft_deletion 0.2.1 → 0.3.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    soft_deletion (0.2.1)
+    soft_deletion (0.3.0)
 
 GEM
   remote: http://rubygems.org/

data/Readme.md

@@ -12,8 +12,8 @@ Usage
     class User < ActiveRecord::Base
       has_soft_deletion :default_scope => true
 
-      after_soft_delete :send_deletion_emails # Rails 2 + 3
-      set_callback :soft_delete, :after, :prepare_emails # Rails 3
+      before_soft_delete :validate_deletability # soft_delete stops if this returns false
+      after_soft_delete :send_deletion_emails
 
       has_many :products
     end
@@ -38,12 +38,6 @@ Usage
     # soft delete many
     User.soft_delete_all!(1,2,3,4)
 
-
-TODO
-====
- - Rails 3 with inspiration from https://github.com/JackDanger/permanent_records/blob/master/lib/permanent_records.rb
- - maybe stuff from https://github.com/smoku/soft_delete
-
 Authors
 =======
 
@@ -51,8 +45,9 @@ Authors
  - [Michel Pigassou](https://github.com/Dagnan)
  - [Steven Davidovitz](https://github.com/steved555)
  - [PikachuEXE](https://github.com/PikachuEXE)
+ - [Noel Dellofano](https://github.com/pinkvelociraptor)
 
 [Zendesk](http://zendesk.com)<br/>
 michael@grosser.it<br/>
 License: MIT<br/>
-[![Build Status](https://secure.travis-ci.org/grosser/soft_deletion.png)](http://travis-ci.org/grosser/soft_deletion)
+[![Build Status](https://travis-ci.org/grosser/soft_deletion.png)](https://travis-ci.org/grosser/soft_deletion)

data/gem-public_cert.pem

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDMjCCAhqgAwIBAgIBADANBgkqhkiG9w0BAQUFADA/MRAwDgYDVQQDDAdtaWNo
+YWVsMRcwFQYKCZImiZPyLGQBGRYHZ3Jvc3NlcjESMBAGCgmSJomT8ixkARkWAml0
+MB4XDTEzMDIwMzE4MTMxMVoXDTE0MDIwMzE4MTMxMVowPzEQMA4GA1UEAwwHbWlj
+aGFlbDEXMBUGCgmSJomT8ixkARkWB2dyb3NzZXIxEjAQBgoJkiaJk/IsZAEZFgJp
+dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMorXo/hgbUq97+kII9H
+MsQcLdC/7wQ1ZP2OshVHPkeP0qH8MBHGg6eYisOX2ubNagF9YTCZWnhrdKrwpLOO
+cPLaZbjUjljJ3cQR3B8Yn1veV5IhG86QseTBjymzJWsLpqJ1UZGpfB9tXcsFtuxO
+6vHvcIHdzvc/OUkICttLbH+1qb6rsHUceqh+JrH4GrsJ5H4hAfIdyS2XMK7YRKbh
+h+IBu6dFWJJByzFsYmV1PDXln3UBmgAt65cmCu4qPfThioCGDzbSJrGDGLmw/pFX
+FPpVCm1zgYSb1v6Qnf3cgXa2f2wYGm17+zAVyIDpwryFru9yF/jJxE38z/DRsd9R
+/88CAwEAAaM5MDcwCQYDVR0TBAIwADAdBgNVHQ4EFgQUsiNnXHtKeMYYcr4yJVmQ
+WONL+IwwCwYDVR0PBAQDAgSwMA0GCSqGSIb3DQEBBQUAA4IBAQAlyN7kKo/NQCQ0
+AOzZLZ3WAePvStkCFIJ53tsv5Kyo4pMAllv+BgPzzBt7qi605mFSL6zBd9uLou+W
+Co3s48p1dy7CjjAfVQdmVNHF3MwXtfC2OEyvSQPi4xKR8iba8wa3xp9LVo1PuLpw
+/6DsrChWw74HfsJN6qJOK684hJeT8lBYAUfiC3wD0owoPSg+XtyAAddisR+KV5Y1
+NmVHuLtQcNTZy+gRht3ahJRMuC6QyLmkTsf+6MaenwAMkAgHdswGsJztOnNnBa3F
+y0kCSWmK6D+x/SbfS6r7Ke07MRqziJdB9GuE1+0cIRuFh8EQ+LN6HXCKM5pon/GU
+ycwMXfl0
+-----END CERTIFICATE-----

data/gemfiles/rails2.gemfile

@@ -7,6 +7,7 @@ gem "rake"
 gem "sqlite3"
 gem "rspec"
 gem "database_cleaner"
+gem "bump"
 gem "activerecord", "2.3.14"
 gem "activesupport", "2.3.14"
 

data/gemfiles/rails3.gemfile

@@ -7,6 +7,7 @@ gem "rake"
 gem "sqlite3"
 gem "rspec"
 gem "database_cleaner"
+gem "bump"
 gem "activerecord", "3.2.3"
 gem "activesupport", "3.2.3"
 

data/lib/soft_deletion/core.rb

@@ -8,16 +8,7 @@ module SoftDeletion
 
       # backport after_soft_delete so we can safely upgrade to rails 3
       if ActiveRecord::VERSION::MAJOR > 2
-        base.define_callbacks :soft_delete
-        class << base
-          def before_soft_delete(*callbacks, &block)
-            set_callback :soft_delete, :before, *callbacks, &block
-          end
-
-          def after_soft_delete(*callbacks, &block)
-            set_callback :soft_delete, :after, *callbacks, &block
-          end
-        end
+        base.define_model_callbacks :soft_delete
       else
         base.define_callbacks :before_soft_delete
         base.define_callbacks :after_soft_delete
@@ -106,7 +97,7 @@ module SoftDeletion
             result = block.call
           end
         else
-          run_callbacks :before_soft_delete
+          return false if !run_callbacks(:before_soft_delete) { |result, object| result == false }
           mark_as_deleted
           soft_delete_dependencies.each(&:soft_delete!)
           result = block.call

data/lib/soft_deletion/version.rb

@@ -1,3 +1,3 @@
 module SoftDeletion
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/soft_deletion.gemspec

@@ -1,4 +1,4 @@
-$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 name = "soft_deletion"
 require "#{name}/version"
 
@@ -6,7 +6,9 @@ Gem::Specification.new name, SoftDeletion::VERSION do |s|
   s.summary = "Explicit soft deletion for ActiveRecord via deleted_at and default scope."
   s.authors = ["Zendesk"]
   s.email = "michael@grosser.it"
-  s.homepage = "http://github.com/grosser/#{name}"
+  s.homepage = "https://github.com/grosser/#{name}"
   s.files = `git ls-files`.split("\n")
-  s.license = 'MIT'
+  s.license = "MIT"
+  s.signing_key = File.expand_path("~/.ssh/gem-private_key.pem")
+  s.cert_chain = ["gem-public_cert.pem"]
 end

data/spec/soft_deletion_spec.rb

@@ -47,7 +47,7 @@ describe SoftDeletion do
 
   describe "callbacks" do
     describe ".before_soft_delete" do
-      it "should be called on soft-deletion" do
+      it "is called on soft-deletion" do
         Category.before_soft_delete :foo
         category = Category.create!
 
@@ -55,10 +55,22 @@ describe SoftDeletion do
 
         category.soft_delete!
       end
+
+      it "stops execution chain if false is returned" do
+        Category.before_soft_delete :foo, :bar
+        category = Category.create!
+
+        category.should_receive(:foo).and_return(false)
+        category.should_not_receive(:bar)
+
+        category.soft_delete!
+        category.reload
+        category.should_not be_deleted
+      end
     end
 
     describe ".after_soft_delete" do
-      it "should be called after soft-deletion" do
+      it "is called after soft-deletion" do
         Category.after_soft_delete :foo
         category = Category.create!
 
@@ -67,7 +79,7 @@ describe SoftDeletion do
         category.soft_delete!
       end
 
-      it "should be called after bulk soft-deletion" do
+      it "is called after bulk soft-deletion" do
         Category.after_soft_delete :foo
         category = Category.create!
 
@@ -85,7 +97,7 @@ describe SoftDeletion do
         category.soft_delete!
       end
 
-      it "should be call multiple after soft-deletion" do
+      it "calls multiple after soft-deletion" do
         Category.after_soft_delete :foo, :bar
         category = Category.create!
 
@@ -95,7 +107,19 @@ describe SoftDeletion do
         category.soft_delete!
       end
 
-      it "should not be called after normal destroy" do
+      it "does not stop deletion when returning false" do
+        Category.after_soft_delete :foo
+        category = Category.create!
+
+        category.should_receive(:foo).and_return false
+
+        category.soft_delete!
+
+        category.reload
+        category.should be_deleted
+      end
+
+      it "is not called after normal destroy" do
         Category.after_soft_delete :foo
         category = Category.create!
 

metadata

@@ -1,15 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: soft_deletion
 version: !ruby/object:Gem::Version
+  version: 0.3.0
   prerelease: 
-  version: 0.2.1
 platform: ruby
 authors:
 - Zendesk
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2012-12-30 00:00:00.000000000 Z
+cert_chain:
+- !binary |-
+  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURNakNDQWhxZ0F3SUJB
+  Z0lCQURBTkJna3Foa2lHOXcwQkFRVUZBREEvTVJBd0RnWURWUVFEREFkdGFX
+  Tm8KWVdWc01SY3dGUVlLQ1pJbWlaUHlMR1FCR1JZSFozSnZjM05sY2pFU01C
+  QUdDZ21TSm9tVDhpeGtBUmtXQW1sMApNQjRYRFRFek1ESXdNekU0TVRNeE1W
+  b1hEVEUwTURJd016RTRNVE14TVZvd1B6RVFNQTRHQTFVRUF3d0hiV2xqCmFH
+  RmxiREVYTUJVR0NnbVNKb21UOGl4a0FSa1dCMmR5YjNOelpYSXhFakFRQmdv
+  SmtpYUprL0lzWkFFWkZnSnAKZERDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFB
+  RGdnRVBBRENDQVFvQ2dnRUJBTW9yWG8vaGdiVXE5NytrSUk5SApNc1FjTGRD
+  Lzd3UTFaUDJPc2hWSFBrZVAwcUg4TUJIR2c2ZVlpc09YMnViTmFnRjlZVENa
+  V25ocmRLcndwTE9PCmNQTGFaYmpVamxqSjNjUVIzQjhZbjF2ZVY1SWhHODZR
+  c2VUQmp5bXpKV3NMcHFKMVVaR3BmQjl0WGNzRnR1eE8KNnZIdmNJSGR6dmMv
+  T1VrSUN0dExiSCsxcWI2cnNIVWNlcWgrSnJINEdyc0o1SDRoQWZJZHlTMlhN
+  SzdZUktiaApoK0lCdTZkRldKSkJ5ekZzWW1WMVBEWGxuM1VCbWdBdDY1Y21D
+  dTRxUGZUaGlvQ0dEemJTSnJHREdMbXcvcEZYCkZQcFZDbTF6Z1lTYjF2NlFu
+  ZjNjZ1hhMmYyd1lHbTE3K3pBVnlJRHB3cnlGcnU5eUYvakp4RTM4ei9EUnNk
+  OVIKLzg4Q0F3RUFBYU01TURjd0NRWURWUjBUQkFJd0FEQWRCZ05WSFE0RUZn
+  UVVzaU5uWEh0S2VNWVljcjR5SlZtUQpXT05MK0l3d0N3WURWUjBQQkFRREFn
+  U3dNQTBHQ1NxR1NJYjNEUUVCQlFVQUE0SUJBUUFseU43a0tvL05RQ1EwCkFP
+  elpMWjNXQWVQdlN0a0NGSUo1M3RzdjVLeW80cE1BbGx2K0JnUHp6QnQ3cWk2
+  MDVtRlNMNnpCZDl1TG91K1cKQ28zczQ4cDFkeTdDampBZlZRZG1WTkhGM013
+  WHRmQzJPRXl2U1FQaTR4S1I4aWJhOHdhM3hwOUxWbzFQdUxwdwovNkRzckNo
+  V3c3NEhmc0pONnFKT0s2ODRoSmVUOGxCWUFVZmlDM3dEMG93b1BTZytYdHlB
+  QWRkaXNSK0tWNVkxCk5tVkh1THRRY05UWnkrZ1JodDNhaEpSTXVDNlF5TG1r
+  VHNmKzZNYWVud0FNa0FnSGRzd0dzSnp0T25ObkJhM0YKeTBrQ1NXbUs2RCt4
+  L1NiZlM2cjdLZTA3TVJxemlKZEI5R3VFMSswY0lSdUZoOEVRK0xONkhYQ0tN
+  NXBvbi9HVQp5Y3dNWGZsMAotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
+date: 2013-02-19 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -25,6 +52,7 @@ files:
 - MIT-LICENSE
 - Rakefile
 - Readme.md
+- gem-public_cert.pem
 - gemfiles/rails2.gemfile
 - gemfiles/rails3.gemfile
 - lib/soft_deletion.rb
@@ -35,7 +63,7 @@ files:
 - soft_deletion.gemspec
 - spec/soft_deletion_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/grosser/soft_deletion
+homepage: https://github.com/grosser/soft_deletion
 licenses:
 - MIT
 post_install_message: 
@@ -43,23 +71,23 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: 3946818531354053907
-  none: false
+      hash: -3470966134953021274
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: 3946818531354053907
-  none: false
+      hash: -3470966134953021274
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24