requires_approval 1.0.2 → 1.0.3

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/lib/requires_approval.rb

@@ -298,9 +298,13 @@ module RequiresApproval
         define_method("#{f}=") do |val|
           # type cast our val so "0" changes to 'false'
           type_casted_val = self.column_for_attribute(f).type_cast(val)
-          # make sure we don't already have this val in the approved
-          # version
-          unless type_casted_val == self.send(f)
+          
+          # if we have a latest_unapproved version already, let it handle
+          # updates - if not, only create one if the type casted value is 
+          # not the same as what is in the parent value
+          if self.latest_unapproved_version.present? || 
+            type_casted_val != self.send(f)
+            
             self.send("#{f}_will_change!")
             self.latest_unapproved_version_with_nil_check.send("#{f}=", val)
           end

data/requires_approval.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "requires_approval"
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Langevin"]

data/spec/lib/requires_approval_spec.rb

@@ -219,6 +219,24 @@ describe RequiresApproval do
 
     end
 
+    it "should allow you to modify attributes after an unapproved version
+      has been created" do
+
+      user = User.create(
+        :first_name => "Dan",
+        :last_name => "Langevin"
+      )
+      user.approve_all_attributes
+
+      user.update_attributes(:first_name => "X")
+      user.update_attributes(:first_name => "Dan")
+
+      user.approve_all_attributes
+      user.reload.first_name.should eql("Dan")
+
+    end
+
+
   end
 
   context ".validates_approved_field" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: requires_approval
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2153934840 !ruby/object:Gem::Requirement
+  requirement: &2153724740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *2153934840
+  version_requirements: *2153724740
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153933940 !ruby/object:Gem::Requirement
+  requirement: &2153724060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *2153933940
+  version_requirements: *2153724060
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2153933280 !ruby/object:Gem::Requirement
+  requirement: &2153723440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153933280
+  version_requirements: *2153723440
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2153932400 !ruby/object:Gem::Requirement
+  requirement: &2153722600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153932400
+  version_requirements: *2153722600
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &2153931680 !ruby/object:Gem::Requirement
+  requirement: &2153721500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153931680
+  version_requirements: *2153721500
 - !ruby/object:Gem::Dependency
   name: guard-spork
-  requirement: &2153930780 !ruby/object:Gem::Requirement
+  requirement: &2153719900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153930780
+  version_requirements: *2153719900
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2153929860 !ruby/object:Gem::Requirement
+  requirement: &2153704360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *2153929860
+  version_requirements: *2153704360
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2153929100 !ruby/object:Gem::Requirement
+  requirement: &2153703040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153929100
+  version_requirements: *2153703040
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2153928520 !ruby/object:Gem::Requirement
+  requirement: &2153701720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153928520
+  version_requirements: *2153701720
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153927900 !ruby/object:Gem::Requirement
+  requirement: &2153699920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153927900
+  version_requirements: *2153699920
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2153927340 !ruby/object:Gem::Requirement
+  requirement: &2153697700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153927340
+  version_requirements: *2153697700
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2153926620 !ruby/object:Gem::Requirement
+  requirement: &2153695840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153926620
+  version_requirements: *2153695840
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2153925840 !ruby/object:Gem::Requirement
+  requirement: &2153695220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153925840
+  version_requirements: *2153695220
 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: -4308162649724031230
+      hash: -3663401651777872902
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: