requires_approval_rails_2 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a4b7bd4c275b86b2b16aa1de9dbdc8ed41a7b7e
-  data.tar.gz: 27891b68e190c130107655d46277ed09b919a07d
+  metadata.gz: b19005354f9fe49d93f36d8439ab9021079f6d08
+  data.tar.gz: 8aec5974156e1d41db9bd61939000ebf4ef4c3e0
 SHA512:
-  metadata.gz: 89c9161b544d25ded4c4dd9b8829e7fea8d85c7318b3110cfc0beb20b9030179091b720fd0a9b4c9ee27be8b165254db2817ed555dfe1cdf14a3eb5a632331e1
-  data.tar.gz: 2b933bb51777f10b0cbff0f836fa282b4b7889956b7813c29f81d2ee6cb7352d36f8db4362f8aec26b378fe0e472b70eb1b85283eaa272b17a0c0a586b83e8eb
+  metadata.gz: c79319fea80be82f71bcf2f834330051f8aa1b4f608564ce01ac838b80d18dede30399ee12967cd39918285275ef9094eb1b0cb62b7191dd230fc216d05802fe
+  data.tar.gz: f6dcfa3b2f198e544c1db4ef20fd334d96bfdd1f1362960937657cc74f6dbf119a9d0e7ad3e203c0e684553bb5f65132dbd2df3f00ee42a20a4dc3aadf005744

data/Gemfile

@@ -3,4 +3,21 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gemspec :name => "requires_approval"
+gem "activerecord", "~> 2.3"
+gem "activesupport", "~> 2.3"
+
+# Add dependencies to develop your gem here.
+# Include everything needed to run rake, tests, features, etc.
+group :development do
+  gem "bundler"
+  gem "guard-rspec"
+  gem "guard-bundler"
+  gem "guard-spork"
+  gem "jeweler", "~> 1.8.3"
+  gem "mocha"
+  gem "rdoc"
+  gem "rspec"
+  gem "ruby-debug19", :require => "ruby-debug"
+  gem "sqlite3"
+  gem "yard"
+end

data/Gemfile.lock

@@ -1,55 +1,40 @@
-PATH
-  remote: .
-  specs:
-    requires_approval (1.0.8)
-      activerecord
-      requires_approval
-
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.14)
-      activesupport (= 3.2.14)
-      builder (~> 3.0.0)
-    activerecord (3.2.14)
-      activemodel (= 3.2.14)
-      activesupport (= 3.2.14)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.14)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    arel (3.0.2)
-    builder (3.0.4)
+    activerecord (2.3.12)
+      activesupport (= 2.3.12)
+    activesupport (2.3.12)
+    archive-tar-minitar (0.5.2)
+    columnize (0.3.6)
     diff-lcs (1.1.3)
-    ffi (1.1.5)
+    ffi (1.1.0)
     git (1.2.5)
-    guard (1.3.2)
+    guard (1.2.3)
       listen (>= 0.4.2)
       thor (>= 0.14.6)
     guard-bundler (1.0.0)
       bundler (~> 1.0)
       guard (~> 1.1)
-    guard-rspec (1.2.1)
+    guard-rspec (1.2.0)
       guard (>= 1.1)
     guard-spork (1.1.0)
       guard (>= 1.1)
       spork (>= 0.8.4)
-    i18n (0.6.5)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.7.5)
+    json (1.7.4)
+    linecache19 (0.5.12)
+      ruby_core_source (>= 0.1.4)
     listen (0.4.7)
       rb-fchange (~> 0.0.5)
       rb-fsevent (~> 0.9.1)
       rb-inotify (~> 0.8.8)
     metaclass (0.0.1)
-    mocha (0.12.3)
+    mocha (0.12.1)
       metaclass (~> 0.0.1)
-    multi_json (1.8.0)
     rake (0.9.2.2)
     rb-fchange (0.0.5)
       ffi
@@ -63,19 +48,30 @@ GEM
       rspec-expectations (~> 2.11.0)
       rspec-mocks (~> 2.11.0)
     rspec-core (2.11.1)
-    rspec-expectations (2.11.2)
+    rspec-expectations (2.11.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.2)
+    rspec-mocks (2.11.1)
+    ruby-debug-base19 (0.11.25)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.5)
+      archive-tar-minitar (>= 0.5.2)
     spork (0.9.2)
     sqlite3 (1.3.6)
-    thor (0.16.0)
-    tzinfo (0.3.37)
+    thor (0.15.4)
     yard (0.8.2.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord (~> 2.3)
+  activesupport (~> 2.3)
   bundler
   guard-bundler
   guard-rspec
@@ -83,7 +79,7 @@ DEPENDENCIES
   jeweler (~> 1.8.3)
   mocha
   rdoc
-  requires_approval!
   rspec
+  ruby-debug19
   sqlite3
   yard

data/Rakefile

@@ -1,8 +1,5 @@
 # encoding: utf-8
 
-Dir.glob('lib/tasks/*.rake').each {|r| import r}
-require 'rake'
-
 require 'rubygems'
 require 'bundler'
 begin
@@ -12,12 +9,12 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-
+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"
+  gem.name = "requires_approval_rails_2"
   gem.homepage = "http://github.com/LifebookerInc/requires_approval"
   gem.license = "MIT"
   gem.summary = %Q{Gem to handle versioning and things that require approval}
@@ -28,5 +25,18 @@ Jeweler::Tasks.new do |gem|
 end
 Jeweler::RubygemsDotOrgTasks.new
 
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
+end
+
+RSpec::Core::RakeTask.new(:rcov) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
+
+task :default => :spec
+
 require 'yard'
 YARD::Rake::YardocTask.new

data/VERSION

@@ -1 +1 @@
-1.0.8
+1.0.9

data/lib/requires_approval.rb

@@ -4,9 +4,8 @@ require 'errors'
 
 module RequiresApproval
 
-  extend ActiveSupport::Concern
-
-  included do |klass|
+  
+  def self.included(klass)
     klass.send(:extend, ClassMethods)
   end
 
@@ -16,10 +15,10 @@ module RequiresApproval
 
   # # approve a list of attributes
   def approve_attributes(*attributes)
-
+  
     return true unless self.has_pending_changes?
 
-    # validate an normalize our attributes
+    # validate an normalize our attributes    
     attributes = self.check_attributes_for_approval(attributes)
 
     # make sure that all attributes are provided if we have never
@@ -28,7 +27,7 @@ module RequiresApproval
 
     if fields_not_being_approved.present? && self.never_approved?
       raise PartialApprovalForNewObject.new(
-        "You must approve #{self.fields_requiring_approval.join(", ")} " +
+        "You must approve #{self.fields_requiring_approval.join(", ")} " + 
         "for a new #{self.class.name}"
       )
     end
@@ -37,26 +36,24 @@ module RequiresApproval
       write_attribute(attr, self.latest_unapproved_version.send(attr))
     end
 
-    if self.save
-      # if we have approved all requested changes, make our latest
-      # 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
-        # creates another unapproved version with any remaining
-        # attributes
-        self.create_approval_version_record
-      end
-
-      self.update_attributes(:is_frozen => false)
-      self.reload
-      return true
+    # if we have approved all requested changes, make our latest
+    # 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
-      return false
+      # makes our latest_unapproved_version approved and 
+      # creates another unapproved version with any remaining 
+      # attributes
+      self.create_approval_version_record
     end
+
+    self.is_frozen = false
+
+    self.save
+    self.reload
+    true
   end
 
   def deny_attributes(*attributes)
@@ -72,33 +69,20 @@ module RequiresApproval
       true
     end
 
-    # if we have denied all changes, remove the record and
-    # make sure it isn't frozen
+    # if we have denied all changes, remove the record
     unless self.has_pending_changes?
       self.latest_unapproved_version.destroy
-      self.update_attribute(:is_frozen, false)
     else
       self.latest_unapproved_version.save
     end
-
+    
     self.reload
     true
   end
 
-  def reload(*args)
-    if instance_variable_defined?(:@has_approved_version)
-      remove_instance_variable(:@has_approved_version)
-    end
-    super(*args)
-  end
-
   # have any of our versions ever been approved?
   def has_approved_version?
-    unless instance_variable_defined?(:@has_approved_version)
-      @has_approved_version = (self.versions.where(:is_approved => true).count > 0)
-    end
-
-    @has_approved_version
+    self.versions.count(:conditions => {:is_approved => true}) > 0
   end
 
   # have we already approved all outstanding changes?
@@ -119,21 +103,21 @@ module RequiresApproval
   # the changes users have requested since the last approval
   def pending_changes
     return {} if self.latest_unapproved_version.blank?
-
+    
     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
-      if self.is_first_version? ||
+      if self.is_first_version? || 
         self.send(field) != self.latest_unapproved_version.send(field)
-
+        
         # otherwise we get the change set
         ret[field] = {
-          # our first version is always nil, regardless of the
+          # our first version is always nil, regardless of the 
           # defaults in that table
-          "was" => self.is_first_version? ? nil : self.send(field),
+          "was" => self.is_first_version? ? nil : self.send(field), 
           "became" => self.latest_unapproved_version.send(field)
         }
       end
@@ -171,7 +155,7 @@ module RequiresApproval
     self.latest_unapproved_version.update_attributes(
       self.attributes_requiring_approval.merge(:is_approved => true)
     )
-    # reload so this unapproved version is out of our cache and will not
+    # reload so this unapproved version is out of our cache and will not 
     # get its foreign key unassigned
     self.latest_unapproved_version(true)
 
@@ -192,7 +176,7 @@ module RequiresApproval
     !self.has_approved_version?
   end
 
-  # ActiveRecord-style attribute hash for the
+  # ActiveRecord-style attribute hash for the 
   # requested changes
   def pending_attributes
     ret = {}
@@ -220,7 +204,7 @@ module RequiresApproval
       # adds our versions table
       self.drop_versions_table
       self.create_versions_table
-
+      
     end
 
     def requires_approval_for(*attrs)
@@ -235,14 +219,13 @@ module RequiresApproval
 
       # create a blank version before create to handle if no
       # attributes were ever set
-      self.before_validation(
-        :latest_unapproved_version_with_nil_check,
-        :on => :create
+      self.before_validation_on_create(
+        :latest_unapproved_version_with_nil_check
       )
-
+      
       # create the versions class
       self.create_versions_class
-      self.has_many :versions,
+      self.has_many :versions, 
         :class_name => self.versions_class.name,
         :foreign_key => self.versions_foreign_key
 
@@ -253,11 +236,10 @@ module RequiresApproval
         :conditions => [
           "#{self.versions_table_name}.is_approved = ?", false
         ]
-    end
 
-    def unapproved
-      includes(:latest_unapproved_version)
-        .where("#{self.versions_table_name}.id IS NOT NULL")
+      self.set_up_scopes
+
+
     end
 
     # the class which our versions are
@@ -286,9 +268,9 @@ module RequiresApproval
     # create a class
     def create_versions_class
       versions_table_name = self.versions_table_name
-
+      
       self.const_set self.versions_class_name, Class.new(ActiveRecord::Base)
-
+      
       self.versions_class.class_eval do
         self.table_name = versions_table_name
       end
@@ -327,18 +309,27 @@ 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|
           # 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
+          # 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? ||
+          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
@@ -346,12 +337,6 @@ module RequiresApproval
       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.8"
+  s.version = "1.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Langevin"]
-  s.date = "2012-08-05"
+  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

@@ -235,12 +235,12 @@ describe RequiresApproval do
       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
 
 
@@ -266,12 +266,13 @@ describe RequiresApproval do
 
   end
 
-  context ".validates_approved_field" do
+  context "validation" do
 
     it "should delegate to the requires_approval field" do
       User.class_eval do 
-        validates_approved_field :first_name,
-          :presence => true
+        self.versions_class.class_eval do
+          validates_presence_of :first_name
+        end
       end
 
       user = User.new
@@ -332,7 +333,8 @@ describe RequiresApproval do
       })
 
       # should create an approved version
-      user.versions.where(:is_approved => true).count.should be > 0
+      count = user.versions.count(:conditions => {:is_approved => true})
+      count.should be > 0
 
     end
 
@@ -385,19 +387,6 @@ describe RequiresApproval do
 
     end
 
-    it "should not approve the latest unapproved version if it is invalid" do
-
-      user = User.new(
-        :first_name => "Dan", 
-        :last_name => "Langevin",
-        :birthday => Date.today
-      )
-
-      user.stubs(:save => false)
-      user.approve_all_attributes.should eql false
-
-    end
-
   end
 
   context "#deny_attributes" do
@@ -475,23 +464,6 @@ describe RequiresApproval do
       )
     end
 
-    it "should set is_frozen to false when denying all attributes" do
-
-      u = User.create( 
-        :first_name => "Dan",
-        :last_name => "Langevin",
-        :birthday => Date.today
-      )
-      u.approve_all_attributes
-
-      u.update_attributes(:first_name => "Changed!", :is_frozen => true)
-      u.is_frozen?.should eql(true)
-
-      u.deny_attributes(:first_name)
-      u.is_frozen?.should eql(false)
-
-    end
-
   end
 
    context "#has_approved_version?" do

data/spec/spec_helper.rb

@@ -13,6 +13,9 @@ Spork.prefork do
   require 'rspec'
   require 'requires_approval'
 
+  require 'ruby-debug'
+  Debugger.start
+
   # Requires supporting files with custom matchers and macros, etc,
   # in ./support/ and its subdirectories.
   Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: requires_approval_rails_2
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Dan Langevin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-05 00:00:00.000000000 Z
+date: 2012-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord