ui_bibz 1.2.5.3 → 2.0.0.alpha

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

@@ -50,7 +50,7 @@ module UiBibz::Ui::Core
       if type == :form_for
         @form = form_for(model_or_url, options, &block)
       else
-        @form = form_tag(model_or_url, class: "navbar-form #{ position }", &block)
+        @form = form_tag(model_or_url, class: "navbar-form form-inline #{ position }", &block)
       end
     end
 
@@ -74,7 +74,7 @@ module UiBibz::Ui::Core
     end
 
     def position
-      "navbar-#{ @options[:position] }" unless @options[:position].nil?
+      "pull-#{ @options[:position] }" unless @options[:position].nil?
     end
 
   end

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

@@ -50,7 +50,7 @@ module UiBibz::Ui::Core
     end
 
     def position
-      "navbar-#{ @options[:position] }" unless @options[:position].nil?
+      "pull-#{ @options[:position] }" unless @options[:position].nil?
     end
 
   end

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

@@ -40,13 +40,17 @@ module UiBibz::Ui::Core
 
     # Render html tag
     def render
-      content_tag :ul, @content, class_and_html_options(["navbar-text", position])
+      content_tag :ul, content, html_options
     end
 
   private
 
+    def component_html_classes
+      ["navbar-text", position]
+    end
+
     def position
-      "navbar-#{ @options[:position] }" unless @options[:position].nil?
+      "navbar-#{ options[:position] }" unless options[:position].nil?
     end
 
   end

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

@@ -66,13 +66,19 @@ module UiBibz::Ui::Core
 
     # Render html tag
     def render
-      content_tag :ul, @items.join.html_safe, class_and_html_options(["nav", type, position])
+      content_tag tag, @items.join.html_safe, html_options
     end
 
     # Add nav link items
     # See UiBibz::Ui::Core::NavLink
     def link content = nil, options = {}, html_options = nil, &block
-      @items << NavLink.new(content, options.merge({ nav_type: type }), html_options, &block).render
+      block_given? ? content.merge!({ nav_type: type }) : options.merge!({ nav_type: type })
+      @items << NavLink.new(content, options, html_options, &block).render
+    end
+
+    # Add nav in nav
+    def nav content = nil, options = {}, html_options = nil, &block
+      @items << content_tag(:li, Nav.new(content, options, html_options).tap(&block).render, class: 'nav-item')
     end
 
     # Add nav dropdown items
@@ -83,13 +89,25 @@ module UiBibz::Ui::Core
 
   private
 
+    def component_html_classes
+      ["nav", type, position, stacked]
+    end
+
     # tabs or pills
     def type
-     "nav-#{ @options[:type] || :tabs }"
+      "nav-#{ @options[:type] }" unless @options[:type].nil?
     end
 
     def position
-      "nav-#{ @options[:position] }" unless @options[:position].nil?
+      "pull-#{ @options[:position] }" unless @options[:position].nil?
+    end
+
+    def stacked
+      "nav-stacked" unless @options[:stacked].nil?
+    end
+
+    def tag
+      type == "nav-links" ? :nav : :ul
     end
 
   end

data/lib/ui_bibz/ui/core/nav/navbar.rb

@@ -1,6 +1,7 @@
 require 'ui_bibz/ui/core/nav/components/navbar_nav'
 require 'ui_bibz/ui/core/nav/components/navbar_text'
 require 'ui_bibz/ui/core/nav/components/navbar_form'
+require 'ui_bibz/ui/core/nav/components/navbar_brand'
 module UiBibz::Ui::Core
 
   # Create a Navbar
@@ -17,9 +18,11 @@ module UiBibz::Ui::Core
   #
   # You can add HTML attributes using the +html_options+.
   # You can pass arguments in options attribute:
-  # * +type+ - Symbol (default: :default)
-  #   (+:inverse+, +:default+)
+  # * +type+ - Symbol
+  #   (+:light+, +:dark+)
   # * +glyph+
+  # * +state+
+  #   (+:secondary+, +:primary+, +:info+, +:warning+, +:danger+, +inverse+)
   # * +position+ - Symbol
   #   (+:top+, +:bottom+)
   # * +title+ - String
@@ -71,7 +74,7 @@ module UiBibz::Ui::Core
 
     # Render html tag
     def render
-      content_tag :nav, class_and_html_options(['navbar', type, position]) do
+      content_tag :nav, html_options do
         content_tag :div, class: 'container-fluid' do
           concat header_html
           concat body_html
@@ -92,35 +95,42 @@ module UiBibz::Ui::Core
       @items << UiBibz::Ui::Core::NavbarForm.new(model_or_url, options, &block).render
     end
 
+    # Not use !!!!!
     # Add navbar text items
     # See UiBibz::Ui::Core::NavbarText
-    def text content = nil, options = nil, html_options = nil, &block
-      @items << UiBibz::Ui::Core::NavbarText.new(content, options, html_options, &block).render
-    end
+    #def text content = nil, options = nil, html_options = nil, &block
+      #@items << UiBibz::Ui::Core::NavbarText.new(content, options, html_options, &block).render
+    #end
 
     def brand content = nil, options = nil, html_options = nil, &block
-      @brand = UiBibz::Ui::Core::Component.new(content, options, html_options, &block)
+      @brand = UiBibz::Ui::Core::NavbarBrand.new(content, options, html_options, &block).render
     end
 
   private
 
+    def component_html_classes
+      ['navbar', type, position]
+    end
+
     def header_html
       content_tag :div, class: 'navbar-header' do
         concat navbar_toggle_button_html
-        concat link_to title.content, title.options[:url], title.class_and_html_options('navbar-brand') unless title.nil?
       end
     end
 
     def title
       @title ||= if @brand.nil?
-         brand(@options[:title], url: '/') unless @options[:title].nil?
+         brand(@options[:title]) unless @options[:title].nil?
       else
         @brand
       end
     end
 
     def body_html
-      content_tag :div, @items.join.html_safe, class: "collapse navbar-collapse", id: id
+      content_tag :div, class: "collapse navbar-toggleable-xs", id: id do
+        concat title
+        concat @items.join.html_safe
+      end
     end
 
     def id
@@ -128,12 +138,7 @@ module UiBibz::Ui::Core
     end
 
     def navbar_toggle_button_html
-      content_tag :button, class: 'navbar-toggle collapsed', data: { toggle: 'collapse', target:"##{ id }" } do
-        concat content_tag :span, 'Toggle navigation', class: 'sr-only'
-        concat content_tag :span, '', class: 'icon-bar'
-        concat content_tag :span, '', class: 'icon-bar'
-        concat content_tag :span, '', class: 'icon-bar'
-      end
+      content_tag :button, "☰", class: 'navbar-toggler hidden-sm-up', type: :button, data: { toggle: 'collapse', target:"##{ id }" }
     end
 
     def position
@@ -141,7 +146,11 @@ module UiBibz::Ui::Core
     end
 
     def type
-      "navbar-#{ @options[:type] || 'default' }"
+      "navbar-#{ @options[:type] || 'light' }"
+    end
+
+    def state
+      "bg-#{ @options[:state] }" unless @options[:state].nil?
     end
 
   end

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

@@ -0,0 +1,98 @@
+module UiBibz::Ui::Core
+
+  # Create a progress bar
+  #
+  # 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:
+  # * +state+ - State of élement with symbol value:
+  #   (+:secondary+, +:primary+, +:info+, +:warning+, +:danger+)
+  # * +max+ - Max value (default: 100)
+  # * +value+ - Value of percentage (default: content)
+  # * +animated+ - Boolean
+  # * +striped+ - Boolean
+  #
+  #
+  # ==== Signatures
+  #
+  #   UiBibz::Ui::Core::Progress.new(percentage, options = nil, html_options = nil)
+  #
+  #   UiBibz::Ui::Core::Progress.new(options = nil, html_options = nil) do
+  #     percentage
+  #   end
+  #
+  # ==== Examples
+  #
+  #   UiBibz::Ui::Core::Progress.new(50%, { value: 50})
+  #   # or
+  #   UiBibz::Ui::Core::Progress.new(10%, { value: 10, state: :success },{ class: 'test' }).render
+  #   # or
+  #   UiBibz::Ui::Core::Progress.new({ value: 10, state: :success},{ class: 'test' }) do
+  #     10%
+  #   end.render
+  #
+  # ==== Helper
+  #
+  #   progress(integer, options = {}, html_options = {})
+  #
+  #   progress(options = { tap: true }, html_options = {}) do |pb|
+  #     pb.bar(integer, options = {}, html_options = {})
+  #     pb.bar(options = {}, html_options = {}) do
+  #       integer
+  #     end
+  #   end
+  #
+  class Progress < Component
+
+    # See UiBibz::Ui::Core::Component.initialize
+    def initialize content = nil, options = nil, html_options = nil, &block
+      super
+      @bars = []
+    end
+
+    # Render html tag
+    def render
+      content_tag :progress, content, html_options
+    end
+
+  private
+
+    def component_html_classes
+      ['progress', striped, animated]
+    end
+
+    def component_html_options
+      { max: max, value: value }
+    end
+
+    def striped
+      'progress-striped' unless options[:striped].nil?
+    end
+
+    def animated
+      'progress-animated' unless options[:animated].nil?
+    end
+
+    def max
+      options[:max] || 100
+    end
+
+    def value
+      options[:value] || content.to_i
+    end
+
+    def state
+      "progress-#{ options[:state] }" unless options[:state].nil?
+    end
+
+  end
+end

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

@@ -51,13 +51,18 @@ module UiBibz::Ui::Core
 
     # Render html tag
     def render
-      content_tag :span, stars_notation.join(' ').html_safe, class_and_html_options('stars-notation')
+      content_tag :span, stars_notation.join(' ').html_safe, html_options
     end
 
   private
 
+
+    def component_html_classes
+      'stars-notation'
+    end
+
     def number
-      @options[:num] || 5
+      options[:num] || 5
     end
 
     def stars_notation
@@ -71,13 +76,16 @@ module UiBibz::Ui::Core
     end
 
     def glyph_opts
-      { state: @options[:state] } unless @options[:state].nil?
+      opts = {}
+      opts = opts.merge({ state: options[:state] }) unless options[:state].nil?
+      opts = opts.merge({ size: options[:size] })   unless options[:size].nil?
+      opts
     end
 
     def star_name star
-      if star <= @content
+      if star <= content
         'star'
-      elsif star > @content && !@content.is_a?(Integer) && star < @content + 1
+      elsif star > content && !content.is_a?(Integer) && star < content + 1
         'star-half-o'
       else
         'star-o'

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

@@ -36,6 +36,10 @@ module UiBibz::Ui::Ux
       @actions.empty? ? defaults_actions : @actions
     end
 
+    def raw_list
+      @actions
+    end
+
     def format_action
       @format_action
     end

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

@@ -64,14 +64,14 @@ module UiBibz::Ui::Ux
       @store.search
     end
 
-    def params
-      @store.params || {}
-    end
-
     def controller
       @store.controller
     end
 
+    def params
+      @store.params || {}
+    end
+
     def parameters
       @store.params
     end

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

@@ -21,23 +21,25 @@ module UiBibz::Ui::Ux
       tds
     end
 
-    # Add "id" in url to match with current record
-    def inject_url url, record
-      url.gsub(/(\/id\/?)/, "/#{ record.id }/")
-    end
-
   private
 
+    def default_actions?
+      @options[:default_actions].nil? ? true : @options[:default_actions]
+    end
+
     def dropdown_action record
-      UiBibz::Ui::Core::Dropdown.new(dropdown_action_name, { position: :right, glyph: actions_glyph }, class: 'btn-group-xs dropdown-action').tap do |d|
-        unless @actions.nil?
-          @actions.format_action.call(record) unless @actions.format_action.nil?
-          actions_links(record).each do |l|
-            d.html l.to_s.html_safe
-          end
-          @actions.reset
+      unless @actions.nil?
+        @actions.format_action.call(record) unless @actions.format_action.nil?
+        unless (default_actions? != true && @actions.raw_list.empty?)
+          UiBibz::Ui::Core::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
+            # Maybe remove this line
+            @actions.reset unless @actions.format_action.nil?
+          end.render
         end
-      end.render
+      end
     end
 
     def actions_glyph

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

@@ -2,16 +2,17 @@ module UiBibz::Ui::Ux
   class Paginable < UiBibz::Ui::Base
     include WillPaginate::ActionView
 
-    def initialize store, options
-      @store   = store
-      @options = options
+    def initialize store, options, html_options = nil
+      @store        = store
+      @options      = options
+      @html_options = html_options
     end
 
     # Render html tag
     def render
-      content_tag :div do
-        concat UiBibz::Ui::Ux::TablePagination.new(@options.merge({ store: @store })).render
-        concat UiBibz::Ui::Ux::TablePaginationPerPage.new(@options.merge({ store: @store })).render
+      content_tag :div, @html_options do
+        concat UiBibz::Ui::Ux::TablePagination.new(store: @store).render
+        concat UiBibz::Ui::Ux::TablePaginationPerPage.new(store: @store).render
         concat tag(:br, class: 'ui-bibz-clear')
       end
     end

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

@@ -1,16 +1,17 @@
 module UiBibz::Ui::Ux
   class Searchable < UiBibz::Ui::Base
 
-    def initialize store, options
-      @store   = store
-      @options = options
+    def initialize store, options, html_options = nil
+      @store        = store
+      @options      = options
+      @html_options = html_options
     end
 
     # Render html tag
     def render
-      content_tag :div do
+      content_tag :div, @html_options do
         concat content_tag(:div, table_name, class: 'title')
-        concat TableSearchField.new(store: @store, wrap_form: false).render if searchable?
+        concat TableSearchField.new({ store: @store, wrap_form: false }).render if searchable?
         concat tag :br, class: 'ui-bibz-clear'
       end
     end