requires_approval_rails_2 1.0.2 → 1.0.3

data/Gemfile

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

data/Gemfile.lock

@@ -1,42 +1,31 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    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)
+    activerecord (2.3.12)
+      activesupport (= 2.3.12)
+    activesupport (2.3.12)
     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.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.0)
     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)
@@ -44,9 +33,8 @@ GEM
       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.3.6)
     rake (0.9.2.2)
     rb-fchange (0.0.5)
       ffi
@@ -60,9 +48,9 @@ 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)
@@ -75,16 +63,15 @@ GEM
       archive-tar-minitar (>= 0.5.2)
     spork (0.9.2)
     sqlite3 (1.3.6)
-    thor (0.16.0)
-    tzinfo (0.3.33)
+    thor (0.15.4)
     yard (0.8.2.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 3)
-  activesupport (~> 3)
+  activerecord (~> 2.3)
+  activesupport (~> 2.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"
+  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}

data/VERSION

@@ -1 +1 @@
-1.0.5
+1.0.3

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
 
@@ -83,7 +82,7 @@ module RequiresApproval
 
   # have any of our versions ever been approved?
   def has_approved_version?
-    self.versions.where(:is_approved => true).count > 0
+    self.versions.count(:conditions => {:is_approved => true}) > 0
   end
 
   # have we already approved all outstanding changes?
@@ -220,9 +219,8 @@ 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
@@ -238,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
@@ -312,6 +309,15 @@ 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|
@@ -331,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,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "requires_approval_rails_2"
-  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

@@ -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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: requires_approval_rails_2
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2163753200 !ruby/object:Gem::Requirement
+  requirement: &2154973160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2163753200
+  version_requirements: *2154973160
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2163752640 !ruby/object:Gem::Requirement
+  requirement: &2154972680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2163752640
+  version_requirements: *2154972680
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2163751920 !ruby/object:Gem::Requirement
+  requirement: &2154972200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2163751920
+  version_requirements: *2154972200
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2163751300 !ruby/object:Gem::Requirement
+  requirement: &2154971720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2163751300
+  version_requirements: *2154971720
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &2163750660 !ruby/object:Gem::Requirement
+  requirement: &2154971240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2163750660
+  version_requirements: *2154971240
 - !ruby/object:Gem::Dependency
   name: guard-spork
-  requirement: &2163750040 !ruby/object:Gem::Requirement
+  requirement: &2154970760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2163750040
+  version_requirements: *2154970760
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2163749420 !ruby/object:Gem::Requirement
+  requirement: &2154970280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *2163749420
+  version_requirements: *2154970280
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2163748740 !ruby/object:Gem::Requirement
+  requirement: &2154986160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2163748740
+  version_requirements: *2154986160
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2163748060 !ruby/object:Gem::Requirement
+  requirement: &2154985680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2163748060
+  version_requirements: *2154985680
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2163747460 !ruby/object:Gem::Requirement
+  requirement: &2154985200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2163747460
+  version_requirements: *2154985200
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2163746760 !ruby/object:Gem::Requirement
+  requirement: &2154984720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2163746760
+  version_requirements: *2154984720
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2163746140 !ruby/object:Gem::Requirement
+  requirement: &2154984240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2163746140
+  version_requirements: *2154984240
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2163745620 !ruby/object:Gem::Requirement
+  requirement: &2154983760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2163745620
+  version_requirements: *2154983760
 description: Gem to handle versioning and things that require approval
 email: dan.langevin@lifebooker.com
 executables: []
@@ -190,9 +190,6 @@ 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:
@@ -206,3 +203,4 @@ signing_key:
 specification_version: 3
 summary: Gem to handle versioning and things that require approval
 test_files: []
+has_rdoc: