formtastic 1.2.0.beta → 1.2.0.beta2

data/README.textile

@@ -115,6 +115,30 @@ A proof-of-concept stylesheet is provided which you can include in your layout.
 </pre>
 
 
+h2. Syntax
+
+*Please note:* Formtastic makes use of a lot of ERB blocks and currently supports both Rails 2 and Rails 3, which means the syntax in these examples will differ depending on which version of Rails you're using.
+
+The difference is subtle, with most blocks in Rails 3 requiring the addition of an equals sign:
+
+<pre>
+  <!-- Rails 2 -->
+  <% semantic_form_for @user do |form| %>
+    <% form.inputs do %>
+      ...
+    <% end %>
+  <% end %>
+  
+  <!-- Rails 3 -->
+  <%= semantic_form_for @user do |form| %>
+    <%= form.inputs do %>
+      ...
+    <% end %>
+  <% end %>
+  
+This README is currently documenting the Rails 2 way only. If you're using Rails 3 and your forms aren't rendering everything as expected, try changing @<%@ to @<%=@.
+
+
 h2. Usage
 
 Forms are really boring to code... you want to get onto the good stuff as fast as possible.
@@ -128,7 +152,9 @@ This renders a set of inputs (one for _most_ columns in the database table, and
   <% end %>
 </pre>
 
-If you want to specify the order of the fields, skip some of the fields or even add in fields that Formtastic couldn't detect, you can pass in a list of field names to @inputs@ and list of button names to @buttons@:
+This is a great way to get something up fast, but like scaffolding, it's not recommended for production.
+
+You probably want to specify the order of the fields, skip some of the fields or even add in fields that Formtastic couldn't detect, you can pass in a list of field names to @inputs@ and list of button names to @buttons@:
 
 <pre>
   <% semantic_form_for @user do |form| %>
@@ -137,7 +163,7 @@ If you want to specify the order of the fields, skip some of the fields or even
   <% end %>
 </pre>
 
-If you want control over the input type Formtastic uses for each field, you can expand the @inputs@ and @buttons@ blocks. This specifies the @:section@ input should be a set of radio buttons (rather than the default select box), and that the @:created_at@ field should be a string (rather than the default datetime selects):
+You probably want control over the input type Formtastic uses for each field, you can expand the @inputs@ and @buttons@ blocks. This specifies the @:section@ input should be a set of radio buttons (rather than the default select box), and that the @:created_at@ field should be a string (rather than the default datetime selects):
 
 <pre>
   <% semantic_form_for @post do |form| %>
@@ -428,7 +454,7 @@ If I18n-lookups is disabled, i.e.:
       <%= form.input :section, :label => true %>    # => :label => I18n.t('activerecord.attributes.user.section')  or 'Section'
     <% end %>
     <% form.buttons do %>
-      <%= form.commit_button true %>                # => "Save changes" (if we are in edit that is...)
+      <%= form.commit_button true %>                # => "Update %{model}" (if we are in edit that is...)
     <% end %>
   <% end %>
 </pre>
@@ -558,6 +584,25 @@ If you want to add your own input types to encapsulate your own logic or interfa
 
 @Formtastic::SemanticFormHelper.builder = MyCustomBuilder@
 
+Be aware that you should either set the options on custom builder or require it after setting options on formtastic default builder.
+
+<pre>
+  # OK
+  Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
+  require 'formtastic/my_custom_builder'
+  Formtastic::SemanticFormHelper.builder = Formtastic::MyCustomBuilder
+  
+  # OK
+  require 'formtastic/my_custom_builder'
+  Formtastic::SemanticFormHelper.builder = Formtastic::MyCustomBuilder
+  Formtastic::MyCustomBuilder.i18n_lookups_by_default = true
+  
+  # WRONG!
+  require 'formtastic/my_custom_builder'
+  Formtastic::SemanticFormBuilder.i18n_lookups_by_default = true
+  Formtastic::SemanticFormHelper.builder = Formtastic::MyCustomBuilder
+</pre>
+
 
 h2. Security
 

data/lib/formtastic/i18n.rb

@@ -4,13 +4,7 @@ module Formtastic
   module I18n
 
     DEFAULT_SCOPE = [:formtastic].freeze
-    DEFAULT_VALUES = {
-        :required       => 'required',
-        :yes            => 'Yes',
-        :no             => 'No',
-        :create         => 'Create %{model}',
-        :update         => 'Update %{model}'
-      }.freeze
+    DEFAULT_VALUES = YAML.load_file(File.expand_path("../../locale/en.yml", __FILE__))["en"]["formtastic"].freeze
     SCOPES = [
         '%{model}.%{nested_model}.%{action}.%{attribute}',
         '%{model}.%{action}.%{attribute}',

data/lib/formtastic.rb

@@ -340,7 +340,9 @@ module Formtastic #:nodoc:
     #
     def commit_button(*args)
       options = args.extract_options!
+      ::ActiveSupport::Deprecation.warn(":class => 'whatever' is deprecated on commit button, use :wrapper_html => { :class => 'whatever' } instead.", caller) if options.key?(:class)
       text = options.delete(:label) || args.shift
+      
 
       if @object && (@object.respond_to?(:persisted?) || @object.respond_to?(:new_record?))
         if @object.respond_to?(:persisted?) # ActiveModel
@@ -371,10 +373,14 @@ module Formtastic #:nodoc:
 
       button_html = options.delete(:button_html) || {}
       button_html.merge!(:class => [button_html[:class], key].compact.join(' '))
-      element_class = ['commit', options.delete(:class)].compact.join(' ') # TODO: Add class reflecting on form action.
+
+      wrapper_html_class = ['commit', options.delete(:class)].compact # TODO: Add class reflecting on form action.
+      wrapper_html = options.delete(:wrapper_html) || {}
+      wrapper_html[:class] = (wrapper_html_class << wrapper_html[:class] << button_html[:class]).flatten.compact.join(' ')
+
       accesskey = (options.delete(:accesskey) || self.class.default_commit_button_accesskey) unless button_html.has_key?(:accesskey)
       button_html = button_html.merge(:accesskey => accesskey) if accesskey
-      template.content_tag(:li, Formtastic::Util.html_safe(self.submit(text, button_html)), :class => element_class)
+      template.content_tag(:li, Formtastic::Util.html_safe(self.submit(text, button_html)), wrapper_html)
     end
 
     # A thin wrapper around #fields_for to set :builder => Formtastic::SemanticFormBuilder

data/lib/locale/en.yml

@@ -2,7 +2,6 @@ en:
   formtastic:
     :yes: 'Yes'
     :no: 'No'
-    create: 'Create'
-    save: 'Save'
-    submit: 'Submit'
-    required: 'Required'
+    :create: 'Create %{model}'
+    :update: 'Update %{model}'
+    :required: 'required'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: formtastic
 version: !ruby/object:Gem::Version 
-  hash: 31098177
+  hash: -1848230070
   prerelease: true
   segments: 
   - 1
   - 2
   - 0
-  - beta
-  version: 1.2.0.beta
+  - beta2
+  version: 1.2.0.beta2
 platform: ruby
 authors: 
 - Justin French
@@ -115,6 +115,22 @@ dependencies:
         version: 1.0.0
   type: :development
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: hpricot
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 57
+        segments: 
+        - 0
+        - 8
+        - 3
+        version: 0.8.3
+  type: :development
+  version_requirements: *id007
 description: A Rails form builder plugin/gem with semantically rich and accessible markup
 email: justin@indent.com.au
 executables: []