bootstrap_ui_helper 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36f403069f00bd4734ef52b6121d05b875b458a4
-  data.tar.gz: 7f0099b18df7f8af7e246bd4484473a41c9c68ed
+  metadata.gz: e26314f2f2b54fc50aefdafbc176c0ad65e5a463
+  data.tar.gz: 98f766aa947346510ebb84319f1a240dcd521d89
 SHA512:
-  metadata.gz: 9e4588ec543f3ff3832ef45fa1f021ac0f363d393bd55cda257d3ca96d974179f296f302395d2f4dcaeacd9dae0047efb4c85052b8863f3dd5f1ca2ced62685a
-  data.tar.gz: fbc507cd20ba350cabf8d1301677533f199efaa4d846fa3cba1951af60e0af2e42c592338e84ea0b2f86d8e237ff78c703887c85833680cb797b26b392e3327b
+  metadata.gz: d09a35756e59cc30cb942c824d2847a9f6871745699e0df2a0d8e6b7ad285a408c6cc8989e9662e528244aad891972fc10cf942fcc1e38219b8f520d4fd3750a
+  data.tar.gz: a731800e6c67852e1a6621129a1fa37dc213b8be8dca949793c8101014ef13eb6d1013f7ecd8a55373bba40f4eee56763523b0bb1b2da3c0b33ee4d384d48817

data/CHANGELOG.md

@@ -0,0 +1,2 @@
+##v0.3.1
+- fix and improve dropdown helper

data/app/helpers/button_helper.rb

@@ -24,7 +24,7 @@ module ButtonHelper
              end
 
     prepend_class(options, layout, size)
-    options[:role] = squeeze_n_strip("group #{options[:role]}")
+    options[:role] = 'group'
     options[:data] = (options[:data] || {}).merge({bui: 'btn_group', size: size})
 
     content_tag :div, options, &block
@@ -32,7 +32,7 @@ module ButtonHelper
 
   def button_toolbar(options={}, &block)
     prepend_class(options, 'btn-toolbar')
-    prepend_role(options, 'toolbar')
+    options[:role] = 'toolbar'
 
     content_tag :div, options, &block
   end

data/app/helpers/dropdown_helper.rb

@@ -1,6 +1,6 @@
 module DropdownHelper
 
-  # TODO: support split button dropdowns
+  # TODO: support split button dropdowns; use blocks to add list items
   class DropdownListItem
     include FormatHelper
     include ActionView::Helpers
@@ -11,21 +11,21 @@ module DropdownHelper
       @options = options
     end
 
-    def construct
+    def render
       content_tag :li, parse_type(options), options
     end
 
     def parse_type(options={})
-      case options[:type].try(:to_sym)
+      case options.delete(:type).try(:to_sym)
       when :link
-        return link_to(options[:text], options[:link], role: :menuitem,
-                       tabindex: -1)
+        return link_to(options.delete(:text), options.delete(:link),
+                       role: :menuitem, tabindex: -1)
       when :header
         prepend_class(options, 'dropdown-header')
-        return options[:text]
+        return options.delete(:text)
       when :divider
         prepend_class(options, 'divider')
-        options[:role] = 'separator'
+        options[:role] = 'separator' and return nil
       else
       end
     end
@@ -34,30 +34,33 @@ module DropdownHelper
   class DropdownCreator
     include FormatHelper
     include ActionView::Helpers
+    include ButtonHelper
 
     attr_accessor :content
     attr_accessor :list
     attr_accessor :options
+    attr_accessor :btn_group_options
     attr_accessor :output_buffer
 
     def initialize(content, list, options)
-      @content = content
-      @list    = list
-      @options = options
+      @content           = content
+      @list              = list
+      @options           = options
+      @btn_group_options = options.delete(:btn_group_html) || {}
     end
 
-    def build
-      navbar, btn_id, klass, align, direction, size, type = process_dropdown_options(options)
+    def render
+      navbar, btn_id, align, direction, size, type = process_dropdown_options(options)
 
       btn_options  = button_options(content, size, type, btn_id, navbar)
       list_options = list_options(btn_id, align)
 
       tag = navbar ? :li : :div
-      prepend_class(options, 'btn-group',
-                    (direction == :up ? 'dropup' : 'dropdown'), klass)
+      prepend_class(btn_group_options, 'btn-group',
+                    (direction == :up ? 'dropup' : 'dropdown'))
 
-      content_tag tag, options do
-        (dropdown_button(btn_options) +
+      content_tag tag, btn_group_options do
+        (dropdown_button(btn_options.deep_merge(options)) +
           dropdown_list(list, list_options)).html_safe
       end
     end
@@ -65,25 +68,26 @@ module DropdownHelper
     private
     def process_dropdown_options(options)
       navbar    = options.delete(:category).try(:to_sym) == :navbar
-      btn_id    = options.delete(:id) || "dropdown-#{rand(0...999)}"
-      klass     = options.delete(:class)
+      btn_id    = options.delete(:id) || "dropdown-#{SecureRandom.hex(3)}"
       active    = 'active' if options.delete(:active)
       align     = options.delete(:align).try(:to_sym)
       direction = options.delete(:direction).try(:to_sym)
       size      = get_btn_size(options.delete(:size))
       type      = get_btn_type(options.delete(:type))
 
-      [navbar, btn_id, "#{klass} #{active}", align, direction, size,
-       "btn #{type}"]
+      prepend_class(options, active)
+
+      [navbar, btn_id, align, direction, size, "btn #{type}"]
     end
 
     def button_options(content, size, type, id, navbar)
       klass = navbar ? 'dropdown-toggle' : "dropdown-toggle #{size} #{type}"
+      prepend_class(options, klass)
 
       {
         content: content,
-        class: klass,
         id: id,
+        type: 'button',
         data: {toggle: 'dropdown'},
         aria: {haspopup: true, expended: false},
         navbar: navbar
@@ -118,17 +122,16 @@ module DropdownHelper
 
       content_tag :ul, options do
         list_items.map do |item|
-          DropdownListItem.new(item).construct
+          DropdownListItem.new(item).render
         end.join('').html_safe
       end
     end
-
   end
 
   def dropdown(content=nil, list=[], options={})
     return if content.blank? || list.empty?
 
-    DropdownCreator.new(content, list, options).build
+    DropdownCreator.new(content, list, options).render
   end
 
   def navbar_dropdown(content=nil, list=[], options={})

data/app/helpers/format_helper.rb

@@ -4,9 +4,7 @@ module FormatHelper
     string.squeeze(' ').strip
   end
 
-  %w(class role).each do |attr|
-    define_method "prepend_#{attr}" do |options={}, *attrs|
-      options[attr.to_sym] = squeeze_n_strip("#{attrs.join(' ')} #{options[attr.to_sym]}")
-    end
+  def prepend_class(options, *attrs)
+    options[:class] = squeeze_n_strip("#{attrs.join(' ')} #{options[:class]}")
   end
 end

data/app/helpers/icon_helper.rb

@@ -13,7 +13,7 @@ module IconHelper
       @options = options
     end
 
-    def build
+    def render
       icon_options = {
         type:        type,
         size:        options.delete(:size).presence || :normal,
@@ -29,13 +29,13 @@ module IconHelper
         # stack = options.delete(:stack).presence
       }
 
-      prepend_class(options, 'fa', build_fa_class(icon_options))
+      prepend_class(options, 'fa', render_fa_class(icon_options))
 
       content_tag :i, nil, options
     end
 
     private
-    def build_fa_class(options)
+    def render_fa_class(options)
       type = "fa-#{options[:type]}"
       raise 'Invalid Icon Type!' if ValidIcons::VALID_ICONS.exclude?(type)
 
@@ -107,6 +107,6 @@ module IconHelper
   def icon(type=nil, options={})
     raise 'Please provide an icon type!' if type.blank?
 
-    IconCreator.new(type, options).build
+    IconCreator.new(type, options).render
   end
 end

data/app/helpers/modal_helper.rb

@@ -6,7 +6,7 @@ module ModalHelper
     button_options = options.delete(:button) || {}
 
     caption               = button_options.delete(:caption) || 'Modal'
-    modal_dialog_id       = options[:id] || "modal-#{rand(0...999)}"
+    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

data/lib/bootstrap_ui_helper/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap_ui_helper
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Sen Zhang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-13 00:00:00.000000000 Z
+date: 2015-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -46,6 +46,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md