purgatory 2.4.0 → 2.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGY3YmJjZTM5ZTc0ZWU3NWQ4MTQxNTc3MDVkNzdlZjQ2ZDkzZmJkMg==
+    NjNjNzY3NWYxY2FlZDdhOGU4YzU4NTU0ZjQ5ZmI5Y2I0NmUwMTg1MQ==
   data.tar.gz: !binary |-
-    NTMxMTZkMTYxMzZmNGJmY2M0NzNiMjc4YTgyODExNzdkNWE2NzE4Zg==
+    ZjdlNGQ1MDhmMDFmNDUyZWM2MTRiMWQ4NTYzYWRmOGM1Y2EzNDE1Mw==
 SHA512:
   metadata.gz: !binary |-
-    OTMzNjlhY2YwMWQyYTBiMmUxMjE1MmJjYzM5MWIzMjI1OWZjOGVkZGI3ZGZm
-    NTc1YzkzN2E1YmU5NGZkNTE2MWIzMzU5MWJiNDkzYTI5MDZmOThkZWYxOWVl
-    ZGIxZTA5NTBiNGE1YTRiYTA3OGZhMWYxYWEzMGY5NzAyN2FmMDQ=
+    YzNjMjdhNDk4NzUyMzU0NDMxNDQxNDZlNGJjZTE4Y2RhZmQ2YjM4NDA1ZTFl
+    MDQyODhhMTZjMmQ3NGEyYjBlNjM5NjVkOTRhYWQ2ODg5MDQ1NjIzMjhkMTll
+    MzJhYjNkMDg4ZGM3NWM2NDZmMTA4OTkzNmE4ZTU5Y2Y0N2IzMTY=
   data.tar.gz: !binary |-
-    Njk0M2Q2ZWQyMTEzYTVkZDY0NzdlOGZkMzk0MDBlYTY1MzA1NTZjMTA2ZTJj
-    NWFlYzRlNWY2ZWE0MmM4MjJhYjk3YjhjMjBjNjIzNDY0YmQ5ZjdmM2Q2ZDZm
-    N2M3NjkzMDllYTBiNTBmOTZiMGNhMzY0OTZmOTJmMWFjY2I0OWY=
+    YjQ0OWRlMTFiZDY0YzhkNzYzNTZjOGJkNmU1YzQ2ZjczODVlMjA3MmJkYTc0
+    MWNjZjIxNjQ2ODg0ZmM1MmU4YWZiY2QyMDRiYTZkMTliNDA5MzRhNWY5OGIy
+    OTNhY2MzZDUzMzE4NzdjNGIzNjM0MjY5Y2ZiNjk3Y2ZlMjIxODM=

data/VERSION

@@ -1 +1 @@
-2.4.0
+2.5.0

data/lib/purgatory/purgatory.rb

@@ -28,7 +28,11 @@ class Purgatory < ActiveRecord::Base
   end
 
   def soul
-    @soul ||= (super || soul_type.constantize.new)
+    @soul ||= (super || (sti_class || soul_type).constantize.new)
+  end
+
+  def sti_class
+    requested_changes['type'].try(:last)
   end
 
   def approve!(approver = nil)

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 2.4.0 ruby lib
+# stub: purgatory 2.5.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "purgatory"
-  s.version = "2.4.0"
+  s.version = "2.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Elan Dubrofsky"]
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
     "purgatory.gemspec",
     "spec/purgatory_spec.rb",
     "spec/support/active_record.rb",
+    "spec/support/animal.rb",
     "spec/support/user.rb",
     "spec/support/widget.rb"
   ]

data/spec/purgatory_spec.rb

@@ -1,6 +1,7 @@
 require 'support/active_record'
 require 'support/widget'
 require 'support/user'
+require 'support/animal'
 require 'purgatory/purgatory'
 
 describe Purgatory do
@@ -109,6 +110,35 @@ describe Purgatory do
           Widget.count.should be_zero
         end
       end
+
+      context "valid object using STI (single table inheritance)" do
+        before {create_new_object_purgatory_with_sti}
+    
+        it "should create and return pending Purgatory object" do
+          @purgatory.should be_present
+          @purgatory.should_not be_approved
+          @purgatory.should be_pending            
+          Purgatory.pending.count.should == 1
+          Purgatory.pending.first.should == @purgatory
+          Purgatory.approved.count.should be_zero            
+        end
+        
+        it "should return the soul as a new instance of the purgatoried class" do
+          dog = @purgatory.soul
+          dog.class.should == Dog
+          dog.should be_new_record
+        end
+        
+        it "should store the requester and requested changes" do
+          @purgatory.requester.should == user1
+          @purgatory.requested_changes['name'].first.should == nil
+          @purgatory.requested_changes['name'].last.should == 'doggy'
+        end
+    
+        it "should not create a dog" do
+          Dog.count.should be_zero
+        end
+      end
     
       it "should not allow invalid object creation to be put into purgatory" do
         widget = Widget.new name: ''
@@ -173,6 +203,34 @@ describe Purgatory do
         @purgatory.approve!(user2).should be_false
       end
     end
+
+    context "approving new object creation using STI" do
+      before do
+        create_new_object_purgatory_with_sti
+        @purgatory.approve!(user2).should be_true
+      end
+      
+      it "should create the new object and apply any callbacks" do
+        Dog.count.should == 1
+        dog = Dog.first
+        dog.name.should == 'doggy'
+        dog.original_name.should == 'doggy'
+        dog.price.should == Dog::DEFAULT_PRICE
+      end
+
+      it "should mark purgatory as approved and store approver" do
+        @purgatory.approver.should == user2
+        @purgatory.should be_approved
+        @purgatory.should_not be_pending            
+        Purgatory.pending.count.should be_zero
+        Purgatory.approved.count.should == 1
+        Purgatory.approved.first.should == @purgatory
+      end
+      
+      it "should fail if you try to approve again" do
+        @purgatory.approve!(user2).should be_false
+      end
+    end
   end
   
   private
@@ -191,4 +249,11 @@ describe Purgatory do
     purgatory = widget.purgatory! user1
     @purgatory = Purgatory.find(purgatory.id)
   end
+
+  def create_new_object_purgatory_with_sti
+    dog = Dog.new name: 'doggy'
+    purgatory = dog.purgatory! user1
+    @purgatory = Purgatory.find(purgatory.id)
+  end
+  
 end

data/spec/support/active_record.rb

@@ -16,6 +16,14 @@ ActiveRecord::Migration.create_table :users do |t|
   t.timestamps
 end
 
+ActiveRecord::Migration.create_table :animals do |t|
+  t.string :name
+  t.string :type
+  t.integer :price 
+  t.string :original_name 
+  t.timestamps
+end
+
 CreatePurgatories.new.migrate(:up)
 
 PurgatoryModule.configure do |config|
@@ -29,4 +37,4 @@ RSpec.configure do |config|
       raise ActiveRecord::Rollback
     end
   end
-end
+end

data/spec/support/animal.rb

@@ -0,0 +1,26 @@
+require 'purgatory'
+
+class Animal < ActiveRecord::Base
+  before_create :set_original_name
+
+  private
+
+  def set_original_name
+    self.original_name = name
+  end
+end
+
+class Dog < Animal
+  use_purgatory
+  validates :name, presence: true
+
+  DEFAULT_PRICE = 100
+
+  before_create :set_price
+
+  private
+
+  def set_price
+    self.price = DEFAULT_PRICE unless self.price
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: purgatory
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Elan Dubrofsky
@@ -77,6 +77,7 @@ files:
 - purgatory.gemspec
 - spec/purgatory_spec.rb
 - spec/support/active_record.rb
+- spec/support/animal.rb
 - spec/support/user.rb
 - spec/support/widget.rb
 homepage: http://github.com/financeit/purgatory