grouped_validations 0.2.0 → 0.2.1

data/README.rdoc

@@ -48,6 +48,20 @@ You can also check validation for multiple groups
 
   p.groups_valid?(:group1, :group2)
 
+
+To define validation blocks just use the respective group validation method, like so
+
+  class Person < ActiveRecord::Base
+    validation_group :name do
+      validates_presence_of :first_name
+      validates_presence_of :last_name
+    end
+
+    validate_name           {|r| # something custom on save }
+    validate_name_on_create {|r| # something custom on create }
+    validate_name_on_update {|r| # something custom on update }
+  end
+
 == Credits
 
 * Adam Meehan (http://github.com/adzap)

data/lib/grouped_validations/version.rb

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

data/lib/grouped_validations.rb

@@ -5,6 +5,10 @@ module GroupedValidations
     def validation_group(group, &block)
       raise "The validation_group method requires a block" unless block_given?
 
+      unless self.include?(GroupedValidations::InstanceMethods)
+        include GroupedValidations::InstanceMethods
+      end
+
       self.validation_groups ||= []
       self.validation_groups << group
 
@@ -18,6 +22,18 @@ module GroupedValidations
   end
 
   module InstanceMethods
+    def self.included(base)
+      base.alias_method_chain :valid?, :groups
+      base.class_eval do
+        class << self
+          if ActiveRecord::VERSION::MAJOR < 3
+            alias_method_chain :validation_method, :groups
+          else
+            alias_method_chain :validate, :groups
+          end
+        end
+      end
+    end
 
     def group_valid?(group)
       raise "Validation group '#{group}' not defined" unless validation_groups.include?(group)
@@ -50,23 +66,11 @@ end
 
 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
+if ActiveRecord::VERSION::MAJOR < 3
   require 'grouped_validations/active_record'
-  ActiveRecord::Base.class_eval do
-    class << self
-      alias_method_chain :validation_method, :groups
-    end
-  end
+else
+  require 'grouped_validations/active_model'
 end

data/spec/grouped_validations_spec.rb

@@ -9,6 +9,10 @@ describe GroupedValidations do
     Person.should respond_to(:validation_group)
   end
 
+  it "should not include instance methods by default" do
+    ActiveRecord::Base.include?(GroupedValidations::InstanceMethods).should be_false
+  end
+
   it "should store defined validation group names" do
     Person.validation_group(:dummy) { }
     Person.validation_groups.should == [:dummy]
@@ -73,10 +77,9 @@ describe GroupedValidations do
     p.should have(3).errors
   end
 
-  it "should respect :on validation option" do
+  it "should respect :on => :create validation option" do
     Person.validation_group :name do
       validates_presence_of :first_name, :on => :create
-      validates_presence_of :last_name, :on => :update
     end
 
     p = Person.new
@@ -86,6 +89,22 @@ describe GroupedValidations do
     p.group_valid?(:name)
     p.should have(0).errors
 
+    p.save.should be_true
+    p.first_name = nil
+    p.group_valid?(:name)
+    p.should have(0).errors
+  end
+
+  it "should respect :on => :update validation option" do
+    Person.validation_group :name do
+      validates_presence_of :last_name, :on => :update
+    end
+
+    p = Person.new
+    p.last_name = nil
+    p.group_valid?(:name)
+    p.should have(0).errors
+
     p.save.should be_true
     p.group_valid?(:name)
     p.should have(1).errors
@@ -93,4 +112,20 @@ describe GroupedValidations do
     p.group_valid?(:name)
     p.should have(0).errors
   end
+
+  it "should allow a validation group to appended with subsequent blocks" do
+    Person.class_eval do
+      validation_group :name do
+        validates_presence_of :first_name
+      end
+      validation_group :name do
+        validates_presence_of :last_name
+      end
+    end
+
+    p = Person.new
+    p.group_valid?(:name)
+    p.should have(2).errors
+  end
+
 end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: grouped_validations
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  hash: 21
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Adam Meehan
@@ -9,7 +15,7 @@ autorequire: grouped_validations
 bindir: bin
 cert_chain: []
 
-date: 2010-02-23 00:00:00 +11:00
+date: 2010-06-08 00:00:00 +10:00
 default_executable: 
 dependencies: []
 
@@ -41,21 +47,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: grouped_validations
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Define validation groups in ActiveRecord for greater control over which validations to run.