grouped_validations 0.2.1 → 0.2.2

data/lib/grouped_validations.rb

@@ -35,14 +35,6 @@ module GroupedValidations
       end
     end
 
-    def group_valid?(group)
-      raise "Validation group '#{group}' not defined" unless validation_groups.include?(group)
-
-      errors.clear
-      run_group_validation_callbacks group
-      errors.empty?
-    end
-
     def groups_valid?(*groups)
       errors.clear
       groups.each do |group|
@@ -51,14 +43,7 @@ module GroupedValidations
       end
       errors.empty?
     end
-
-    def valid_with_groups?
-      valid_without_groups?
-      (validation_groups || []).each do |group|
-        run_group_validation_callbacks group
-      end
-      errors.empty?
-    end
+    alias group_valid? groups_valid?
 
   end
 

data/lib/grouped_validations/active_model.rb

@@ -3,7 +3,7 @@ module GroupedValidations
   module ClassMethods
 
     def define_group_validation_callbacks(group)
-      define_callbacks :"validate_#{group}", :scope => 'validate'
+      define_callbacks :"validate_#{group}", :terminator => "result == false", :scope => 'validate'
     end
 
     def validate_with_groups(*args, &block)
@@ -11,7 +11,7 @@ module GroupedValidations
         options = args.last
         if options.is_a?(Hash) && options.key?(:on)
           options[:if] = Array(options[:if])
-          options[:if] << "@_on_validate == :#{options[:on]}"
+          options[:if] << "self.validation_context == :#{options[:on]}"
         end
         set_callback(:"validate_#{@current_validation_group}", *args, &block)
       else
@@ -23,9 +23,19 @@ module GroupedValidations
 
   module InstanceMethods
 
+    def valid_with_groups?(context=nil)
+      valid_without_groups?(context)
+      (validation_groups || []).each do |group|
+        run_group_validation_callbacks group
+      end
+      errors.empty?
+    end
+
     def run_group_validation_callbacks(group)
-      @_on_validate = new_record? ? :create : :update
+      current_context, self.validation_context = validation_context, (new_record? ? :create : :update)
       send(:"_run_validate_#{group}_callbacks")
+    ensure
+      self.validation_context = current_context
     end
 
   end

data/lib/grouped_validations/active_record.rb

@@ -24,6 +24,14 @@ module GroupedValidations
 
   module InstanceMethods
 
+    def valid_with_groups?
+      valid_without_groups?
+      (validation_groups || []).each do |group|
+        run_group_validation_callbacks group
+      end
+      errors.empty?
+    end
+
     def run_group_validation_callbacks(group)
       base_name = :"validate_#{group}"
       run_callbacks(base_name)

data/lib/grouped_validations/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: grouped_validations
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Adam Meehan
@@ -15,7 +15,7 @@ autorequire: grouped_validations
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:00:00 +10:00
+date: 2010-08-10 00:00:00 +10:00
 default_executable: 
 dependencies: []