requires_approval 1.0.4 → 1.0.5

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.5

data/lib/requires_approval.rb

@@ -38,8 +38,10 @@ module RequiresApproval
     end
 
     # if we have approved all requested changes, make our latest
-    # unapproved version approved
-    unless self.has_pending_changes?
+    # unapproved version approved - 
+    # this is ALWAYS true for a new record even though its pending_changes
+    # hash is forced to have values
+    if self.is_first_version? || self.no_pending_changes?
       self.latest_unapproved_version.update_attribute(:is_approved, true)
     else
       # makes our latest_unapproved_version approved and 
@@ -89,6 +91,16 @@ module RequiresApproval
     self.pending_changes.present?
   end
 
+  # are we the first version?
+  def is_first_version?
+    !self.has_approved_version?
+  end
+
+  # returns true if there are no changes to approve
+  def no_pending_changes?
+    !self.has_pending_changes?
+  end
+
   # the changes users have requested since the last approval
   def pending_changes
     return {} if self.latest_unapproved_version.blank?
@@ -96,12 +108,17 @@ module RequiresApproval
     ret = {}
     # check each field requiring approval
     self.fields_requiring_approval.each do |field|
+      
       # if it is the same in the unapproved as in the parent table
       # we skip it
-      unless self.send(field) == self.latest_unapproved_version.send(field)
+      if self.is_first_version? || 
+        self.send(field) != self.latest_unapproved_version.send(field)
+        
         # otherwise we get the change set
         ret[field] = {
-          "was" => self.send(field), 
+          # our first version is always nil, regardless of the 
+          # defaults in that table
+          "was" => self.is_first_version? ? nil : self.send(field), 
           "became" => self.latest_unapproved_version.send(field)
         }
       end

data/requires_approval.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "requires_approval"
-  s.version = "1.0.4"
+  s.version = "1.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Langevin"]
-  s.date = "2012-10-02"
+  s.date = "2012-10-12"
   s.description = "Gem to handle versioning and things that require approval"
   s.email = "dan.langevin@lifebooker.com"
   s.extra_rdoc_files = [

data/spec/lib/requires_approval_spec.rb

@@ -13,17 +13,44 @@ describe RequiresApproval do
       t.string(:first_name)
       t.string(:last_name)
       t.date(:birthday)
+      t.boolean(:is_alive, :default => true)
       t.timestamps
     end
 
     class User < ActiveRecord::Base
-      requires_approval_for(:first_name, :last_name)
+      requires_approval_for(:first_name, :last_name, :is_alive)
     end
 
     User.prepare_tables_for_requires_approval
 
   end
 
+  context "#pending_changes" do
+
+    it "gives back all attributes when it is a new record" do
+      user = User.create(
+        :first_name => "Dan", 
+        :last_name => "Test",
+        :is_alive => true
+      )
+      user.pending_changes.should eql({
+        "first_name" => {
+          "was" => nil,
+          "became" => "Dan"
+        },
+        "last_name" => {
+          "was" => nil,
+          "became" => "Test"
+        },
+        "is_alive" => {
+          "was" => nil,
+          "became" => true
+        }
+      })
+    end
+
+  end
+
 
   context "setup" do
 
@@ -317,7 +344,7 @@ describe RequiresApproval do
         :last_name => "Langevin",
         :birthday => Date.today
       )
-      user.approve_attributes(:first_name, :last_name)
+      user.approve_attributes(:first_name, :last_name, :is_alive)
       user.update_attributes({
         :first_name => "New Name", 
         :last_name => "New Last Name"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: requires_approval
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2012-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2156869340 !ruby/object:Gem::Requirement
+  requirement: &2168522820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *2156869340
+  version_requirements: *2168522820
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2156866560 !ruby/object:Gem::Requirement
+  requirement: &2168521560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *2156866560
+  version_requirements: *2168521560
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156865100 !ruby/object:Gem::Requirement
+  requirement: &2168520320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156865100
+  version_requirements: *2168520320
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2156857020 !ruby/object:Gem::Requirement
+  requirement: &2168518400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156857020
+  version_requirements: *2168518400
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &2156854060 !ruby/object:Gem::Requirement
+  requirement: &2168516160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156854060
+  version_requirements: *2168516160
 - !ruby/object:Gem::Dependency
   name: guard-spork
-  requirement: &2156850320 !ruby/object:Gem::Requirement
+  requirement: &2168514860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156850320
+  version_requirements: *2168514860
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2156841340 !ruby/object:Gem::Requirement
+  requirement: &2168513920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *2156841340
+  version_requirements: *2168513920
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2156838740 !ruby/object:Gem::Requirement
+  requirement: &2168512820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156838740
+  version_requirements: *2168512820
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2156835720 !ruby/object:Gem::Requirement
+  requirement: &2168511880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156835720
+  version_requirements: *2168511880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156833420 !ruby/object:Gem::Requirement
+  requirement: &2168510840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156833420
+  version_requirements: *2168510840
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2156830360 !ruby/object:Gem::Requirement
+  requirement: &2168509940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156830360
+  version_requirements: *2168509940
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2156827980 !ruby/object:Gem::Requirement
+  requirement: &2168508940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156827980
+  version_requirements: *2168508940
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2156729980 !ruby/object:Gem::Requirement
+  requirement: &2168508200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156729980
+  version_requirements: *2168508200
 description: Gem to handle versioning and things that require approval
 email: dan.langevin@lifebooker.com
 executables: []
@@ -193,7 +193,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1714695095380622902
+      hash: 2029788370061406567
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: