formtastic 0.9.6 → 0.9.7

data/generators/formtastic/templates/formtastic.rb

@@ -25,7 +25,7 @@
 # Formtastic::SemanticFormBuilder.inline_errors = :sentence
 
 # Set the method to call on label text to transform or format it for human-friendly
-# reading (overridden if :label or i18 used). Defaults to :humanize.
+# reading when formtastic is user without object. Defaults to :humanize.
 # Formtastic::SemanticFormBuilder.label_str_method = :humanize
 
 # Set the array of methods to try calling on parent objects in :select and :radio inputs

data/lib/formtastic.rb

@@ -1478,7 +1478,11 @@ module Formtastic #:nodoc:
       end
 
       def humanized_attribute_name(method) #:nodoc:
-        method.to_s.send(@@label_str_method)
+        if @object && @object.class.respond_to?(:human_attribute_name)
+          @object.class.human_attribute_name(method.to_s)
+        else
+          method.to_s.send(@@label_str_method)
+        end
       end
 
       # Internal generic method for looking up localized values within Formtastic

data/spec/input_spec.rb

@@ -400,8 +400,9 @@ describe 'SemanticFormBuilder#input' do
 
       describe 'when not provided' do
         describe 'when localized label is NOT provided' do
-          describe 'and label_str_method is not provided' do
+          describe 'and object is not given' do
             it 'should default the humanized method name, passing it down to the label tag' do
+              ::Formtastic::SemanticFormBuilder.label_str_method = :humanize
 
               semantic_form_for(:project, :url => 'http://test.host') do |builder|
                 concat(builder.input(:meta_description))
@@ -411,14 +412,16 @@ describe 'SemanticFormBuilder#input' do
             end
           end
 
-          describe 'and label_str_method is :capitalize' do
-            it 'should capitalize method name, passing it down to the label tag' do
-              with_config :label_str_method, :capitalize do
-                semantic_form_for(:project, :url => 'http://test.host') do |builder|
-                  concat(builder.input(:meta_description))
-                end
-                output_buffer.should have_tag("form li label", /#{'meta_description'.capitalize}/)
+          describe 'and object is given' do
+            it 'should delegate the label logic to class human attribute name and pass it down to the label tag' do
+              @new_post.stub!(:meta_description) # a two word method name
+              @new_post.class.should_receive(:human_attribute_name).with('meta_description').and_return('meta_description'.humanize)
+
+              semantic_form_for(@new_post) do |builder|
+                concat(builder.input(:meta_description))
               end
+
+              output_buffer.should have_tag("form li label", /#{'meta_description'.humanize}/)
             end
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: formtastic
 version: !ruby/object:Gem::Version 
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors: 
 - Justin French
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-03 00:00:00 +11:00
+date: 2009-12-04 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency