purgatory 4.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be4d6f59af39018b4417a418f8e8c2e91eaa1eef4eeb8cb3764bcea91e08911a
-  data.tar.gz: f02e6f1cd52fc530db2dc671abec047b896b576e34b988b8749418e29c9bc1bc
+  metadata.gz: a1583114c3324345ef6ace121844c2dbc67769d92982acfe17b6e96239d8d745
+  data.tar.gz: dff5194db0354ac30037530e6d007291db0adf30a01fc950e2d75f13990cd5fd
 SHA512:
-  metadata.gz: 6aa6ed6eca3b918911dc1fabf5c02d1cdfbebf9a5f720712e39e707742071dbfee26428f4ea6a26663360642351e5e8ccf935df13968f0df3bc25ff2d40dc0e0
-  data.tar.gz: 8d88f7c48bdc0956c315e73bcf30493e2c29bd836b6682d6bfeaf804401155e30a7bf186b626f4bc65a750a2b16124bddbd59626cfb82e5be7ed9c6136769cce
+  metadata.gz: f354e1057db8afa43f520c1c58658f0bb04fadc5b4ec63a972d733691bddc1673b30f010cbadfa7f857d0dbf0ab61796c9b1803c6e29d679e816e091a77c35f7
+  data.tar.gz: afb6c2f8af9874ab2ae52dc76174eec87c5fd97869ece5c2fabd3bbc4eb49f6b904de905d45766444b58b3f3e0a9f6b1e1c086836b10bed2b61d4fc62189a31b

data/VERSION

@@ -1 +1 @@
-4.0.0
+6.0.1

data/lib/purgatory/purgatory.rb

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

data/purgatory.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: purgatory 4.0.0 ruby lib
+# stub: purgatory 6.0.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "purgatory"
-  s.version = "4.0.0"
+  s.version = "6.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: purgatory
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Elan Dubrofsky
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Allow changes to a model to be put in purgatory until they are approved