formeze 1.5.1 → 1.6.0

data/README.md

@@ -14,6 +14,14 @@ of being "strict by default", forcing the application code to be explicit in
 what it accepts as input.
 
 
+Installation
+------------
+
+```
+$ gem install formeze
+```
+
+
 Example usage
 -------------
 

data/Rakefile.rb

@@ -1,7 +1,7 @@
 require 'rake/testtask'
 
-task :default => :test
+task :default => :spec
 
-Rake::TestTask.new do |t|
+Rake::TestTask.new(:spec) do |t|
   t.test_files = FileList['spec/*_spec.rb']
 end

data/formeze.gemspec

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

data/lib/formeze.rb

@@ -120,17 +120,7 @@ module Formeze
   module ArrayAttrAccessor
     def array_attr_reader(name)
       define_method(name) do
-        ivar = :"@#{name}"
-
-        values = instance_variable_get(ivar)
-
-        if values.nil?
-          values = []
-
-          instance_variable_set(ivar, values)
-        end
-
-        values
+        Array(instance_variable_get(:"@#{name}"))
       end
     end
 
@@ -138,13 +128,7 @@ module Formeze
       define_method(:"#{name}=") do |value|
         ivar = :"@#{name}"
 
-        values = instance_variable_get(ivar)
-
-        if values.nil?
-          instance_variable_set(ivar, [value])
-        else
-          values << value
-        end
+        instance_variable_set(ivar, Array(instance_variable_get(ivar)) + [value])
       end
     end
 
@@ -188,6 +172,10 @@ module Formeze
     def error(message)
       errors << message
     end
+
+    def parse(encoded_form_data)
+      new.tap { |form| form.parse(encoded_form_data) }
+    end
   end
 
   class KeyError < StandardError; end
@@ -219,7 +207,7 @@ module Formeze
           scrubbed_value = field.scrub(value)
 
           field.validate(scrubbed_value) do |error|
-            errors << UserError.new("#{field.label} #{error}")
+            error!("#{field.label} #{error}", field.name)
           end
 
           send(:"#{field.name}=", scrubbed_value)
@@ -228,11 +216,33 @@ module Formeze
 
       raise KeyError unless form_data.empty?
 
-      self.class.checks.zip(self.class.errors) do |check, error|
-        instance_eval(&check) ? next : errors << UserError.new(error)
+      self.class.checks.zip(self.class.errors) do |check, message|
+        instance_eval(&check) ? next : error!(message)
       end
     end
 
+    def valid?
+      errors.empty?
+    end
+
+    def errors?
+      errors.size > 0
+    end
+
+    def errors
+      @errors ||= []
+    end
+
+    def errors_on?(field_name)
+      field_errors[field_name].size > 0
+    end
+
+    def errors_on(field_name)
+      field_errors[field_name]
+    end
+
+    private
+
     def field_defined?(field)
       if field.defined_if?
         instance_eval(&field.defined_if)
@@ -243,16 +253,16 @@ module Formeze
       end
     end
 
-    def errors
-      @errors ||= []
+    def field_errors
+      @field_errors ||= Hash.new { |h, k| h[k] = [] }
     end
 
-    def errors?
-      errors.size > 0
-    end
+    def error!(message, field_name = nil)
+      error = UserError.new(message)
 
-    def valid?
-      errors.empty?
+      errors << error
+
+      field_errors[field_name] << error unless field_name.nil?
     end
   end
 

data/spec/formeze_spec.rb

@@ -69,6 +69,20 @@ describe 'FormWithField after parsing valid input' do
       @form.errors.must_be_empty
     end
   end
+
+  describe 'errors_on query method' do
+    it 'should return false when given the title field name' do
+      @form.errors_on?(:title).must_equal(false)
+    end
+  end
+
+  describe 'errors_on method' do
+    it 'should return an empty array when given the title field name' do
+      errors = @form.errors_on(:title)
+      errors.must_be_instance_of(Array)
+      errors.must_be_empty
+    end
+  end
 end
 
 describe 'FormWithField after parsing blank input' do
@@ -90,12 +104,27 @@ describe 'FormWithField after parsing blank input' do
   end
 
   describe 'errors method' do
-    it 'should return an array containing an error message' do
+    it 'should return an array containing a single error message' do
       @form.errors.must_be_instance_of(Array)
       @form.errors.length.must_equal(1)
       @form.errors.first.to_s.must_equal('Title is required')
     end
   end
+
+  describe 'errors_on query method' do
+    it 'should return true when given the title field name' do
+      @form.errors_on?(:title).must_equal(true)
+    end
+  end
+
+  describe 'errors_on method' do
+    it 'should return an array containing a single error message when given the title field name' do
+      errors = @form.errors_on(:title)
+      errors.must_be_instance_of(Array)
+      errors.length.must_equal(1)
+      errors.first.to_s.must_equal('Title is required')
+    end
+  end
 end
 
 describe 'FormWithField after parsing input containing newlines' do
@@ -111,6 +140,15 @@ describe 'FormWithField after parsing input containing newlines' do
   end
 end
 
+describe 'FormWithField parse class method' do
+  it 'should create a new instance of the class and call the parse instance method' do
+    form = FormWithField.parse('title=Untitled')
+    form.must_be_instance_of(FormWithField)
+    form.valid?.must_equal(true)
+    form.title.must_equal('Untitled')
+  end
+end
+
 class FormWithOptionalField < Formeze::Form
   field :title, required: false
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formeze
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-22 00:00:00.000000000 Z
+date: 2012-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n