purgatory 2.1.0 → 2.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDk2M2Q4ODkzMTE1NDM4YzRjNGFjZTVmNDg3ZDI0MTE2YzI5NjkzOA==
+    ZThjNmYwNzUxOTAyNWY4Nzg5YjViOGViMmU0NTE5ZTg4MmJhZWQ2Mw==
   data.tar.gz: !binary |-
-    MjgzNTkxZWM0NzJiNDQyYzY3YzI4NmQ3NmEzNWMwMzZhYjhjNDk5ZQ==
-!binary "U0hBNTEy":
+    NzE1MmNmNzkzZTgxZDY2Y2IxNTgzZmQ1YmI3NjRhYjBhMTY4Nzk1Nw==
+SHA512:
   metadata.gz: !binary |-
-    MTJlOTU1NDRiNjgzZjM5ODgzZWY1NjExZTg1YzAxMWVkZTI1OTdkZTA2NGQ5
-    NmQ2NmIwYjMyZDI2OWFlNDM0ZDcwODI5OWU0ZTMxMThhYTkwYjFiM2U2NzIy
-    NDEzZTNmMWQ0MTliZDVhMzk2OTJlYmUyNDY0ZDUxNjVhZWE1ODc=
+    OTE1N2FiNmUwMjEzYTFlNWU3M2M3MmZiYmRiOTU2MzIzODQ4NjNlMjI5ZTFm
+    YzkxZjc4ZWI1OWFhZWQ3NThhY2EzZTM5ZGI4M2NlN2JjMWQ3MjA5YTEwMTQy
+    MDdmNmFmNzYwMDE2YzEzODU3ZTU1N2RiZDMzZDU5NjNjNTRlMzQ=
   data.tar.gz: !binary |-
-    MTJlMmE3ZWEwNjM0NDQyNGYxNjNmYjE5NzVmOTE3ZGFmNDI1ZTFhZjgwYzdh
-    YzFhMjkwZDlkZmYyN2JjMThhNmIzNjIzYmZjYTFjNzFjMjAzZjhiZDFjOGFj
-    ZGQxN2E3Mjc5NDJjMmJjNWJmZTA0OTE0ZDJkZmQ2NmE2Yjg0Mjk=
+    NDg5MjZlYTA3ZDY1NTQyOTE3MDE4MzczMjNlNGE5NWVhMTRmMzMxYzU4ZmEz
+    ZjQyOGFkYTE0N2RlOWM0MmU5NzI0NmFmNmNlYTAzMDRhOWU0M2JkYWE1MjY4
+    YTg3NjNmOGI0NTcxNmM5YjY0YTE3MWI0M2EyODM5Mjk1MTk3ODU=

data/Gemfile

@@ -6,14 +6,13 @@ source "http://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "shoulda", ">= 0"
   gem "rdoc", "~> 3.12"
   gem "bundler", "~> 1.0"
   gem "jeweler", "~> 1.8.7"
 end
 
 group :test do
-  gem "activerecord"
+  gem "activerecord", ">= 4"
   gem "rspec"
   gem "sqlite3"
 end

data/Gemfile.lock

@@ -1,7 +1,15 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activerecord (1.6.0)
+    activemodel (4.0.1)
+      activesupport (= 4.0.1)
+      builder (~> 3.1.0)
+    activerecord (4.0.1)
+      activemodel (= 4.0.1)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.1)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
     activesupport (4.0.1)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
@@ -9,9 +17,10 @@ GEM
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
     addressable (2.3.5)
+    arel (4.0.1)
     atomic (1.1.14)
-    builder (3.2.2)
-    diff-lcs (1.1.3)
+    builder (3.1.4)
+    diff-lcs (1.2.5)
     faraday (0.8.8)
       multipart-post (~> 1.2.0)
     git (1.2.6)
@@ -54,21 +63,15 @@ GEM
     rake (10.1.0)
     rdoc (3.12.2)
       json (~> 1.4)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
-    shoulda (3.5.0)
-      shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (>= 1.4.1, < 3.0)
-    shoulda-context (1.1.6)
-    shoulda-matchers (2.4.0)
-      activesupport (>= 3.0.0)
-    sqlite3 (1.3.7)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.4)
+    sqlite3 (1.3.8)
     thread_safe (0.1.3)
       atomic
     tzinfo (0.3.38)
@@ -77,10 +80,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord
+  activerecord (>= 4)
   bundler (~> 1.0)
   jeweler (~> 1.8.7)
   rdoc (~> 3.12)
   rspec
-  shoulda
   sqlite3

data/README.markdown

@@ -37,6 +37,7 @@ The following are some attributes of a purgatory:
     purgatory.soul # The ActiveRecord model instance whose changes are in purgatory
     purgatory.requester # The user who created the purgatory
     purgatory.created_at # The time when the purgatory was created
+    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
 
@@ -49,7 +50,6 @@ Here are some handy scopes and methods available to you:
     ### Methods
     purgatory.pending? # Returns true if the purgatory is pending, false otherwise
     purgatory.approved? # Returns true if the purgatory has been approved, false otherwise
-    purgatory.changes_hash # Returns 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
 
 ## Contributing to Purgatory
  

data/VERSION

@@ -1 +1 @@
-2.1.0
+2.2.0

data/lib/generators/purgatory/templates/create_purgatories.rb

@@ -6,7 +6,7 @@ class CreatePurgatories < ActiveRecord::Migration
       t.integer :requester_id
       t.integer :approver_id
       t.datetime :approved_at
-      t.string :changes_json
+      t.string :requested_changes
 
       t.timestamps
     end

data/lib/purgatory/purgatory.rb

@@ -6,6 +6,8 @@ class Purgatory < ActiveRecord::Base
 
   validates :soul_type, presence: true
 
+  serialize :requested_changes
+
   def self.pending
     where(approved_at: nil)
   end
@@ -22,17 +24,13 @@ class Purgatory < ActiveRecord::Base
     approved_at.nil?
   end
 
-  def changes_hash
-    ActiveSupport::JSON.decode(changes_json)
-  end
-
   def soul
     @soul ||= (super || soul_type.constantize.new)
   end
 
   def approve!(approver = nil)
     return false if approved?
-    changes_hash.each{|k,v| soul.send "#{k}=", v[1]}
+    requested_changes.each{|k,v| soul.send "#{k}=", v[1]}
     if soul.save
       self.approver = approver
       self.approved_at = Time.now
@@ -45,6 +43,6 @@ class Purgatory < ActiveRecord::Base
   private
 
   def store_changes
-    self.changes_json = ActiveSupport::JSON.encode(soul.changes)
+    self.requested_changes = soul.changes
   end
 end

data/purgatory.gemspec

@@ -2,14 +2,15 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: purgatory 2.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "purgatory"
-  s.version = "2.1.0"
+  s.version = "2.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Elan Dubrofsky"]
-  s.date = "2013-11-24"
+  s.date = "2013-11-25"
   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 = [
@@ -39,25 +40,22 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/financeit/purgatory"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.3"
+  s.rubygems_version = "2.1.11"
   s.summary = "Allow changes to a model to be put in purgatory until they are approved"
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.7"])
     else
-      s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.7"])
     end
   else
-    s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.7"])

data/spec/purgatory_spec.rb

@@ -23,10 +23,10 @@ describe Purgatory do
         it "should store the soul, requester and requested changes" do
           @purgatory.soul.should == @widget
           @purgatory.requester.should == user1
-          @purgatory.changes_hash['name'].first.should == 'foo'
-          @purgatory.changes_hash['name'].last.should == 'bar'
-          @purgatory.changes_hash['price'].first.should == 100
-          @purgatory.changes_hash['price'].last.should == 200
+          @purgatory.requested_changes['name'].first.should == 'foo'
+          @purgatory.requested_changes['name'].last.should == 'bar'
+          @purgatory.requested_changes['price'].first.should == 100
+          @purgatory.requested_changes['price'].last.should == 200
         end
     
         it "should not change the widget" do
@@ -71,10 +71,10 @@ describe Purgatory do
         
         it "should store the requester and requested changes" do
           @purgatory.requester.should == user1
-          @purgatory.changes_hash['name'].first.should == nil
-          @purgatory.changes_hash['name'].last.should == 'foo'
-          @purgatory.changes_hash['price'].first.should == nil
-          @purgatory.changes_hash['price'].last.should == 100
+          @purgatory.requested_changes['name'].first.should == nil
+          @purgatory.requested_changes['name'].last.should == 'foo'
+          @purgatory.requested_changes['price'].first.should == nil
+          @purgatory.requested_changes['price'].last.should == 100
         end
     
         it "should not create a widget" do

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: purgatory
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Elan Dubrofsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-24 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -113,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Allow changes to a model to be put in purgatory until they are approved