validation-sets 1.1.0 → 1.2.0

data/Rakefile

@@ -5,14 +5,24 @@ require 'rake/rdoctask'
 desc 'Default: run unit tests.'
 task :default => :test
 
-desc 'Test the plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
+namespace :test do
+  Rake::TestTask.new(:rails2) do |t|
+    t.libs += %w(test test/test_helper/rails2)
+    t.pattern = 'test/**/*_test.rb'
+    t.verbose = true
+  end
+  
+  desc 'Test the plugin with Rails 3.'
+  Rake::TestTask.new(:rails3) do |t|
+    t.libs += %w(test test/test_helper/rails3)
+    t.pattern = 'test/**/*_test.rb'
+    t.verbose = true
+  end
 end
 
+desc 'Run all tests'
+task :test => ['test:rails2', 'test:rails3']
+
 desc 'Generate documentation'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/lib/validation_sets.rb

@@ -1,61 +1,4 @@
 module ValidationSets
-  autoload :ValidationSet, 'validation_sets/validation_set'
-  
-  # Used to set the current validation set during definition of the model
-  attr_accessor :current_validation_set
-  
-  # Returns the name of the validation callback method for a save method and the label of a
-  # validation set.
-  def validation_set_method(on, label)
-    case on
-      when :save   then "validate_#{label}_set".to_sym
-      when :create then "validate_on_create_#{label}_set".to_sym
-      when :update then "validate_on_update_#{label}_set".to_sym
-    end
-  end
-  
-  # Returns the name of the validation callback method for a save method.
-  def validation_method(on)
-    if current_validation_set
-      validation_set_method(on, current_validation_set)
-    else
-      super
-    end
-  end
-  
-  # Returns true if the validation set is defined on this class
-  def validation_set_defined?(set)
-    [:save, :create, :update].any? do |on|
-      respond_to?(validation_set_method(on, set))
-    end
-  end
-  
-  # Add a validation set to the model.
-  #
-  #   class Account < ActiveRecord::Base
-  #     validation_set_for(:activation) do |set|
-  #       set.validates_presence_of :username
-  #     end
-  #   end
-  def validation_set_for(label, &block)
-    [:save, :create, :update].each do |save_method|
-      callback_chain = validation_method(save_method)
-      callback_chain_for_set = validation_set_method(save_method, label)
-      unless respond_to?(callback_chain_for_set)
-        define_callbacks(callback_chain_for_set)
-        define_method(callback_chain_for_set) { run_callbacks(callback_chain_for_set) }
-        send(callback_chain, callback_chain_for_set, :if => Proc.new { |r| label.to_sym == r._validation_set })
-      end
-    end
-    
-    validation_set = ValidationSet.new(self, label)
-    
-    before = current_validation_set
-    self.current_validation_set = label.to_sym
-    block.call(validation_set)
-    self.current_validation_set = before
-  end
-  
   module InstanceMethods
     attr_reader :_validation_set
     
@@ -71,7 +14,7 @@ module ValidationSets
     #   account.use_validation_set(nil)    # Turns off all validation sets
     def use_validation_set(set)
       if self.class.validation_set_defined?(set)
-        @_validation_set = set
+        @_validation_set = set.to_sym
       else
         raise ArgumentError, "There is no validation set `#{set}'"
       end
@@ -79,6 +22,89 @@ module ValidationSets
   end
 end
 
+if ActiveRecord::Base.respond_to?(:set_callback)
+  module ValidationSets
+    autoload :ValidationProxy, 'validation_sets/validation_proxy'
+    
+    # Add a validation set to the model.
+    #
+    #   class Account < ActiveRecord::Base
+    #     validation_set_for(:activation) do |set|
+    #       set.validates_presence_of :username
+    #     end
+    #   end
+    def validation_set_for(set, &block)
+      @_validation_sets ||= Set.new
+      @_validation_sets << set
+      yield ValidationProxy.new(self, set)
+    end
+    
+    # Returns true if the validation set is defined on this class
+    def validation_set_defined?(set)
+      @_validation_sets.include?(set)
+    end
+  end
+else
+  module ValidationSets
+    autoload :ValidationSet, 'validation_sets/validation_set'
+    
+    # Used to set the current validation set during definition of the model
+    attr_accessor :current_validation_set
+    
+    # Returns the name of the validation callback method for a save method and the label of a
+    # validation set.
+    def validation_set_method(on, label)
+      case on
+        when :save   then "validate_#{label}_set".to_sym
+        when :create then "validate_on_create_#{label}_set".to_sym
+        when :update then "validate_on_update_#{label}_set".to_sym
+      end
+    end
+    
+    # Returns the name of the validation callback method for a save method.
+    def validation_method(on)
+      if current_validation_set
+        validation_set_method(on, current_validation_set)
+      else
+        super
+      end
+    end
+    
+    # Returns true if the validation set is defined on this class
+    def validation_set_defined?(set)
+      [:save, :create, :update].any? do |on|
+        respond_to?(validation_set_method(on, set))
+      end
+    end
+    
+    # Add a validation set to the model.
+    #
+    #   class Account < ActiveRecord::Base
+    #     validation_set_for(:activation) do |set|
+    #       set.validates_presence_of :username
+    #     end
+    #   end
+    def validation_set_for(label, &block)
+      [:save, :create, :update].each do |save_method|
+        callback_chain = validation_method(save_method)
+        callback_chain_for_set = validation_set_method(save_method, label)
+        unless respond_to?(callback_chain_for_set)
+          define_callbacks(callback_chain_for_set)
+          define_method(callback_chain_for_set) { run_callbacks(callback_chain_for_set) }
+          send(callback_chain, callback_chain_for_set, :if => Proc.new { |r| label.to_sym == r._validation_set })
+        end
+      end
+      
+      validation_set = ValidationSet.new(self, label)
+      
+      before = current_validation_set
+      self.current_validation_set = label.to_sym
+      block.call(validation_set)
+      self.current_validation_set = before
+    end
+  end
+end
+
 module ActiveRecord #:nodoc:
   class Base #:nodoc:
     extend ValidationSets

data/lib/validation_sets/validation_proxy.rb

@@ -0,0 +1,26 @@
+module ValidationSets
+  # A ValidationSet instance is used to add extra options to validations to make
+  # sure the only run when a certain validation set is active.
+  class ValidationProxy
+    def initialize(model, set)
+      @model = model
+      @set = set
+    end
+    
+    # Forwards all other methods (ie. validates_presence_of) to the model class
+    # with extra options
+    def method_missing(method, *args, &block)
+      options = args.extract_options!
+      options[:if] = Array.wrap(options[:if])
+      options[:if] << "_validation_set == :#{@set}"
+      # BUG: Callbacks get deleted from their chain when they're the same as a previous callback
+      if (method == :validate) and !block and args[0].kind_of?(Symbol)
+        callback = args.shift
+        block = lambda { send(callback) }
+      end
+      args << options
+      @model.send(method, *args, &block)
+    end
+  end
+end
+  

data/lib/validation_sets/validation_set.rb

@@ -2,24 +2,24 @@ module ValidationSets
   # A ValidationSet instance is used to redirect the original validation methods (validate,
   # validate_on_create, and validate_on_update) to the callback chain for the set.
   class ValidationSet
-    def initialize(model, label)
+    def initialize(model, set)
       @model = model
-      @label = label
+      @set = set
     end
     
     # Adds a validation method or proc that always runs
     def validate(*params, &block)
-      send(validation_set_method(:save, @label), *params, &block)
+      send(validation_set_method(:save, @set), *params, &block)
     end
     
     # Adds a validation method or proc that runs on create
     def validate_on_create(*params, &block)
-      send(validation_set_method(:create, @label), *params, &block)
+      send(validation_set_method(:create, @set), *params, &block)
     end
     
     # Adds a validation method or proc that runs on update
     def validate_on_update(*params, &block)
-      send(validation_set_method(:update, @label), *params, &block)
+      send(validation_set_method(:update, @set), *params, &block)
     end
     
     # Forwards all other methods (ie. validates_presence_of) to the model class.

data/test/test_helper/rails2/test_helper.rb

@@ -0,0 +1,28 @@
+require File.expand_path('../../shared', __FILE__)
+
+module ValidationSetsTests
+  module Initializer
+    def self.load_dependencies
+      if rails_directory
+        $:.unshift(File.join(rails_directory, 'activesupport', 'lib'))
+        $:.unshift(File.join(rails_directory, 'activerecord', 'lib'))
+      else
+        require 'rubygems'
+        gem 'rails', '< 3.0'
+      end
+      
+      require 'test/unit'
+      
+      require 'active_support'
+      require 'active_support/test_case'
+      require 'active_record'
+      require 'active_record/test_case'
+      require 'active_record/base' # this is needed because of dependency hell
+      
+      $:.unshift File.expand_path('../../lib', __FILE__)
+      require File.join(PLUGIN_ROOT, 'rails', 'init')
+    end
+  end
+end
+
+ValidationSetsTests::Initializer.start

data/test/test_helper/rails3/test_helper.rb

@@ -0,0 +1,28 @@
+require File.expand_path('../../shared', __FILE__)
+
+module ValidationSetsTests
+  module Initializer
+    def self.load_dependencies
+      if rails_directory
+        $:.unshift(File.join(rails_directory, 'activesupport', 'lib'))
+        $:.unshift(File.join(rails_directory, 'activerecord', 'lib'))
+      else
+        require 'rubygems'
+        gem 'rails', '> 3.0'
+      end
+      
+      require 'test/unit'
+      
+      require 'active_support'
+      require 'active_support/test_case'
+      require 'active_record'
+      require 'active_record/test_case'
+      require 'active_record/base' # this is needed because of dependency hell
+      
+      $:.unshift File.expand_path('../../lib', __FILE__)
+      require File.join(PLUGIN_ROOT, 'rails', 'init')
+    end
+  end
+end
+
+ValidationSetsTests::Initializer.start

data/test/test_helper/shared.rb

@@ -0,0 +1,39 @@
+module ValidationSetsTests
+  module Initializer
+    VENDOR_RAILS = File.expand_path('../../../../../../vendor/rails', __FILE__)
+    PLUGIN_ROOT = File.expand_path('../../../', __FILE__)
+    
+    def self.rails_directory
+      if File.exist?(VENDOR_RAILS)
+        VENDOR_RAILS
+      end
+    end
+    
+    def self.configure_database
+      ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
+      ActiveRecord::Migration.verbose = false
+    end
+    
+    def self.setup_database
+      ActiveRecord::Schema.define(:version => 1) do
+        create_table :accounts do |t|
+          t.column :fullname, :string
+          t.column :email, :string
+          t.column :username, :string
+          t.column :password, :string
+        end
+      end
+    end
+    
+    def self.teardown_database
+      ActiveRecord::Base.connection.tables.each do |table|
+        ActiveRecord::Base.connection.drop_table(table)
+      end
+    end
+    
+    def self.start
+      load_dependencies
+      configure_database
+    end
+  end
+end

data/test/validation_sets/validation_set_test.rb

@@ -1,9 +1,11 @@
-require File.expand_path('../../test_helper', __FILE__)
+require 'test_helper'
 
-class ValidationSetTest < ActiveSupport::TestCase
-  test "forwards missing methods to the model" do
-    model = 'Model'
-    validation_set = ValidationSets::ValidationSet.new(model, :admin)
-    assert_equal 5, validation_set.length
+if !ActiveRecord::Base.respond_to?(:set_callback) # Rails 2
+  class ValidationSetTest < ActiveSupport::TestCase
+    test "forwards missing methods to the model" do
+      model = 'Model'
+      validation_set = ValidationSets::ValidationSet.new(model, :admin)
+      assert_equal 5, validation_set.length
+    end
   end
 end

data/test/validation_sets/validaton_proxy_test.rb

@@ -0,0 +1,17 @@
+require 'test_helper'
+
+if ActiveRecord::Base.respond_to?(:set_callback) # Rails 3
+  class Person
+    def self.arguments(*args)
+      args
+    end
+  end
+  
+  class ValidationProxyTest < ActiveSupport::TestCase
+    test "forwards missing methods to the model" do
+      validation_proxy = ValidationSets::ValidationProxy.new(Person, :admin)
+      args = validation_proxy.arguments
+      assert args.last.has_key?(:if)
+    end
+  end
+end

data/test/validation_sets_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper', __FILE__)
+require 'test_helper'
 
 class Account < ActiveRecord::Base
   attr_accessor :current_password
@@ -47,7 +47,7 @@ class ValidationSetsTest < ActiveSupport::TestCase
   test "global validation should always run" do
     account = Account.new
     assert !account.valid?
-    assert account.errors.on(:fullname)
+    assert_error(account, :fullname)
     
     account.fullname = "Patricia Herder"
     assert account.valid?
@@ -58,9 +58,9 @@ class ValidationSetsTest < ActiveSupport::TestCase
     account = Account.new
     account.use_validation_set(:activation)
     assert !account.valid?
-    assert account.errors.on(:email)
-    assert account.errors.on(:username)
-    assert account.errors.on(:password)
+    assert_error(account, :email)
+    assert_error(account, :username)
+    assert_error(account, :password)
     
     account.fullname = "Patricia Herder"
     account.email = 'patricia@example.com'
@@ -74,8 +74,8 @@ class ValidationSetsTest < ActiveSupport::TestCase
     account = Account.new
     account.use_validation_set(:admin)
     assert !account.valid?
-    assert account.errors.on(:fullname)
-    assert account.errors.on(:email)
+    assert_error(account, :fullname)
+    assert_error(account, :email)
     
     account.fullname = "Patricia Herder"
     account.email = 'patricia@example.com'
@@ -95,6 +95,15 @@ class ValidationSetsTest < ActiveSupport::TestCase
     end
   end
   
+  def assert_error(object, attribute)
+    message = "Expected #{attribute} to have a validation error"
+    if object.errors[:base].kind_of?(Array)
+      assert !object.errors[attribute].empty?, message
+    else
+      assert object.errors.on(attribute), message
+    end
+  end
+  
   def setup
     ValidationSetsTests::Initializer.setup_database
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: validation-sets
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Manfred Stienstra
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-05 00:00:00 +02:00
+date: 2011-02-24 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -29,17 +29,20 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .gitignore
 - .kick
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
 - lib/validation_sets.rb
+- lib/validation_sets/validation_proxy.rb
 - lib/validation_sets/validation_set.rb
 - rails/init.rb
-- test/test_helper.rb
+- test/test_helper/rails2/test_helper.rb
+- test/test_helper/rails3/test_helper.rb
+- test/test_helper/shared.rb
 - test/validation_sets/validation_set_test.rb
+- test/validation_sets/validaton_proxy_test.rb
 - test/validation_sets_test.rb
 - validation-sets.gemspec
 has_rdoc: true
@@ -47,8 +50,8 @@ homepage: http://fingertips.github.com
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -72,11 +75,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: A Rails plugin that adds validation sets to Active Record.
 test_files: 
-- test/test_helper.rb
+- test/test_helper/rails2/test_helper.rb
+- test/test_helper/rails3/test_helper.rb
+- test/test_helper/shared.rb
 - test/validation_sets/validation_set_test.rb
+- test/validation_sets/validaton_proxy_test.rb
 - test/validation_sets_test.rb

data/.gitignore

@@ -1,2 +0,0 @@
-pkg
-rdoc

data/test/test_helper.rb

@@ -1,64 +0,0 @@
-module ValidationSetsTests
-  module Initializer
-    VENDOR_RAILS = File.expand_path('../../../../../vendor/rails', __FILE__)
-    OTHER_RAILS = File.expand_path('../../../rails', __FILE__)
-    PLUGIN_ROOT = File.expand_path('../../', __FILE__)
-    
-    def self.rails_directory
-      if File.exist?(VENDOR_RAILS)
-        VENDOR_RAILS
-      elsif File.exist?(OTHER_RAILS)
-        OTHER_RAILS
-      end
-    end
-    
-    def self.load_dependencies
-      if rails_directory
-        $:.unshift(File.join(rails_directory, 'activesupport', 'lib'))
-        $:.unshift(File.join(rails_directory, 'activerecord', 'lib'))
-      else
-        require 'rubygems' rescue LoadError
-      end
-      
-      require 'test/unit'
-      
-      require 'active_support'
-      require 'active_support/test_case'
-      require 'active_record'
-      require 'active_record/test_case'
-      require 'active_record/base' # this is needed because of dependency hell
-      
-      $:.unshift File.expand_path('../../lib', __FILE__)
-      require File.join(PLUGIN_ROOT, 'rails', 'init')
-    end
-    
-    def self.configure_database
-      ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
-      ActiveRecord::Migration.verbose = false
-    end
-    
-    def self.setup_database
-      ActiveRecord::Schema.define(:version => 1) do
-        create_table :accounts do |t|
-          t.column :fullname, :string
-          t.column :email, :string
-          t.column :username, :string
-          t.column :password, :string
-        end
-      end
-    end
-    
-    def self.teardown_database
-      ActiveRecord::Base.connection.tables.each do |table|
-        ActiveRecord::Base.connection.drop_table(table)
-      end
-    end
-    
-    def self.start
-      load_dependencies
-      configure_database
-    end
-  end
-end
-
-ValidationSetsTests::Initializer.start