formeze 2.1.0 → 2.1.1

data/formeze.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'formeze'
-  s.version = '2.1.0'
+  s.version = '2.1.1'
   s.platform = Gem::Platform::RUBY
   s.authors = ['Tim Craft']
   s.email = ['mail@timcraft.com']

data/lib/formeze.rb

@@ -142,8 +142,16 @@ module Formeze
       @options.has_key?(:when) ? form.instance_eval(&@options[:when]) : true
     end
 
+    def field_value?(form)
+      form.send(@field.name) =~ /\S/
+    end
+
+    def field_errors?(form)
+      form.errors_on?(@field.name)
+    end
+
     def validate(form)
-      if validates?(form) && !form.errors_on?(@field.name)
+      if validates?(form) && field_value?(form) && !field_errors?(form)
         return_value = if @block.arity == 1
           @block.call(form.send(@field.name))
         else

data/spec/formeze_spec.rb

@@ -665,6 +665,39 @@ describe 'FormWithCustomMinimumSpendValidation after parsing invalid input' do
   end
 end
 
+class FormWithOptionalFieldAndCustomValidation < Formeze::Form
+  field :website, :required => false
+
+  validates :website do
+    website =~ /\./ && website !~ /\s/
+  end
+end
+
+describe 'FormWithOptionalFieldAndCustomValidation after parsing blank input' do
+  before do
+    @form = FormWithOptionalFieldAndCustomValidation.new
+    @form.parse('website=')
+  end
+
+  describe 'valid query method' do
+    it 'returns true' do
+      @form.valid?.must_equal(true)
+    end
+  end
+
+  describe 'errors method' do
+    it 'returns an empty array' do
+      @form.errors.must_be_empty
+    end
+  end
+
+  describe 'errors_on query method' do
+    it 'returns false when given the field name' do
+      @form.errors_on?(:website).must_equal(false)
+    end
+  end
+end
+
 describe 'FormWithField on Rails' do
   before do
     @form = FormWithField.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formeze
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-27 00:00:00.000000000 Z
+date: 2013-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake