formulate 0.0.5 → 0.0.6

data/lib/formulate/form_builder.rb

@@ -39,6 +39,8 @@ module Formulate
 
     def input(method, options={}, &block)
       type = options.delete(:type)
+      prefix = options.delete(:prefix)
+      suffix = options.delete(:suffix)
       instructions = options.delete(:instructions)
       errors = errors_on(method)
 
@@ -46,6 +48,7 @@ module Formulate
       classes << (options.delete(:required) ? 'required' : 'optional')
       classes << 'checkbox' if type == :check_box
       classes << 'radio' if type == :radio_button
+      classes << 'error' if errors.any?
       classes << options.delete(:class) if options[:class]
       classes.uniq!
 
@@ -87,7 +90,7 @@ module Formulate
       end unless block_given?
 
       label = options[:label] != false ? label(method, options[:label]) : nil
-      markup = [label, input].compact
+      markup = [label, prefix, input, suffix].compact
       markup.reverse! if type.in?(:check_box, :radio_button)
 
       markup << @template.capture_haml do

data/lib/formulate/form_helper.rb

@@ -1,9 +1,16 @@
 module Formulate
   module FormHelper
+    FIELD_ERROR_PROC = proc { |html_tag, instance_tag| html_tag }
+
     def form_for(record, options={}, &proc)
       options[:html] ||= {}
       options[:html][:class] ||= 'formulate'
+
+      original_field_error_proc = ::ActionView::Base.field_error_proc
+      ::ActionView::Base.field_error_proc = FIELD_ERROR_PROC
       super
+    ensure
+      ::ActionView::Base.field_error_proc = original_field_error_proc
     end
   end
 end

data/lib/formulate/version.rb

@@ -1,3 +1,3 @@
 module Formulate
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/vendor/assets/stylesheets/formulate.css.sass

@@ -73,6 +73,15 @@ form.formulate
         margin-right: 0.5em
         width: inherit
 
+    &.error
+      label
+        color: $error-color
+
+      input,
+      select,
+      textarea
+        border-color: $error-color
+
     p
       font-size: 0.875em
       font-style: italic
@@ -119,12 +128,3 @@ form.formulate
       li
         list-style: disc
         line-height: $line-height
-
-  .field_with_errors
-    label
-      color: $error-color
-
-    input,
-    select,
-    textarea
-      border-color: $error-color

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formulate
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-10 00:00:00.000000000 Z
+date: 2012-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack