ui_bibz 1.2.5.3 → 2.0.0.alpha

data/lib/ui_bibz/ui/core/{row.rb → layout/row.rb}

@@ -35,7 +35,13 @@ module UiBibz::Ui::Core
 
     # Render html tag
     def render
-      content_tag :div, @content, class_and_html_options('row')
+      content_tag :div, content, html_options
+    end
+
+  private
+
+    def component_html_classes
+      'row'
     end
 
   end

data/lib/ui_bibz/ui/core/list/components/list.rb

@@ -1,3 +1,5 @@
+require "ui_bibz/ui/core/list/components/list_header"
+require "ui_bibz/ui/core/list/components/list_body"
 module UiBibz::Ui::Core
 
   # Create a list
@@ -62,36 +64,47 @@ module UiBibz::Ui::Core
 
     # Render html tag
     def render
-      content_tag tag, class_and_html_options('list-group-item') do
+      content_tag tag_type, html_options do
         concat glyph_and_content_html if @content
         concat header_html if @body
         concat body_html   if @body
-        concat badge_html  if @options[:badge]
+        concat label_html  if @options[:label]
       end
     end
 
+
     # Add header which is a component
     def header content = nil, options = nil, html_options = nil, &block
-      @header = Component.new content, options, html_options, &block
+      @header = UiBibz::Ui::Core::ListHeader.new content, options, html_options, &block
     end
 
     # Add body which is a component
     def body content = nil, options = nil, html_options = nil, &block
-      @body = Component.new content, options, html_options, &block
+      @body = UiBibz::Ui::Core::ListBody.new content, options, html_options, &block
     end
 
   private
 
+    def component_html_classes
+      'list-group-item'
+    end
+
     def header_html
-      content_tag :h4, @header.render, @header.class_and_html_options('list-group-item-heading')
+      @header.render
     end
 
     def body_html
-      content_tag :p, @body.render, @body.class_and_html_options('list-group-item-text')
+      @body.render
     end
 
-    def tag
-      is_link_type? ? :a : :li
+    def tag_type
+      if is_link_type?
+        :a
+      elsif is_button_type?
+        :button
+      else
+        :li
+      end
     end
 
     def is_link_type?
@@ -99,10 +112,12 @@ module UiBibz::Ui::Core
       @options[:type] == :link || @html_options[:type] == :link
     end
 
+    def is_button_type?
+      @options[:type] == :button || @html_options[:type] == :button
+    end
+
     def state
-      unless @options[:state].nil?
-        "list-group-item-#{ states[@options[:state]] }"
-      end
+      "list-group-item-#{ @options[:state] }" unless @options[:state].nil?
     end
 
   end

data/lib/ui_bibz/ui/core/list/components/list_body.rb

@@ -0,0 +1,36 @@
+module UiBibz::Ui::Core
+
+  # Create a listBody
+  #
+  # This element is an extend of UiBibz::Ui::Core::Component.
+  #
+  # ==== Attributes
+  #
+  # * +content+ - Content of element
+  # * +options+ - Options of element
+  # * +html_options+ - Html Options of element
+  #
+  # ==== Options
+  #
+  # You can add HTML attributes using the +html_options+.
+  # You can pass arguments in options attribute:
+  class ListBody < Component
+
+    # See UiBibz::Ui::Core::Component.initialize
+    def initialize content = nil, options = nil, html_options = nil, &block
+      super
+    end
+
+    # Render html tag
+    def render
+      content_tag :p, content, html_options
+    end
+
+  private
+
+    def component_html_classes
+      'list-group-item-text'
+    end
+
+  end
+end

data/lib/ui_bibz/ui/core/list/components/list_header.rb

@@ -0,0 +1,36 @@
+module UiBibz::Ui::Core
+
+  # Create a listHeader
+  #
+  # This element is an extend of UiBibz::Ui::Core::Component.
+  #
+  # ==== Attributes
+  #
+  # * +content+ - Content of element
+  # * +options+ - Options of element
+  # * +html_options+ - Html Options of element
+  #
+  # ==== Options
+  #
+  # You can add HTML attributes using the +html_options+.
+  # You can pass arguments in options attribute:
+  class ListHeader < Component
+
+    # See UiBibz::Ui::Core::Component.initialize
+    def initialize content = nil, options = nil, html_options = nil, &block
+      super
+    end
+
+    # Render html tag
+    def render
+      content_tag :h4, content, html_options
+    end
+
+  private
+
+    def component_html_classes
+      'list-group-item-heading'
+    end
+
+  end
+end

data/lib/ui_bibz/ui/core/list/list_group.rb

@@ -78,14 +78,14 @@ module UiBibz::Ui::Core
 
     # Render html tag
     def render
-      content_tag type, @lists.join().html_safe, class_and_html_options("list-group")
+      content_tag type, @lists.join().html_safe, html_options
     end
 
     # Add group list
     # See UiBibz::Ui::Core::List
     def list content = nil, options = {} , html_options = nil, &block
       is_tap  = (content[:tap] if content.kind_of?(Hash)) || (options[:tap] unless options.nil?)
-      options = options.merge({ type: :link }) if @options[:type] == :link
+      options = options.merge({ type: @options[:type] }) unless @options[:type].nil?
 
       if is_tap
         @lists << List.new(content, options, html_options).tap(&block).render
@@ -96,8 +96,12 @@ module UiBibz::Ui::Core
 
   private
 
+    def component_html_classes
+      "list-group"
+    end
+
     def type
-      @options[:type] == :link ? :div : :ul
+      [:link, :button].include?(@options[:type]) ? :div : :ul
     end
 
   end

data/lib/ui_bibz/ui/core/modal/components/modal_body.rb

@@ -38,7 +38,13 @@ module UiBibz::Ui::Core
 
     # Render html tag
     def render
-      content_tag :div, @content, class_and_html_options("modal-body")
+      content_tag :div, content, html_options
+    end
+
+  private
+
+    def component_html_classes
+      'modal-body'
     end
 
   end

data/lib/ui_bibz/ui/core/modal/components/modal_footer.rb

@@ -38,7 +38,13 @@ module UiBibz::Ui::Core
 
     # Render html tag
     def render
-      content_tag :div, @content, class_and_html_options("modal-footer")
+      content_tag :div, content, html_options
+    end
+
+  private
+
+    def component_html_classes
+      'modal-footer'
     end
 
   end

data/lib/ui_bibz/ui/core/modal/components/modal_header.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 module UiBibz::Ui::Core
 
   # Create a modal header
@@ -39,7 +38,7 @@ module UiBibz::Ui::Core
 
     # Render html tag
     def render
-      content_tag :div, class_and_html_options("modal-header") do
+      content_tag :div, html_options do
         concat close_button_html
         concat content_tag :h4, glyph_and_content_html, class: 'modal-title'
       end
@@ -47,6 +46,10 @@ module UiBibz::Ui::Core
 
     private
 
+    def component_html_classes
+      'modal-header'
+    end
+
     def close_button_html
       content_tag :button, class: 'close', "data-dismiss" => 'modal', "aria-label" => "Close" do
         concat content_tag :span, "×", "aria-hidden" => true

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

@@ -17,6 +17,8 @@ module UiBibz::Ui::Core
   #
   # You can add HTML attributes using the +html_options+.
   # You can pass arguments in options attribute:
+  # * +size+
+  #   (+:sm+, +:lg+)
   #
   # ==== Signatures
   #
@@ -59,8 +61,8 @@ module UiBibz::Ui::Core
 
     # Render html tag
     def render
-      content_tag :div, class_and_html_options(['modal', effect]) do
-        content_tag :div, class: 'modal-dialog', role: 'document' do
+      content_tag :div, html_options do
+        content_tag :div, class: "modal-dialog #{ size }", role: 'document' do
           content_tag :div, class: 'modal-content' do
             concat @header
             concat @body
@@ -84,6 +86,15 @@ module UiBibz::Ui::Core
 
     private
 
+    def component_html_classes
+      'modal'
+    end
+
+    # :lg, :sm or :xs
+    def size
+      "modal-#{ @options[:size] }" if @options[:size]
+    end
+
     def effect
       @options[:effect] unless @options[:effect].nil?
     end

data/lib/ui_bibz/ui/core/nav/components/nav_dropdown.rb

@@ -50,7 +50,7 @@ module UiBibz::Ui::Core
 
     # Render html tag
     def render
-      content_tag :li, class_and_html_options(type) do
+      content_tag :li, html_options do
         concat link_html
         concat ul_html
       end
@@ -58,8 +58,12 @@ module UiBibz::Ui::Core
 
   private
 
+    def component_html_classes
+      [type, 'nav-item']
+    end
+
     def link_html
-      link_to button_content, "#", class: add_classes(size, "dropdown-toggle"), "data-toggle" => 'dropdown', "aria-expanded" => false
+      link_to button_content, "#", class: join_classes(size, "dropdown-toggle", 'nav-link'), "data-toggle" => 'dropdown', "aria-expanded" => false
     end
 
   end

data/lib/ui_bibz/ui/core/nav/components/nav_link.rb

@@ -1,3 +1,5 @@
+require 'ui_bibz/ui/core/nav/components/nav_link_link'
+require 'ui_bibz/ui/core/nav/components/nav_link_list'
 module UiBibz::Ui::Core
 
   # Create a NavLink
@@ -45,25 +47,12 @@ module UiBibz::Ui::Core
 
     # Render html tag
     def render
-      content_tag :li, content_htm, class_and_html_options.merge({ role: 'presentation' })
-    end
-
-  private
-
-    # content_htm and not content_html for haml bug
-    def content_htm
-      link_to @options[:url], link_html_options do
-        concat glyph_and_content_html
-        concat badge_html if @options[:badge]
-      end
-    end
-
-    def link_html_options
-      lho = @options[:link_html_options] || {}
-      if @options[:nav_type] == "nav-tabs"
-        lho.merge({ "aria-controls" => @options[:selector], "role" => "tab", "data-toggle" => "tab" })
+      content_htm = UiBibz::Ui::Core::NavLinkLink.new(content, options, html_options).render
+      if options[:nav_type] == "nav-links"
+        content_htm
       else
-        lho
+        options.delete(:status)
+        UiBibz::Ui::Core::NavLinkList.new(content_htm, options).render
       end
     end
 

data/lib/ui_bibz/ui/core/nav/components/nav_link_link.rb

@@ -0,0 +1,45 @@
+module UiBibz::Ui::Core
+
+  # Create a NavLinkLink
+  #
+  # This element is an extend of UiBibz::Ui::Core::Component.
+  #
+  # ==== Attributes
+  #
+  # * +content+ - Content of element
+  # * +options+ - Options of element
+  # * +html_options+ - Html Options of element
+  #
+  # ==== Options
+  #
+  # You can add HTML attributes using the +html_options+.
+  # You can pass arguments in options attribute:
+  # * +status+ - State of élement with symbol value:
+  #   (+:active+)
+  #
+  class NavLinkLink < Component
+
+    def initialize content = nil, options = nil, html_options = nil, &block
+      super
+    end
+
+    # Render html tag
+    def render
+      link_to options[:url], html_options do
+        concat glyph_and_content_html
+        concat label_html if options[:label]
+      end
+    end
+
+  private
+
+    def component_html_classes
+      "nav-link"
+    end
+
+    def component_html_options
+      options[:nav_type] == "nav-tabs" ? { "data-toggle" => "tab", role: 'tab' } : {}
+    end
+
+  end
+end

data/lib/ui_bibz/ui/core/nav/components/nav_link_list.rb

@@ -0,0 +1,35 @@
+module UiBibz::Ui::Core
+
+  # Create a NavLinkList
+  #
+  # This element is an extend of UiBibz::Ui::Core::Component.
+  #
+  # ==== Attributes
+  #
+  # * +content+ - Content of element
+  # * +options+ - Options of element
+  # * +html_options+ - Html Options of element
+  #
+  # ==== Options
+  #
+  # You can add HTML attributes using the +html_options+.
+  # You can pass arguments in options attribute:
+  class NavLinkList < Component
+
+    def initialize content = nil, options = nil, html_options = nil, &block
+      super
+    end
+
+    # Render html tag
+    def render
+      content_tag :li, content, html_options
+    end
+
+  private
+
+    def component_html_classes
+      'nav-item'
+    end
+
+  end
+end

data/lib/ui_bibz/ui/core/nav/components/navbar_brand.rb

@@ -0,0 +1,40 @@
+module UiBibz::Ui::Core
+
+  # Create a Navbar
+  #
+  # This element is an extend of UiBibz::Ui::Core::Component.
+  #
+  # ==== Attributes
+  #
+  # * +content+ - Content of element
+  # * +options+ - Options of element
+  # * +html_options+ - Html Options of element
+  #
+  # ==== Options
+  #
+  # You can add HTML attributes using the +html_options+.
+  # You can pass arguments in options attribute:
+  class NavbarBrand < Component
+
+    # See UiBibz::Ui::Core::Component.initialize
+    def initialize content = nil, options = nil, html_options = nil, &block
+      super
+    end
+
+    # Render html tag
+    def render
+      link_to content, brand_url, html_options
+    end
+
+  private
+
+    def component_html_classes
+      'navbar-brand'
+    end
+
+    def brand_url
+      options[:url] || "/"
+    end
+
+  end
+end