validation-scopes 0.0.1 → 0.0.3

data/README.md

@@ -4,13 +4,18 @@ Validation Scopes allows you to group validations together that share the same c
 
     class Car < ActiveRecord::Base
       validation_scope :if => Proc.new { |u| u.step == 2 } do
-        # All validations here get their options merged with the options passed in above
         validates_presence_of :variant
         validates_presence_of :body
       end
       
       validation_scope :if => Proc.new { |u| i.step == 3 } do
         validates_inclusion_of :outstanding_finance, :in => [true, false], :if => Proc.new { |u| u.finance == true }
+        # Duplicate keys are turned into arrays
+        # In this case InclusionValidator would get an array containing both Procs in the :if attribute
+        
+        validate do
+          errors.add(:weight, "Must be greater than 0") unless !@weight.nil? && @weight > 0
+        end
       end
     end
     

data/lib/validation_scopes.rb

@@ -12,27 +12,42 @@ module ValidationScopes
       block.call
       @_validation_scope_options = nil
       @_in_validation_scope = false
+      @_handled_by_with = false
     end
     
-    def validate(*args, &block)
+    def validates_with(*args, &block)
       if @_in_validation_scope
-        if args.empty?
-          args = [@_validation_scope_options.dup]
-        elsif args.last.is_a?(Hash) && args.last.extractable_options?
-          options = args.extract_options!
-          options = options.dup
-          @_validation_scope_options.each_key do |key|
-            if options[key].nil?
-              options[key] = @_validation_scope_options[key]
-            else
-              options[key] = Array.wrap(options[key])
-              options[key] << @_validation_scope_options[key]
-            end
+        merge_args(args)
+        @_handled_by_with = true
+      end
+      super(*args, &block)
+    end
+    
+    def validate(*args, &block)
+      if @_in_validation_scope & !@_handled_by_with
+        merge_args(args)
+      end
+      super(*args, &block)
+    end
+    
+    protected
+    
+    def merge_args(args)
+      if args.empty?
+        args << @_validation_scope_options.dup
+      elsif args.last.is_a?(Hash) && args.last.extractable_options?
+        options = args.extract_options!
+        options = options.dup
+        @_validation_scope_options.each_key do |key|
+          if options[key].nil?
+            options[key] = @_validation_scope_options[key]
+          else
+            options[key] = Array.wrap(options[key])
+            options[key] << @_validation_scope_options[key]
           end
-          args << options
         end
+        args << options
       end
-      super(*args, &block)
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,8 +1,5 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
-require 'validation_scopes'
 require 'bundler/setup'
+require 'validation_scopes'
 require 'rspec'
 
 RSpec.configure do |config|

data/spec/validation_scopes_spec.rb

@@ -15,6 +15,19 @@ class TestUser
   end
 end
 
+class TestValidator < ActiveModel::EachValidator
+  attr_accessor :options
+  
+  def initialize(options)
+    @options = options
+    super(options)
+  end
+  
+  def validate(record)
+    
+  end
+end
+
 describe ".validation_scope" do
   
   context "validates_with" do
@@ -45,6 +58,7 @@ describe ".validation_scope" do
     it "only validates eye colour when on step 3 and age is above 20" do
       @user.eye_colour = nil
       @user.should be_valid
+      @user.age = 20
       @user.step = 3
       @user.eye_colour = "red"
       @user.should be_valid
@@ -54,7 +68,10 @@ describe ".validation_scope" do
       @user.should be_valid
     end
     
-    after { Object.send(:remove_const, :User) }
+    it "calls validates_with with merged scope options" do
+      presence_validator = User.validators_on(:name).first
+      presence_validator.options.should eq({:if => :step_2?})
+    end
   end
   
   context "validate method" do
@@ -79,7 +96,27 @@ describe ".validation_scope" do
       user.weight = 0
       user.should be_valid
     end
+  end
+  
+  context "custom validators" do
+    before do
+      User = Class.new(TestUser) do
+        validation_scope :unless => :step_2?, :some_config_var => 5 do
+          validates_with TestValidator, {:attributes => [:name], :some_config_var => 6}
+        end
+      end
+      @validator = User.validators_on(:name).first
+    end
     
-    after { Object.send(:remove_const, :User) }
+    it "passes the options in" do
+      @validator.options[:unless].should eq(:step_2?)
+      @validator.options[:some_config_var].should be
+    end
+    
+    it "turns the duplicate options into an array" do
+      @validator.options[:some_config_var].should eq([6, 5])
+    end
   end
+  
+  after { Object.send(:remove_const, :User) if defined?(User) }
 end

data/validation-scopes.gemspec

@@ -3,11 +3,11 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "validation-scopes"
-  s.version     = "0.0.1"# Validation::Scopes::VERSION
+  s.version     = "0.0.3"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Steve Hodgkiss"]
   s.email       = ["steve@hodgkiss.me.uk"]
-  s.homepage    = ""
+  s.homepage    = "https://github.com/stevehodgkiss/validation-scopes"
   s.summary     = %q{Scope ActiveModel validations}
   s.description = %q{Scope ActiveModel validations}
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Steve Hodgkiss
@@ -54,7 +54,7 @@ files:
 - specs.watchr
 - validation-scopes.gemspec
 has_rdoc: true
-homepage: ""
+homepage: https://github.com/stevehodgkiss/validation-scopes
 licenses: []
 
 post_install_message: