ui_bibz 1.1.1 → 1.1.2

data/doc/top-level-namespace.html

@@ -103,7 +103,7 @@
 </div>
 
     <div id="footer">
-  Generated on Mon Aug 31 14:08:52 2015 by
+  Generated on Wed Sep  2 11:20:03 2015 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.7.6 (ruby-1.9.3).
 </div>

data/lib/ui_bibz/ui/core/dropdown/components/dropdown_divider.rb

@@ -0,0 +1,17 @@
+module UiBibz::Ui::Core
+
+  # Create DropdownDivider
+  #
+  class DropdownDivider < UiBibz::Ui::Base
+
+    # See UiBibz::Ui::Core::Component.initialize
+    def initialize
+    end
+
+    # Render html tag
+    def render
+      content_tag :li, nil, class: 'divider', role: 'separator'
+    end
+
+  end
+end

data/lib/ui_bibz/ui/core/dropdown/components/dropdown_header.rb

@@ -0,0 +1,47 @@
+module UiBibz::Ui::Core
+
+  # Create DropdownHeader
+  #
+  # This element is an extend of UiBibz::Ui::Core::Component.
+  # Use '---' in content to add a separator
+  #
+  # ==== 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+.
+  #
+  # ==== Signatures
+  #
+  #   UiBibz::Ui::Core::DropdownHeader.new(content, options = nil, html_options = nil)
+  #
+  #   UiBibz::Ui::Core::DropdownHeader.new(options = nil, html_options = nil) do
+  #     content
+  #   end
+  #
+  # ==== Examples
+  #
+  #   UiBibz::Ui::Core::DropdownHeader.new('Home',{ class: 'test' }).render
+  #
+  #   UiBibz::Ui::Core::DropdownHeader.new({ class: 'test' }) do
+  #     'Home'
+  #   end.render
+  #
+  class DropdownHeader < 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 :li, @content, class_and_html_options('dropdown-header').merge({ role: 'presentation' })
+    end
+
+  end
+end

data/lib/ui_bibz/ui/core/dropdown/components/dropdown_link.rb

@@ -48,10 +48,16 @@ module UiBibz::Ui::Core
 
     # Render html tag
     def render
-      content_tag :li, @html_options.merge({ role: 'presentation' }) do
-        link_to glyph_and_content_html, @options[:url], @options[:link_html_options]
+      content_tag :li, class_and_html_options('').merge({ role: 'presentation' }) do
+        link_to glyph_and_content_html, link_url, @options[:link_html_options]
       end
     end
 
+    private
+
+    def link_url
+      @options[:url] || "#"
+    end
+
   end
 end

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

@@ -1,4 +1,5 @@
-require 'ui_bibz/ui/core/dropdown/components/dropdown_list'
+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
 
@@ -30,7 +31,8 @@ module UiBibz::Ui::Core
   #
   #   UiBibz::Ui::Core::Dropdown.new(options = nil, html_options = nil).tap do |d|
   #     ...
-  #     d.list content = nil, options = nil, html_options = nil, &block
+  #     d.header content = nil, options = nil, html_options = nil, &block
+  #     d.divider
   #     d.link content = nil, options = nil, html_options = nil, &block
   #     ...
   #   end
@@ -39,22 +41,23 @@ module UiBibz::Ui::Core
   #
   #   UiBibz::Ui::Core::Dropdown.new(name, state: :success).tap do |d|
   #     d.link 'test', { url: '#' }
-  #     d.list '---'
-  #     d.list 'Header 1', { type: :header }
+  #     d.divider
+  #     d.header 'Header 1'
   #     d.link 'test2', { url: '#' }
   #   end.render
   #
   # ==== Helper
   #
   #   dropdown(name, options = { tap: true }, html_options = {}) do |d|
-  #     d.list(content, options = {}, html_options = {})
-  #     d.list(options = {}, html_options = {}) do
-  #       content
-  #     end
   #     d.link(content, options = {}, html_options = {})
   #     d.link(options = {}, html_options = {}) do
   #       content
   #     end
+  #     d.divider
+  #     d.header(content, options = {}, html_options = {})
+  #     d.header(options = {}, html_options = {}) do
+  #       content
+  #     end
   #   end
   #
   class Dropdown < Component
@@ -73,10 +76,16 @@ module UiBibz::Ui::Core
       end
     end
 
-    # Add dropdown list
-    # See UiBibz::Ui::Core::DropdownList
-    def list content = nil, options = nil, html_options = nil, &block
-      @items << DropdownList.new(content, options, html_options, &block).render
+    # 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
+    end
+
+    # Add dropdown Separator
+    # See UiBibz::Ui::Core::DropdownDivider
+    def divider
+      @items << DropdownDivider.new.render
     end
 
     # Add dropdown link in list
@@ -85,6 +94,11 @@ module UiBibz::Ui::Core
       @items << DropdownLink.new(content, options, html_options, &block).render
     end
 
+    # Add html component
+    def html content
+      @items << content
+    end
+
   protected
 
     def button_content

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

@@ -1,4 +1,3 @@
-require "ui_bibz/ui/ux/table/components/table_action"
 module UiBibz::Ui::Ux
   class Actions
 
@@ -8,9 +7,17 @@ module UiBibz::Ui::Ux
       @action_order = -1
     end
 
-    # Add action in table
-    def action content = nil, options = nil, html_options = nil, &block
-      @actions << TableAction.new(content, options, html_options, &block).render
+    # Add link action in table
+    def link content = nil, options = nil, html_options = nil, &block
+      @actions << UiBibz::Ui::Core::DropdownLink.new(content, options, html_options, &block).render
+    end
+
+    def divider
+      @actions << UiBibz::Ui::Core::DropdownDivider.new.render
+    end
+
+    def header content = nil, options = nil, html_options = nil, &block
+      @actions << UiBibz::Ui::Core::DropdownHeader.new(content, options, html_options, &block).render
     end
 
     def reset
@@ -34,9 +41,9 @@ module UiBibz::Ui::Ux
 
     def defaults_actions
       [
-        UiBibz::Ui::Ux::TableAction.new(show_name, url: { controller: @store.controller, action: 'show', id: :id }, glyph: 'eye').render,
-        UiBibz::Ui::Ux::TableAction.new(edit_name, url:{ controller: @store.controller, action: 'edit', id: :id }, glyph: 'pencil').render,
-        UiBibz::Ui::Ux::TableAction.new(delete_name, { glyph: 'trash', url: { controller: @store.controller, action: 'destroy', id: :id }}, data: { confirm: 'Are you sure?', method: :delete }).render
+        UiBibz::Ui::Core::DropdownLink.new(show_name, url: { controller: @store.controller, action: 'show', id: :id }, glyph: 'eye').render,
+        UiBibz::Ui::Core::DropdownLink.new(edit_name, url:{ controller: @store.controller, action: 'edit', id: :id }, glyph: 'pencil').render,
+        UiBibz::Ui::Core::DropdownLink.new(delete_name, { glyph: 'trash', url: { controller: @store.controller, action: 'destroy', id: :id }}, data: { confirm: 'Are you sure?', method: :delete }).render
       ]
     end
 

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

@@ -33,7 +33,7 @@ module UiBibz::Ui::Ux
         unless @actions.nil?
           @actions.format_action.call(record) unless @actions.format_action.nil?
           actions_links(record).each do |l|
-            d.list l.to_s.html_safe
+            d.html l.to_s.html_safe
           end
           @actions.reset
         end

data/lib/ui_bibz/version.rb

@@ -1,3 +1,3 @@
 module UiBibz
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/test/ui/button_test.rb

@@ -28,26 +28,26 @@ class ButtonTest < ActionView::TestCase
 
   test 'button dropdown' do
       actual = UiBibz::Ui::Core::ButtonDropdown.new("Dropdown", type: :dropup, state: :success).tap do |d|
-      d.list 'toto'
-      d.list 'header', type: :header
-      d.list 'momo'
-      d.list '---'
-      d.list 'lolo'
+      d.link 'toto'
+      d.header 'header'
+      d.link 'momo'
+      d.divider
+      d.link 'lolo'
     end.render
-    expected = "<div class=\"btn-group dropup\" role=\"group\"><button class=\"btn btn-success dropdown-toggle\" type=\"button\" data-toggle=\"dropdown\" aria-expanded=\"false\">Dropdown <span class=\"caret\"></span></button><ul class=\"dropdown-menu dropdown-menu-left\" role=\"menu\"><li role=\"presentation\">toto</li><li class=\"dropdown-header\" role=\"presentation\">header</li><li role=\"presentation\">momo</li><li class=\"divider\" role=\"presentation\"></li><li role=\"presentation\">lolo</li></ul></div>"
+    expected = "<div class=\"btn-group dropup\" role=\"group\"><button class=\"btn btn-success dropdown-toggle\" type=\"button\" data-toggle=\"dropdown\" aria-expanded=\"false\">Dropdown <span class=\"caret\"></span></button><ul class=\"dropdown-menu dropdown-menu-left\" role=\"menu\"><li class=\"\" role=\"presentation\"><a href=\"#\">toto</a></li><li class=\"dropdown-header\" role=\"presentation\">header</li><li class=\"\" role=\"presentation\"><a href=\"#\">momo</a></li><li class=\"divider\" role=\"separator\"></li><li class=\"\" role=\"presentation\"><a href=\"#\">lolo</a></li></ul></div>"
 
     assert_equal expected, actual
   end
 
   test 'button split dropdown' do
       actual = UiBibz::Ui::Core::ButtonSplitDropdown.new("Dropdown", type: :dropup, state: :primary).tap do |d|
-      d.list 'toto'
-      d.list 'header', type: :header
-      d.list 'momo'
-      d.list '---'
-      d.list 'lolo'
+      d.link 'toto'
+      d.header 'header'
+      d.link 'momo'
+      d.divider
+      d.link 'lolo'
     end.render
-    expected = "<div class=\"btn-group dropup\" role=\"group\"><button class=\"btn btn-primary\">Dropdown</button><button class=\"btn btn-primary dropdown-toggle\" type=\"button\" data-toggle=\"dropdown\" aria-expanded=\"false\"><span class=\"caret\"></span><span class=\"sr-only\">Toggle Dropdown</span></button><ul class=\"dropdown-menu dropdown-menu-left\" role=\"menu\"><li role=\"presentation\">toto</li><li class=\"dropdown-header\" role=\"presentation\">header</li><li role=\"presentation\">momo</li><li class=\"divider\" role=\"presentation\"></li><li role=\"presentation\">lolo</li></ul></div>"
+    expected = "<div class=\"btn-group dropup\" role=\"group\"><button class=\"btn btn-primary\">Dropdown</button><button class=\"btn btn-primary dropdown-toggle\" type=\"button\" data-toggle=\"dropdown\" aria-expanded=\"false\"><span class=\"caret\"></span><span class=\"sr-only\">Toggle Dropdown</span></button><ul class=\"dropdown-menu dropdown-menu-left\" role=\"menu\"><li class=\"\" role=\"presentation\"><a href=\"#\">toto</a></li><li class=\"dropdown-header\" role=\"presentation\">header</li><li class=\"\" role=\"presentation\"><a href=\"#\">momo</a></li><li class=\"divider\" role=\"separator\"></li><li class=\"\" role=\"presentation\"><a href=\"#\">lolo</a></li></ul></div>"
 
     assert_equal expected, actual
   end

data/test/ui/dropdown_test.rb

@@ -5,12 +5,12 @@ class DropdownTest < ActionView::TestCase
   test 'Dropdown' do
     actual = UiBibz::Ui::Core::Dropdown.new("Dropdown", type: :dropup, state: :success).tap do |d|
       d.link 'Link 1', url: '#link1', glyph: 'eye'
-      d.list 'header', type: :header
+      d.header 'header'
       d.link 'Link 2', url: '#link2'
-      d.list '---'
+      d.divider
       d.link 'Link3', url: '#link3'
     end.render
-    expected = "<div class=\"dropup\"><button class=\"btn btn-success dropdown-toggle\" type=\"button\" data-toggle=\"dropdown\" aria-expanded=\"false\">Dropdown <span class=\"caret\"></span></button><ul class=\"dropdown-menu dropdown-menu-left\" role=\"menu\"><li role=\"presentation\"><a href=\"#link1\"><i class=\"glyph fa fa-eye\"></i> Link 1</a></li><li class=\"dropdown-header\" role=\"presentation\">header</li><li role=\"presentation\"><a href=\"#link2\">Link 2</a></li><li class=\"divider\" role=\"presentation\"></li><li role=\"presentation\"><a href=\"#link3\">Link3</a></li></ul></div>"
+    expected = "<div class=\"dropup\"><button class=\"btn btn-success dropdown-toggle\" type=\"button\" data-toggle=\"dropdown\" aria-expanded=\"false\">Dropdown <span class=\"caret\"></span></button><ul class=\"dropdown-menu dropdown-menu-left\" role=\"menu\"><li class=\"\" role=\"presentation\"><a href=\"#link1\"><i class=\"glyph fa fa-eye\"></i> Link 1</a></li><li class=\"dropdown-header\" role=\"presentation\">header</li><li class=\"\" role=\"presentation\"><a href=\"#link2\">Link 2</a></li><li class=\"divider\" role=\"separator\"></li><li class=\"\" role=\"presentation\"><a href=\"#link3\">Link3</a></li></ul></div>"
 
     assert_equal expected, actual
   end

data/test/ui/table_test.rb

@@ -172,9 +172,9 @@ class TableTest < ActionView::TestCase
         c.column(:name_en, { name: 'Name en', format: lambda{ |records, record| "name #{ record.id}"}})
       end
       pane.actions do |a|
-        a.action 'toto', url: users_path(:id), glyph: 'eye'
-        a.action '---'
-        a.action 'momo', url: users_path(:id), glyph: 'home'
+        a.link 'toto', url: users_path(:id), glyph: 'eye'
+        a.divider
+        a.link 'momo', url: users_path(:id), glyph: 'home'
       end
     end.render
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ui_bibz
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Thooams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-31 00:00:00.000000000 Z
+date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -267,6 +267,8 @@ files:
 - doc/UiBibz/Ui/Core/Col.html
 - doc/UiBibz/Ui/Core/Component.html
 - doc/UiBibz/Ui/Core/Dropdown.html
+- doc/UiBibz/Ui/Core/DropdownDivider.html
+- doc/UiBibz/Ui/Core/DropdownHeader.html
 - doc/UiBibz/Ui/Core/DropdownLink.html
 - doc/UiBibz/Ui/Core/DropdownList.html
 - doc/UiBibz/Ui/Core/Glyph.html
@@ -357,8 +359,9 @@ files:
 - lib/ui_bibz/ui/core/button/button_split_dropdown.rb
 - lib/ui_bibz/ui/core/col.rb
 - lib/ui_bibz/ui/core/component.rb
+- lib/ui_bibz/ui/core/dropdown/components/dropdown_divider.rb
+- lib/ui_bibz/ui/core/dropdown/components/dropdown_header.rb
 - lib/ui_bibz/ui/core/dropdown/components/dropdown_link.rb
-- lib/ui_bibz/ui/core/dropdown/components/dropdown_list.rb
 - lib/ui_bibz/ui/core/dropdown/dropdown.rb
 - lib/ui_bibz/ui/core/glyph.rb
 - lib/ui_bibz/ui/core/jumbotron.rb
@@ -382,7 +385,6 @@ files:
 - lib/ui_bibz/ui/ux/table/components/column.rb
 - lib/ui_bibz/ui/ux/table/components/columns.rb
 - lib/ui_bibz/ui/ux/table/components/store.rb
-- lib/ui_bibz/ui/ux/table/components/table_action.rb
 - lib/ui_bibz/ui/ux/table/extensions/actionable.rb
 - lib/ui_bibz/ui/ux/table/extensions/paginable.rb
 - lib/ui_bibz/ui/ux/table/extensions/searchable.rb

data/lib/ui_bibz/ui/core/dropdown/components/dropdown_list.rb

@@ -1,75 +0,0 @@
-module UiBibz::Ui::Core
-
-  # Create DropdownList
-  #
-  # This element is an extend of UiBibz::Ui::Core::Component.
-  # Use '---' in content to add a separator
-  #
-  # ==== 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+)
-  # * +url+ - String
-  # * +glyph+ - Add glyph with name or hash options
-  #   * +name+ - String
-  #   * +size+ - Integer
-  #   * +type+ - Symbol
-  #
-  # ==== Signatures
-  #
-  #   UiBibz::Ui::Core::DropdownList.new(content, options = nil, html_options = nil)
-  #
-  #   UiBibz::Ui::Core::DropdownList.new(options = nil, html_options = nil) do
-  #     content
-  #   end
-  #
-  # ==== Examples
-  #
-  #   UiBibz::Ui::Core::DropdownList.new('Home', { glyph: 'home', status: :active },{ class: 'test' }).render
-  #
-  #   UiBibz::Ui::Core::DropdownList.new({glyph: { name: 'eye', size: 3}, { class: 'test' }) do
-  #     'Home'
-  #   end.render
-  #
-  #   UiBibz::Ui::CoreBibz::DropdownList.new('---').render # To add a separator
-  #
-  class DropdownList < Component
-
-    DIVIDER = '---'
-
-    # See UiBibz::Ui::Core::Component.initialize
-    def initialize content = nil, options = nil, html_options = nil, &block
-      super
-    end
-
-    # Render html tag
-    def render
-      @content == DIVIDER ? divider_html : link_html
-    end
-
-  private
-
-    def divider_html
-      content_tag :li, '', class_and_html_options('divider').merge({ role: 'presentation' })
-    end
-
-    def link_html
-      content_tag :li, class_and_html_options(type).merge({ role: 'presentation' }) do
-        @content
-      end
-    end
-
-    def type
-      "dropdown-header" if @options[:type] == :header
-    end
-
-  end
-end

data/lib/ui_bibz/ui/ux/table/components/table_action.rb

@@ -1,21 +0,0 @@
-module UiBibz::Ui::Ux
-  class TableAction < UiBibz::Ui::Core::Component
-
-    DIVIDER = '---'
-
-    def initialize content = nil, options = nil, html_options = nil, &block
-      super
-    end
-
-    def render
-      @content == DIVIDER ? DIVIDER : link_html
-    end
-
-  private
-
-    def link_html
-      link_to glyph_and_content_html, @options[:url], class_and_html_options
-    end
-
-  end
-end