ui_bibz 2.0.0.alpha32 → 2.0.0.beta2

data/lib/ui_bibz/ui/core/forms/surrounds/surround_field.rb

@@ -0,0 +1,153 @@
+require 'ui_bibz/ui/core/forms/surrounds/components/surround_addon'
+require 'ui_bibz/ui/core/forms/surrounds/components/surround_button'
+require 'ui_bibz/ui/core/forms/surrounds/components/surround_button_group'
+require 'ui_bibz/ui/core/forms/surrounds/components/surround_button_link'
+require 'ui_bibz/ui/core/forms/surrounds/components/surround_button_refresh'
+require 'ui_bibz/ui/core/forms/surrounds/components/surround_checkbox_field'
+require 'ui_bibz/ui/core/forms/surrounds/components/surround_radio_field'
+require 'ui_bibz/ui/core/forms/surrounds/components/surround_switch_field'
+require 'ui_bibz/ui/core/forms/surrounds/components/surround_dropdown'
+module UiBibz::Ui::Core::Forms::Surrounds
+
+  # Create a TextField
+  #
+  # 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:
+  # * +prepend+ - String, Html
+  # * +append+ - String, Html
+  #
+  # ==== Signatures
+  #
+  #   UiBibz::Ui::Core::Forms::Texts::TextField.new(content, options = {}, html_options = {}).render
+  #
+  #   UiBibz::Ui::Core::Forms::Texts::TextField.new(options = {}, html_options = {}) do
+  #     content
+  #   end.render
+  #
+  # ==== Examples
+  #
+  #   UiBibz::Ui::Core::Forms::Texts::TextField.new('search', prepend: 'Prepend content', append: 'Append content', class: 'test')
+  #
+  #   UiBibz::Ui::Core::Forms::Texts::TextField.new(prepend: glyph('pencil'), append: glyph('camera-retro')) do
+  #     #content
+  #   end
+  #
+  # ==== Helper
+  #
+  #   text_field(options = {}, html_options = {}) do
+  #    # content
+  #   end
+  #
+  class SurroundField < UiBibz::Ui::Core::Component
+
+    # See UiBibz::Ui::Core::Component.initialize
+    def initialize content = nil, options = nil, html_options = nil, &block
+      super
+      @items = []
+    end
+
+    # Render html tag
+    def render
+      content_tag :div, @items.join.html_safe, html_options
+    end
+
+    def dropdown content, options = nil, html_options = nil, &block
+      @items << SurroundDropdown.new(content, options, html_options).tap(&block).render
+    end
+
+    def input attribute_name, options = {}, &block
+      @items << @options[:form].input(attribute_name, options.merge({ label: false, wrapper: false }), &block)
+    end
+
+    def glyph content = nil, options = {}, html_options = nil, &block
+      @items << SurroundAddon.new(UiBibz::Ui::Core::Glyph.new(content, options, html_options, &block).render).render
+    end
+
+    def addon content = nil, options = {}, html_options = nil, &block
+      @items << SurroundAddon.new(content, options, html_options, &block).render
+    end
+
+    def button content = nil, options = nil, html_options = nil, &block
+      @items << SurroundButton.new(content, options, html_options, &block).render
+    end
+
+    def button_group content = nil, options = nil, html_options = nil, &block
+      @items << SurroundButtonGroup.new(content, options, html_options).tap(&block).render
+    end
+
+    def button_link content = nil, options = nil, html_options = nil, &block
+      @items << SurroundButtonLink.new(content, options, html_options, &block).render
+    end
+
+    def button_refresh content = nil, options = nil, html_options = nil, &block
+      @items << SurroundButtonRefresh.new(content, options, html_options, &block).render
+    end
+
+    def checkbox_field content = nil, options = nil, html_options = nil, &block
+      @items << SurroundCheckboxField.new(content, options, html_options, &block).render
+    end
+
+    def radio_field content = nil, options = nil, html_options = nil, &block
+      @items << SurroundRadioField.new(content, options, html_options, &block).render
+    end
+
+    def text_field content = nil, options = nil, html_options = nil, &block
+      @items << UiBibz::Ui::Core::Forms::Texts::TextField.new(content, options, html_options, &block).render
+    end
+
+    def date_picker_field content = nil, options = nil, html_options = nil, &block
+      @items << UiBibz::Ui::Core::Forms::Dates::DatePickerField.new(content, options, html_options, &block).render
+    end
+
+    def dropdown_select_field content = nil, options = nil, html_options = nil, &block
+      @items << UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new(content, options, html_options, &block).render
+    end
+
+    def select_field content = nil, options = nil, html_options = nil, &block
+      @items << UiBibz::Ui::Core::Forms::Selects::SelectField.new(content, options, html_options, &block).render
+    end
+
+    def multi_select_field content = nil, options = nil, html_options = nil, &block
+      @items << UiBibz::Ui::Core::Forms::Selects::MultiSelectField.new(content, options, html_options, &block).render
+    end
+
+    def auto_complete_field content = nil, options = nil, html_options = nil, &block
+      @items << UiBibz::Ui::Core::Forms::Texts::AutoCompleteField.new(content, options, html_options, &block).render
+    end
+
+    def html content
+      @items << content
+    end
+
+    # Not correctly implemented
+    # def switch_field content = nil, options = nil, html_options = nil, &block
+    #   @items << SurroundSwitchField.new(content, options, html_options, &block).render
+    # end
+
+    private
+
+    def component_html_classes
+      ['input-group', status, size, 'ui_surround_field']
+    end
+
+    # :lg, :sm or :xs
+    def size
+      "input-group-#{ options[:size] }" if options[:size]
+    end
+
+    def status
+      "has-#{ options[:status] }" if options[:status]
+    end
+
+  end
+end

data/lib/ui_bibz/ui/core/forms/texts/auto_complete_field.rb

@@ -1,3 +1,4 @@
+require 'ui_bibz/ui/extensions/core/forms/surround_extension'
 module UiBibz::Ui::Core::Forms::Texts
 
   # Create a AutoCompleteField
@@ -14,7 +15,9 @@ module UiBibz::Ui::Core::Forms::Texts
   #
   # You can add HTML attributes using the +html_options+.
   # You can pass arguments in options attribute:
-  # * option_tags - Array, Object [required]
+  # * +option_tags+ - Array, Object [required]
+  # * +append+  - String, Html
+  # * +prepend+ - String, Html
   #
   # ==== Signatures
   #
@@ -36,70 +39,42 @@ module UiBibz::Ui::Core::Forms::Texts
   #
   # ==== Helper
   #
-  #   autocomplete_field(options = {}, html_options = {}) do
+  #   auto_complete_field(options = {}, html_options = {}) do
   #    # content
   #   end
   #
-  class AutoCompleteField < UiBibz::Ui::Core::ConnectedComponent
+  class AutoCompleteField < UiBibz::Ui::Core::Forms::Texts::TextField
 
     # See UiBibz::Ui::Core::Component.initialize
     def initialize content = nil, options = nil, html_options = nil, &block
       super
     end
 
-    # Render html tag
-    def render
-      if options[:refresh]
-        refresh_render
-      else
-        text_field_input_tag  + data_list_render
-      end
-    end
-
     private
 
-    def refresh_render
-      content_tag :div, class: 'input-group field-refresh' do
-        concat text_field_input_tag
-        concat data_list_render
-        concat refresh_btn_html
-      end
-    end
-
-    def component_html_data
-      connect_options
+    def text_field_input_tag
+      text_field_tag(content, options[:value] || html_options[:value], html_options) + data_list_render
     end
 
     def data_list_render
       content_tag :datalist, options[:option_tags], id: data_list_name
     end
 
-    def text_field_input_tag
-      text_field_tag content, html_options[:value], html_options
-    end
-
     def component_html_options
-      args = { autocomplete: true, list: data_list_name }
-      args = args.merge(options[:state] == :disabled ? { disabled: 'disabled' } : {})
-      args
-    end
-
-    def connect_opts
-      selector = options[:refresh][:target][:selector]
-      options[:refresh][:target][:selector] = selector.blank? ? "##{ data_list_name }" : selector
-      options[:refresh]
+      { autocomplete: true, list: data_list_name, disabled: options[:state] }
     end
 
     def component_html_classes
-      'form-control'
+      super << "auto-complete-field"
     end
 
     def data_list_name
       @datalist ||= "#{ html_options[:id] || content.to_s.parameterize.underscore }-datalist"
     end
 
-    def status
-      "form-control-#{ options[:status] }" if options[:status]
+    # Connect option
+    def connect_options_selector
+       data_list_name
     end
 
   end

data/lib/ui_bibz/ui/core/forms/texts/text_field.rb

@@ -0,0 +1,81 @@
+require 'ui_bibz/ui/extensions/core/forms/surround_extension'
+module UiBibz::Ui::Core::Forms::Texts
+
+  # Create a TextField
+  #
+  # 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:
+  # * +prepend+ - String, Html
+  # * +append+ - String, Html
+  #
+  # ==== Signatures
+  #
+  #   UiBibz::Ui::Core::Forms::Texts::TextField.new(content, options = {}, html_options = {}).render
+  #
+  #   UiBibz::Ui::Core::Forms::Texts::TextField.new(options = {}, html_options = {}) do
+  #     content
+  #   end.render
+  #
+  # ==== Examples
+  #
+  #   UiBibz::Ui::Core::Forms::Texts::TextField.new('search', prepend: 'Prepend content', append: 'Append content', class: 'test')
+  #
+  #   UiBibz::Ui::Core::Forms::Texts::TextField.new(prepend: glyph('pencil'), append: glyph('camera-retro')) do
+  #     #content
+  #   end
+  #
+  # ==== Helper
+  #
+  #   text_field(options = {}, html_options = {}) do
+  #    # content
+  #   end
+  #
+  class TextField < UiBibz::Ui::Core::Component
+    include SurroundExtension
+
+    # See UiBibz::Ui::Core::Component.initialize
+    def initialize content = nil, options = nil, html_options = nil, &block
+      super
+    end
+
+    # Render html tag
+    def render
+      surround_field text_field_input_tag
+    end
+
+    private
+
+    # Simple_form or not
+    def text_field_input_tag
+      text_field_tag content, options[:value] || html_options[:value], html_options
+    end
+
+    # Todo
+    def component_options
+      options[:status].nil? ? super : super.merge({ surrounded: true })
+    end
+
+    def component_html_classes
+      ['form-control', status]
+    end
+
+    def component_html_options
+      options[:state] == :disabled ? { disabled: 'disabled' } : {}
+    end
+
+    def status
+      "form-control-#{ options[:status] }" unless options[:status].nil?
+    end
+
+  end
+end

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

@@ -86,7 +86,7 @@ module UiBibz::Ui::Core
 
     def size
       case @options[:size]
-      when :xs
+      when :sm
         1
       when :md
         3

data/lib/ui_bibz/ui/core/layouts/col.rb

@@ -70,17 +70,25 @@ module UiBibz::Ui::Core::Layouts
       @options.each do |ke,va|
         kl << write_classes(ke, va) if %i(xs sm md lg xl).include?(ke)
       end
-      kl << write_classes(:md, @options) if kl.empty?
+      if not_col_options?
+        kl = "col"
+      else
+        kl << write_classes(:md, @options) if kl.empty?
+      end
       kl
     end
 
+    def not_col_options?
+      (@options.keys & %i(xs sm md lg xl num offset push pull)).empty?
+    end
+
     def write_classes size, opts
       opts.map{ |k, v| send(k, size.to_sym, v) if %i(num offset push pull).include?(k) }.join(' ')
     end
 
     # col-md-9
     def num size, n
-      "col-#{ size }-#{ n }"
+      size == :auto ? "col" : "col-#{ size }-#{ n }"
     end
 
     # col-md-offset-9

data/lib/ui_bibz/ui/core/layouts/row.rb

@@ -10,6 +10,12 @@ module UiBibz::Ui::Core::Layouts
   # * +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:
+  # * +type+ - Symbol | :form
+  #
   # ==== Signatures
   #
   #   UiBibz::Ui::Core::Layouts::Row.new(content, options = {}, html_options = {})
@@ -41,7 +47,7 @@ module UiBibz::Ui::Core::Layouts
   private
 
     def component_html_classes
-      'row'
+      options[:type] == :form ? 'form-row' : 'row'
     end
 
   end

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

@@ -23,13 +23,15 @@ module UiBibz::Ui::Core::Lists::Components
 
     # Render html tag
     def render
-      content_tag :p, content, html_options
+      output = [content_tag(:p, content, html_options)]
+      output << content_tag(:small, options[:extra])
+      output.join.html_safe
     end
 
   private
 
     def component_html_classes
-      'list-group-item-text'
+      'mb-1'
     end
 
   end

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

@@ -23,13 +23,16 @@ module UiBibz::Ui::Core::Lists::Components
 
     # Render html tag
     def render
-      content_tag :h4, content, html_options
+      content_tag :div, html_options do
+        concat content_tag(:h5, content, class: 'mb-1')
+        concat content_tag(:small, options[:extra])
+      end
     end
 
   private
 
     def component_html_classes
-      'list-group-item-heading'
+      super << ["d-flex", "w-100", "justify-content-between"]
     end
 
   end

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

@@ -25,7 +25,7 @@ module UiBibz::Ui::Core::Lists::Components
   # * +glyph+ - Add glyph with name or hash options
   #   * +name+ - String
   #   * +size+ - Integer
-  #   * +type+ - Symbol
+  #   * +tag+ - Symbol (+:a+, +:button+, +:li+)
   #
   # ==== Signatures
   #
@@ -68,11 +68,10 @@ module UiBibz::Ui::Core::Lists::Components
         concat glyph_and_content_html if @content
         concat header_html if @body
         concat body_html   if @body
-        concat tag_html    if @options[:tag]
+        concat badge_html  if @options[:badge]
       end
     end
 
-
     # Add header which is a component
     def header content = nil, options = nil, html_options = nil, &block
       @header = UiBibz::Ui::Core::Lists::Components::ListHeader.new content, options, html_options, &block
@@ -86,7 +85,7 @@ module UiBibz::Ui::Core::Lists::Components
   private
 
     def component_html_classes
-      'list-group-item'
+      super << ['list-group-item', tag_type_class, badge_classes, header_classes]
     end
 
     def header_html
@@ -97,6 +96,31 @@ module UiBibz::Ui::Core::Lists::Components
       @body.render
     end
 
+    def badge_classes
+      "d-flex justify-content-between align-items-center" unless options[:badge].nil?
+    end
+
+    def status
+      "list-group-item-#{ @options[:status] }" unless @options[:status].nil?
+    end
+
+    def header_classes
+      "flex-column align-items-start" unless options[:tap].nil?
+    end
+
+    def tag_type_class
+      "list-group-item-action" if is_button_type? || is_link_type?
+    end
+
+    def is_link_type?
+      @html_options[:href] = @options[:url] if @options[:url]
+      @options[:tag] == :a || @html_options[:tag] == :a
+    end
+
+    def is_button_type?
+      @options[:tag] == :button || @html_options[:tag] == :button
+    end
+
     def tag_type
       if is_link_type?
         :a
@@ -107,17 +131,14 @@ module UiBibz::Ui::Core::Lists::Components
       end
     end
 
-    def is_link_type?
-      @html_options[:href] = @options[:url] if @options[:url]
-      @options[:type] == :link || @html_options[:type] == :link
-    end
-
-    def is_button_type?
-      @options[:type] == :button || @html_options[:type] == :button
-    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
 
-    def status
-      "list-group-item-#{ @options[:status] }" unless @options[:status].nil?
+      else
+        UiBibz::Ui::Core::Badge.new(options[:badge], type: :pill, status: (options[:status] || :secondary)).render
+      end
     end
 
   end

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

@@ -78,14 +78,14 @@ module UiBibz::Ui::Core::Lists
 
     # Render html tag
     def render
-      content_tag type, @lists.join().html_safe, html_options
+      content_tag 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: @options[:type] }) unless @options[:type].nil?
+      options = options.merge({ tag: @options[:tag] }) unless @options[:tag].nil?
 
       if is_tap
         @lists << UiBibz::Ui::Core::Lists::Components::List.new(content, options, html_options).tap(&block).render
@@ -100,8 +100,8 @@ module UiBibz::Ui::Core::Lists
       "list-group"
     end
 
-    def type
-      [:link, :button].include?(@options[:type]) ? :div : :ul
+    def tag_type
+      [:a, :button].include?(options[:tag]) ? :div : :ul
     end
 
   end

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

@@ -41,13 +41,18 @@ module UiBibz::Ui::Core::Navs
   #
   class NavbarForm < UiBibz::Ui::Base
     include Haml::Helpers
+    include SimpleForm::ActionViewExtensions::FormHelper
+    include UiBibz::Helpers::UtilsHelper
     include ActionView::Helpers#::FormHelper
 
     def initialize model_or_url, options = {}, &block
       init_haml_helpers
       @options = options
-      if type == :form_for
+      case type
+      when :form_for
         @form = form_for(model_or_url, new_option, &block)
+      when :ui_form_for
+        @form = ui_form_for(model_or_url, new_option, &block)
       else
         #@form = form_tag(model_or_url, class: "navbar-form form-inline #{ position }", block)
         html_options = html_options_for_form(model_or_url, new_option)
@@ -63,7 +68,7 @@ module UiBibz::Ui::Core::Navs
   private
 
     def new_option
-      (@options || {}).merge({ class: "navbar-form form-inline #{ position }" })
+      (@options || {}).merge({ class: "navbar-form form-inline #{ position } my-2 my-lg-0" })
     end
 
     def protect_against_forgery?

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

@@ -45,6 +45,10 @@ module UiBibz::Ui::Core::Navs
 
   private
 
+    def component_html_classes
+      ["navbar-nav"]
+    end
+
     def type
       'navbar-nav'
     end

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

@@ -40,7 +40,7 @@ module UiBibz::Ui::Core::Navs
 
     # Render html tag
     def render
-      content_tag :ul, content, html_options
+      content_tag :span, content, html_options
     end
 
   private

data/lib/ui_bibz/ui/core/navs/components/pagination_link.rb

@@ -0,0 +1,60 @@
+module UiBibz::Ui::Core::Navs
+
+  # Create a PageLink
+  #
+  # This element is an extend of UiBibz::Ui::Core::Navs::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+ - status of élement with symbol value:
+  #   (+:active+)
+  # * +url+ - String
+  # * +badge+ - String
+  # * +link_html_options+ - Hash
+  #
+  # ==== Signatures
+  #
+  #   UiBibz::Ui::Core::Navs::PageLink.new(content, options = nil, html_options = nil)
+  #
+  #   UiBibz::Ui::Core::Navs::PageLink.new(options = nil, html_options = nil) do
+  #     content
+  #   end
+  #
+  # ==== Examples
+  #
+  #   UiBibz::Ui::Core::Navs::PageLink.new(content, { badge: 15, url: '/', state: :active, link_html_options: { class: 'link1' }},{ class: 'test' }).render
+  #
+  #   UiBibz::Ui::Core::Navs::PageLink.new({glyph: { name: 'eye', size: 3 }, { class: 'test' }) do
+  #     'Home'
+  #   end.render
+  #
+  class PaginationLink < UiBibz::Ui::Core::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, html_options do
+        link_to content, options[:url], class: 'page-link'
+      end
+    end
+
+    private
+
+    def component_html_classes
+      "page-item"
+    end
+
+  end
+end