twitter_bootstrap_builder 0.0.3 → 0.0.4

data/lib/twitter_bootstrap_builder/builders/fieldset_builder.rb

@@ -29,14 +29,14 @@ module TwitterBootstrapBuilder
       end
 
       def text_field(method, options={})
-        ControlGroup.new(model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
+        ControlGroup.new(options[:label] || model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
           cg.append form_builder.text_field(method, options)
         end.to_s.html_safe
       end
 
       TwitterBootstrapMarkup::InputSize::VALUES.each do |size|
         define_method "text_field_#{size}" do |method, options={}|
-          ControlGroup.new(model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
+          ControlGroup.new(options[:label] || model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
             options.append!(:class, "input-#{size}")
             cg.append form_builder.text_field(method, options)
           end.to_s.html_safe
@@ -44,14 +44,14 @@ module TwitterBootstrapBuilder
       end
 
       def text_area(method, options={})
-        ControlGroup.new(model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
+        ControlGroup.new(options[:label] || model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
           cg.append form_builder.text_area(method, options)
         end.to_s.html_safe
       end
 
       TwitterBootstrapMarkup::InputSize::VALUES.each do |size|
         define_method "text_area_#{size}" do |method, options={}|
-          ControlGroup.new(model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
+          ControlGroup.new(options[:label] || model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
             options.append!(:class, "input-#{size}")
             cg.append form_builder.text_area(method, options)
           end.to_s.html_safe
@@ -59,49 +59,49 @@ module TwitterBootstrapBuilder
       end
 
       def email_field(method, options={})
-        ControlGroup.new(model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
+        ControlGroup.new(options[:label] || model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
           cg.append form_builder.email_field(method, options)
         end.to_s.html_safe
       end
 
       def password_field(method, options={})
-        ControlGroup.new(model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
+        ControlGroup.new(options[:label] || model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
           cg.append form_builder.password_field(method, options)
         end.to_s.html_safe
       end
 
       def check_box(method, options={})
-        ControlGroup.new(model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
+        ControlGroup.new(options[:label] || model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
           cg.append form_builder.check_box(method, options)
         end.to_s.html_safe
       end
 
       def hidden_field(method, options={})
-        ControlGroup.new(model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
+        ControlGroup.new(options[:label] || model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
           cg.append form_builder.hidden_field(method, options)
         end.to_s.html_safe
       end
 
       def select(method, choices, options={}, html_options={})
-        ControlGroup.new(model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
+        ControlGroup.new(options[:label] || model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
           cg.append form_builder.select(method, choices, options, html_options)
         end.to_s.html_safe
       end
 
       def date_select(method, options={}, html_options={})
-        ControlGroup.new(model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
+        ControlGroup.new(options[:label] || model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
           cg.append form_builder.date_select(method, form_builder.send('objectify_options', options), html_options)
         end.to_s.html_safe
       end
 
       def time_select(method, options={}, html_options={})
-        ControlGroup.new(model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
+        ControlGroup.new(options[:label] || model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
           cg.append form_builder.time_select(method, form_builder.send('objectify_options', options), html_options)
         end.to_s.html_safe
       end
 
       def datetime_select(method, options={}, html_options={})
-        ControlGroup.new(model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
+        ControlGroup.new(options[:label] || model.class.human_attribute_name(method), for: "#{form_builder.object_name}_#{method}") do |cg|
           cg.append form_builder.datetime_select(method, form_builder.send('objectify_options', options), html_options)
         end.to_s.html_safe
       end

data/lib/twitter_bootstrap_builder/version.rb

@@ -1,3 +1,3 @@
 module TwitterBootstrapBuilder
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twitter_bootstrap_builder
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-12 00:00:00.000000000 Z
+date: 2012-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter_bootstrap_markup
-  requirement: &28123860 !ruby/object:Gem::Requirement
+  requirement: &28680948 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *28123860
+  version_requirements: *28680948
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &28123608 !ruby/object:Gem::Requirement
+  requirement: &28680696 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *28123608
+  version_requirements: *28680696
 description: Set of helpers to extend Rails for implement Twitter Bootstrap markup
 email:
 - gabynaiman@gmail.com