requires_approval 1.0.6 → 1.0.7

data/Gemfile.lock

@@ -1,27 +1,13 @@
 PATH
   remote: .
   specs:
-    requires_approval (1.0.6)
-      activerecord (~> 3)
-      activesupport (~> 3)
+    requires_approval (1.0.7)
+      requires_approval
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.11)
-      activesupport (= 3.2.11)
-      builder (~> 3.0.0)
-    activerecord (3.2.11)
-      activemodel (= 3.2.11)
-      activesupport (= 3.2.11)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.11)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
     archive-tar-minitar (0.5.2)
-    arel (3.0.2)
-    builder (3.0.4)
     columnize (0.3.6)
     diff-lcs (1.1.3)
     ffi (1.1.5)
@@ -37,7 +23,6 @@ GEM
     guard-spork (1.1.0)
       guard (>= 1.1)
       spork (>= 0.8.4)
-    i18n (0.6.1)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -53,7 +38,6 @@ GEM
     metaclass (0.0.1)
     mocha (0.12.3)
       metaclass (~> 0.0.1)
-    multi_json (1.5.0)
     rake (0.9.2.2)
     rb-fchange (0.0.5)
       ffi
@@ -83,7 +67,6 @@ GEM
     spork (0.9.2)
     sqlite3 (1.3.6)
     thor (0.16.0)
-    tzinfo (0.3.35)
     yard (0.8.2.1)
 
 PLATFORMS

data/Rakefile

@@ -1,5 +1,8 @@
 # encoding: utf-8
 
+Dir.glob('lib/tasks/*.rake').each {|r| import r}
+require 'rake'
+
 require 'rubygems'
 require 'bundler'
 begin
@@ -9,7 +12,7 @@ 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|
@@ -25,18 +28,5 @@ 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.5
+1.0.7

data/lib/requires_approval/version.rb

@@ -0,0 +1,3 @@
+module RequiresApproval
+  VERSION = "1.0.6"
+end

data/lib/requires_approval.rb

@@ -37,24 +37,26 @@ module RequiresApproval
       write_attribute(attr, self.latest_unapproved_version.send(attr))
     end
 
-    # 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)
+    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
     else
-      # makes our latest_unapproved_version approved and 
-      # creates another unapproved version with any remaining 
-      # attributes
-      self.create_approval_version_record
+      return false
     end
-
-    self.is_frozen = false
-
-    self.save
-    self.reload
-    true
   end
 
   def deny_attributes(*attributes)

data/lib/tasks/requires_approval.rake

@@ -0,0 +1,36 @@
+require 'rubygems'
+require 'rspec/core/rake_task'
+
+task :default => [:all]
+
+namespace :spec do
+  desc "Run Rspec Unit Tests"
+  RSpec::Core::RakeTask.new(:unit) do |t|
+    files = Dir.glob('spec/**/*_spec.rb').delete_if{|f|
+      f =~ /(integration|request|acceptance)/
+    }
+    files = files.delete_if{|f| f =~ /routing/}
+    t.pattern = files
+    t.rspec_opts = ["-O", ".rspec", "--tag", "~integration"]
+  end
+  desc "Run Rspec Integration Tests"
+  RSpec::Core::RakeTask.new(:integration) do |t|
+    files =  Dir.glob(
+      'spec/{integration,request}/**/*_spec.rb'
+    )
+    t.pattern = files
+    t.rspec_opts = [
+      "--format nested"
+    ]
+  end
+  desc "Run All Rspec Tests"
+  RSpec::Core::RakeTask.new(:all) do |t|
+    files = Dir.glob('spec/**/*_spec.rb')
+    # routing doesn't work
+    files = files.delete_if{|f| f =~ /routing/}
+    t.pattern = files
+    t.rspec_opts = [
+      "--format nested"
+    ]
+  end
+end

data/lib/tasks/test.rake

@@ -0,0 +1,3 @@
+task :greet do
+  puts "kh"
+end

data/requires_approval.gemspec

@@ -1,39 +1,91 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'requires_approval/version'
 
 Gem::Specification.new do |s|
   s.name = "requires_approval"
-  s.version = RequiresApproval::VERSION
+  s.version = "1.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Langevin"]
-  s.date = "2012-10-12"
-  s.summary = "Gem to handle versioning and things that require approval"
+  s.date = "2013-04-03"
   s.description = "Gem to handle versioning and things that require approval"
   s.email = "dan.langevin@lifebooker.com"
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
+    "Guardfile",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/errors.rb",
+    "lib/requires_approval.rb",
+    "lib/requires_approval/version.rb",
+    "lib/tasks/requires_approval.rake",
+    "lib/tasks/test.rake",
+    "requires_approval.gemspec",
+    "requires_approval_rails_2.gemspec",
+    "spec/lib/requires_approval_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/support/BLANK"
+  ]
   s.homepage = "http://github.com/LifebookerInc/requires_approval"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.files         = `git ls-files`.split($/)
-  s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.17"
+  s.summary = "Gem to handle versioning and things that require approval"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
 
-  s.add_runtime_dependency(%q<activerecord>, ["~> 3"])
-  s.add_runtime_dependency(%q<activesupport>, ["~> 3"])
-  s.add_development_dependency(%q<bundler>, [">= 0"])
-  s.add_development_dependency(%q<guard-rspec>, [">= 0"])
-  s.add_development_dependency(%q<guard-bundler>, [">= 0"])
-  s.add_development_dependency(%q<guard-spork>, [">= 0"])
-  s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
-  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"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<requires_approval>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<guard-rspec>, [">= 0"])
+      s.add_development_dependency(%q<guard-bundler>, [">= 0"])
+      s.add_development_dependency(%q<guard-spork>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
+      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<bundler>, [">= 0"])
+      s.add_dependency(%q<guard-rspec>, [">= 0"])
+      s.add_dependency(%q<guard-bundler>, [">= 0"])
+      s.add_dependency(%q<guard-spork>, [">= 0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+      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<bundler>, [">= 0"])
+    s.add_dependency(%q<guard-rspec>, [">= 0"])
+    s.add_dependency(%q<guard-bundler>, [">= 0"])
+    s.add_dependency(%q<guard-spork>, [">= 0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+    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
 end
 

data/spec/lib/requires_approval_spec.rb

@@ -385,6 +385,19 @@ 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: requires_approval
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,43 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-12 00:00:00.000000000 Z
+date: 2013-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
+  name: requires_approval
+  requirement: &70165360482200 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3'
+  version_requirements: *70165360482200
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70165360478060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70165360478060
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70165360473460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,15 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70165360473460
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70165360457860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,15 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70165360457860
 - !ruby/object:Gem::Dependency
   name: guard-spork
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70165360455700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,15 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70165360455700
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70165360453640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -117,15 +76,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.8.3
+  version_requirements: *70165360453640
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70165360449700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,15 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70165360449700
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70165360447740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -149,15 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70165360447740
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70165360444980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,15 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70165360444980
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70165360443640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -181,15 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70165360443640
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70165360440240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,15 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70165360440240
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70165360438500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -213,20 +142,16 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *70165360438500
 description: Gem to handle versioning and things that require approval
 email: dan.langevin@lifebooker.com
 executables: []
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- LICENSE.txt
+- README.rdoc
 files:
 - .document
-- .gitignore
 - .rspec
 - Gemfile
 - Gemfile.lock
@@ -237,6 +162,9 @@ files:
 - VERSION
 - lib/errors.rb
 - lib/requires_approval.rb
+- lib/requires_approval/version.rb
+- lib/tasks/requires_approval.rake
+- lib/tasks/test.rake
 - requires_approval.gemspec
 - requires_approval_rails_2.gemspec
 - spec/lib/requires_approval_spec.rb
@@ -255,6 +183,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2528865283922867578
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -263,12 +194,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Gem to handle versioning and things that require approval
-test_files:
-- spec/lib/requires_approval_spec.rb
-- spec/spec_helper.rb
-- spec/support/BLANK
-has_rdoc: 
+test_files: []

data/.gitignore

@@ -1,51 +0,0 @@
-# rcov generated
-coverage
-coverage.data
-
-# rdoc generated
-rdoc
-
-# yard generated
-doc
-.yardoc
-
-# bundler
-.bundle
-
-# jeweler generated
-pkg
-
-spec/support/db.sqlite
-
-# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
-#
-# * Create a file at ~/.gitignore
-# * Include files you want ignored
-# * Run: git config --global core.excludesfile ~/.gitignore
-#
-# After doing this, these files will be ignored in all your git projects,
-# saving you from having to 'pollute' every project you touch with them
-#
-# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
-#
-# For MacOS:
-#
-#.DS_Store
-
-# For TextMate
-#*.tmproj
-#tmtags
-
-# For emacs:
-#*~
-#\#*
-#.\#*
-
-# For vim:
-#*.swp
-
-# For redcar:
-#.redcar
-
-# For rubinius:
-#*.rbc