purgatory 6.0.0 → 6.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8eb88e0af6155fa4f85f62fbef33cc2cfb85277355245c4269f3b5e7ec6b308
-  data.tar.gz: 5da3f4b72076eda8f3c184ad44fab91ea2c4777b7b027105e31e03f1d7d1b024
+  metadata.gz: ec4ff54491b9cf42aec51289751468068f725b26c23afd64c1746a8ba13c4307
+  data.tar.gz: 1b37daf95411e0954068510e291404b7aa3fd7575872e7a99890e51e2326d9a0
 SHA512:
-  metadata.gz: 4a05fb7cf10245cb78cf00f4ff4b90f58e013eaa2d239f951c8ce024a8289c0018447e591304d1ee6763eabeb60fdeedb5efa6f383fda906e8e3b0ef85fa975d
-  data.tar.gz: 2f3f8a0ac54b713ef38401f567c46a22c95d49548c049cb83d91b70b0e63d6d0cfa4ba8328eee4e00cff1d480dbda2321198b7e55f28a2fe03e07b3bcc44f3e4
+  metadata.gz: 49297777b6cb45633974769cebb4c01474915ae1d318e63b04de5007b6e4a7964be405402bfe2b05130f900e9612a18692940787c2005fdaea74364f7915a276
+  data.tar.gz: f16f71f7977734e2ebd065d978f0ad0e7c7a07bfb4a0fb935588acd44cd005518828cc550482add7047399de2edc4d6448745f0523acd5a257bc89af12c6ad53

data/VERSION

@@ -1 +1 @@
-6.0.0
+6.0.2

data/lib/purgatory/purgatory.rb

@@ -48,16 +48,18 @@ class Purgatory < ActiveRecord::Base
 
     success = nil
     self.with_lock do
-      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
+      unless approved?
+        success = soul_with_changes.save
+        if performable_method.present? && success
+          success = soul.send(performable_method[:method], *performable_method[:args], **performable_method[:kwargs])
+        end
+
+        if success
+          self.approver = approver
+          self.approved_at = Time.now
+          self.soul_id = soul.id
+          save
+        end
       end
     end
 

data/lib/purgatory/purgatory_module.rb

@@ -31,9 +31,9 @@ module PurgatoryModule
       @options = options
     end
 
-    def method_missing(method, *args)
+    def method_missing(method, *args, **kwargs)
       return nil if Purgatory.pending_with_matching_soul(@soul).any? && @options[:fail_if_matching_soul]
-      Purgatory.create soul: @soul, requester: @requester, performable_method: {method: method.to_sym, args: args}
+      Purgatory.create soul: @soul, requester: @requester, performable_method: { method: method.to_sym, args: args, kwargs: kwargs }
     end
   end
 

data/purgatory.gemspec

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

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: purgatory
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.2
 platform: ruby
 authors:
 - Elan Dubrofsky
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2017-08-24 00:00:00.000000000 Z
@@ -47,7 +47,7 @@ homepage: http://github.com/financeit/purgatory
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -62,9 +62,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
-signing_key: 
+rubygems_version: 3.5.15
+signing_key:
 specification_version: 4
 summary: Allow changes to a model to be put in purgatory until they are approved
 test_files: []