grouped_validations 0.1.0 → 0.2.0

data/README.rdoc

@@ -4,7 +4,7 @@ Allows you to define validation groups in ActiveRecord for more control over wha
 
 This can be useful for multi-page forms or wizard style data entry.
 
-Works with Rails 2.3.5 and probably earlier. Haven't tried it with Rails 3 yet.
+Works with Rails 2.3 and Rails 3 (ActiveRecord only).
 
 == Installation
 

data/Rakefile

@@ -3,9 +3,10 @@ require 'rake/rdoctask'
 require 'rake/gempackagetask'
 require 'rubygems/specification'
 require 'spec/rake/spectask'
+require 'lib/grouped_validations/version'
 
 GEM_NAME = "grouped_validations"
-GEM_VERSION = '0.1.0'
+GEM_VERSION = GroupedValidations::VERSION
 
 spec = Gem::Specification.new do |s|
   s.name = GEM_NAME

data/lib/grouped_validations/active_model.rb

@@ -0,0 +1,33 @@
+module GroupedValidations
+
+  module ClassMethods
+
+    def define_group_validation_callbacks(group)
+      define_callbacks :"validate_#{group}", :scope => 'validate'
+    end
+
+    def validate_with_groups(*args, &block)
+      if @current_validation_group
+        options = args.last
+        if options.is_a?(Hash) && options.key?(:on)
+          options[:if] = Array(options[:if])
+          options[:if] << "@_on_validate == :#{options[:on]}"
+        end
+        set_callback(:"validate_#{@current_validation_group}", *args, &block)
+      else
+        validate_without_groups(*args, &block)
+      end
+    end
+
+  end
+
+  module InstanceMethods
+
+    def run_group_validation_callbacks(group)
+      @_on_validate = new_record? ? :create : :update
+      send(:"_run_validate_#{group}_callbacks")
+    end
+
+  end
+
+end

data/lib/grouped_validations/active_record.rb

@@ -0,0 +1,39 @@
+module GroupedValidations
+
+  module ClassMethods
+
+    def define_group_validation_callbacks(group)
+      base_name = :"validate_#{group}"
+      define_callbacks base_name, :"#{base_name}_on_create", :"#{base_name}_on_update"
+    end
+
+    def validation_method_with_groups(on)
+      if @current_validation_group
+        base_name = :"validate_#{@current_validation_group}"
+        case on
+          when :save   then base_name
+          when :create then :"#{base_name}_on_create"
+          when :update then :"#{base_name}_on_update"
+        end
+      else
+        validation_method_without_groups on
+      end
+    end
+
+  end
+
+  module InstanceMethods
+
+    def run_group_validation_callbacks(group)
+      base_name = :"validate_#{group}"
+      run_callbacks(base_name)
+      if new_record?
+        run_callbacks(:"#{base_name}_on_create")
+      else
+        run_callbacks(:"#{base_name}_on_update")
+      end
+    end
+
+  end
+
+end

data/lib/grouped_validations/version.rb

@@ -0,0 +1,3 @@
+module GroupedValidations
+  VERSION = '0.2.0'
+end

data/lib/grouped_validations.rb

@@ -1,63 +1,37 @@
 module GroupedValidations
 
-  def self.included(base)
-    base.extend ClassMethods
-    base.class_eval do
-      include InstanceMethods
-      class_inheritable_accessor :validation_groups
-      alias_method_chain :valid?, :groups
-      class << self
-        alias_method_chain :validation_method, :groups
-      end
-    end
-  end
-
   module ClassMethods
 
-    def validation_group(name, &block)
+    def validation_group(group, &block)
       raise "The validation_group method requires a block" unless block_given?
 
       self.validation_groups ||= []
-      self.validation_groups << name
+      self.validation_groups << group
 
-      base_name = :"validate_#{name}"
-      define_callbacks base_name, :"#{base_name}_on_create", :"#{base_name}_on_update"
+      define_group_validation_callbacks group
 
-      @current_validation_group = name
+      @current_validation_group = group
       class_eval &block
       @current_validation_group = nil
     end
 
-    def validation_method_with_groups(on)
-      if @current_validation_group
-        base_name = :"validate_#{@current_validation_group}"
-        case on
-          when :save   then base_name
-          when :create then :"#{base_name}_on_create"
-          when :update then :"#{base_name}_on_update"
-        end
-      else
-        validation_method_without_groups on
-      end
-    end
-
   end
 
   module InstanceMethods
 
-    def group_valid?(name)
-      raise "Validation group '#{name}' not defined" unless validation_groups.include?(name)
+    def group_valid?(group)
+      raise "Validation group '#{group}' not defined" unless validation_groups.include?(group)
 
       errors.clear
-      run_group_validation_callbacks name
+      run_group_validation_callbacks group
       errors.empty?
     end
 
     def groups_valid?(*groups)
       errors.clear
-      groups.each do |name|
-        raise "Validation group '#{name}' not defined" unless validation_groups.include?(name)
-        run_group_validation_callbacks name
+      groups.each do |group|
+        raise "Validation group '#{group}' not defined" unless validation_groups.include?(group)
+        run_group_validation_callbacks group
       end
       errors.empty?
     end
@@ -70,18 +44,29 @@ module GroupedValidations
       errors.empty?
     end
 
-    def run_group_validation_callbacks(name)
-      base_name = :"validate_#{name}"
-      run_callbacks(base_name)
-      if new_record?
-        run_callbacks(:"#{base_name}_on_create")
-      else
-        run_callbacks(:"#{base_name}_on_update")
-      end
-    end
-
   end
 
 end
 
-ActiveRecord::Base.send :include, GroupedValidations
+ActiveRecord::Base.class_eval do
+  extend GroupedValidations::ClassMethods
+  include GroupedValidations::InstanceMethods
+  class_inheritable_accessor :validation_groups
+  alias_method_chain :valid?, :groups
+end
+
+if ActiveRecord::VERSION::MAJOR == 3
+  require 'grouped_validations/active_model'
+  ActiveRecord::Base.class_eval do
+    class << self
+      alias_method_chain :validate, :groups
+    end
+  end
+else
+  require 'grouped_validations/active_record'
+  ActiveRecord::Base.class_eval do
+    class << self
+      alias_method_chain :validation_method, :groups
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ $:.unshift File.expand_path(File.dirname(__FILE__) + '/spec')
 
 require 'rubygems'
 require 'active_record'
+require 'active_support'
 
 require 'grouped_validations'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grouped_validations
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Adam Meehan
@@ -9,7 +9,7 @@ autorequire: grouped_validations
 bindir: bin
 cert_chain: []
 
-date: 2010-02-22 00:00:00 +11:00
+date: 2010-02-23 00:00:00 +11:00
 default_executable: 
 dependencies: []
 
@@ -25,6 +25,9 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
+- lib/grouped_validations/active_model.rb
+- lib/grouped_validations/active_record.rb
+- lib/grouped_validations/version.rb
 - lib/grouped_validations.rb
 - spec/grouped_validations_spec.rb
 - spec/spec_helper.rb