ui_bibz 2.0.0.beta2.5 → 2.0.0.beta2.6

data/lib/ui_bibz/ui/core/{progresses → notifications}/components/bar.rb

@@ -1,4 +1,4 @@
-module UiBibz::Ui::Core::Progresses::Components
+module UiBibz::Ui::Core::Notifications::Components
 
   # Create a bar
   #
@@ -24,19 +24,19 @@ module UiBibz::Ui::Core::Progresses::Components
   #
   # ==== Signatures
   #
-  #   UiBibz::Ui::Core::Bar.new(percentage, options = nil, html_options = nil)
+  #   UiBibz::Ui::Core::Notifications::Components::Bar.new(percentage, options = nil, html_options = nil)
   #
-  #   UiBibz::Ui::Core::Bar.new(options = nil, html_options = nil) do
+  #   UiBibz::Ui::Core::Notifications::Components::Bar.new(options = nil, html_options = nil) do
   #     percentage
   #   end
   #
   # ==== Examples
   #
-  #   UiBibz::Ui::Core::Bar.new(50%, { value: 50})
+  #   UiBibz::Ui::Core::Notifications::Components::Bar.new(50%, { value: 50})
   #   # or
-  #   UiBibz::Ui::Core::Bar.new(10%, { value: 10, status: :success },{ class: 'test' }).render
+  #   UiBibz::Ui::Core::Notifications::Components::Bar.new(10%, { value: 10, status: :success },{ class: 'test' }).render
   #   # or
-  #   UiBibz::Ui::Core::Bar.new({ value: 10, status: :success},{ class: 'test' }) do
+  #   UiBibz::Ui::Core::Notifications::Components::Bar.new({ value: 10, status: :success},{ class: 'test' }) do
   #     10%
   #   end.render
   #

data/lib/ui_bibz/ui/core/{progresses → notifications}/progress_bar.rb

@@ -1,5 +1,5 @@
-require 'ui_bibz/ui/core/progresses/components/bar'
-module UiBibz::Ui::Core::Progresses
+require 'ui_bibz/ui/core/notifications/components/bar'
+module UiBibz::Ui::Core::Notifications
 
   # Create a progress bar
   #
@@ -26,19 +26,19 @@ module UiBibz::Ui::Core::Progresses
   #
   # ==== Signatures
   #
-  #   UiBibz::Ui::Core::ProgressBar.new(percentage, options = nil, html_options = nil)
+  #   UiBibz::Ui::Core::Notifications::ProgressBar.new(percentage, options = nil, html_options = nil)
   #
-  #   UiBibz::Ui::Core::ProgressBar.new(options = nil, html_options = nil) do
+  #   UiBibz::Ui::Core::Notifications::ProgressBar.new(options = nil, html_options = nil) do
   #     percentage
   #   end
   #
   # ==== Examples
   #
-  #   UiBibz::Ui::Core::ProgressBar.new(50%, { value: 50})
+  #   UiBibz::Ui::Core::Notifications::ProgressBar.new(50%, { value: 50})
   #   # or
-  #   UiBibz::Ui::Core::ProgressBar.new(10%, { value: 10, status: :success },{ class: 'test' }).render
+  #   UiBibz::Ui::Core::Notifications::ProgressBar.new(10%, { value: 10, status: :success },{ class: 'test' }).render
   #   # or
-  #   UiBibz::Ui::Core::ProgressBar.new({ value: 10, status: :success},{ class: 'test' }) do
+  #   UiBibz::Ui::Core::Notifications::ProgressBar.new({ value: 10, status: :success},{ class: 'test' }) do
   #     10%
   #   end.render
   #
@@ -67,7 +67,7 @@ module UiBibz::Ui::Core::Progresses
     end
 
     def bar content = nil, options = nil, html_options = nil, &block
-      @bars << UiBibz::Ui::Core::Progresses::Components::Bar.new(content, options, html_options, &block).render
+      @bars << UiBibz::Ui::Core::Notifications::Components::Bar.new(content, options, html_options, &block).render
     end
 
   private
@@ -82,7 +82,7 @@ module UiBibz::Ui::Core::Progresses
       elsif options[:stacked]
         stacked_bars
       else
-        [UiBibz::Ui::Core::Progresses::Components::Bar.new(content, options).render]
+        [UiBibz::Ui::Core::Notifications::Components::Bar.new(content, options).render]
       end
     end
 
@@ -95,9 +95,9 @@ module UiBibz::Ui::Core::Progresses
       stacked_colors.map.with_index do |color, i|
         if percentages[0, i].sum <= content.to_f
           if content.to_f.between?(percentages[0, i].sum , percentages[0, i+1].sum)
-            UiBibz::Ui::Core::Progresses::Components::Bar.new((content.to_f*percentages[i]/100), min: 0, striped: options[:striped], animated: options[:animated], max: 100, status: color).render
+            UiBibz::Ui::Core::Notifications::Components::Bar.new((content.to_f*percentages[i]/100), min: 0, striped: options[:striped], animated: options[:animated], max: 100, status: color).render
           else
-            UiBibz::Ui::Core::Progresses::Components::Bar.new(percentages[i], min: 0, striped: options[:striped], animated: options[:animated], max: 100, status: color).render
+            UiBibz::Ui::Core::Notifications::Components::Bar.new(percentages[i], min: 0, striped: options[:striped], animated: options[:animated], max: 100, status: color).render
           end
         end
       end

data/lib/ui_bibz/ui/extensions/core/component/glyph_extension.rb

@@ -13,7 +13,7 @@ module GlyphExtension
   # Render glyph html
   def glyph
     glyph_info = options[:glyph] if options.kind_of?(Hash)
-    UiBibz::Ui::Core::Glyph.new(glyph_info).render unless glyph_info.nil?
+    UiBibz::Ui::Core::Icons::Glyph.new(glyph_info).render unless glyph_info.nil?
   end
 
 end

data/lib/ui_bibz/ui/extensions/core/component/klass_extension.rb

@@ -4,15 +4,23 @@ module KlassExtension
     UiBibz::Utils::Screwdriver.join_classes classes
   end
 
+  def exclude_classes arr, *classes
+    UiBibz::Utils::Screwdriver.exclude_classes arr, classes
+  end
+
   # Override this method to add a status class
   def status
   end
 
+  def exclude_classes_in_html_options *classes
+    html_options[:class] = exclude_classes html_options[:class], classes
+  end
+
   private
 
   def initialize_component_html_classes
     cls = [
-      html_options[:class],
+      original_html_options,
       state,
       status,
       effect,
@@ -23,12 +31,16 @@ module KlassExtension
     html_options[:class] = join_classes(cls)
   end
 
+  def original_html_options
+    transform_classes_to_array(html_options[:class])
+  end
+
   def effect
     options[:effect]
   end
 
   def options_classes
-    options[:class] if options.kind_of?(Hash)
+    transform_classes_to_array(options[:class])
   end
 
   def state
@@ -39,4 +51,8 @@ module KlassExtension
     "ui-bibz-connect" unless options[:connect].nil?
   end
 
+  def transform_classes_to_array classes
+    UiBibz::Utils::Screwdriver.uniq_word_in_string(classes.kind_of?(String) ? classes : classes.join(' ')) unless classes.nil?
+  end
+
 end

data/lib/ui_bibz/ui/ux/tables/components/actions.rb

@@ -1,6 +1,6 @@
-require 'ui_bibz/ui/core/dropdowns/components/dropdown_header'
-require 'ui_bibz/ui/core/dropdowns/components/dropdown_divider'
-require 'ui_bibz/ui/core/dropdowns/components/dropdown_link'
+require 'ui_bibz/ui/core/forms/dropdowns/components/dropdown_header'
+require 'ui_bibz/ui/core/forms/dropdowns/components/dropdown_divider'
+require 'ui_bibz/ui/core/forms/dropdowns/components/dropdown_link'
 module UiBibz::Ui::Ux::Tables
   class Actions
 
@@ -12,15 +12,15 @@ module UiBibz::Ui::Ux::Tables
 
     # Add link action in table
     def link content = nil, options = nil, html_options = nil, &block
-      @actions << UiBibz::Ui::Core::Dropdowns::Components::DropdownLink.new(content, options, html_options, &block).render
+      @actions << UiBibz::Ui::Core::Forms::Dropdowns::Components::DropdownLink.new(content, options, html_options, &block).render
     end
 
     def divider
-      @actions << UiBibz::Ui::Core::Dropdowns::Components::DropdownDivider.new.render
+      @actions << UiBibz::Ui::Core::Forms::Dropdowns::Components::DropdownDivider.new.render
     end
 
     def header content = nil, options = nil, html_options = nil, &block
-      @actions << UiBibz::Ui::Core::Dropdowns::Components::DropdownHeader.new(content, options, html_options, &block).render
+      @actions << UiBibz::Ui::Core::Forms::Dropdowns::Components::DropdownHeader.new(content, options, html_options, &block).render
     end
 
     def html content
@@ -52,9 +52,9 @@ module UiBibz::Ui::Ux::Tables
 
     def defaults_actions
       [
-        UiBibz::Ui::Core::Dropdowns::Components::DropdownLink.new(show_name, url: { controller: @store.controller, action: 'show', id: :id }, glyph: 'eye').render,
-        UiBibz::Ui::Core::Dropdowns::Components::DropdownLink.new(edit_name, url:{ controller: @store.controller, action: 'edit', id: :id }, glyph: 'pencil').render,
-        UiBibz::Ui::Core::Dropdowns::Components::DropdownLink.new(delete_name, { glyph: 'trash', url: { controller: @store.controller, action: 'destroy', id: :id }, link_html_options: { data: { confirm: 'Are you sure?', method: :delete }}}).render
+        UiBibz::Ui::Core::Forms::Dropdowns::Components::DropdownLink.new(show_name, url: { controller: @store.controller, action: 'show', id: :id }, glyph: 'eye').render,
+        UiBibz::Ui::Core::Forms::Dropdowns::Components::DropdownLink.new(edit_name, url:{ controller: @store.controller, action: 'edit', id: :id }, glyph: 'pencil').render,
+        UiBibz::Ui::Core::Forms::Dropdowns::Components::DropdownLink.new(delete_name, { glyph: 'trash', url: { controller: @store.controller, action: 'destroy', id: :id }, link_html_options: { data: { confirm: 'Are you sure?', method: :delete }}}).render
       ]
     end
 

data/lib/ui_bibz/ui/ux/tables/components/as.rb

@@ -27,9 +27,9 @@ module UiBibz::Ui::Ux::Tables
 
     def boolean_render
       if @content == true
-        glyph = UiBibz::Ui::Core::Glyph.new('check-circle', status: :success)
+        glyph = UiBibz::Ui::Core::Icons::Glyph.new('check-circle', status: :success)
       else
-        glyph = UiBibz::Ui::Core::Glyph.new('minus-circle', status: :danger)
+        glyph = UiBibz::Ui::Core::Icons::Glyph.new('minus-circle', status: :danger)
       end
       glyph.render
     end

data/lib/ui_bibz/ui/ux/tables/extensions/actionable.rb

@@ -31,7 +31,7 @@ module UiBibz::Ui::Ux::Tables
       unless @actions.nil?
         @actions.format_action.call(record) unless @actions.format_action.nil?
         unless (default_actions? != true && @actions.raw_list.empty?)
-          UiBibz::Ui::Core::Dropdowns::Dropdown.new(dropdown_action_name, { position: :right, size: :sm, glyph: actions_glyph }, { class: 'dropdown-action' }).tap do |d|
+          UiBibz::Ui::Core::Forms::Dropdowns::Dropdown.new(dropdown_action_name, { position: :right, size: :sm, glyph: actions_glyph }, { class: 'dropdown-action' }).tap do |d|
             actions_links(record).each do |l|
               d.html l.to_s.html_safe
             end

data/lib/ui_bibz/ui/ux/tables/extensions/searchable.rb

@@ -42,7 +42,7 @@ module UiBibz::Ui::Ux::Tables
     end
 
     def table_glyph
-      UiBibz::Ui::Core::Glyph.new(@options[:glyph]).render unless @options[:glyph].nil?
+      UiBibz::Ui::Core::Icons::Glyph.new(@options[:glyph]).render unless @options[:glyph].nil?
     end
 
   end

data/lib/ui_bibz/ui/ux/tables/extensions/sortable.rb

@@ -77,7 +77,7 @@ module UiBibz::Ui::Ux::Tables
     end
 
     def caret
-      UiBibz::Ui::Core::Glyph.new("caret-#{ direction == 'desc' ? 'up' : 'down' }").render
+      UiBibz::Ui::Core::Icons::Glyph.new("caret-#{ direction == 'desc' ? 'up' : 'down' }").render
     end
 
     def cls

data/lib/ui_bibz/ui/ux/tables/table_card.rb

@@ -3,7 +3,7 @@ module UiBibz::Ui::Ux::Tables
 
   # Create a TableCard
   #
-  # This element is an extend of UiBibz::Ui::Core::Cards::card.
+  # This element is an extend of UiBibz::Ui::Core::Boxes::card.
   #
   # ==== Attributes
   #
@@ -103,11 +103,11 @@ module UiBibz::Ui::Ux::Tables
   #       content
   #     end
   #   end
-  class TableCard < UiBibz::Ui::Core::Cards::Card
+  class TableCard < UiBibz::Ui::Core::Boxes::Card
 
     attr_accessor :columns
 
-    # See UiBibz::Ui::Core::Cards::Card.initialize
+    # See UiBibz::Ui::Core::Boxes::Card.initialize
     def initialize content = nil, options = nil, html_options = nil, &block
       super
       table_options = (@options[:table_options] || {}).merge({ store: store })

data/lib/ui_bibz/ui/ux/tables/table_search_field.rb

@@ -43,16 +43,16 @@ module UiBibz::Ui::Ux::Tables
     def search_field_html
       # add surround_field maybe ?
       content_tag :div, html_options do
-        concat content_tag(:span, UiBibz::Ui::Core::Glyph.new('search').render, class: 'input-group-addon')
+        concat content_tag(:span, UiBibz::Ui::Core::Icons::Glyph.new('search').render, class: 'input-group-addon')
         concat tag(:input, type: 'search', value: search_content, name: 'search', class: 'form-control', placeholder: search_placeholder_field)
         concat tag(:input, type: 'hidden', name: 'link_type', value: 'search')
-        concat content_tag(:span, UiBibz::Ui::Core::Glyph.new('times-circle').render, class: 'clear-search-btn input-group-addon')
+        concat content_tag(:span, UiBibz::Ui::Core::Icons::Glyph.new('times-circle').render, class: 'clear-search-btn input-group-addon')
       end
     end
 
     def search_field_html_in_wrap
       content_tag :div, html_options do
-        concat content_tag(:span, UiBibz::Ui::Core::Glyph.new('search').render, class: 'input-group-addon')
+        concat content_tag(:span, UiBibz::Ui::Core::Icons::Glyph.new('search').render, class: 'input-group-addon')
         store.parameters.with_indifferent_access.reject{ |k,_|  default_parameters?(k) }.each do |k,v|
           concat tag(:input, type: 'hidden', name: k, value: v)
         end
@@ -72,7 +72,7 @@ module UiBibz::Ui::Ux::Tables
     end
 
     def clear_button
-      content_tag :button, UiBibz::Ui::Core::Glyph.new('times-circle').render, type: :button, class: 'btn btn-secondary'
+      content_tag :button, UiBibz::Ui::Core::Icons::Glyph.new('times-circle').render, type: :button, class: 'btn btn-secondary'
     end
 
     def component_html_classes

data/lib/ui_bibz/utils/screwdriver.rb

@@ -3,9 +3,18 @@ module UiBibz::Utils
     include Singleton
 
     def self.join_classes *classes
-      klasses = [*classes].flatten.compact.uniq.reject(&:blank?)
+      klasses = [*classes].flatten.map(&:to_s).compact.uniq.reject(&:blank?)
       klasses.empty? ? nil : klasses
     end
 
+    def self.exclude_classes html_classes, *classes
+      klasses = (html_classes || []).flatten.map(&:to_s).reject{ |klass_name| [*classes].flatten.include?(klass_name.to_s) || klass_name.blank? }
+      klasses.empty? ? nil : klasses
+    end
+
+    def self.uniq_word_in_string str
+      str.split(/\s/).uniq
+    end
+
   end
 end

data/lib/ui_bibz/version.rb

@@ -1,3 +1,3 @@
 module UiBibz
-  VERSION = "2.0.0.beta2.5"
+  VERSION = "2.0.0.beta2.6"
 end

data/structure.md

@@ -0,0 +1,64 @@
+* Ui
+  * Core
+    * Navigations
+      * navbar
+      * tabs
+      * nav
+      * breadcrumb
+      * pagination
+      * toolbar
+    * Notifications
+      * alert
+      * badge
+      * progress_bar
+    * Icons
+      * glyph
+      * star
+    * Boxes
+      * jumbotron
+      * card
+      * card_deck
+      * card_column
+      * card_group
+    * Lists
+      * list_group
+    * Layouts
+      * container
+      * row
+      * col
+    * Forms
+      * buttons
+        * button
+        * button_choice
+        * button_group
+        * button_link
+        * button_refresh
+      * choices
+        * checkbox_field
+        * radio_field
+        * switch_field
+      * dates
+        * date_picker_field
+      * dropdowns
+        * dropdown
+        * split_dropdown
+      * numbers
+        * formula_field
+      * selects
+        * dropdown_select_field
+        * multi_column_field
+        * multi_select_field
+        * select_field
+      * surrounds
+        * surround_field
+      * textareas
+        * markdown_editor_field
+      * texts
+        * auto_complete_field
+        * text_field
+    * Windows
+      * modal
+  * Ux
+    * tables
+      * table
+      * table_card

data/test/ui/core/forms/buttons/button_test.rb

@@ -75,7 +75,7 @@ class ButtonTest < ActionView::TestCase
 
   test 'button glyph without text' do
     actual   = ui_button('state', glyph: 'diamond', text: false)
-    expected = "<button class=\"btn without-text\"><i class=\"glyph fa fa-diamond\"></i>  </button>"
+    expected = "<button class=\"btn without-text\" title=\"state\"><i class=\"glyph fa fa-diamond\"></i>  </button>"
 
     assert_equal expected, actual
   end

data/test/ui/core/forms/choices/choice_group_test.rb

@@ -0,0 +1,36 @@
+require 'test_helper'
+
+class ChoiceGroupTest < ActionView::TestCase
+  include UiBibz::Helpers::Ui::CoreHelper
+
+  test 'Choice group checkbox' do
+    actual   = ui_choice_group do |bc|
+      bc.choice 'Checkbox 1'
+      bc.choice 'Checkbox 2', state: :active
+    end
+    expected = "<div data-toggle=\"buttons\" class=\"btn-group button-choice\"><label class=\"btn-secondary btn checkbox\"><input type=\"checkbox\" autocomplete=\"off\" />Checkbox 1</label><label class=\"active btn-secondary btn checkbox\" aria-pressed=\"true\"><input type=\"checkbox\" autocomplete=\"off\" checked=\"checked\" />Checkbox 2</label></div>"
+
+    assert_equal expected, actual
+  end
+
+  test 'Choice group radio' do
+    actual = ui_choice_group type: :radio do |bc|
+      bc.choice 'Radio 1'
+      bc.choice 'Radio 2', state: :active
+    end
+    expected = "<div data-toggle=\"buttons\" class=\"btn-group button-choice\"><label class=\"btn-secondary btn radio\"><input type=\"radio\" autocomplete=\"off\" />Radio 1</label><label class=\"active btn-secondary btn radio\" aria-pressed=\"true\"><input type=\"radio\" autocomplete=\"off\" checked=\"checked\" />Radio 2</label></div>"
+
+    assert_equal expected, actual
+  end
+
+  test 'Choice group options' do
+    actual = ui_choice_group size: :lg, outline: true, type: :radio do |bc|
+      bc.choice 'Radio 1', glyph: 'diamond', status: :primary
+      bc.choice 'Radio 2', state: :active
+    end
+    expected = "<div data-toggle=\"buttons\" class=\"btn-group btn-group-lg button-choice\"><label class=\"btn-outline-primary btn btn-lg radio\"><input type=\"radio\" autocomplete=\"off\" /><i class=\"glyph fa fa-diamond\"></i> Radio 1</label><label class=\"active btn-outline-secondary btn btn-lg radio\" aria-pressed=\"true\"><input type=\"radio\" autocomplete=\"off\" checked=\"checked\" />Radio 2</label></div>"
+
+    assert_equal expected, actual
+  end
+
+end

data/test/ui/core/{dropdowns → forms/dropdowns}/dropdown_test.rb

@@ -3,7 +3,7 @@ class DropdownTest < ActionView::TestCase
   include UiBibz::Helpers::Ui::CoreHelper
 
   test 'Dropdown' do
-    actual = UiBibz::Ui::Core::Dropdowns::Dropdown.new("Dropdown").tap do |d|
+    actual = UiBibz::Ui::Core::Forms::Dropdowns::Dropdown.new("Dropdown").tap do |d|
       d.link 'link'
     end
     expected = "<div class=\"dropdown\"><button class=\"btn btn-secondary dropdown-toggle\" type=\"button\" data-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"false\" id=\"#{ actual.id }\">Dropdown <span class=\"caret\"></span></button><div class=\"dropdown-menu\" arial-labelledby=\"#{ actual.id }\"><a class=\"dropdown-item\" href=\"#\">link</a></div></div>"
@@ -12,7 +12,7 @@ class DropdownTest < ActionView::TestCase
   end
 
   test 'Dropdown status' do
-    actual = UiBibz::Ui::Core::Dropdowns::Dropdown.new("Dropdown", status: :primary).tap do |d|
+    actual = UiBibz::Ui::Core::Forms::Dropdowns::Dropdown.new("Dropdown", status: :primary).tap do |d|
       d.link 'link'
     end
     expected = "<div class=\"dropdown\"><button class=\"btn btn-primary dropdown-toggle\" type=\"button\" data-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"false\" id=\"#{ actual.id }\">Dropdown <span class=\"caret\"></span></button><div class=\"dropdown-menu\" arial-labelledby=\"#{ actual.id }\"><a class=\"dropdown-item\" href=\"#\">link</a></div></div>"
@@ -21,7 +21,7 @@ class DropdownTest < ActionView::TestCase
   end
 
   test 'Dropdown outline' do
-    actual = UiBibz::Ui::Core::Dropdowns::Dropdown.new("Dropdown", status: :primary, outline: true).tap do |d|
+    actual = UiBibz::Ui::Core::Forms::Dropdowns::Dropdown.new("Dropdown", status: :primary, outline: true).tap do |d|
       d.link 'link'
     end
     expected = "<div class=\"dropdown\"><button class=\"btn btn-outline-primary dropdown-toggle\" type=\"button\" data-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"false\" id=\"#{ actual.id }\">Dropdown <span class=\"caret\"></span></button><div class=\"dropdown-menu\" arial-labelledby=\"#{ actual.id }\"><a class=\"dropdown-item\" href=\"#\">link</a></div></div>"
@@ -30,7 +30,7 @@ class DropdownTest < ActionView::TestCase
   end
 
   test 'Dropdown options' do
-    actual =  UiBibz::Ui::Core::Dropdowns::Dropdown.new("Dropdown", type: :dropup, status: :success, glyph: 'diamond').tap do |d|
+    actual =  UiBibz::Ui::Core::Forms::Dropdowns::Dropdown.new("Dropdown", type: :dropup, status: :success, glyph: 'diamond').tap do |d|
       d.link 'Link 1', url: '#link1', glyph: 'eye'
       d.header 'header'
       d.link 'Link 2', url: '#link2'
@@ -43,7 +43,7 @@ class DropdownTest < ActionView::TestCase
   end
 
   test 'Split Dropdown' do
-    actual = UiBibz::Ui::Core::Dropdowns::Dropdown.new("Split Dropdown").tap do |d|
+    actual = UiBibz::Ui::Core::Forms::Dropdowns::Dropdown.new("Split Dropdown").tap do |d|
       d.link 'state'
     end
     expected = "<div class=\"dropdown\"><button class=\"btn btn-secondary dropdown-toggle\" type=\"button\" data-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"false\" id=\"#{ actual.id }\">Split Dropdown <span class=\"caret\"></span></button><div class=\"dropdown-menu\" arial-labelledby=\"#{ actual.id }\"><a class=\"dropdown-item\" href=\"#\">state</a></div></div>"