better_form 0.4.4 → 0.5.0

data/lib/better_form/builder.rb

@@ -9,14 +9,21 @@ module BetterForm
         validations = generate_validations(@object, field_name)
         options.merge!(validations)
         label = options.delete(:label)
+
+        unless @object.errors[field_name].blank?
+          css_classes = options.delete(:class)
+          options.merge!({ :class => "#{css_classes} invalid" })
+          error_message = generate_error(field_name)
+        end
+
         if label == false
-          super(field_name, *(args << options))
+          super(field_name, *(args << options)) + error_message
         elsif label
-          generate_label(field_type, field_name, label) + super(field_name, *(args << options))
+          generate_label(field_type, field_name, label) + super(field_name, *(args << options)) + error_message
         elsif @template.label_all? == false
-          super(field_name, *(args << options))
+          super(field_name, *(args << options)) + error_message
         else
-          generate_label(field_type, field_name, label) + super(field_name, *(args << options))
+          generate_label(field_type, field_name, label) + super(field_name, *(args << options)) + error_message
         end
       end
     end
@@ -43,6 +50,12 @@ module BetterForm
       label(method, label_text, options ||= {})
     end
 
+    def generate_error(field_name)
+      error_messages = []
+      @object.errors[field_name].each { |error| error_messages << "#{field_name.to_s.humanize} #{error}" }
+      content_tag(:span, error_messages.join(', and '), :class => :error_message)
+    end
+
     def generate_validations(object, attribute)
       validations = {}
       @attribute = attribute

data/lib/better_form/version.rb

@@ -1,3 +1,3 @@
 module BetterForm
-  VERSION = "0.4.4"
+  VERSION = "0.5.0"
 end

metadata

@@ -2,7 +2,7 @@
 name: better_form
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors: 
 - Nicholas Firth-McCoy
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-25 00:00:00 +10:00
+date: 2011-04-28 00:00:00 +10:00
 default_executable: 
 dependencies: []