purgatory 3.0.0 → 3.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmFlNGZiY2ZlNWNkYzRkNzc2MDJlOWIxM2RiZjMyYTNhNjRmMDc5NA==
+    YTk3MmQ1NzAxNGRmOThjMWE1NTI4MTFjNjAyMDIyMjlkYWFlMmY0Mg==
   data.tar.gz: !binary |-
-    ZWRmYWJjYzg2Mzg2ZjFmZjE1MmVjYjM5ZDU5Y2I0MTE0MDRhYmE4Yg==
+    NDA2Mjc0NzNjYTI5NWEzOWFkY2VjOTQ1YWZhNjZkMzM2MmJhZDdkOA==
 SHA512:
   metadata.gz: !binary |-
-    MzI4OTMzYWQ2NTBhNWMyM2ExNTc3NTE2OWJiMmE2MTE2Mzc4MDhkYWJmZDQw
-    MTgyMDdhYWQ0MTg5MGJiMWM2NWZjNmIxMmE1MzZhODgzN2QxNjhiNDI5ODRj
-    YjRmOWZjMGZjNWQ1YmZlYjM4OWQ0YzExMTFhNDlmNTljMTUxOTM=
+    YjhjZTRmZGRlMjU5ZDA4OTc4NWU2MzgxMDE4NjcwOWE2ZTcwODM0ZDQ2OTcw
+    NWM1ZWRkZWVjZDc4MGRiODQ3MjE2NmYzNTU1YzhjODhhNTk2MTdhYjdhNmVk
+    MzI2ZDc2ZjMyYjlmYTI3ZWEyYTk1NzBmZTVjNTlkMjg3MzY3YmY=
   data.tar.gz: !binary |-
-    MmZmNDRjY2MwYWEzNjA2MTdlZTRjY2U1ZGJlZmFjYTk2ZDRlOTcxYjNiYmRi
-    MDkxMGIzNzQzNGEwOTAzZWFhMmJlOGRjOWIwMDU1YmNhYzZmZjA5NTliMGUy
-    MzFkYzQ1ZWExZjQzMjg2NTRjYjE1ZDhkZTQzYzU5NzkxMGIyYjU=
+    Nzc1MTUzZDRhYjUxMDYwMGQ4MmM2OTE0OTdiMzJhODA4ODkzYzhhNTRjNjI3
+    N2MxNTJkMzllZDRjNzkzNzc5MGM2MzAxMWNjMGZlOTJkOTc1NmY0NDkzMDFm
+    YjAwMjYxZjdiMDIwOTg2ODk1NDMyMjcwZWQ0M2E1MDIyMzUyYTg=

data/README.markdown

@@ -41,7 +41,7 @@ You can also put the creation of a new object into Purgatory
     item = Item.new price: 100
     purgatory = item.purgatory!
 
-Call .purgatize.method(params) to put a method call into Purgatory. When the purgatory is approved the method will be called on the soul
+Call .purgatize.method(params) to put a method call into Purgatory. When the purgatory is approved the method will be called on the soul. The purgatory will only be approved if the method returns true to indicate it succeeded.
 
     #without purgatory:
     item.increase_price(200)
@@ -57,7 +57,7 @@ The following are some attributes of a purgatory:
     purgatory.requested_changes # A hash of the proposed changes. The keys are the attribute names and the values are 2-element arrays where the 1st element is the old value and the 2nd element is the new value
     purgatory.approver # The user who approved the purgatory
     purgatory.approved_at # The time when the purgatory was approved
-    purgatory.performable_method # Information about the method to call on the soul when the purgatory is approved
+    purgatory.performable_method # Information about the method to call on the soul when the purgatory is approved. Performable methods should return true if they succeed.
 
 Here are some handy class and instance methods available to you:
 

data/VERSION

@@ -1 +1 @@
-3.0.0
+3.1.0

data/lib/purgatory/purgatory.rb

@@ -44,9 +44,13 @@ class Purgatory < ActiveRecord::Base
   end
 
   def approve!(approver = nil)
-    return false if approved? 
-    if soul_with_changes.save
-      soul.send(performable_method[:method],*performable_method[:args]) if performable_method
+    return false if approved?
+    if performable_method.present?
+      success = soul.send(performable_method[:method], *performable_method[:args])
+    else
+      success = soul_with_changes.save
+    end
+    if success
       self.approver = approver
       self.approved_at = Time.now
       self.soul_id = soul.id

data/purgatory.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: purgatory 3.0.0 ruby lib
+# stub: purgatory 3.1.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "purgatory"
-  s.version = "3.0.0"
+  s.version = "3.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Elan Dubrofsky"]
-  s.date = "2014-11-07"
+  s.date = "2017-08-17"
   s.description = "Put your model changes in purgatory and allow them to remain lost souls until they are approved"
   s.email = "elan.dubrofsky@gmail.com"
   s.extra_rdoc_files = [
@@ -47,7 +47,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/financeit/purgatory"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.2.5"
   s.summary = "Allow changes to a model to be put in purgatory until they are approved"
 
   if s.respond_to? :specification_version then

data/spec/purgatory_spec.rb

@@ -237,6 +237,30 @@ describe Purgatory do
       end
     end
 
+    context "approving a performable method that returns false" do
+      before do
+        create_method_call_purgatory
+        @purgatory.soul.stub(:rename).and_return(false)
+      end
+
+      it "should store the soul, requester and performable_method" do
+        @purgatory.soul.should == @widget
+        @purgatory.requester.should == user1
+        @purgatory.performable_method[:method].should == :rename
+        @purgatory.performable_method[:args].should == ['bar']
+      end
+
+      it "should fail when performable method returns false" do
+        @purgatory.approve!(user2).should be_false
+      end
+
+      it "it should not be approved" do
+        @purgatory.should be_present
+        @purgatory.should_not be_approved
+        @purgatory.should be_pending
+      end
+    end
+
     context "approving object change purgatory with attr_accessor" do
       before do
         create_object_change_purgatory_with_attr_accessor
@@ -673,3 +697,4 @@ describe Purgatory do
     Class.new(klass)  
   end
 end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: purgatory
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Elan Dubrofsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2017-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -106,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Allow changes to a model to be put in purgatory until they are approved