ui_bibz 2.0.0.alpha24 → 2.0.0.alpha26

data/lib/ui_bibz/ui/core/cards/card.rb

@@ -96,31 +96,31 @@ module UiBibz::Ui::Core::Cards
 
     # Add Header which is a component
     def header content = nil, options = nil, html_options = nil, &block
-      @items << CardHeader.new(content, options, html_options, &block).render
+      @items << UiBibz::Ui::Core::Cards::Components::CardHeader.new(content, options, html_options, &block).render
     end
 
     # Add Block div which is a component
     def block content = nil, options = nil, html_options = nil, &block
       if is_tap(content, options)
-        @items << CardBlock.new(content, options, html_options).tap(&block).render
+        @items << UiBibz::Ui::Core::Cards::Components::CardBlock.new(content, options, html_options).tap(&block).render
       else
-        @items << CardBlock.new(content, options, html_options, &block).render
+        @items << UiBibz::Ui::Core::Cards::Components::CardBlock.new(content, options, html_options, &block).render
       end
     end
 
     # Add Footer which is a component
     def footer content = nil, options = nil, html_options = nil, &block
-      @items << CardFooter.new(content, options, html_options, &block).render
+      @items << UiBibz::Ui::Core::Cards::Components::CardFooter.new(content, options, html_options, &block).render
     end
 
     # Add List group which is a component
     def list_group content = nil, options = nil, html_options = nil, &block
-      @items << CardListGroup.new(content, options, html_options).tap(&block).render
+      @items << UiBibz::Ui::Core::Cards::Components::CardListGroup.new(content, options, html_options).tap(&block).render
     end
 
     # Add Image which is a component
     def image content = nil, options = nil, html_options = nil, &block
-      @items << CardImage.new(content, options, html_options, &block).render
+      @items << UiBibz::Ui::Core::Cards::Components::CardImage.new(content, options, html_options, &block).render
     end
 
     # Render html tag

data/lib/ui_bibz/ui/core/cards/components/block/card_block_link.rb

@@ -1,4 +1,4 @@
-module UiBibz::Ui::Core::Cards
+module UiBibz::Ui::Core::Cards::Components::Block
 
   # Create a card block title
   #

data/lib/ui_bibz/ui/core/cards/components/block/card_block_text.rb

@@ -1,4 +1,4 @@
-module UiBibz::Ui::Core::Cards
+module UiBibz::Ui::Core::Cards::Components::Block
 
   # Create a card block title
   #

data/lib/ui_bibz/ui/core/cards/components/block/card_block_title.rb

@@ -1,4 +1,4 @@
-module UiBibz::Ui::Core::Cards
+module UiBibz::Ui::Core::Cards::Components::Block
 
   # Create a card block title
   #

data/lib/ui_bibz/ui/core/cards/components/card_block.rb

@@ -1,7 +1,7 @@
 require 'ui_bibz/ui/core/cards/components/block/card_block_text'
 require 'ui_bibz/ui/core/cards/components/block/card_block_title'
 require 'ui_bibz/ui/core/cards/components/block/card_block_link'
-module UiBibz::Ui::Core::Cards
+module UiBibz::Ui::Core::Cards::Components
 
   # Create a card block
   #
@@ -46,15 +46,15 @@ module UiBibz::Ui::Core::Cards
     end
 
     def title content = nil, options = nil, html_options = nil, &block
-      @items << CardBlockTitle.new(content, options, html_options, &block).render
+      @items << UiBibz::Ui::Core::Cards::Components::Block::CardBlockTitle.new(content, options, html_options, &block).render
     end
 
     def link content = nil, options = nil, html_options = nil, &block
-      @items << CardBlockLink.new(content, options, html_options, &block).render
+      @items << UiBibz::Ui::Core::Cards::Components::Block::CardBlockLink.new(content, options, html_options, &block).render
     end
 
     def text content = nil, options = nil, html_options = nil, &block
-      @items << CardBlockText.new(content, options, html_options, &block).render
+      @items << UiBibz::Ui::Core::Cards::Components::Block::CardBlockText.new(content, options, html_options, &block).render
     end
 
   private

data/lib/ui_bibz/ui/core/cards/components/card_footer.rb

@@ -1,4 +1,4 @@
-module UiBibz::Ui::Core::Cards
+module UiBibz::Ui::Core::Cards::Components
 
   # Create a card footer
   #

data/lib/ui_bibz/ui/core/cards/components/card_header.rb

@@ -1,4 +1,4 @@
-module UiBibz::Ui::Core::Cards
+module UiBibz::Ui::Core::Cards::Components
 
   # Create a card header
   #

data/lib/ui_bibz/ui/core/cards/components/card_image.rb

@@ -1,4 +1,4 @@
-module UiBibz::Ui::Core::Cards
+module UiBibz::Ui::Core::Cards::Components
 
   # Create a card image
   #

data/lib/ui_bibz/ui/core/cards/components/card_list_group.rb

@@ -1,4 +1,4 @@
-module UiBibz::Ui::Core::Cards
+module UiBibz::Ui::Core::Cards::Components
 
   # Create a card list_group
   #
@@ -29,7 +29,7 @@ module UiBibz::Ui::Core::Cards
   #     'Exemple'
   #   end.render
   #
-  class CardListGroup < UiBibz::Ui::Core::ListGroup
+  class CardListGroup < UiBibz::Ui::Core::Lists::ListGroup
 
     # See UiBibz::Ui::Core::Component.initialize
     def initialize content = nil, options = nil, html_options = nil, &block

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

@@ -1,4 +1,6 @@
 require 'haml'
+require 'ui_bibz/ui/core/component/klass_extension'
+require 'ui_bibz/ui/core/component/glyph_extension'
 module UiBibz::Ui::Core
 
   # Creates a component of the given +name+ using options created by the set of +options+.
@@ -37,6 +39,8 @@ module UiBibz::Ui::Core
   #   end
   #
   class Component < UiBibz::Ui::Base
+    include UiBibz::Ui::Core::Component::KlassExtension
+    include Component::GlyphExtension
 
     attr_accessor :content, :html_options, :options
 
@@ -68,22 +72,6 @@ module UiBibz::Ui::Core
       glyph_and_content_html
     end
 
-    # Render glyph and content html
-    def glyph_and_content_html
-      [glyph_with_space, content].compact.join.html_safe
-    end
-
-    # Render glyph with space html
-    def glyph_with_space
-      "#{ glyph } " unless glyph.nil?
-    end
-
-    # Render glyph html
-    def glyph
-      glyph_info = options[:glyph] if options.kind_of?(Hash)
-      Glyph.new(glyph_info).render unless glyph_info.nil?
-    end
-
     def tag_html
       UiBibz::Ui::Core::Tag.new(options[:tag], class: 'pull-right', type: :pill, status: (options[:tag_status] || :default)).render
     end
@@ -116,16 +104,6 @@ module UiBibz::Ui::Core
       {}
     end
 
-    # Override this method to add a status class
-    def status
-    end
-
-    # Join classes
-    def join_classes *classes
-      klasses = [*classes].flatten.compact.uniq.reject(&:blank?)
-      klasses.empty? ? nil : klasses
-    end
-
     # Add html data arguments
     def add_html_data name, value = true
       html_options[:data] = {} if html_options[:data].nil?
@@ -135,31 +113,10 @@ module UiBibz::Ui::Core
 
   private
 
-    def initialize_component_html_classes
-      cls = [
-        html_options[:class],
-        state,
-        status,
-        effect,
-        options_classes,
-        component_html_classes
-      ]
-      html_options[:class] = join_classes(cls)
-    end
-
     def init_options
       @options = component_options.merge(@options)
     end
 
-    # Set effect class
-    def effect
-      options[:effect]
-    end
-
-    def options_classes
-      options[:class] if options.kind_of?(Hash)
-    end
-
     def initialize_component_html_data
       component_html_data
     end
@@ -174,9 +131,5 @@ module UiBibz::Ui::Core
       initialize_component_html_options
     end
 
-    def state
-      options[:state] unless options[:state].nil?
-    end
-
   end
 end

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

@@ -0,0 +1,19 @@
+module GlyphExtension
+
+  # Render glyph and content html
+  def glyph_and_content_html
+    [glyph_with_space, content].compact.join.html_safe
+  end
+
+  # Render glyph with space html
+  def glyph_with_space
+    "#{ glyph } " unless glyph.nil?
+  end
+
+  # 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?
+  end
+
+end

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

@@ -0,0 +1,38 @@
+module KlassExtension
+
+  def join_classes *classes
+    klasses = [*classes].flatten.compact.uniq.reject(&:blank?)
+    klasses.empty? ? nil : klasses
+  end
+
+  # Override this method to add a status class
+  def status
+  end
+
+  private
+
+  def initialize_component_html_classes
+    cls = [
+      html_options[:class],
+      state,
+      status,
+      effect,
+      options_classes,
+      component_html_classes
+    ]
+    html_options[:class] = join_classes(cls)
+  end
+
+  def effect
+    options[:effect]
+  end
+
+  def options_classes
+    options[:class] if options.kind_of?(Hash)
+  end
+
+  def state
+    options[:state] unless options[:state].nil?
+  end
+
+end

data/lib/ui_bibz/ui/core/{dropdown → dropdowns}/components/dropdown_divider.rb

@@ -1,4 +1,4 @@
-module UiBibz::Ui::Core
+module UiBibz::Ui::Core::Dropdowns::Components
 
   # Create DropdownDivider
   #

data/lib/ui_bibz/ui/core/{dropdown → dropdowns}/components/dropdown_header.rb

@@ -1,4 +1,4 @@
-module UiBibz::Ui::Core
+module UiBibz::Ui::Core::Dropdowns::Components
 
   # Create DropdownHeader
   #
@@ -31,7 +31,7 @@ module UiBibz::Ui::Core
   #     'Home'
   #   end.render
   #
-  class DropdownHeader < Component
+  class DropdownHeader < UiBibz::Ui::Core::Component
 
     # See UiBibz::Ui::Core::Component.initialize
     def initialize content = nil, options = nil, html_options = nil, &block

data/lib/ui_bibz/ui/core/{dropdown → dropdowns}/components/dropdown_link.rb

@@ -1,4 +1,4 @@
-module UiBibz::Ui::Core
+module UiBibz::Ui::Core::Dropdowns::Components
 
   # Create DropdownLink
   #
@@ -39,7 +39,7 @@ module UiBibz::Ui::Core
   #     'Home'
   #   end.render
   #
-  class DropdownLink < Component
+  class DropdownLink <  UiBibz::Ui::Core::Component
 
     # See UiBibz::Ui::Core::Component.initialize
     def initialize content = nil, options = nil, html_options = nil, &block

data/lib/ui_bibz/ui/core/{dropdown → dropdowns}/dropdown.rb

@@ -1,7 +1,7 @@
-require 'ui_bibz/ui/core/dropdown/components/dropdown_header'
-require 'ui_bibz/ui/core/dropdown/components/dropdown_divider'
-require 'ui_bibz/ui/core/dropdown/components/dropdown_link'
-module UiBibz::Ui::Core
+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'
+module UiBibz::Ui::Core::Dropdowns
 
   # Create a dropdown
   #
@@ -29,7 +29,7 @@ module UiBibz::Ui::Core
   #
   # ==== Signatures
   #
-  #   UiBibz::Ui::Core::Dropdown.new(options = nil, html_options = nil).tap do |d|
+  #   UiBibz::Ui::Core::Dropdowns::Dropdown.new(options = nil, html_options = nil).tap do |d|
   #     ...
   #     d.header content = nil, options = nil, html_options = nil, &block
   #     d.divider
@@ -39,7 +39,7 @@ module UiBibz::Ui::Core
   #
   # ==== Examples
   #
-  #   UiBibz::Ui::Core::Dropdown.new(name, status: :success).tap do |d|
+  #   UiBibz::Ui::Core::Dropdowns::Dropdown.new(name, status: :success).tap do |d|
   #     d.link 'test', { url: '#' }
   #     d.divider
   #     d.header 'Header 1'
@@ -60,7 +60,7 @@ module UiBibz::Ui::Core
   #     end
   #   end
   #
-  class Dropdown < Component
+  class Dropdown < UiBibz::Ui::Core::Component
 
     def initialize content, options = nil, html_options  = nil, &block
       super
@@ -79,19 +79,19 @@ module UiBibz::Ui::Core
     # Add dropdown header
     # See UiBibz::Ui::Core::DropdownHeader
     def header content = nil, options = nil, html_options = nil, &block
-      @items << DropdownHeader.new(content, options, html_options, &block).render
+      @items << UiBibz::Ui::Core::Dropdowns::Components::DropdownHeader.new(content, options, html_options, &block).render
     end
 
     # Add dropdown Separator
     # See UiBibz::Ui::Core::DropdownDivider
     def divider
-      @items << DropdownDivider.new.render
+      @items << UiBibz::Ui::Core::Dropdowns::Components::DropdownDivider.new.render
     end
 
     # Add dropdown link in list
     # See UiBibz::Ui::Core::DropdownLink
     def link content = nil, options = nil, html_options = nil, &block
-      @items << DropdownLink.new(content, options, html_options, &block).render
+      @items << UiBibz::Ui::Core::Dropdowns::Components::DropdownLink.new(content, options, html_options, &block).render
     end
 
     # Add html component
@@ -134,8 +134,7 @@ module UiBibz::Ui::Core
     end
 
     def button_status
-      sym = @status || :primary
-      "btn-#{ sym }"
+      "btn-#{ @status || :primary }"
     end
 
     # :lg, :sm or :xs

data/lib/ui_bibz/ui/core/{buttons/button_split_dropdown.rb → dropdowns/split_dropdown.rb}

@@ -1,8 +1,8 @@
-module UiBibz::Ui::Core::Buttons
+module UiBibz::Ui::Core::Dropdowns
 
   # Create a button dropdown
   #
-  # This element is an extend of UiBibz::Ui::Core::Dropdown.
+  # This element is an extend of UiBibz::Ui::Core::Dropdowns::Dropdown.
   #
   # ==== Attributes
   #
@@ -28,7 +28,7 @@ module UiBibz::Ui::Core::Buttons
   #
   # ==== Signatures
   #
-  #   UiBibz::Ui::Core::Buttons::ButtonSplitDropdown.new(options = nil, html_options = nil).tap do |d|
+  #   UiBibz::Ui::Core::Dropdowns::SplitDropdown.new(options = nil, html_options = nil).tap do |d|
   #     d.list content = nil, options = nil, html_options = nil, &block
   #     d.list content = nil, options = nil, html_options = nil, &block
   #     d.list content = nil, options = nil, html_options = nil, &block
@@ -37,7 +37,7 @@ module UiBibz::Ui::Core::Buttons
   #
   # ==== Examples
   #
-  #   UiBibz::Ui::Core::Buttons::ButtonSplitDropdown.new(name, status: :success).tap do |d|
+  #   UiBibz::Ui::Core::Dropdowns::SplitDropdown.new(name, status: :success).tap do |d|
   #     d.list link_to('test', '#')
   #     d.list('---')
   #     d.list('Header 1', { type: :header })
@@ -46,14 +46,14 @@ module UiBibz::Ui::Core::Buttons
   #
   # ==== Helper
   #
-  #   button_split_dropdown(name, options = {}, html_options = {}) do |b|
+  #  split_dropdown(name, options = {}, html_options = {}) do |b|
   #     d.list(content, options = {}, html_options = {})
   #     d.list(options = {}, html_options = {}) do
   #       content
   #     end
   #   end
   #
-  class ButtonSplitDropdown < UiBibz::Ui::Core::Dropdown
+  class SplitDropdown < UiBibz::Ui::Core::Dropdowns::Dropdown
 
     # See UiBibz::Ui::Core::Dropdown.initialize
     def initialize name, options = nil, html_options = nil, &block
@@ -75,10 +75,6 @@ module UiBibz::Ui::Core::Buttons
       ['btn-group', type]
     end
 
-    def component_html_options
-      { role: 'group' }
-    end
-
     def button_html
       content_tag :button, button_content, class: join_classes("btn", button_status, size)
     end