bs_form_builder 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb43b999ee5f0362b1544f99f3b1e442240f57d9
-  data.tar.gz: 6c86a155cf8abb5a4731a1a932e42f33e2ab4734
+  metadata.gz: 004500afba4cd769f5b1c2617bcf5a495298dd80
+  data.tar.gz: 850351fd8aec0e70359c3efb60fa3d87c6d5f782
 SHA512:
-  metadata.gz: 9427f597d16817ca1669966b6e7861de9ca75dea6901f0c1b55c38727a84be763219105c2009955c2cf6c1a67e0a44d185bf5fae4a474f338e15ef3f6e334a35
-  data.tar.gz: d4b921c2cce23feea98b32e5500d2c56e8a005280c0d60ec81833a296bbd080308a044139780d7feeb90b740c0da890121563bb6adb8260cf07d5286bca0518a
+  metadata.gz: 7c648e99f138a9876a7915d4087aa9ac42b4c4ef18aab73365023fa23a60fe19891b8ce29fe64e8f537b91d786a12761ac77c11783038aca649a9d8cc1fa236d
+  data.tar.gz: 4867b1a3bc53223583a536486268f9744bb0f9cfc4376a6e7c49822d11a28f47c4e258467fe41fe69b3b7892083c6e21123ce2c12341001393b683361f69833a

data/lib/bootstrap_form_builder/horizontal_form_builder.rb

@@ -2,21 +2,21 @@
 #
 class BootstrapFormBuilder::HorizontalFormBuilder < ActionView::Helpers::FormBuilder
   def email_field(name, opts = {})
-    form_group(name) do
+    form_group(name, opts.slice(:label_options, :group_options, :tip_options)) do
       super(name, opts.reverse_merge(:class => 'form-control',
                                      :placeholder => help(name)))
     end
   end
 
   def text_field(name, opts = {})
-    form_group(name) do
+    form_group(name, opts.slice(:label_options, :group_options, :tip_options)) do
       super(name, opts.reverse_merge(:class => 'form-control',
                                      :placeholder => help(name)))
     end
   end
 
   def search_field(name, opts = {})
-    form_group(name) do
+    form_group(name, opts.slice(:label_options, :group_options, :tip_options)) do
       @template.content_tag(:div,
                   super(name, opts.reverse_merge(:class => 'form-control',
                                                  :placeholder => help(name))) +
@@ -28,28 +28,28 @@ class BootstrapFormBuilder::HorizontalFormBuilder < ActionView::Helpers::FormBui
   end
 
   def password_field(name, opts = {})
-    form_group(name) do
+    form_group(name, opts.slice(:label_options, :group_options, :tip_options)) do
       super(name, opts.reverse_merge(:class => 'form-control',
                                      :placeholder => help(name)))
     end
   end
 
   def date_field(name, opts = {})
-    form_group(name) do
+    form_group(name, opts.slice(:label_options, :group_options, :tip_options)) do
       super(name, opts.reverse_merge(:class => 'form-control',
                                      :placeholder => help(name)))
     end
   end
 
   def number_field(name, opts = {})
-    form_group(name) do
+    form_group(name, opts.slice(:label_options, :group_options, :tip_options)) do
       super(name, opts.reverse_merge(:class => 'form-control',
                                      :placeholder => help(name)))
     end
   end
 
   def check_box(name, opts = {})
-    form_group(name) do
+    form_group(name, opts.slice(:label_options, :group_options, :tip_options)) do
       @template.content_tag(:div,
                             @template.content_tag(:label, super(name, opts) + (help(name) || "&nbsp;").html_safe),
                             :class => 'checkbox')
@@ -69,7 +69,7 @@ class BootstrapFormBuilder::HorizontalFormBuilder < ActionView::Helpers::FormBui
   #}
   #
   def justified_radio_button_group(name, button_options, opts = {})
-    form_group(name) do
+    form_group(name, opts.slice(:label_options, :group_options, :tip_options)) do
       buttons = button_options.map do |button|
         @template.content_tag(:div, radio_button_label(name, button), :class => 'btn-group')
       end.join("\n").html_safe
@@ -82,7 +82,7 @@ class BootstrapFormBuilder::HorizontalFormBuilder < ActionView::Helpers::FormBui
   end
 
   def radio_button_group(name, button_options, opts = {})
-    form_group(name) do
+    form_group(name, opts.slice(:label_options, :group_options, :tip_options)) do
       buttons = button_options.map do |button|
         radio_button_label(name, button)
       end.join("\n").html_safe
@@ -103,29 +103,31 @@ class BootstrapFormBuilder::HorizontalFormBuilder < ActionView::Helpers::FormBui
   end
 
   def select(name, choices, options = {}, html_options = {})
-    form_group(name) do
+    form_group(name, options.slice(:label_options, :group_options, :tip_options)) do
       super(name, choices, options, html_options.reverse_merge(:class => 'form-control'))
     end
   end
 
   def text_area(name, opts = {})
-    form_group(name) do
+    form_group(name, opts.slice(:label_options, :group_options, :tip_options)) do
       super(name, opts.reverse_merge(:class => 'form-control',
                                      :placeholder => help(name)))
     end
   end
 
-  def form_group(name, &block)
-    classes = ['form-group']
+  def form_group(name, options = {}, &block)
+    group_options = options.fetch(:group_options, {})
+    classes = Array(group_options[:class]) << 'form-group'
 
     if @object.errors.has_key?(name)
       classes << 'has-error'
     end
 
     @template.content_tag(:div,
-                          label(name) +
-                          col_wrap(block.call + errors(name)),
-                          :class => classes.join(' '))
+                          label(name, options.fetch(:label_options, {})) +
+                          col_wrap(block.call + errors(name)) +
+                          tip(name, options.fetch(:tip_options, {})),
+                          group_options.merge(:class => classes.join(' ')))
   end
 
   def col_wrap(html)
@@ -133,7 +135,9 @@ class BootstrapFormBuilder::HorizontalFormBuilder < ActionView::Helpers::FormBui
   end
 
   def label(name, opts = {})
-    super(name, opts.reverse_merge(:class => 'control-label'))
+    classes = Array(opts.fetch(:class, ''))
+    classes << 'control-label'
+    super(name, opts.merge(:class => classes.join(' ')))
   end
 
   def errors(name)
@@ -154,6 +158,14 @@ class BootstrapFormBuilder::HorizontalFormBuilder < ActionView::Helpers::FormBui
     end
   end
 
+  def tip(name, options = {})
+    i18n_name = "helpers.tips.#{object_name}.#{name}"
+    if I18n.exists?(i18n_name)
+      options[:class] = (Array(options[:class]) + ['help-block']).join(' ')
+      @template.content_tag(:span, I18n.t(i18n_name), options)
+    end
+  end
+
   def cancel_button(cancel_path)
     @template.link_to(I18n.t('helpers.button.cancel'),
                       cancel_path,

data/lib/bootstrap_form_builder/version.rb

@@ -1,3 +1,3 @@
 module BootstrapFormBuilder
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bs_form_builder
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Sean Geoghegan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-24 00:00:00.000000000 Z
+date: 2014-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview