grouped_validations 0.3.0 → 0.3.1

data/Gemfile

@@ -1,7 +1,8 @@
 # A sample Gemfile
 source "http://rubygems.org"
 
+gem 'rake', '~> 0.8.7'
 gem 'rspec', '~> 2.0.0'
-gem 'activesupport', '~> 3.0.0'
-gem 'activemodel', '~> 3.0.0'
+gem 'activesupport', '~> 3.2.0'
+gem 'activemodel', '~> 3.2.0'
 gem 'ruby-debug'

data/Gemfile.lock

@@ -1,16 +1,19 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.1)
-      activesupport (= 3.0.1)
-      builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activesupport (3.0.1)
-    builder (2.1.2)
+    activemodel (3.2.2)
+      activesupport (= 3.2.2)
+      builder (~> 3.0.0)
+    activesupport (3.2.2)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    builder (3.0.0)
     columnize (0.3.1)
     diff-lcs (1.1.2)
-    i18n (0.4.2)
+    i18n (0.6.0)
     linecache (0.43)
+    multi_json (1.1.0)
+    rake (0.8.7)
     rspec (2.0.1)
       rspec-core (~> 2.0.1)
       rspec-expectations (~> 2.0.1)
@@ -31,7 +34,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activemodel (~> 3.0.0)
-  activesupport (~> 3.0.0)
+  activemodel (~> 3.2.0)
+  activesupport (~> 3.2.0)
+  rake (~> 0.8.7)
   rspec (~> 2.0.0)
   ruby-debug

data/lib/grouped_validations.rb

@@ -34,60 +34,57 @@ module GroupedValidations
 
   end
 
-  module InstanceMethods
-
-    def valid?(context=nil)
-      super
-      validation_groups.each do |group|
-        _run_group_validation_callbacks(group, context)
-      end
-      errors.empty?
+  def valid?(context=nil)
+    super
+    validation_groups.each do |group|
+      _run_group_validation_callbacks(group, context)
     end
+    errors.empty?
+  end
 
-    def groups_valid?(*groups)
-      options = groups.extract_options!
-      errors.clear
-      groups.each do |group|
-        raise "Validation group '#{group}' not defined" unless validation_groups.include?(group)
-        _run_group_validation_callbacks(group, options[:context])
-      end
-      errors.empty?
-    end
-    alias_method :group_valid?, :groups_valid?
-
-    def grouped_errors(context=nil)
-      original_errors = @errors.dup if @errors
-      @errors = nil
-      grouped = {}
-
-      with_validation_context(context) do
-        _run_validate_callbacks
-        grouped[nil] = @errors
-
-        validation_groups.each do |group|
-          @errors = nil
-          send(:"_run_validate_#{group}_callbacks")
-          grouped[group] = @errors
-        end
-      end
-      grouped.values.all?(&:empty?) ? {} : grouped
-    ensure
-      @errors = original_errors
+  def groups_valid?(*groups)
+    options = groups.extract_options!
+    errors.clear
+    groups.each do |group|
+      raise "Validation group '#{group}' not defined" unless validation_groups.include?(group)
+      _run_group_validation_callbacks(group, options[:context])
     end
+    errors.empty?
+  end
+  alias_method :group_valid?, :groups_valid?
+
+  def grouped_errors(context=nil)
+    original_errors = @errors.dup if @errors
+    @errors = nil
+    grouped = {}
 
-    def _run_group_validation_callbacks(group, context=nil)
-      with_validation_context(context) do
+    with_validation_context(context) do
+      _run_validate_callbacks
+      grouped[nil] = @errors
+
+      validation_groups.each do |group|
+        @errors = nil
         send(:"_run_validate_#{group}_callbacks")
+        grouped[group] = @errors
       end
     end
+    grouped.values.all?(&:empty?) ? {} : grouped
+  ensure
+    @errors = original_errors
+  end
 
-    def with_validation_context(context)
-      context ||= (persisted? ? :update : :create)
-      current_context, self.validation_context = validation_context, context
-      yield
-    ensure
-      self.validation_context = current_context
+  def _run_group_validation_callbacks(group, context=nil)
+    with_validation_context(context) do
+      send(:"_run_validate_#{group}_callbacks")
     end
+  end
 
+  def with_validation_context(context)
+    context ||= (persisted? ? :update : :create)
+    current_context, self.validation_context = validation_context, context
+    yield
+  ensure
+    self.validation_context = current_context
   end
+
 end

data/lib/grouped_validations/version.rb

@@ -1,3 +1,3 @@
 module GroupedValidations
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/spec/grouped_validations_spec.rb

@@ -213,8 +213,9 @@ describe GroupedValidations do
 
     it 'should return hash of error hashes with validation groups as keys' do
       errors = person.grouped_errors
-      errors[:first_name_group].should == {:first_name => ["can't be blank"]}
-      errors[:last_name_group].should  == {:last_name  => ["can't be blank"]}
+
+      errors[:first_name_group][:first_name].should eq ["can't be blank"]
+      errors[:last_name_group][:last_name].should eq ["can't be blank"]
     end
 
     it 'should return hash of errors for validations outside a validation group, for nil key' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: grouped_validations
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Adam Meehan
@@ -15,7 +15,7 @@ autorequire: grouped_validations
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 +11:00
+date: 2012-05-03 00:00:00 +10:00
 default_executable: 
 dependencies: []