formeze 1.1.1 → 1.1.2

data/formeze.gemspec

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

data/lib/formeze.rb

@@ -19,17 +19,19 @@ module Formeze
     end
 
     def validate(value, &error)
-      error.call(:'is required') if required? && value !~ /\S/
-
-      error.call(:'has too many lines') if !multiline? && value.lines.count > 1
+      if value !~ /\S/ # blank
+        error.call(:'is required') if required?
+      else
+        error.call(:'has too many lines') if !multiline? && value.lines.count > 1
 
-      error.call(:'has too many characters') if value.chars.count > char_limit
+        error.call(:'has too many characters') if value.chars.count > char_limit
 
-      error.call(:'has too many words') if word_limit? && value.scan(/\w+/).length > word_limit
+        error.call(:'has too many words') if word_limit? && value.scan(/\w+/).length > word_limit
 
-      error.call(:'is invalid') if pattern? && value !~ pattern
+        error.call(:'is invalid') if pattern? && value !~ pattern
 
-      error.call(:'is invalid') if values? && !values.include?(value)
+        error.call(:'is invalid') if values? && !values.include?(value)
+      end
     end
 
     def key

data/spec/formeze_spec.rb

@@ -418,6 +418,25 @@ describe 'FormWithOptionalKey after parsing input without the key' do
   end
 end
 
+class FormWithOptionalFieldThatCanOnlyHaveSpecifiedValues
+  Formeze.setup(self)
+
+  field :size, required: false, values: %w(S M L XL)
+end
+
+describe 'FormWithOptionalFieldThatCanOnlyHaveSpecifiedValues after parsing blank input' do
+  before do
+    @form = FormWithOptionalFieldThatCanOnlyHaveSpecifiedValues.new
+    @form.parse('size=')
+  end
+
+  describe 'valid query method' do
+    it 'should return true' do
+      @form.valid?.must_equal(true)
+    end
+  end
+end
+
 Rails = Object.new
 
 class RailsForm

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formeze
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors: