requires_approval 1.0.7 → 1.0.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: d604fa067efbb88cdf1f0f23b6b4e5bf9c78c6c3
+  data.tar.gz: b31e28f39559b72140db9b4d192004e1e000dcdf
+SHA512:
+  metadata.gz: e097e37c17729cb4ebec30e49c6a4e339c9fb3c2a15c51c3562b642032ff09e985c5c7d7c9184a1250f73f94ccebeabf68ecb6bfc6301d81ac7c8728172ec466
+  data.tar.gz: 35ab14aaded4103085529559b4328120b244e280263fbf655ea379e2aa9c1234ea0f8a636eb22ffd9a207c421bfe1f187ffa85591ef6f50a22ed11035ce17d89

data/Gemfile.lock

@@ -1,14 +1,26 @@
 PATH
   remote: .
   specs:
-    requires_approval (1.0.7)
+    requires_approval (1.0.8)
+      activerecord
       requires_approval
 
 GEM
   remote: http://rubygems.org/
   specs:
-    archive-tar-minitar (0.5.2)
-    columnize (0.3.6)
+    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)
     diff-lcs (1.1.3)
     ffi (1.1.5)
     git (1.2.5)
@@ -23,14 +35,13 @@ GEM
     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)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
     listen (0.4.7)
       rb-fchange (~> 0.0.5)
       rb-fsevent (~> 0.9.1)
@@ -38,6 +49,7 @@ GEM
     metaclass (0.0.1)
     mocha (0.12.3)
       metaclass (~> 0.0.1)
+    multi_json (1.8.0)
     rake (0.9.2.2)
     rb-fchange (0.0.5)
       ffi
@@ -54,19 +66,10 @@ GEM
     rspec-expectations (2.11.2)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.11.2)
-    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)
     yard (0.8.2.1)
 
 PLATFORMS
@@ -82,6 +85,5 @@ DEPENDENCIES
   rdoc
   requires_approval!
   rspec
-  ruby-debug19
   sqlite3
   yard

data/VERSION

@@ -1 +1 @@
-1.0.7
+1.0.8

data/lib/requires_approval.rb

@@ -16,10 +16,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 +28,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
@@ -39,14 +39,14 @@ module RequiresApproval
 
     if self.save
       # if we have approved all requested changes, make our latest
-      # unapproved version approved - 
+      # 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 
+        # makes our latest_unapproved_version approved and
+        # creates another unapproved version with any remaining
         # attributes
         self.create_approval_version_record
       end
@@ -80,14 +80,25 @@ module RequiresApproval
     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?
-    self.versions.where(:is_approved => true).count > 0
+    unless instance_variable_defined?(:@has_approved_version)
+      @has_approved_version = (self.versions.where(:is_approved => true).count > 0)
+    end
+
+    @has_approved_version
   end
 
   # have we already approved all outstanding changes?
@@ -108,21 +119,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
@@ -160,7 +171,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)
 
@@ -181,7 +192,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 = {}
@@ -209,7 +220,7 @@ module RequiresApproval
       # adds our versions table
       self.drop_versions_table
       self.create_versions_table
-      
+
     end
 
     def requires_approval_for(*attrs)
@@ -228,10 +239,10 @@ module RequiresApproval
         :latest_unapproved_version_with_nil_check,
         :on => :create
       )
-      
+
       # 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
 
@@ -275,9 +286,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
@@ -321,13 +332,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)
-          
+
           # 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

data/requires_approval.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "requires_approval"
-  s.version = "1.0.7"
+  s.version = "1.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Langevin"]
-  s.date = "2013-04-03"
+  s.date = "2013-10-19"
   s.description = "Gem to handle versioning and things that require approval"
   s.email = "dan.langevin@lifebooker.com"
   s.extra_rdoc_files = [
@@ -40,14 +40,15 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/LifebookerInc/requires_approval"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.17"
+  s.rubygems_version = "2.0.3"
   s.summary = "Gem to handle versioning and things that require approval"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<requires_approval>, [">= 0"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<guard-rspec>, [">= 0"])
       s.add_development_dependency(%q<guard-bundler>, [">= 0"])
@@ -56,11 +57,11 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<mocha>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
     else
       s.add_dependency(%q<requires_approval>, [">= 0"])
+      s.add_dependency(%q<activerecord>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<guard-rspec>, [">= 0"])
       s.add_dependency(%q<guard-bundler>, [">= 0"])
@@ -69,12 +70,12 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<ruby-debug19>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
     end
   else
     s.add_dependency(%q<requires_approval>, [">= 0"])
+    s.add_dependency(%q<activerecord>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<guard-rspec>, [">= 0"])
     s.add_dependency(%q<guard-bundler>, [">= 0"])
@@ -83,7 +84,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<ruby-debug19>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])
   end

data/spec/spec_helper.rb

@@ -13,9 +13,6 @@ 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,148 +1,183 @@
 --- !ruby/object:Gem::Specification
 name: requires_approval
 version: !ruby/object:Gem::Version
-  version: 1.0.7
-  prerelease: 
+  version: 1.0.8
 platform: ruby
 authors:
 - Dan Langevin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-03 00:00:00.000000000 Z
+date: 2013-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: requires_approval
-  requirement: &70165360482200 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70165360482200
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70165360478060 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165360478060
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70165360473460 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165360473460
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &70165360457860 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165360457860
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-spork
-  requirement: &70165360455700 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165360455700
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70165360453640 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70165360453640
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.3
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70165360449700 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165360449700
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70165360447740 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165360447740
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70165360444980 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165360444980
-- !ruby/object:Gem::Dependency
-  name: ruby-debug19
-  requirement: &70165360443640 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70165360443640
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70165360440240 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165360440240
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70165360438500 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165360438500
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Gem to handle versioning and things that require approval
 email: dan.langevin@lifebooker.com
 executables: []
@@ -173,29 +208,25 @@ files:
 homepage: http://github.com/LifebookerInc/requires_approval
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2528865283922867578
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Gem to handle versioning and things that require approval
 test_files: []