formeze 2.0.0 → 2.1.0

data/README.md

@@ -285,9 +285,10 @@ class ExampleForm < Formeze::Form
 end
 ```
 
-The error for the email validation would use the `formeze.errors.invalid`
-I18n key, defaulting to "is invalid". The error message for the password
-confirmation validation would use the `formeze.errors.does_not_match` key.
+The error for the email field validation would include the value of the
+`formeze.errors.invalid` I18n key, defaulting to "is invalid" if the I18n
+key does not exist. The error for the password_confirmation field validation
+would include the value of the `formeze.errors.does_not_match` I18n key.
 
 
 Rails usage

data/formeze.gemspec

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

data/lib/formeze.rb

@@ -1,25 +1,11 @@
 require 'cgi'
 
 module Formeze
-  class Label
-    def initialize(name)
-      @name = name
-    end
-
-    def to_s
-      @name.to_s.tr('_', ' ').capitalize
-    end
-  end
-
   class Field
     attr_reader :name
 
     def initialize(name, options = {})
       @name, @options = name, options
-
-      if options.has_key?(:word_limit)
-        Kernel.warn '[formeze] :word_limit option is deprecated, please use custom validation instead'
-      end
     end
 
     def validate(value, form)
@@ -57,7 +43,7 @@ module Formeze
     end
 
     def label
-      @options.fetch(:label) { Formeze.translate(name, :scope => [:formeze, :labels], :default => Label.new(name)) }
+      @options.fetch(:label) { Formeze.translate(name, :scope => [:formeze, :labels], :default => Formeze.label(name)) }
     end
 
     def required?
@@ -73,21 +59,13 @@ module Formeze
     end
 
     def too_long?(value)
-      too_many_characters?(value) || too_many_words?(value)
+      value.chars.count > @options.fetch(:maxlength) { 64 }
     end
 
     def too_short?(value)
       @options.has_key?(:minlength) && value.chars.count < @options.fetch(:minlength)
     end
 
-    def too_many_characters?(value)
-      value.chars.count > @options.fetch(:maxlength) { 64 }
-    end
-
-    def too_many_words?(value)
-      @options.has_key?(:word_limit) && value.scan(/\w+/).length > @options[:word_limit]
-    end
-
     def no_match?(value)
       @options.has_key?(:pattern) && value !~ @options[:pattern]
     end
@@ -164,12 +142,8 @@ module Formeze
       @options.has_key?(:when) ? form.instance_eval(&@options[:when]) : true
     end
 
-    def value?(form)
-      form.send(@field.name) =~ /\S/
-    end
-
     def validate(form)
-      if validates?(form) && value?(form)
+      if validates?(form) && !form.errors_on?(@field.name)
         return_value = if @block.arity == 1
           @block.call(form.send(@field.name))
         else
@@ -345,6 +319,10 @@ module Formeze
     end
   end
 
+  def self.label(field_name)
+    field_name.to_s.tr('_', ' ').capitalize
+  end
+
   def self.scrub_methods
     @scrub_methods ||= {
       :strip => :strip.to_proc,

data/spec/formeze_spec.rb

@@ -269,23 +269,6 @@ describe 'FormWithMinLengthField after parsing input with too few characters' do
   end
 end
 
-class FormWithWordLimitedField < Formeze::Form
-  field :title, :word_limit => 2
-end
-
-describe 'FormWithWordLimitedField after parsing input with too many words' do
-  before do
-    @form = FormWithWordLimitedField.new
-    @form.parse('title=This+Title+Will+Be+Too+Long')
-  end
-
-  describe 'valid query method' do
-    it 'returns false' do
-      @form.valid?.must_equal(false)
-    end
-  end
-end
-
 class FormWithFieldThatMustMatchPattern < Formeze::Form
   field :number, :pattern => /\A\d+\z/
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formeze
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-10 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -75,9 +75,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: See description
 test_files: []
-has_rdoc: