ui_bibz 2.0.0.alpha32 → 2.0.0.beta2

data/lib/ui_bibz/helpers/utils_helper.rb

@@ -2,8 +2,29 @@ module UiBibz::Helpers::UtilsHelper
 
   # Same method like I18n.translate but accept
   # strings in default argument
-  def translatize translation, options
+  def ui_translatize translation, options
     UiBibz::Utils::Internationalization.new(translation, options).translate
   end
 
+  def ui_form_for object, *args, &block
+    options = args.extract_options!
+    simple_form_for(object, *(args << new_options(options)), &block)
+  end
+
+  private
+
+  def new_options options
+    if options[:html].nil?
+      options[:html] = { class: options[:class] }
+    else
+      if options[:html][:class].nil?
+        options[:html] = options[:html].merge({ class: options[:class] })
+      else
+        options[:html][:class] = options[:html][:class] + (options[:class] || "")
+      end
+    end
+    options.merge(builder: UiBibzForm::UiBibzFormBuilder)
+  end
+
+
 end

data/lib/ui_bibz/rails/engine.rb

@@ -1,5 +1,7 @@
 # to load pagination in rails app
 require 'will_paginate'
+require 'jquery-rails'
+require 'popper_js'
 require 'bootstrap'
 require "font-awesome-sass"
 
@@ -17,10 +19,12 @@ module UiBibz
     class Engine < ::Rails::Engine
 
       initializer "ui_bibz.helpers" do
-        ActionView::Base.send :include, UiBibz::Helpers::UiCoreHelper
-        ActionView::Base.send :include, UiBibz::Helpers::UiUxHelper
         ActionView::Base.send :include, UiBibz::Helpers::UtilsHelper
       end
+      initializer "ui_bibz.helpers.ui" do
+        ActionView::Base.send :include, UiBibz::Helpers::Ui::CoreHelper
+        ActionView::Base.send :include, UiBibz::Helpers::Ui::UxHelper
+      end
 
     end
   end

data/lib/ui_bibz/ui/base.rb

@@ -15,5 +15,9 @@ module UiBibz::Ui
     def inject_url url, record
       url.gsub(/(\/id\/?)/, "/#{ record.id }/")
     end
+
+    def generate_id name = nil
+      "#{ name || 'id' }-#{ Random.new_seed }"
+    end
   end
 end

data/lib/ui_bibz/ui/core/{tag.rb → badge.rb}

@@ -1,6 +1,6 @@
 module UiBibz::Ui::Core
 
-  # Create a tag
+  # Create a badge
   #
   # This element is an extend of UiBibz::Ui::Core::Component.
   # The helper use 'etiquette' method to avoid conflict with Rails.
@@ -22,21 +22,21 @@ module UiBibz::Ui::Core
   #   * +size+ - Integer
   #   * +type+ - Symbol
   # * +type+ - Symbol
-  #   (+pill+)
+  #   (+:pill+, +:square+)
   #
   # ==== Signatures
   #
-  #   UiBibz::Ui::Core::Tag.new(content, options = nil, html_options = nil)
+  #   UiBibz::Ui::Core::Badge.new(content, options = nil, html_options = nil)
   #
-  #   UiBibz::Ui::Core::Tag.new(options = nil, html_options = nil) do
+  #   UiBibz::Ui::Core::Badge.new(options = nil, html_options = nil) do
   #     content
   #   end
   #
   # ==== Examples
   #
-  #   UiBibz::Ui::Core::Tag.new(content, status: :success, type: :pill).render
+  #   UiBibz::Ui::Core::Badge.new(content, status: :success, type: :pill).render
   #
-  #   UiBibz::Ui::Core::Tag.new() do
+  #   UiBibz::Ui::Core::Badge.new() do
   #     #content
   #   end.render
   #
@@ -48,7 +48,7 @@ module UiBibz::Ui::Core
   #     content
   #   end
   #
-  class Tag < Component
+  class Badge < Component
 
     # See UiBibz::Ui::Core::Component.initialize
     def initialize content = nil, options = nil, html_options = nil, &block
@@ -63,15 +63,15 @@ module UiBibz::Ui::Core
   private
 
     def component_html_classes
-      ['tag', type]
+      ['badge', type]
     end
 
     def status
-      "tag-#{ @options[:status] || :default  }"
+      "badge-#{ @options[:status] || :default  }"
     end
 
     def type
-      "tag-pill" if @options[:type] == :pill
+      "badge-pill" if @options[:type] == :pill
     end
 
   end

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

@@ -1,6 +1,6 @@
 require 'ui_bibz/ui/core/cards/components/card_header'
 require 'ui_bibz/ui/core/cards/components/card_footer'
-require 'ui_bibz/ui/core/cards/components/card_block'
+require 'ui_bibz/ui/core/cards/components/card_body'
 require 'ui_bibz/ui/core/cards/components/card_image'
 require 'ui_bibz/ui/core/cards/components/card_list_group'
 module UiBibz::Ui::Core::Cards
@@ -73,9 +73,9 @@ module UiBibz::Ui::Core::Cards
   #       content
   #     end
   #
-  #     p.block(content, options = {}, html_options = {})
+  #     p.body(content, options = {}, html_options = {})
   #     # or
-  #     p.block(options = {}, html_options = {}) do
+  #     p.body(options = {}, html_options = {}) do
   #       content
   #     end
   #
@@ -91,26 +91,29 @@ module UiBibz::Ui::Core::Cards
     # See UiBibz::Ui::Core::Component.initialize
     def initialize content = nil, options = nil, html_options = nil, &block
       super
-      @items = [@content]
+      @items = @content.nil? ? [] : [UiBibz::Ui::Core::Cards::Components::CardBody.new(@content).render]
     end
 
     # Add Header which is a component
     def header content = nil, options = nil, html_options = nil, &block
-      @items << UiBibz::Ui::Core::Cards::Components::CardHeader.new(content, options, html_options, &block).render
+      options, content = inherit_options(content, options, block)
+      @header = 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
+    # Add Body div which is a component
+    def body content = nil, options = nil, html_options = nil, &block
+      options, content = inherit_options(content, options, block)
       if is_tap(content, options)
-        @items << UiBibz::Ui::Core::Cards::Components::CardBlock.new(content, options, html_options).tap(&block).render
+        @items << UiBibz::Ui::Core::Cards::Components::CardBody.new(content, options, html_options).tap(&block).render
       else
-        @items << UiBibz::Ui::Core::Cards::Components::CardBlock.new(content, options, html_options, &block).render
+        @items << UiBibz::Ui::Core::Cards::Components::CardBody.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 << UiBibz::Ui::Core::Cards::Components::CardFooter.new(content, options, html_options, &block).render
+      options, content = inherit_options(content, options, block)
+      @footer = UiBibz::Ui::Core::Cards::Components::CardFooter.new(content, options, html_options, &block).render
     end
 
     # Add List group which is a component
@@ -125,17 +128,34 @@ module UiBibz::Ui::Core::Cards
 
     # Render html tag
     def render
-      content_tag :div, @items.join.html_safe, html_options
+      content_tag :div, html_structure, html_options
     end
 
   protected
 
+    def html_structure
+      [@header, @items.join, @footer].compact.join.html_safe
+    end
+
+    def inherit_options content, options, block
+      if block.nil?
+        options = (options || {}).merge({ outline: @options[:outline] , status: @options[:status] })
+      else
+        content = (content || {}).merge({ outline: @options[:outline], status: @options[:status] })
+      end
+      [options, content]
+    end
+
     def component_html_classes
-      ["card", text, card_block, type, tab_pane]
+      ["card", text, type, tab_pane, outline]
     end
 
     def status
-      "card-#{ @options[:status] }" unless @options[:status].nil?
+      unless @options[:status].nil?
+        output = @options[:outline] ? ["border-#{ @options[:status] }"] : ["bg-#{ @options[:status] }"]
+        output << "text-white" if @options[:status] != :light && @options[:status] != :warning
+        output.join(' ')
+      end
     end
 
     def text
@@ -154,5 +174,9 @@ module UiBibz::Ui::Core::Cards
       "tab-pane" if @options[:tab]
     end
 
+    def outline
+      "bg-transparent" if @options[:outline]
+    end
+
   end
 end

data/lib/ui_bibz/ui/core/cards/components/{block/card_block_link.rb → body/card_body_link.rb}

@@ -1,4 +1,4 @@
-module UiBibz::Ui::Core::Cards::Components::Block
+module UiBibz::Ui::Core::Cards::Components::Body
 
   # Create a card block title
   #
@@ -15,21 +15,21 @@ module UiBibz::Ui::Core::Cards::Components::Block
   #
   # ==== Signatures
   #
-  #   UiBibz::Ui::Core::Cards::CardBlockLink.new(content, options = nil, html_options = nil)
+  #   UiBibz::Ui::Core::Cards::CardBodyLink.new(content, options = nil, html_options = nil)
   #
-  #   UiBibz::Ui::Core::Cards::CardBlockLink.new(options = nil, html_options = nil) do
+  #   UiBibz::Ui::Core::Cards::CardBodyLink.new(options = nil, html_options = nil) do
   #     content
   #   end
   #
   # ==== Examples
   #
-  #   UiBibz::Ui::Core::Cards::CardBlockLink.new.render
+  #   UiBibz::Ui::Core::Cards::CardBodyLink.new.render
   #
-  #   UiBibz::Ui::Core::Cards::CardBlockLink.new do
+  #   UiBibz::Ui::Core::Cards::CardBodyLink.new do
   #     'Exemple'
   #   end.render
   #
-  class CardBlockLink < UiBibz::Ui::Core::Component
+  class CardBodyLink < 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/cards/components/{block/card_block_text.rb → body/card_body_text.rb}

@@ -1,4 +1,4 @@
-module UiBibz::Ui::Core::Cards::Components::Block
+module UiBibz::Ui::Core::Cards::Components::Body
 
   # Create a card block title
   #
@@ -15,21 +15,21 @@ module UiBibz::Ui::Core::Cards::Components::Block
   #
   # ==== Signatures
   #
-  #   UiBibz::Ui::Core::Cards::CardBlockText.new(content, options = nil, html_options = nil)
+  #   UiBibz::Ui::Core::Cards::CardBodyText.new(content, options = nil, html_options = nil)
   #
-  #   UiBibz::Ui::Core::Cards::CardBlockText.new(options = nil, html_options = nil) do
+  #   UiBibz::Ui::Core::Cards::CardBodyText.new(options = nil, html_options = nil) do
   #     content
   #   end
   #
   # ==== Examples
   #
-  #   UiBibz::Ui::Core::Cards::CardBlockText.new.render
+  #   UiBibz::Ui::Core::Cards::CardBodyText.new.render
   #
-  #   UiBibz::Ui::Core::Cards::CardBlockText.new do
+  #   UiBibz::Ui::Core::Cards::CardBodyText.new do
   #     'Exemple'
   #   end.render
   #
-  class CardBlockText < UiBibz::Ui::Core::Component
+  class CardBodyText < 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/cards/components/{block/card_block_title.rb → body/card_body_title.rb}

@@ -1,4 +1,4 @@
-module UiBibz::Ui::Core::Cards::Components::Block
+module UiBibz::Ui::Core::Cards::Components::Body
 
   # Create a card block title
   #
@@ -15,21 +15,21 @@ module UiBibz::Ui::Core::Cards::Components::Block
   #
   # ==== Signatures
   #
-  #   UiBibz::Ui::Core::Cards::CardBlockTitle.new(content, options = nil, html_options = nil)
+  #   UiBibz::Ui::Core::Cards::CardBodyTitle.new(content, options = nil, html_options = nil)
   #
-  #   UiBibz::Ui::Core::Cards::CardBlockTitle.new(options = nil, html_options = nil) do
+  #   UiBibz::Ui::Core::Cards::CardBodyTitle.new(options = nil, html_options = nil) do
   #     content
   #   end
   #
   # ==== Examples
   #
-  #   UiBibz::Ui::Core::Cards::CardBlockTitle.new.render
+  #   UiBibz::Ui::Core::Cards::CardBodyTitle.new.render
   #
-  #   UiBibz::Ui::Core::Cards::CardBlockTitle.new do
+  #   UiBibz::Ui::Core::Cards::CardBodyTitle.new do
   #     'Exemple'
   #   end.render
   #
-  class CardBlockTitle < UiBibz::Ui::Core::Component
+  class CardBodyTitle < 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/cards/components/{card_block.rb → card_body.rb}

@@ -1,9 +1,9 @@
-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'
+require 'ui_bibz/ui/core/cards/components/body/card_body_text'
+require 'ui_bibz/ui/core/cards/components/body/card_body_title'
+require 'ui_bibz/ui/core/cards/components/body/card_body_link'
 module UiBibz::Ui::Core::Cards::Components
 
-  # Create a card block
+  # Create a card body
   #
   # ==== Attributes
   #
@@ -18,21 +18,21 @@ module UiBibz::Ui::Core::Cards::Components
   #
   # ==== Signatures
   #
-  #   UiBibz::Ui::Core::Cards::CardBlock.new(content, options = nil, html_options = nil)
+  #   UiBibz::Ui::Core::Cards::CardBody.new(content, options = nil, html_options = nil)
   #
-  #   UiBibz::Ui::Core::Cards::CardBlock.new(options = nil, html_options = nil) do
+  #   UiBibz::Ui::Core::Cards::CardBody.new(options = nil, html_options = nil) do
   #     content
   #   end
   #
   # ==== Examples
   #
-  #   UiBibz::Ui::Core::Cards::CardBlock.new.render
+  #   UiBibz::Ui::Core::Cards::CardBody.new.render
   #
-  #   UiBibz::Ui::Core::Cards::CardBlock.new do
+  #   UiBibz::Ui::Core::Cards::CardBody.new do
   #     'Exemple'
   #   end.render
   #
-  class CardBlock < UiBibz::Ui::Core::Component
+  class CardBody < UiBibz::Ui::Core::Component
 
     # See UiBibz::Ui::Core::Component.initialize
     def initialize content = nil, options = nil, html_options = nil, &block
@@ -46,21 +46,25 @@ module UiBibz::Ui::Core::Cards::Components
     end
 
     def title content = nil, options = nil, html_options = nil, &block
-      @items << UiBibz::Ui::Core::Cards::Components::Block::CardBlockTitle.new(content, options, html_options, &block).render
+      @items << UiBibz::Ui::Core::Cards::Components::Body::CardBodyTitle.new(content, options, html_options, &block).render
     end
 
     def link content = nil, options = nil, html_options = nil, &block
-      @items << UiBibz::Ui::Core::Cards::Components::Block::CardBlockLink.new(content, options, html_options, &block).render
+      @items << UiBibz::Ui::Core::Cards::Components::Body::CardBodyLink.new(content, options, html_options, &block).render
     end
 
     def text content = nil, options = nil, html_options = nil, &block
-      @items << UiBibz::Ui::Core::Cards::Components::Block::CardBlockText.new(content, options, html_options, &block).render
+      @items << UiBibz::Ui::Core::Cards::Components::Body::CardBodyText.new(content, options, html_options, &block).render
     end
 
   private
 
     def component_html_classes
-      "card-block"
+      ["card-body", outline]
+    end
+
+    def outline
+      "text-#{ @options[:status] }" if @options[:outline]
     end
 
   end

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

@@ -48,7 +48,11 @@ module UiBibz::Ui::Core::Cards::Components
     end
 
     def component_html_classes
-      ["card-footer", muted]
+      ["card-footer", muted, outline]
+    end
+
+    def outline
+      "text-#{ @options[:status] } border-#{ @options[:status] } bg-transparent" if @options[:outline]
     end
 
   end

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

@@ -44,7 +44,11 @@ module UiBibz::Ui::Core::Cards::Components
   private
 
     def component_html_classes
-      "card-header"
+      ["card-header", outline]
+    end
+
+    def outline
+      "text-#{ @options[:status] } border-#{ @options[:status] } bg-transparent" if @options[:outline]
     end
 
   end

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

@@ -40,7 +40,8 @@ module UiBibz::Ui::Core::Cards::Components
 
     # Render html tag
     def render
-      image_tag asset_path("assets/#{content}"), html_options
+      #image_tag asset_path("assets/#{content}"), html_options
+      image_tag content, html_options
     end
 
   private
@@ -50,7 +51,7 @@ module UiBibz::Ui::Core::Cards::Components
     end
 
     def position
-      "card-img-#{ @options[:position] }" unless @options[:position].nil?
+      "card-img-#{ @options[:position] || :top }"
     end
 
   end

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

@@ -1,6 +1,6 @@
 require 'haml'
-require 'ui_bibz/ui/core/component/klass_extension'
-require 'ui_bibz/ui/core/component/glyph_extension'
+require 'ui_bibz/ui/extensions/core/component/klass_extension'
+require 'ui_bibz/ui/extensions/core/component/glyph_extension'
 module UiBibz::Ui::Core
 
   # Creates a component of the given +name+ using options created by the set of +options+.
@@ -72,10 +72,6 @@ module UiBibz::Ui::Core
       glyph_and_content_html
     end
 
-    def tag_html
-      UiBibz::Ui::Core::Tag.new(options[:tag], class: 'pull-right', type: :pill, status: (options[:tag_status] || :default)).render
-    end
-
     # Know if component is tapped or not
     def is_tap content, options
       (content[:tap] if content.kind_of?(Hash)) || (options[:tap] unless options.nil?)
@@ -86,6 +82,7 @@ module UiBibz::Ui::Core
     # Override this method to add html classes
     # Accept Array or String
     def component_html_classes
+      []
     end
 
     # Override this method to add html data
@@ -104,6 +101,11 @@ module UiBibz::Ui::Core
       {}
     end
 
+    # Override this method to add html classes to wrapper
+    def component_wrapper_html_classes
+      []
+    end
+
     # Add html data arguments
     def add_html_data name, value = true
       html_options[:data] = {} if html_options[:data].nil?

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

@@ -99,10 +99,14 @@ module UiBibz::Ui::Core::Dropdowns
       @items << content
     end
 
+    def id
+      @id ||= html_options[:id] || generate_id("dropdown")
+    end
+
   protected
 
     def component_html_classes
-      [type, "btn-group", open]
+      [type, open, inline]
     end
 
     def button_content
@@ -110,19 +114,27 @@ module UiBibz::Ui::Core::Dropdowns
     end
 
     def button_html
-      content_tag :button, button_content, class: join_classes("btn", button_status, state, size, "dropdown-toggle"), type: 'button', "data-toggle" => 'dropdown', "aria-haspopup" => true, "aria-expanded" => false
+      if options[:tag] == :a
+        content_tag dropdown_tag, button_content, class: join_classes("btn", button_status, state, size, "dropdown-toggle"), href: '#', role: 'button', "data-toggle" => 'dropdown', "aria-haspopup" => true, "aria-expanded" => false, "id" => id
+      else
+        content_tag dropdown_tag, button_content, class: join_classes("btn", button_status, state, size, "dropdown-toggle"), type: 'button', "data-toggle" => 'dropdown', "aria-haspopup" => true, "aria-expanded" => false, "id" => id
+      end
     end
 
     def ul_html
-      content_tag :div, @items.join.html_safe, class: "dropdown-menu dropdown-menu-#{ position }"
+      content_tag :div, @items.join.html_safe, class: join_classes("dropdown-menu", position, open), "arial-labelledby" => id
     end
 
     def caret
       content_tag :span, '', class: 'caret'
     end
 
+    def dropdown_tag
+      options[:tag] || :button
+    end
+
     def position
-      @options[:position] || 'left'
+      "dropdown-menu-#{ @options[:position] }" unless @options[:position].nil?
     end
 
     def type
@@ -130,7 +142,11 @@ module UiBibz::Ui::Core::Dropdowns
     end
 
     def open
-      "open" if @options[:open]
+      "show" if @options[:open]
+    end
+
+    def inline
+      "btn-group" if @options[:inline]
     end
 
     def button_status

data/lib/ui_bibz/ui/core/forms/buttons/button.rb

@@ -44,12 +44,12 @@ module UiBibz::Ui::Core::Forms::Buttons
   #
   # ==== Helper
   #
-  #  button(content, options = {}, html_options = {})
+  #  ui_button(content, options = {}, html_options = {})
   #
-  #  button(options = {}, html_options = {}) do
+  #  ui_button(options = {}, html_options = {}) do
   #    content
   #  end
-  class Button < UiBibz::Ui::Core::ConnectedComponent
+  class Button < UiBibz::Ui::Core::Component
 
     # See UiBibz::Ui::Core::Component.initialize
     def initialize content = nil, options = nil, html_options = nil, &block
@@ -58,22 +58,32 @@ module UiBibz::Ui::Core::Forms::Buttons
 
     # Render html tag
     def render
-      content_tag :button, glyph_and_content_html, html_options
+      button_html_tag
     end
 
   protected
 
+    def button_html_tag
+      content_tag :button, html_options do
+        concat glyph_and_content_html(options[:text].nil? ? @content : ' ')
+        concat badge_html unless options[:badge].nil?
+      end
+    end
+
     def component_html_classes
-      ['btn', size, type]
+      super << ['btn', size, type, without_text]
     end
 
     def component_html_options
-      options[:toggle].nil? ? {} : { "data-toggle" => 'button', "aria-pressed" => false, "autocomplete" => "off" }
+      opts = super
+      opts = opts.merge(toggle)                   unless options[:toggle].nil?
+      opts = opts.merge(active_html_options)      if options[:state] == :active
+      opts = opts.merge({ disabled: 'disabled' }) if options[:state] == :disabled
+      opts
     end
 
     def status
-      s = options[:status] || :primary
-      ["btn", outline, s].compact.join('-')
+      ["btn", outline, options[:status]].compact.join('-')
     end
 
     def outline
@@ -81,12 +91,31 @@ module UiBibz::Ui::Core::Forms::Buttons
     end
 
     def toggle
+      { "data-toggle" => 'button', "aria-pressed" => false, "autocomplete" => "off" }
+    end
+
+    def active_html_options
+      { "aria-pressed" => true }
     end
 
     def type
       "btn-block" if options[:type] == :block
     end
 
+    def without_text
+      "without-text" unless options[:text].nil?
+    end
+
+    def badge_html
+      if options[:badge].kind_of? Hash
+        options[:badge][:status] = options[:status] || :secondary
+        UiBibz::Ui::Core::Badge.new(options[:badge].delete(:content), options[:badge]).render
+
+      else
+        UiBibz::Ui::Core::Badge.new(options[:badge], status: (options[:status] || :secondary)).render
+      end
+    end
+
     # :lg, :sm or :xs
     def size
       "btn-#{ options[:size] }" if options[:size]