requires_approval_rails_2 1.0.1 → 1.0.2

data/Gemfile

@@ -3,8 +3,8 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem "activerecord", "~> 2.3"
-gem "activesupport", "~> 2.3"
+gem "activerecord", "~> 3"
+gem "activesupport", "~> 3"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -1,31 +1,42 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activerecord (2.3.12)
-      activesupport (= 2.3.12)
-    activesupport (2.3.12)
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+    activerecord (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.8)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
     archive-tar-minitar (0.5.2)
+    arel (3.0.2)
+    builder (3.0.0)
     columnize (0.3.6)
     diff-lcs (1.1.3)
-    ffi (1.1.0)
+    ffi (1.1.5)
     git (1.2.5)
-    guard (1.2.3)
+    guard (1.3.2)
       listen (>= 0.4.2)
       thor (>= 0.14.6)
     guard-bundler (1.0.0)
       bundler (~> 1.0)
       guard (~> 1.1)
-    guard-rspec (1.2.0)
+    guard-rspec (1.2.1)
       guard (>= 1.1)
     guard-spork (1.1.0)
       guard (>= 1.1)
       spork (>= 0.8.4)
+    i18n (0.6.0)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.7.4)
+    json (1.7.5)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
     listen (0.4.7)
@@ -33,8 +44,9 @@ GEM
       rb-fsevent (~> 0.9.1)
       rb-inotify (~> 0.8.8)
     metaclass (0.0.1)
-    mocha (0.12.1)
+    mocha (0.12.3)
       metaclass (~> 0.0.1)
+    multi_json (1.3.6)
     rake (0.9.2.2)
     rb-fchange (0.0.5)
       ffi
@@ -48,9 +60,9 @@ GEM
       rspec-expectations (~> 2.11.0)
       rspec-mocks (~> 2.11.0)
     rspec-core (2.11.1)
-    rspec-expectations (2.11.1)
+    rspec-expectations (2.11.2)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.1)
+    rspec-mocks (2.11.2)
     ruby-debug-base19 (0.11.25)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
@@ -63,15 +75,16 @@ GEM
       archive-tar-minitar (>= 0.5.2)
     spork (0.9.2)
     sqlite3 (1.3.6)
-    thor (0.15.4)
+    thor (0.16.0)
+    tzinfo (0.3.33)
     yard (0.8.2.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 2.3)
-  activesupport (~> 2.3)
+  activerecord (~> 3)
+  activesupport (~> 3)
   bundler
   guard-bundler
   guard-rspec

data/Rakefile

@@ -14,7 +14,7 @@ require 'rake'
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "requires_approval_rails_2"
+  gem.name = "requires_approval"
   gem.homepage = "http://github.com/LifebookerInc/requires_approval"
   gem.license = "MIT"
   gem.summary = %Q{Gem to handle versioning and things that require approval}

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.5

data/lib/requires_approval.rb

@@ -4,8 +4,9 @@ require 'errors'
 
 module RequiresApproval
 
-  
-  def self.included(klass)
+  extend ActiveSupport::Concern
+
+  included do |klass|
     klass.send(:extend, ClassMethods)
   end
 
@@ -16,6 +17,8 @@ module RequiresApproval
   # # approve a list of attributes
   def approve_attributes(*attributes)
   
+    return true unless self.has_pending_changes?
+
     # validate an normalize our attributes    
     attributes = self.check_attributes_for_approval(attributes)
 
@@ -35,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 
@@ -78,7 +83,7 @@ module RequiresApproval
 
   # have any of our versions ever been approved?
   def has_approved_version?
-    self.versions.count(:conditions => {:is_approved => true}) > 0
+    self.versions.where(:is_approved => true).count > 0
   end
 
   # have we already approved all outstanding changes?
@@ -86,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?
@@ -93,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
@@ -218,10 +238,11 @@ module RequiresApproval
         :conditions => [
           "#{self.versions_table_name}.is_approved = ?", false
         ]
+    end
 
-      self.set_up_scopes
-
-
+    def unapproved
+      includes(:latest_unapproved_version)
+        .where("#{self.versions_table_name}.id IS NOT NULL")
     end
 
     # the class which our versions are
@@ -291,24 +312,31 @@ module RequiresApproval
       @versions_table_name = opts.delete(:versions_table_name)
     end
 
-    def set_up_scopes
-      self.named_scope(:unapproved, {
-        :include => [:latest_unapproved_version],
-        :conditions => [
-          "#{self.versions_table_name}.id IS NOT NULL"
-        ]
-      })
-    end
-
     def set_up_version_delegates
       self.fields_requiring_approval.each do |f|
         define_method("#{f}=") do |val|
-          self.send("#{f}_will_change!")
-          self.latest_unapproved_version_with_nil_check.send("#{f}=", val)
+          # type cast our val so "0" changes to 'false'
+          type_casted_val = self.column_for_attribute(f).type_cast(val)
+          
+          # 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
         end
       end
     end
 
+    def validates_approved_field(*args)
+      self.versions_class.class_eval do
+        validates(*args)
+      end
+    end
+
     # class name for our versions
     def versions_class_name
       @versions_class_name ||= "Version"

data/requires_approval_rails_2.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "requires_approval_rails_2"
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Langevin"]
-  s.date = "2012-08-06"
+  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
 
@@ -197,15 +224,54 @@ describe RequiresApproval do
 
     end
 
+    it "should not create new versions when attributes are not actually
+      updated" do
+
+      user = User.create(
+        :first_name => "Dan",
+        :last_name => "Langevin"
+      )
+      user.approve_all_attributes
+      user.reload
+
+      user.latest_unapproved_version.should be nil
+
+      user.update_attributes(
+        :first_name => user.first_name,
+        :last_name => user.last_name
+      )
+      user.reload
+      user.latest_unapproved_version.should be nil
+
+
+    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 "validation" do
+  context ".validates_approved_field" do
 
     it "should delegate to the requires_approval field" do
       User.class_eval do 
-        self.versions_class.class_eval do
-          validates_presence_of :first_name
-        end
+        validates_approved_field :first_name,
+          :presence => true
       end
 
       user = User.new
@@ -266,8 +332,7 @@ describe RequiresApproval do
       })
 
       # should create an approved version
-      count = user.versions.count(:conditions => {:is_approved => true})
-      count.should be > 0
+      user.versions.where(:is_approved => true).count.should be > 0
 
     end
 
@@ -279,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"
@@ -306,6 +371,20 @@ describe RequiresApproval do
 
     end
 
+    it "should return true if you approve an already approved
+      record" do
+
+      user = User.create(
+        :first_name => "Dan", 
+        :last_name => "Langevin",
+        :birthday => Date.today
+      )
+      user.approve_all_attributes
+
+      user.approve_all_attributes.should be true
+
+    end
+
   end
 
   context "#deny_attributes" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: requires_approval_rails_2
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-06 00:00:00.000000000 Z
+date: 2012-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2164816540 !ruby/object:Gem::Requirement
+  requirement: &2163753200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2164816540
+  version_requirements: *2163753200
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2164815680 !ruby/object:Gem::Requirement
+  requirement: &2163752640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2164815680
+  version_requirements: *2163752640
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2164814860 !ruby/object:Gem::Requirement
+  requirement: &2163751920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164814860
+  version_requirements: *2163751920
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2164813820 !ruby/object:Gem::Requirement
+  requirement: &2163751300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164813820
+  version_requirements: *2163751300
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &2164812360 !ruby/object:Gem::Requirement
+  requirement: &2163750660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164812360
+  version_requirements: *2163750660
 - !ruby/object:Gem::Dependency
   name: guard-spork
-  requirement: &2164809020 !ruby/object:Gem::Requirement
+  requirement: &2163750040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164809020
+  version_requirements: *2163750040
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2164804700 !ruby/object:Gem::Requirement
+  requirement: &2163749420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *2164804700
+  version_requirements: *2163749420
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2164802980 !ruby/object:Gem::Requirement
+  requirement: &2163748740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164802980
+  version_requirements: *2163748740
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2164802080 !ruby/object:Gem::Requirement
+  requirement: &2163748060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164802080
+  version_requirements: *2163748060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2164801020 !ruby/object:Gem::Requirement
+  requirement: &2163747460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164801020
+  version_requirements: *2163747460
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2164800460 !ruby/object:Gem::Requirement
+  requirement: &2163746760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164800460
+  version_requirements: *2163746760
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2164799940 !ruby/object:Gem::Requirement
+  requirement: &2163746140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164799940
+  version_requirements: *2163746140
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2164799380 !ruby/object:Gem::Requirement
+  requirement: &2163745620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164799380
+  version_requirements: *2163745620
 description: Gem to handle versioning and things that require approval
 email: dan.langevin@lifebooker.com
 executables: []
@@ -190,6 +190,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2588660493545333348
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -203,4 +206,3 @@ signing_key:
 specification_version: 3
 summary: Gem to handle versioning and things that require approval
 test_files: []
-has_rdoc: