purgatory 1.1.0 → 2.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjBmNmUyZGQ4NDBjYmI5OWQyNTg1ZmIzNjZkYzdlOWFjZWU2OTNjZg==
+    MDk0ZTBiMmNiNjlmMWUyODRjNTc0OWZjNjE5YTAxZDE0YTI1YjExYQ==
   data.tar.gz: !binary |-
-    ZjQ4NDFlZTk3N2Y4NDY2ZjYwMjI0ZTM0YTM0MTcyNWM1Y2Y4ZWVlMg==
+    MWZjODBlNzQ0MDNmYWI2NmE1MTEyZWQwNjBlYzEwYTcwMzgxNTljZg==
 SHA512:
   metadata.gz: !binary |-
-    MDMzNGY5MGZiODc2N2JmZjNiYmNmMGJlZjBhMDlmZmEzYzRlM2FjNjc2YWZj
-    NDM2MmM5OTZkZmZlYjMxMDllNTU4NDQ5ZjM5MmEwMTY2NTBiYTFhZTk2Y2Q4
-    NjliMDQ4NjE0ZjQ0NmE2ZDgzNWFkMzdjNmQ3ZTQ0MmYzYWI1OTA=
+    OGFhNDljZmM4YjU0YWZiNTllNjgwZDcyMjhlMGUwZWIzZDRkYzMzMjk1ZWM5
+    YTkwOWVkNjg4MjViNzFhZGE0MzM0ODdhNGQ4YTEwYmQwMDgxNWRlMmMzMGQ2
+    YzllMzlhYmQ1MTAzMmNjY2M0NTkyMjg0NjNhZGVjNWVhZTI1YmI=
   data.tar.gz: !binary |-
-    NTFkMGQ5MDczMWU4NTNjOTFkOWU4ZmM0ZDgyZjI3YjQ0ZmE2ZTY5MGJkYWZh
-    Y2I1OWI2NTVmMGMzMzliN2Y1OTUxM2RhZTliODJhNTBkNjM4ZGZiZTY4ZjUy
-    ODg5ZDNkNzM4YTViMzEwNGYzZDg1YTcwMmRjZmU5ZDQwNzY2ZjA=
+    ZGJmNDZhNjNhMWQ2ZTdmMGYwMzAyNDMyZjQ3NjFiY2U1MThhYzNiNzYzM2Vl
+    MzdjYThkZGUyNGVjN2JlYmQ0M2M3MzU0MGJmNDMxYTVmYzQ0YjFiYmQyMWNk
+    MjY2MzBjYjNhZWZkNTk3ZTlkNzc2MGY1NTg3YzI3ZTY0MjBiMjI=

data/README.markdown

@@ -16,16 +16,21 @@ To enable Purgatory functionality in a class, add the following line to the clas
 
     use_purgatory
 
-To put your changes to an ActiveRecord class into Purgatory, simply make your changes and then call the purgatory! method, passing the requesting user as a parameter
+To put your changes to an ActiveRecord class into Purgatory, simply make your changes and then call the purgatory! method. You can pass in the requesting user as an optional parameter
 
     item = Item.find(10)
     item.price = 200
-    item.purgatory!(current_user)
+    purgatory = item.purgatory!(current_user) # returns the newly created purgatory or nil if the item is changes are invalid
 
-To apply the changes, simply call the approve! method on the associated Pergatory instance, passing in the approving user as a parameter
+To apply the changes, simply call the approve! method on the associated Pergatory instance. You can pass in the approving user as an optional parameter
 
     purgatory = item.purgatories.last
-    purgatory.approve!(current_user)
+    purgatory.approve!(current_user) # returns a boolean for whether or not this succeeded
+
+You can also put the creation of a new object into Purgatory
+
+    item = Item.new price: 100
+    purgatory = item.purgatory!
 
 The following are some attributes of a purgatory:
 

data/VERSION

@@ -1 +1 @@
-1.1.0
+2.0.0

data/lib/purgatory/purgatory.rb

@@ -1,12 +1,12 @@
 class Purgatory < ActiveRecord::Base
   attr_accessible :requester, :soul
 
-  belongs_to :soul, polymorphic: true
+  belongs_to :soul, polymorphic: true, autosave: false
   belongs_to :requester, class_name: 'User'
   belongs_to :approver, class_name: 'User'
   before_create :store_changes
 
-  validates :soul, :requester, presence: true
+  validates :soul_type, presence: true
 
   scope :pending, conditions: { approved_at: nil }
   scope :approved, conditions: ["approved_at IS NOT NULL"]
@@ -23,14 +23,21 @@ class Purgatory < ActiveRecord::Base
     ActiveSupport::JSON.decode(changes_json)
   end
 
-  def approve!(approver)
-    return if approved_at.present?
+  def soul
+    super || soul_type.constantize.new
+  end
+
+  def approve!(approver = nil)
+    return false if approved?
     changes = changes_hash
+
     if soul.update_attributes(changes.update(changes){|k,v| v.last}, without_protection: true)
       self.approver = approver
       self.approved_at = Time.now
       save
+      return true
     end
+    false
   end
 
   private

data/lib/purgatory/purgatory_module.rb

@@ -7,7 +7,8 @@ module PurgatoryModule
     end
   end
 
-  def purgatory!(requester)
+  def purgatory!(requester = nil)
+    return nil if self.invalid?
     Purgatory.create soul: self, requester: requester
   end
 end

data/purgatory.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: purgatory 1.1.0 ruby lib
+# stub: purgatory 2.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "purgatory"
-  s.version = "1.1.0"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Elan Dubrofsky"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: purgatory
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Elan Dubrofsky