requires_approval_rails_2 1.0.0 → 1.0.1

data/Gemfile

@@ -3,8 +3,8 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem "activerecord", "~> 3.0.9"
-gem "activesupport", "~> 3.0.9"
+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,19 +1,10 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.16)
-      activesupport (= 3.0.16)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.16)
-      activemodel (= 3.0.16)
-      activesupport (= 3.0.16)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.16)
+    activerecord (2.3.12)
+      activesupport (= 2.3.12)
+    activesupport (2.3.12)
     archive-tar-minitar (0.5.2)
-    arel (2.0.10)
-    builder (2.1.2)
     columnize (0.3.6)
     diff-lcs (1.1.3)
     ffi (1.1.0)
@@ -29,7 +20,6 @@ GEM
     guard-spork (1.1.0)
       guard (>= 1.1)
       spork (>= 0.8.4)
-    i18n (0.5.0)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -74,15 +64,14 @@ GEM
     spork (0.9.2)
     sqlite3 (1.3.6)
     thor (0.15.4)
-    tzinfo (0.3.33)
     yard (0.8.2.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 3.0.9)
-  activesupport (~> 3.0.9)
+  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.0
+1.0.1

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
 
@@ -79,7 +78,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?
@@ -219,11 +218,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
@@ -293,6 +291,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|
@@ -302,12 +309,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.0"
+  s.version = "1.0.1"
 
   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-08-06"
   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

@@ -199,12 +199,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
@@ -265,7 +266,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.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-05 00:00:00.000000000 Z
+date: 2012-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2169540880 !ruby/object:Gem::Requirement
+  requirement: &2164816540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2169540880
+  version_requirements: *2164816540
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2169540160 !ruby/object:Gem::Requirement
+  requirement: &2164815680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2169540160
+  version_requirements: *2164815680
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2169539480 !ruby/object:Gem::Requirement
+  requirement: &2164814860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169539480
+  version_requirements: *2164814860
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2169539000 !ruby/object:Gem::Requirement
+  requirement: &2164813820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169539000
+  version_requirements: *2164813820
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &2169538300 !ruby/object:Gem::Requirement
+  requirement: &2164812360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169538300
+  version_requirements: *2164812360
 - !ruby/object:Gem::Dependency
   name: guard-spork
-  requirement: &2169537620 !ruby/object:Gem::Requirement
+  requirement: &2164809020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169537620
+  version_requirements: *2164809020
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2169536920 !ruby/object:Gem::Requirement
+  requirement: &2164804700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *2169536920
+  version_requirements: *2164804700
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2169536380 !ruby/object:Gem::Requirement
+  requirement: &2164802980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169536380
+  version_requirements: *2164802980
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2169535740 !ruby/object:Gem::Requirement
+  requirement: &2164802080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169535740
+  version_requirements: *2164802080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2169535060 !ruby/object:Gem::Requirement
+  requirement: &2164801020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169535060
+  version_requirements: *2164801020
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2169534300 !ruby/object:Gem::Requirement
+  requirement: &2164800460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169534300
+  version_requirements: *2164800460
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2169533780 !ruby/object:Gem::Requirement
+  requirement: &2164799940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169533780
+  version_requirements: *2164799940
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2169533180 !ruby/object:Gem::Requirement
+  requirement: &2164799380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2169533180
+  version_requirements: *2164799380
 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: 696855978375686757
 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: