bootstrap_ui_helper 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e26314f2f2b54fc50aefdafbc176c0ad65e5a463
-  data.tar.gz: 98f766aa947346510ebb84319f1a240dcd521d89
+  metadata.gz: ddccba0e62ae94336a902898de6bfecf864d0913
+  data.tar.gz: 301bc1e5129a8c32ffe65712ea35b7781936bcf9
 SHA512:
-  metadata.gz: d09a35756e59cc30cb942c824d2847a9f6871745699e0df2a0d8e6b7ad285a408c6cc8989e9662e528244aad891972fc10cf942fcc1e38219b8f520d4fd3750a
-  data.tar.gz: a731800e6c67852e1a6621129a1fa37dc213b8be8dca949793c8101014ef13eb6d1013f7ecd8a55373bba40f4eee56763523b0bb1b2da3c0b33ee4d384d48817
+  metadata.gz: d9a732dd179af6596ed50b9ad5e506d82c907b27947fb45e8873a71f1469d47373bb60ada764dc8f5bbfd44aa5c73ea4327c708ae1facfcb6f81fbe76f49b534
+  data.tar.gz: b48ed5fb3ad875fddaec24e155609b71b7a827d0800b1cbab3510ebe9fc82704bd941ba201ea167bd836dce9ed597575c14eac034488997279a3fd5973a2d21a

data/CHANGELOG.md

@@ -1,2 +1,24 @@
-##v0.3.1
-- fix and improve dropdown helper
+# bootstrap_ui_helper Change Log
+
+All notable changes to this project will be documented in this file.
+
+bootstrap_ui_helper is in a 0.3.2 beta state. This means that its APIs and behavior are subject to breaking changes without deprecation notices.
+
+## [0.3.1](https://github.com/Sen-Zhang/bootstrap_ui_helper/releases/tag/0.3.1) (2015-10-16)
+
+Fixes:
+
+* Fix dropdown_helper
+
+## [0.3.2](https://github.com/Sen-Zhang/bootstrap_ui_helper/releases/tag/0.3.2) (2015-11-09)
+
+Changes:
+
+* Redo panel_helper
+* Redo modal_helper
+* Refactor icon_helper
+* Refactor panel_helper
+* Refactor panel_row_helper
+* Refactor nav_helper
+* Refactor navbar_helper
+* Refactor form_helper

data/README.md

@@ -38,11 +38,3 @@ In `application.css`, add the following line:
 ## Usage
 
 Please proceed to http://sen-zhang.github.io/#/articles/bootstrap_ui_helper for more details and examples on how to use the helpers.
-
-## Contributing
-
-1. Fork it ( https://github.com/[my-github-username]/bootstrap_ui_helper/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request

data/app/assets/javascripts/bootstrap_ui_helper.js

@@ -1,5 +1,5 @@
-(function ($) {
-  "use strict";
+(function ($, document) {
+  'use strict';
 
   /*
    * create a jquery DOM element based on tag name and options
@@ -19,27 +19,33 @@
    */
   $.fn.nav = function () {
     var $this              = $(this),
-        activeChildLocator = $this.data("active-el-locator"),
+        activeChildLocator = $this.data('active-el-locator'),
         children           = $this.children();
 
     if (activeChildLocator % 1 === 0) {
-      $(children[activeChildLocator]).attr("active", true);
+      $(children[activeChildLocator]).attr('active', true);
     } else {
-      $this.children(activeChildLocator).attr("active", true);
+      $this.children(activeChildLocator).attr('active', true);
     }
 
     $this.children().remove();
 
     children.each(function () {
       var $child  = $(this),
-          wrapper = createElement("li", {role: "presentation"});
+          wrapper;
 
-      if ($child.attr("active") === "true") {
-        $child.removeAttr("active");
-        wrapper.addClass("active");
-      }
+      if ($child.prop('tagName') === 'LI') {
+        $this.append($child);
+      } else {
+        wrapper = createElement('li', {role: 'presentation'});
+
+        if ($child.attr('active') === 'true') {
+          $child.removeAttr('active');
+          wrapper.addClass('active');
+        }
 
-      $this.append(wrapper.append($child));
+        $this.append(wrapper.append($child));
+      }
     });
   };
 
@@ -50,14 +56,14 @@
    */
   $.fn.panelRow = function () {
     var $this       = $(this),
-        columnClass = $this.data("column-class"),
+        columnClass = $this.data('column-class'),
         children    = $this.children();
 
     $this.children().remove();
 
     children.each(function () {
       var $child  = $(this),
-          wrapper = createElement("div");
+          wrapper = createElement('div');
 
       $this.append(wrapper.addClass(columnClass).append($child));
     });
@@ -65,13 +71,13 @@
 
   /*
    * Button Group
-   * make sure children button group has the same size of their parents"
+   * make sure children button group has the same size of their parents
    *
    */
   $.fn.buttonGroup = function () {
     var $this = $(this);
 
-    $this.children(".btn-group").addClass($this.data("size"));
+    $this.children('.btn-group').addClass($this.data('size'));
   };
 
   /*
@@ -79,19 +85,19 @@
    *
    */
   $.fn.navBar = function () {
-    var $this    = $(this),
-      $burgerBtn = $this.find(".navbar-toggle"),
-      $collapse  = $this.find(".navbar-collapse");
+    var $this      = $(this),
+        $burgerBtn = $this.find('.navbar-toggle'),
+        $collapse  = $this.find('.navbar-collapse');
 
     if ($burgerBtn.length > 0 && $collapse.length > 0) {
-      var collapseId = $collapse.attr("id");
+      var collapseId = $collapse.attr('id');
 
-      if ($collapse.attr("id") === undefined) {
+      if ($collapse.attr('id') === undefined) {
         collapseId = Math.random().toString(36).substring(7);
-        $collapse.attr("id", collapseId);
+        $collapse.attr('id', collapseId);
       }
 
-      $burgerBtn.attr("data-target", "#" + collapseId);
+      $burgerBtn.attr('data-target', '#' + collapseId);
     }
   };
 
@@ -110,4 +116,4 @@
     $("[data-bui='btn_group']").buttonGroup();
 
   });
-})(jQuery);
+})(window.jQuery, window.document);

data/app/helpers/alert_box_helper.rb

@@ -1,16 +1,12 @@
 module AlertBoxHelper
   include ActionView::Helpers
+  include FormatHelper
 
   def alert_box(content_or_options=nil, options={}, &block)
-    if content_or_options.is_a?(Hash)
-      options = content_or_options
-    else
-      content = content_or_options
-    end
-
-    dismissible = options.delete(:dismiss).present?
-    klass       = options.delete(:class)
-    type        = alert_type(options.delete(:type))
+    content, options = parse_content_or_options(content_or_options, options)
+    dismissible      = options.delete(:dismiss).present?
+    klass            = options.delete(:class)
+    type             = alert_type(options.delete(:type))
 
     prepend_class(options, 'alert', type, klass)
     options[:role] = 'alert'

data/app/helpers/bootstrap_form_helper.rb

@@ -3,10 +3,12 @@ module BootstrapFormHelper
   include PanelHelper
 
   mattr_accessor :layout
+  alias_method :fieldset, :panel
+
   FIELD_HELPERS = [:email_field, :password_field, :text_field, :text_area,
                    :search_field, :telephone_field, :url_field, :number_field,
                    :file_field, :date_field, :time_field, :month_field,
-                   :week_field, :datetime_field]
+                   :week_field, :datetime_field, :datetime_local_field]
 
   def form_for(record, options = {}, &block)
     html_options = options[:html] ||= {}
@@ -17,8 +19,7 @@ module BootstrapFormHelper
     super
   end
 
-  # TODO: color_field, datetime_local_field, range_field
-
+  # TODO: color_field, range_field
   FIELD_HELPERS.each do |helper|
     define_method helper do |object_name, method, options={}|
       label_class, field_wrapper = ['col-sm-3 control-label', true] if layout == :horizontal
@@ -26,18 +27,18 @@ module BootstrapFormHelper
       prepend_class(options, 'form-control') unless __callee__ == :file_field
 
       required        = 'required' if options.delete(:required)
-      label_sr_only   = 'sr-only' if options[:label].is_a?(FalseClass)
+      label_sr_only   = 'sr-only' if options[:label].is_a?(FalseClass) || layout == :inline
       label_class     = squeeze_n_strip("#{label_class} #{required} #{label_sr_only}")
-      help_text       = (options[:help] ? "<span class='help-block text-left'>#{options[:help]}</span>" : '').html_safe
+      help_text       = render_help_text(options.delete(:help))
       prefix_content  = options.delete(:prefix)
       suffix_content  = options.delete(:suffix)
 
-      label_proc = proc { label(object_name, method, options[:label], class: label_class) }
+      label_proc = proc { label(object_name, method, options.delete(:label), class: label_class) }
 
       input_proc = proc do
         input_content = if prefix_content.present? || suffix_content.present?
-                          prefix_addon = build_input_addon(prefix_content)
-                          suffix_addon = build_input_addon(suffix_content)
+                          prefix_addon = render_input_addon(prefix_content)
+                          suffix_addon = render_input_addon(suffix_content)
                           content_tag :div, class: 'input-group' do
                             prefix_addon + super(object_name, method, options) + suffix_addon
                           end
@@ -50,44 +51,46 @@ module BootstrapFormHelper
 
       render_field(field_wrapper, label_proc, input_proc)
     end
+  end
 
-    def fields_for(record_name, record_object = nil, options = {}, &block)
-      fieldset = HashWithIndifferentAccess.new(options.delete(:fieldset))
+  def fields_for(record_name, record_object = nil, options = {}, &block)
+    fieldset = HashWithIndifferentAccess.new(options.delete(:fieldset))
 
-      if fieldset.present?
-        type  = get_panel_type(fieldset[:type])
-        title = fieldset[:title]
-      end
+    if fieldset.present?
+      type  = get_panel_type(fieldset[:type])
+      title = fieldset[:title]
+    end
 
-      content_tag :fieldset, class: "panel #{type}" do
-        ((title.present? ? (content_tag :div, title, class: 'panel-heading') : '') +
-          (content_tag :div, class: 'panel-body' do
-            super
-          end)).html_safe
-      end
+    content_tag :fieldset, class: "panel #{type}" do
+      ((title.present? ? (content_tag :div, title, class: 'panel-heading') : '') +
+        (content_tag :div, class: 'panel-body' do
+          super
+        end)).html_safe
     end
+  end
 
-    alias_method :fieldset, :panel
+  def render_help_text(help)
+    (help.present? ? "<span class='help-block text-left'>#{help}</span>" : '').html_safe
+  end
 
-    def build_input_addon(content)
-      return ('').html_safe if content.blank?
+  def render_input_addon(content)
+    return ('').html_safe if content.blank?
 
-      if content.is_a?(String)
-        "<span class='input-group-addon'>#{content}</span>".html_safe
-      elsif content.is_a?(Hash) && content.key?(:icon)
-        "<span class='input-group-addon'>#{icon(content[:icon])}</span>".html_safe
-      else
-        ('').html_safe
-      end
+    if content.is_a?(String)
+      "<span class='input-group-addon'>#{content}</span>".html_safe
+    elsif content.is_a?(Hash) && content.key?(:icon)
+      "<span class='input-group-addon'>#{icon(content[:icon])}</span>".html_safe
+    else
+      ('').html_safe
     end
+  end
 
-    def render_field(inline_style, label_proc, input_proc)
-      content_tag :div, class: 'form-group' do
-        if inline_style
-          (label_proc.call + (content_tag :div, class: 'col-sm-9', &input_proc)).html_safe
-        else
-          (label_proc.call + input_proc.call).html_safe
-        end
+  def render_field(inline_style, label_proc, input_proc)
+    content_tag :div, class: 'form-group' do
+      if inline_style
+        (label_proc.call + (content_tag :div, class: 'col-sm-9', &input_proc)).html_safe
+      else
+        (label_proc.call + input_proc.call).html_safe
       end
     end
   end
@@ -99,56 +102,25 @@ module BootstrapFormHelper
     attr_accessor :output_buffer
 
     def check_box(method, options = {}, checked_value = '1', unchecked_value = '0')
-      layout_inline = options.delete(:layout).try(:to_sym) == :inline
+      layout_inline, help_text, label = parse_options(options)
 
-      check_box = proc do
-        proc = proc do
-          @template.check_box(@object_name, method, objectify_options(options), checked_value, unchecked_value) +
-            options[:label]
-        end
-
-        if layout_inline
-          content_tag :label, class: 'checkbox-inline', &proc
-        else
-          content_tag :div, class: 'checkbox' do
-            content_tag :label, &proc
-          end
-        end
+      check_box_proc = proc do
+        @template.check_box(@object_name, method, objectify_options(options), checked_value, unchecked_value) +
+          label
       end
 
-      if horizontal_layout?
-        content_tag :div, class: 'form-group' do
-          content_tag :div, class: 'col-sm-offset-3 col-sm-9', &check_box
-        end
-      else
-        check_box.call
-      end
+      render_input_field(layout_inline, help_text, :checkbox, &check_box_proc)
     end
 
     def radio_button(method, tag_value, options = {})
-      layout_inline = options.delete(:layout).try(:to_sym) == :inline
+      layout_inline, help_text, label = parse_options(options)
 
-      radio_button = proc do
-        proc = proc do
-          @template.radio_button(@object_name, method, tag_value, objectify_options(options)) + options[:label]
-        end
-
-        if layout_inline
-          content_tag :label, class: 'radio-inline', &proc
-        else
-          content_tag :div, class: 'radio' do
-            content_tag :label, &proc
-          end
-        end
+      radio_button_proc = proc do
+        @template.radio_button(@object_name, method, tag_value, objectify_options(options)) +
+          label
       end
 
-      if horizontal_layout?
-        content_tag :div, class: 'form-group' do
-          content_tag :div, class: 'col-sm-offset-3 col-sm-9', &radio_button
-        end
-      else
-        radio_button.call
-      end
+      render_input_field(layout_inline, help_text, :radio, &radio_button_proc)
     end
 
     def submit(value=nil, options={})
@@ -167,6 +139,33 @@ module BootstrapFormHelper
     end
 
     private
+    def parse_options(options)
+      layout_inline = options.delete(:layout).try(:to_sym) == :inline
+      help_text     = render_help_text(options.delete(:help))
+      label         = options.delete(:label)
+
+      [layout_inline, help_text, label]
+    end
+
+    def get_input_lambda(layout_inline, help_text, type, &block)
+      lambda do
+        return (content_tag :label, class: "#{type}-inline", &block) + help_text if layout_inline
+
+        (content_tag :div, class: "#{type}" do
+          content_tag :label, &block
+        end) + help_text
+      end
+    end
+
+    def render_input_field(layout_inline, help_text, type, &block)
+      input_lambda = get_input_lambda(layout_inline, help_text, type, &block)
+
+      return input_lambda.call unless horizontal_layout?
+
+      content_tag :div, class: 'form-group' do
+        content_tag :div, class: 'col-sm-offset-3 col-sm-9', &input_lambda
+      end
+    end
 
     def horizontal_layout?
       BootstrapFormHelper.layout == :horizontal
@@ -174,17 +173,16 @@ module BootstrapFormHelper
   end
 
   private
-
   def get_form_layout(form_layout)
     case form_layout.try(:to_sym)
     when :horizontal
-      layout = :horizontal
+      self.layout = :horizontal
       'form form-horizontal'
     when :inline
-      layout = :inline
+      self.layout = :inline
       'form form-inline'
     else
-      layout = :basic
+      self.layout = :basic
       'form'
     end
   end

data/app/helpers/bootstrap_form_options_helper.rb

@@ -4,16 +4,15 @@ module BootstrapFormOptionsHelper
     include FormatHelper
     include BootstrapFormHelper
 
-
     def select(method, choices = nil, options = {}, html_options = {}, &block)
       label_class, field_wrapper = horizontal_layout? ? ['col-sm-3 control-label', true] : []
 
-      required = 'required' if html_options.delete(:required)
-      label_sr_only = 'sr-only' if html_options[:label].is_a?(FalseClass)
-      html_options[:class] = squeeze_n_strip("form-control #{html_options[:class]}")
-      label_class = squeeze_n_strip("#{label_class} #{required} #{label_sr_only}")
-      help_text = (html_options[:help] ? "<span class='help-block text-left'>#{html_options[:help]}</span>" : '').html_safe
+      required      = 'required' if options.delete(:required)
+      label_sr_only = 'sr-only' if options[:label].is_a?(FalseClass) || layout == :inline
+      label_class   = squeeze_n_strip("#{label_class} #{required} #{label_sr_only}")
+      help_text     = render_help_text(options.delete(:help))
 
+      prepend_class(html_options, 'form-control')
       select_proc = proc do
         @template.select(@object_name,
                          method,
@@ -22,38 +21,49 @@ module BootstrapFormOptionsHelper
                          @default_options.merge(html_options),
                          &block) + help_text
       end
-
-      label_proc = proc { label(method, html_options[:label], class: label_class) }
+      label_proc  = proc { label(method, options.delete(:label), class: label_class) }
 
       render_field(field_wrapper, label_proc, select_proc)
     end
 
     def collection_check_boxes(method, collection, value_method, text_method, options = {}, html_options = {}, &block)
       check_boxes_proc = proc do
-        @template.collection_check_boxes(@object_name, method, collection, value_method, text_method,
-                                         objectify_options(options), @default_options.merge(html_options),
+        @template.collection_check_boxes(@object_name,
+                                         method,
+                                         collection,
+                                         value_method,
+                                         text_method,
+                                         objectify_options(options),
+                                         @default_options.merge(html_options),
                                          &block)
       end
 
-      render_collection(options[:label], &check_boxes_proc)
+      render_collection(options.delete(:label), &check_boxes_proc)
     end
 
     def collection_radio_buttons(method, collection, value_method, text_method, options = {}, html_options = {}, &block)
-      radion_buttons_prc = proc do
-        @template.collection_radio_buttons(@object_name, method, collection, value_method, text_method,
-                                           objectify_options(options), @default_options.merge(html_options),
+      radio_buttons_proc = proc do
+        @template.collection_radio_buttons(@object_name,
+                                           method,
+                                           collection,
+                                           value_method,
+                                           text_method,
+                                           objectify_options(options),
+                                           @default_options.merge(html_options),
                                            &block)
       end
 
-      render_collection(options[:label], &radion_buttons_prc)
+      render_collection(options.delete(:label), &radio_buttons_proc)
     end
 
     private
 
     def render_label(label)
-      label_class = 'col-sm-3 control-label' if horizontal_layout?
+      label_class = horizontal_layout? ? 'col-sm-3 control-label' : ''
+      label_class += ' sr-only' if label.blank?
 
-      label.present? ? "<label class='#{label_class}'>#{label}</label>  " : ''
+      rendered_label = ("<label class='#{label_class}'>#{label}</label>  ").html_safe
+      basic_layout? ? content_tag(:div, rendered_label) : rendered_label
     end
 
     def render_input(&input_block)
@@ -66,6 +76,10 @@ module BootstrapFormOptionsHelper
       end
     end
 
+    def basic_layout?
+      BootstrapFormHelper.layout == :basic
+    end
+
     def horizontal_layout?
       BootstrapFormHelper.layout == :horizontal
     end
@@ -77,7 +91,7 @@ module BootstrapFormOptionsHelper
     def render(&block)
       rendered_collection = render_collection do |item, value, text, default_html_options|
         default_html_options[:multiple] = true
-        builder = instantiate_builder(CheckBoxBuilder, item, value, text, default_html_options)
+        builder                         = instantiate_builder(CheckBoxBuilder, item, value, text, default_html_options)
 
         if block_given?
           @template_object.capture(builder, &block)

data/app/helpers/button_helper.rb

@@ -3,16 +3,14 @@ module ButtonHelper
   include FormatHelper
 
   def button(content_or_options=nil, options={}, &block)
-    content_or_options.is_a?(Hash) ? options = content_or_options : content = content_or_options
+    content, options = parse_content_or_options(content_or_options, options)
 
     layout = 'btn-block' if options.delete(:layout).try(:to_sym) == :block
     size   = get_btn_size(options.delete(:size))
     type   = get_btn_type(options.delete(:type))
     prepend_class(options, 'btn', type, size, layout)
 
-    content_tag :button, options do
-      content.presence || capture(&block)
-    end
+    content_tag :button, (content.presence || capture(&block)), options
   end
 
   def button_group(options={}, &block)
@@ -38,7 +36,7 @@ module ButtonHelper
   end
 
   def navbar_button(content_or_options=nil, options={}, &block)
-    content_or_options.is_a?(Hash) ? options = content_or_options : content = content_or_options
+    content, options = parse_content_or_options(content_or_options, options)
 
     prepend_class(options, 'navbar-btn')
     button content, options, &block

data/app/helpers/dropdown_helper.rb

@@ -133,8 +133,4 @@ module DropdownHelper
 
     DropdownCreator.new(content, list, options).render
   end
-
-  def navbar_dropdown(content=nil, list=[], options={})
-    dropdown(content, list, options.merge({category: :navbar}))
-  end
 end

data/app/helpers/format_helper.rb

@@ -7,4 +7,12 @@ module FormatHelper
   def prepend_class(options, *attrs)
     options[:class] = squeeze_n_strip("#{attrs.join(' ')} #{options[:class]}")
   end
+
+  def parse_content_or_options(content_or_options, options)
+    if content_or_options.is_a?(Hash)
+      [nil, content_or_options]
+    else
+      [content_or_options, options]
+    end
+  end
 end

data/app/helpers/icon_helper.rb

@@ -9,46 +9,35 @@ module IconHelper
     attr_accessor :options
 
     def initialize(type, options)
-      @type    = type
+      @type    = type.to_s.tr('_', '-')
       @options = options
     end
 
     def render
-      icon_options = {
-        type:        type,
-        size:        options.delete(:size).presence || :normal,
-        fw:          options.delete(:fixed_with).presence,
-        li:          options.delete(:list_icon).presence,
-        inverse:     options.delete(:inverse).presence,
-        border:      options.delete(:border).presence,
-        pull:        options.delete(:pull).presence,
-        animate:     options.delete(:animate).presence,
-        orientation: options.delete(:orientation).presence
-
-        # TODO add fa-stack support
-        # stack = options.delete(:stack).presence
-      }
-
-      prepend_class(options, 'fa', render_fa_class(icon_options))
+      render_fa_class(options)
 
       content_tag :i, nil, options
     end
 
     private
     def render_fa_class(options)
-      type = "fa-#{options[:type]}"
+      type = "fa-#{@type}"
       raise 'Invalid Icon Type!' if ValidIcons::VALID_ICONS.exclude?(type)
 
       size        = get_icon_size(options.delete(:size))
-      fw          = options[:fw].presence ? 'fa-fw' : nil
-      li          = options[:li].presence ? 'fa-li' : nil
-      inverse     = options[:inverse].presence ? 'fa-inverse' : nil
-      border      = options[:border].presence ? 'fa-border' : nil
-      pull        = get_icon_position(options[:pull])
-      animate     = get_icon_animation(options[:animate])
-      orientation = get_icon_orientation(options[:orientation])
-
-      "#{type} #{size} #{fw} #{li} #{inverse} #{border} #{pull} #{animate} #{orientation}"
+      fw          = options.delete(:fw).presence ? 'fa-fw' : nil
+      li          = options.delete(:li).presence ? 'fa-li' : nil
+      inverse     = options.delete(:inverse).presence ? 'fa-inverse' : nil
+      border      = options.delete(:border).presence ? 'fa-border' : nil
+      pull        = get_icon_position(options.delete(:pull))
+      animate     = get_icon_animation(options.delete(:animate))
+      orientation = get_icon_orientation(options.delete(:orientation))
+
+      # TODO add fa-stack support
+      # stack = options.delete(:stack).presence
+
+      prepend_class(options, 'fa', type, size, fw, li, inverse, border, pull,
+                    animate, orientation)
     end
 
     def get_icon_size(size)
@@ -109,4 +98,20 @@ module IconHelper
 
     IconCreator.new(type, options).render
   end
+
+  def icon_list(options={}, &block)
+    prepend_class(options, 'fa-ul')
+
+    content_tag :ul, options, &block
+  end
+
+  def icon_list_item(content_or_options, options={}, &block)
+    content, options = parse_content_or_options(content_or_options, options)
+    icon_options     = options.delete(:icon_html)
+    icon             = icon(icon_options.delete(:type), icon_options)
+
+    content_tag :li, options do
+      (icon + (content.presence || capture(&block))).html_safe
+    end
+  end
 end

data/app/helpers/modal_helper.rb

@@ -3,63 +3,76 @@ module ModalHelper
   include FormatHelper
 
   def modal(options={}, &block)
-    button_options = options.delete(:button) || {}
-
-    caption               = button_options.delete(:caption) || 'Modal'
-    modal_dialog_id       = options[:id] || "modal-#{SecureRandom.hex(3)}"
-    button_options[:data] = (button_options[:data] || {}).merge({toggle: 'modal', target: "##{modal_dialog_id}"})
-    size                  = case options.delete(:size).try(:to_sym)
-                            when :xsmall
-                              'modal-sm'
-                            when :large
-                              'modal-lg'
-                            else
-                            end
-
-    prepend_class(options, 'modal', 'fade')
-    options.merge!({id: modal_dialog_id, tabindex: -1, role: 'dialog', aria: {hidden: true}})
+    caption,
+    button_options,
+    modal_dialog_options,
+    modal_content_options = parse_modal_options(options)
 
     ((button caption, button_options) +
       (content_tag :div, options do
-        content_tag :div, class: "modal-dialog #{size}" do
-          content_tag :div, class: 'modal-content' do
-            yield if block_given?
-          end
+        content_tag :div, modal_dialog_options do
+          content_tag :div, modal_content_options, &block
         end
       end)).html_safe
   end
 
   def modal_header(content_or_options=nil, options={}, &block)
-    content_or_options.is_a?(Hash) ? options = content_or_options : content = content_or_options
+    content, options = parse_content_or_options(content_or_options, options)
 
-    prepend_class(options, 'modal-title')
+    title_options = options.delete(:title_html) || {}
+    prepend_class(options, 'modal-header')
 
-    content_tag :div, class: 'modal-header' do
-      ("<button type='button' class='close' data-dismiss='modal'><span aria-hidden='true'>×</span></button>" +
-        (content_tag :h3, options do
-          content.presence || capture(&block)
-        end)).html_safe
+    header_proc = block_given? ? block : proc { modal_title(content, title_options) }
+
+    content_tag :div, options do
+      render_close_btn + capture(&header_proc)
     end
   end
 
-  def modal_body(content_or_options=nil, options={}, &block)
-    content_or_options.is_a?(Hash) ? options = content_or_options : content = content_or_options
+  %w(title body footer).each do |part|
+    define_method "modal_#{part}" do |content_or_options=nil, options={}, &block|
+      content, options = parse_content_or_options(content_or_options, options)
+      tag              = part == 'title' ? options.delete(:tag).try(:to_sym) || :h4 : :div
 
-    prepend_class(options, 'modal-body')
+      prepend_class(options, "modal-#{part}")
 
-    content_tag :div, options do
-      content.presence || capture(&block)
+      content_tag tag, (content.presence || capture(&block)), options
     end
   end
 
-  def modal_footer(content_or_options=nil, options={}, &block)
-    content_or_options.is_a?(Hash) ? options = content_or_options : content = content_or_options
+  private
+
+  def parse_modal_options(options)
+    button_options        = options.delete(:button_html) || {}
+    modal_dialog_options  = options.delete(:modal_dialog_html) || {}
+    modal_content_options = options.delete(:modal_content_html) || {}
+    caption               = button_options.delete(:caption) || 'Modal'
+    modal_id              = options[:id] || "modal-#{SecureRandom.hex(3)}"
+    button_options[:data] = (button_options[:data] || {}).merge({toggle: 'modal', target: "##{modal_id}"})
+    size                  = get_modal_size(options.delete(:size).try(:to_sym))
+
+    prepend_class(options, 'modal', 'fade')
+    prepend_class(modal_dialog_options, 'modal-dialog', size)
+    prepend_class(modal_content_options, 'modal-content')
 
-    prepend_class(options, 'modal-footer')
+    options.deep_merge!({id: modal_id, tabindex: -1, role: 'dialog', aria: {hidden: true}})
 
-    content_tag :div, options do
-      content.presence || capture(&block)
+    [caption, button_options, modal_dialog_options, modal_content_options]
+  end
+
+  def get_modal_size(size)
+    case size
+    when :small
+      'modal-sm'
+    when :large
+      'modal-lg'
+    else
     end
   end
 
+  def render_close_btn
+    content_tag :button, type: :button, class: 'close', data: {dismiss: 'modal'} do
+      content_tag :span, 'x', aria: {hidden: true}
+    end
+  end
 end

data/app/helpers/nav_helper.rb

@@ -11,7 +11,7 @@ module NavHelper
       @options = options
     end
 
-    def render
+    def render(content)
       nav_options = {
         as:     options.delete(:as).presence || :tabs,
         layout: options.delete(:layout).presence
@@ -21,10 +21,9 @@ module NavHelper
       active = options.delete(:active)
 
       prepend_class(options, 'nav', build_nav_class(nav_options))
+      options.deep_merge!(data: {bui: 'nav', active_el_locator: active})
 
-      options.merge!(data: {bui: 'nav', active_el_locator: active})
-
-      [tag, options]
+      content_tag tag, content, options
     end
 
     private
@@ -49,8 +48,6 @@ module NavHelper
   end
 
   def nav(options={}, &block)
-    tag, options = NavCreator.new(options).render
-
-    content_tag tag, options, &block
+    NavCreator.new(options).render capture(&block)
   end
 end

data/app/helpers/navbar_helper.rb

@@ -1,5 +1,6 @@
 module NavbarHelper
   include ActionView::Helpers
+  include FormatHelper
 
   # TODO: add navbar form support
   def navbar(options={}, &block)
@@ -9,8 +10,7 @@ module NavbarHelper
     position, position_style = parse_position(options.delete(:position), padding)
 
     prepend_class(options, style, position)
-
-    options[:data] = (options[:data] || {}).merge(bui: 'navbar')
+    options.deep_merge!(data: {bui: 'navbar'})
 
     (position_style + (content_tag :nav, options do
       content_tag :div, class: container, &block
@@ -20,14 +20,16 @@ module NavbarHelper
   def vertical(options={}, &block)
     prepend_class(options, 'navbar-header')
 
+    btn_content = ("<span class='icon-bar'></span>" * 3).html_safe
+    btn_options = {
+      class: 'navbar-toggle collapsed',
+      type:  :button,
+      data:  {toggle: 'collapse'},
+      aria:  {expanded: false}
+    }
+
     content_tag :div, options do
-      (content_tag :button,
-                   class: 'navbar-toggle collapsed',
-                   type: :button,
-                   data: {toggle: 'collapse'},
-                   aria: {expanded: false} do
-        ("<span class='icon-bar'></span>" * 3).html_safe
-      end) + capture(&block)
+      (content_tag :button, btn_content, btn_options) + capture(&block)
     end
   end
 
@@ -51,6 +53,50 @@ module NavbarHelper
     content_tag :ul, options, &block
   end
 
+  def navbar_link_to(name = nil, options = nil, html_options = nil, &block)
+    html_options, options, name = options, name, block if block_given?
+    options      ||= {}
+    html_options ||= {}
+
+    prepend_class(html_options, 'navbar-link')
+
+    link_to options, html_options do
+      block_given? ? (yield name) : name
+    end
+  end
+
+  def navbar_link(name = nil, options = nil, html_options = nil, &block)
+    html_options, options, name = options, name, block if block_given?
+    options      ||= {}
+    html_options ||= {}
+
+    prepend_class(html_options, 'navbar-link')
+    active = 'active' if html_options.delete(:active)
+
+
+    content_tag :li, class: active do
+      link_to options, html_options do
+        block_given? ? (yield name) : name
+      end
+    end
+  end
+
+  def navbar_brand(name = nil, options = nil, html_options = nil, &block)
+    html_options, options, name = options, name, block if block_given?
+    options                     ||= {}
+    html_options                ||= {}
+
+    prepend_class(html_options, 'navbar-brand')
+
+    link_to options, html_options do
+      block_given? ? (yield name) : name
+    end
+  end
+
+  def navbar_dropdown(content=nil, list=[], options={})
+    dropdown(content, list, options.merge({category: :navbar}))
+  end
+
   private
 
   def parse_position(position, padding)

data/app/helpers/panel_helper.rb

@@ -1,78 +1,42 @@
 module PanelHelper
   include ActionView::Helpers
 
-  class PanelCreator
-    include FormatHelper
-    include ActionView::Helpers
+  def panel(options={}, &block)
+    tag  = options.delete(:tag).try(:to_sym) || :div
+    type = get_panel_type(options.delete(:type))
 
-    attr_accessor :content
-    attr_accessor :options
-    attr_accessor :block
-    attr_accessor :output_buffer
+    prepend_class(options, 'panel', type)
 
-    def initialize(content=nil, options, block)
-      @content = content
-      @options = options
-      @block   = block
-    end
-
-    def render
-      heading = options.delete(:heading)
-      title   = options.delete(:title)
-      footer  = options.delete(:footer)
-      tag     = options.delete(:tag).try(:to_sym).presence || :div
-      type    = get_panel_type(options.delete(:type))
-
-      prepend_class(options, 'panel', type)
-
-      content_tag tag, options do
-        (panel_header(heading, title) + panel_body(content, block) +
-          panel_footer(footer)).html_safe
-      end
-    end
-
-    private
-    def panel_header(heading, title)
-      return '' if heading.blank? && title.blank?
-
-      if title.present?
-        "<div class='panel-heading'><h3 class='panel-title'>#{title}</h3></div>"
-      else
-        "<div class='panel-heading'>#{heading}</div>"
-      end
-    end
+    content_tag tag, options, &block
+  end
 
-    def panel_body(content, block)
-      content_tag :div, class: 'panel-body' do
-        content.presence || block
-      end
-    end
+  %w(heading title body footer).each do |part|
+    define_method "panel_#{part}" do |content_or_options=nil, options={}, &block|
+      content, options = parse_content_or_options(content_or_options, options)
 
-    def panel_footer(footer)
-      footer.present? ? "<div class='panel-footer'>#{footer}</div>" : ''
-    end
+      tag = part == 'title' ? options.delete(:tag).try(:to_sym) || :h3 : :div
+      prepend_class(options, "panel-#{part}")
 
-    def get_panel_type(type)
-      case type.try(:to_sym)
-      when :primary
-        'panel-primary'
-      when :info
-        'panel-info'
-      when :success
-        'panel-success'
-      when :warning
-        'panel-warning'
-      when :danger
-        'panel-danger'
-      else
-        'panel-default'
-      end
+      content_tag tag, content || capture(&block), options
     end
   end
 
-  def panel(content_or_options=nil, options={}, &block)
-    content_or_options.is_a?(Hash) ? options = content_or_options : content = content_or_options
-
-    PanelCreator.new(content, options, capture(&block)).render
+  private
+
+  def get_panel_type(type)
+    case type.try(:to_sym)
+    when :primary
+      'panel-primary'
+    when :info
+      'panel-info'
+    when :success
+      'panel-success'
+    when :warning
+      'panel-warning'
+    when :danger
+      'panel-danger'
+    else
+      'panel-default'
+    end
   end
 end

data/app/helpers/panel_row_helper.rb

@@ -2,9 +2,8 @@ module PanelRowHelper
 
   def panel_row(options={}, &block)
     column_class = options.delete(:column_class) || ''
-    data         = (options[:data] || {}).merge(bui: 'panel_row',
-                                                column_class: column_class)
-    options[:data] = data
+
+    options.deep_merge!(data: {bui: 'panel_row', column_class: column_class})
     prepend_class(options, 'row')
 
     content_tag :div, options, &block

data/app/helpers/progress_bar_helper.rb

@@ -17,9 +17,7 @@ module ProgressBarHelper
       options[:role]    = 'progressbar'
       options[:aria]    = {valuemax: 100, valuemin: 0, valuenow: percentage}
 
-      content_tag :div, options do
-        label.present? ? label : (content_tag :span, label, class: 'sr-only')
-      end
+      content_tag :div, label, options
     end
 
     private

data/codeclimate.yml

@@ -1,20 +1,4 @@
-# This is a sample .codeclimate.yml configured for Engine analysis on Code
-# Climate Platform. For an overview of the Code Climate Platform, see here:
-# http://docs.codeclimate.com/article/300-the-codeclimate-platform
-
-# Under the engines key, you can configure which engines will analyze your repo.
-# Each key is an engine name. For each value, you need to specify enabled: true
-# to enable the engine as well as any other engines-specific configuration.
-
-# For more details, see here:
-# http://docs.codeclimate.com/article/289-configuring-your-repository-via-codeclimate-yml#platform
-
-# For a list of all available engines, see here:
-# http://docs.codeclimate.com/article/296-engines-available-engines
-
 engines:
-# to turn on an engine, add it here and set enabled to `true`
-# to turn off an engine, set enabled to `false` or remove it
   rubocop:
     enabled: true
     checks:
@@ -33,26 +17,5 @@ engines:
         enabled: false
   csslint:
     enabled: true
-
-# Engines can analyze files and report issues on them, but you can separately
-# decide which files will receive ratings based on those issues. This is
-# specified by path patterns under the ratings key.
-
-# For more details see here:
-# http://docs.codeclimate.com/article/289-configuring-your-repository-via-codeclimate-yml#platform
-
-# Note: If the ratings key is not specified, this will result in a 0.0 GPA on your dashboard.
-
-# ratings:
-#   paths:
-#   - app/**
-#   - lib/**
-#   - "**.rb"
-#   - "**.go"
-
-# You can globally exclude files from being analyzed by any engine using the
-# exclude_paths key.
-
-#exclude_paths:
-#- spec/**/*
-#- vendor/**/*
+  fixme:
+    enabled: false

data/lib/bootstrap_ui_helper/version.rb

@@ -1,3 +1,3 @@
 module BootstrapUiHelper
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap_ui_helper
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Sen Zhang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-16 00:00:00.000000000 Z
+date: 2015-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -64,7 +64,6 @@ files:
 - app/helpers/format_helper.rb
 - app/helpers/icon_helper.rb
 - app/helpers/label_helper.rb
-- app/helpers/link_helper.rb
 - app/helpers/modal_helper.rb
 - app/helpers/nav_helper.rb
 - app/helpers/navbar_helper.rb
@@ -96,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Bootstrap UI Helper

data/app/helpers/link_helper.rb

@@ -1,53 +0,0 @@
-module LinkHelper
-  include FormatHelper
-
-  def navbar_link_to(name = nil, options = nil, html_options = nil, &block)
-    html_options, options, name = options, name, block if block_given?
-    options      ||= {}
-    html_options ||= {}
-
-    prepend_class(html_options, 'navbar-link')
-
-    return link_to(name, options, html_options) unless block_given?
-
-    link_to options, html_options do
-      yield name
-    end
-  end
-
-  def navbar_link(name = nil, options = nil, html_options = nil, &block)
-    html_options, options, name = options, name, block if block_given?
-    options      ||= {}
-    html_options ||= {}
-
-    prepend_class(html_options, 'navbar-link')
-    active = 'active' if html_options.delete(:active)
-
-
-    content_tag :li, class: active do
-      if block_given?
-        link_to options, html_options do
-          yield name
-        end
-      else
-        link_to name, options, html_options
-      end
-    end
-  end
-
-  def navbar_brand(name = nil, options = nil, html_options = nil, &block)
-    html_options, options, name = options, name, block if block_given?
-    options      ||= {}
-    html_options ||= {}
-
-    prepend_class(html_options, 'navbar-brand')
-
-    if block_given?
-      link_to options, html_options do
-        yield name
-      end
-    else
-      link_to name, options, html_options
-    end
-  end
-end