ui_bibz 2.0.0.alpha28 → 2.0.0.alpha29

data/lib/ui_bibz/ui/core/forms/numbers/formula_field.rb

@@ -57,9 +57,9 @@ module UiBibz::Ui::Core::Forms::Numbers
 
     def text_field_input_tag
       if options[:builder].nil?
-        text_field_tag content, html_options[:value], readonly: true, class: 'formula_field_result form-control'
+        text_field_tag content, html_options[:value], readonly: true, class: 'formula-field-result form-control'
       else
-        options[:builder].text_field content, readonly: true, class: 'formula_field_result form-control'
+        options[:builder].text_field content, readonly: true, class: 'formula-field-result form-control'
       end
     end
 
@@ -72,7 +72,7 @@ module UiBibz::Ui::Core::Forms::Numbers
     end
 
     def component_html_classes
-      'formula_field_input form-control'
+      'formula-field form-control'
     end
 
     def component_html_options
@@ -80,7 +80,7 @@ module UiBibz::Ui::Core::Forms::Numbers
     end
 
     def formula_field_alert
-      content_tag :span, class: 'formula_field_alert input-group-addon', data: { toggle: 'tooltip' } do
+      content_tag :span, class: 'formula-field-alert input-group-addon', data: { toggle: 'tooltip' } do
         UiBibz::Ui::Core::Glyph.new('exclamation-triangle', status: :danger ).render
       end
     end
@@ -90,7 +90,7 @@ module UiBibz::Ui::Core::Forms::Numbers
     end
 
     def formula_field_sign
-      content_tag :span, '=', class: 'formula_field_sign input-group-addon'
+      content_tag :span, '=', class: 'formula-field-sign input-group-addon'
     end
 
      def status

data/lib/ui_bibz/ui/core/forms/selects/dropdown_select_field.rb

@@ -62,7 +62,7 @@ module UiBibz::Ui::Core::Forms::Selects
   #
   #   dropdown_select_field(content, options = {}, html_options = {})
   #
-  class DropdownSelectField < UiBibz::Ui::Core::Component
+  class DropdownSelectField < UiBibz::Ui::Core::ConnectedComponent
 
     # See UiBibz::Ui::Core::Component.initialize
     def initialize content = nil, options = nil, html_options = nil, &block
@@ -72,10 +72,7 @@ module UiBibz::Ui::Core::Forms::Selects
     # Render html tag
     def render
       if options[:refresh]
-        content_tag :div, class: 'input-group select-field-refresh' do
-          concat select_tag content, options[:option_tags], html_options
-          concat content_tag(:span, UiBibz::Ui::Core::Forms::Buttons::ButtonRefresh.new('', connect: connect_opts).render, class: 'input-group-btn')
-        end
+        refresh_render
       else
         select_tag content, options[:option_tags], html_options
       end
@@ -83,11 +80,20 @@ module UiBibz::Ui::Core::Forms::Selects
 
     private
 
+    def component_html_options
+      opts = {}
+      opts = opts.merge({ disabled: true })            if options[:state] == :disabled
+      opts = opts.merge({ include_blank: true})        if options[:include_blank]
+      opts = opts.merge({ prompt: options[:prompt] })  unless options[:prompt].blank?
+      opts
+    end
+
     def component_html_classes
-      ['selectpicker', show_tick, show_menu_arrow, dropup]
+      ['dropdown-select-field', show_tick, show_menu_arrow, dropup]
     end
 
     def component_html_data
+      super
       searchable
       max_options
       selected_text_format
@@ -95,16 +101,6 @@ module UiBibz::Ui::Core::Forms::Selects
       style
       header
       actions_box
-      connect_options
-    end
-
-    def component_html_options
-      options[:state] == :disabled ? { disabled: 'disabled' } : {}
-    end
-
-    def connect_opts
-      options[:refresh][:target].merge!({ selector: "##{ content.parameterize.underscore }" })
-      options[:refresh]
     end
 
     ############################ Data html options
@@ -137,11 +133,6 @@ module UiBibz::Ui::Core::Forms::Selects
       add_html_data('header', options[:header]) if options[:header]
     end
 
-    def connect_options
-      add_html_data('connect', options[:connect]) if options[:connect]
-    end
-
-
     ############################# Css classes
 
     def show_tick

data/lib/ui_bibz/ui/core/forms/selects/multi_column_field.rb

@@ -45,7 +45,7 @@ module UiBibz::Ui::Core::Forms::Selects
   #
   #   multi_column_field(content, options = {}, html_options = {})
   #
-  class MultiColumnField < UiBibz::Ui::Core::Component
+  class MultiColumnField < UiBibz::Ui::Core::ConnectedComponent
 
     # See UiBibz::Ui::Core::Component.initialize
     def initialize content = nil, options = nil, html_options = nil, &block
@@ -63,14 +63,19 @@ module UiBibz::Ui::Core::Forms::Selects
       super
       searchable
       selectable_opt_group
+      connect_options
     end
 
     def component_html_classes
-      'multi-column'
+      'multi-column-field'
     end
 
     def component_html_options
-      { multiple: true }.merge(options[:state] == :disabled ? { disabled: 'disabled' } : {})
+      opts = { multiple: true }
+      opts = opts.merge({ disabled: true })            if options[:state] == :disabled
+      opts = opts.merge({ include_blank: true})        if options[:include_blank]
+      opts = opts.merge({ prompt: options[:prompt] })  unless options[:prompt].blank?
+      opts
     end
 
     def searchable

data/lib/ui_bibz/ui/core/forms/selects/multi_select_field.rb

@@ -58,10 +58,7 @@ module UiBibz::Ui::Core::Forms::Selects
     # Render html tag
     def render
       if options[:refresh]
-        content_tag :div, class: 'input-group select-field-refresh' do
-          concat select_tag content, options[:option_tags], html_options
-          concat content_tag(:span, UiBibz::Ui::Core::Forms::Buttons::ButtonRefresh.new('', connect: connect_opts).render, class: 'input-group-btn')
-        end
+        refresh_render
       else
         select_tag content, options[:option_tags], html_options
       end
@@ -70,11 +67,13 @@ module UiBibz::Ui::Core::Forms::Selects
     private
 
     def component_html_options
-      { multiple: true }.merge(options[:state] == :disabled ? { disabled: 'disabled' } : {})
+      opts = { include_blank: false, prompt: false, multiple: true }
+      opts = opts.merge({ disabled: true }) if options[:state] == :disabled
+      opts
     end
 
     def component_html_classes
-      ['btn', size, type, 'multi-select']
+      [size, type, 'multi-select-field']
     end
 
     def component_html_data
@@ -83,7 +82,6 @@ module UiBibz::Ui::Core::Forms::Selects
       collapsible_opt_group
       searchable
       select_all_option
-      connect_options
     end
 
     def clickable_opt_group
@@ -107,13 +105,10 @@ module UiBibz::Ui::Core::Forms::Selects
     end
 
     def connect_opts
-      options[:refresh][:target].merge!({ selector: "##{ content.parameterize.underscore }" })
+      selector = options[:refresh][:target][:selector]
+      options[:refresh][:target][:selector] = selector.blank? ? "##{ content.to_s.parameterize.underscore }" : selector
       options[:refresh]
     end
 
-    def connect_options
-      add_html_data('connect', options[:connect]) if options[:connect]
-    end
-
   end
 end

data/lib/ui_bibz/ui/core/forms/selects/select_field.rb

@@ -63,7 +63,7 @@ module UiBibz::Ui::Core::Forms::Selects
   #
   #   dropdown_select_field(content, options = {}, html_options = {})
   #
-  class SelectField < UiBibz::Ui::Core::Component
+  class SelectField < UiBibz::Ui::Core::ConnectedComponent
 
     # See UiBibz::Ui::Core::Component.initialize
     def initialize content = nil, options = nil, html_options = nil, &block
@@ -73,10 +73,7 @@ module UiBibz::Ui::Core::Forms::Selects
     # Render html tag
     def render
       if options[:refresh]
-        content_tag :div, class: 'input-group select-field-refresh' do
-          concat select_tag content, options[:option_tags], html_options
-          concat content_tag(:span, UiBibz::Ui::Core::Forms::Buttons::ButtonRefresh.new('', connect: connect_opts).render, class: 'input-group-btn')
-        end
+        refresh_render
       else
         select_tag content, options[:option_tags], html_options
       end
@@ -84,13 +81,17 @@ module UiBibz::Ui::Core::Forms::Selects
 
     private
 
-    def component_html_classes
-      ['select-field', 'form-control']
+    def component_html_options
+      opts = {}
+      opts = opts.merge({ multiple: true })            if options[:multiple]
+      opts = opts.merge({ disabled: true })            if options[:state] == :disabled
+      opts = opts.merge({ include_blank: true})        if options[:include_blank]
+      opts = opts.merge({ prompt: options[:prompt] })  unless options[:prompt].blank?
+      opts
     end
 
-    def connect_opts
-      options[:refresh][:target].merge!({ selector: "##{ content.parameterize.underscore }" })
-      options[:refresh]
+    def component_html_classes
+      ['select-field', 'form-control']
     end
 
   end

data/lib/ui_bibz/ui/core/forms/texts/{autocomplete_field.rb → auto_complete_field.rb}

@@ -1,6 +1,6 @@
 module UiBibz::Ui::Core::Forms::Texts
 
-  # Create a AutocompleteField
+  # Create a AutoCompleteField
   #
   # This element is an extend of UiBibz::Ui::Core::Component.
   #
@@ -18,19 +18,19 @@ module UiBibz::Ui::Core::Forms::Texts
   #
   # ==== Signatures
   #
-  #   UiBibz::Ui::Core::Forms::Texts::AutocompleteField.new(content, options = {}, html_options = {}).render
+  #   UiBibz::Ui::Core::Forms::Texts::AutoCompleteField.new(content, options = {}, html_options = {}).render
   #
-  #   UiBibz::Ui::Core::Forms::Texts::AutocompleteField.new(options = {}, html_options = {}) do
+  #   UiBibz::Ui::Core::Forms::Texts::AutoCompleteField.new(options = {}, html_options = {}) do
   #     content
   #   end.render
   #
   # ==== Examples
   #
   #   options = options_for_select(2.times.map{ |i| "option #{i}" })
-  #   UiBibz::Ui::Core::Forms::Texts::AutocompleteField.new('company', { option_tags: options }, { class: 'test' })
+  #   UiBibz::Ui::Core::Forms::Texts::AutoCompleteField.new('company', { option_tags: options }, { class: 'test' })
   #
   #   options = options_for_select(2.times.map{ |i| "option #{i}" })
-  #   UiBibz::Ui::Core::Forms::Texts::AutocompleteField.new(option_tags: options) do
+  #   UiBibz::Ui::Core::Forms::Texts::AutoCompleteField.new(option_tags: options) do
   #     #content
   #   end
   #
@@ -40,7 +40,7 @@ module UiBibz::Ui::Core::Forms::Texts
   #    # content
   #   end
   #
-  class AutocompleteField < UiBibz::Ui::Core::Component
+  class AutoCompleteField < UiBibz::Ui::Core::ConnectedComponent
 
     # See UiBibz::Ui::Core::Component.initialize
     def initialize content = nil, options = nil, html_options = nil, &block
@@ -49,11 +49,27 @@ module UiBibz::Ui::Core::Forms::Texts
 
     # Render html tag
     def render
-      text_field_input_tag  + data_list_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
+    end
+
     def data_list_render
       content_tag :datalist, options[:option_tags], id: data_list_name
     end
@@ -72,12 +88,18 @@ module UiBibz::Ui::Core::Forms::Texts
       args
     end
 
+    def connect_opts
+      selector = options[:refresh][:target][:selector]
+      options[:refresh][:target][:selector] = selector.blank? ? "##{ data_list_name }" : selector
+      options[:refresh]
+    end
+
     def component_html_classes
       'form-control'
     end
 
     def data_list_name
-      @datalist ||= "#{ html_options[:id] || content }-datalist"
+      @datalist ||= "#{ html_options[:id] || content.to_s.parameterize.underscore }-datalist"
     end
 
     def status

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

@@ -11,8 +11,8 @@ module UiBibz::Ui::Ux::Tables
     # Render html tag
     def render
       content_tag :div, @html_options do
-        concat UiBibz::Ui::Ux::Tables::TablePagination.new(store: @store).render
-        concat UiBibz::Ui::Ux::Tables::TablePaginationPerPage.new(store: @store).render
+        concat UiBibz::Ui::Ux::Tables::TablePagination.new(store: @store, wrap_form: @options[:wrap_form]).render
+        concat UiBibz::Ui::Ux::Tables::TablePaginationPerPage.new(store: @store, wrap_form: @options[:wrap_form]).render
         concat tag(:br, class: 'ui-bibz-clear')
       end
     end

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

@@ -11,7 +11,7 @@ module UiBibz::Ui::Ux::Tables
     def render
       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: @options[:wrap_form] }).render if searchable?
         concat tag :br, class: 'ui-bibz-clear'
       end
     end

data/lib/ui_bibz/ui/ux/tables/extensions/sortable.rb

@@ -49,13 +49,15 @@ module UiBibz::Ui::Ux::Tables
         search:      @store.search,
         sort:        sort_name,
         column_id:   @column.id,
-        direction:   direction
+        direction:   direction,
+        only_path: true
       }
       args = args.merge({ custom_sort: true, column_name: @column.data_index }) if @column.custom_sort
       args = args.merge({ parent: true }) if @column.parent
       args = args.merge({ store_id: @store.id }) unless @store.id.nil?
+      args = args.merge({ link_type: 'column' })
       args = args.merge(@store.parameters.reject{ |k,v| default_parameters.include?(k.to_s) })
-      args
+      args.with_indifferent_access
     end
 
     def default_parameters

data/lib/ui_bibz/ui/ux/tables/table_card.rb

@@ -120,8 +120,8 @@ module UiBibz::Ui::Ux::Tables
 
       content_tag :div, html_options do
         form_tag(url_for(url_parameters), method: :get) do
-          store.parameters.each do |k,v|
-            concat tag(:input, type: 'hidden', name: k, value: v) if !default_parameters?(k) && !v.blank?
+          store.parameters.with_indifferent_access.reject{ |k,v|  default_parameters?(k) || v.blank? }.each do |k,v|
+            concat tag(:input, type: 'hidden', name: k, value: v)
           end
           concat tag(:input, type: 'hidden', name: 'store_id', value: store.id) unless store.id.nil? # if there is more one table in html page
           concat @items.join.html_safe
@@ -167,7 +167,7 @@ module UiBibz::Ui::Ux::Tables
     end
 
     def default_parameters?(k)
-      %w(store_id per_page search utf8 search controller action utf8).include?(k)
+      %w(store_id per_page page search utf8 search controller action link_type).include?(k)
     end
 
     def url_parameters

data/lib/ui_bibz/ui/ux/tables/table_pagination.rb

@@ -40,11 +40,15 @@ module UiBibz::Ui::Ux::Tables
       paginate_parameters = { controller: store.controller }
       paginate_parameters = paginate_parameters.merge({ store_id: store.id }) unless store.id.nil?
       paginate_parameters = paginate_parameters.merge(store.parameters)
-      will_paginate(store.records, params: paginate_parameters, renderer: WillPaginate::ActionView::BootstrapLinkRenderer)
+      paginate_parameters = paginate_parameters.merge({ link_type: 'pagination' })
+      will_paginate(store.records, params: paginate_parameters.with_indifferent_access.reject{|k,v| default_parameters?(k) || v.blank? }, renderer: WillPaginate::ActionView::BootstrapLinkRenderer)
     end
 
   private
 
+    def default_parameters?(k)
+      %w(per_page page link_type).include?(k)
+    end
 
     # Store must be generated by *table_search_pagination* method
     def store

data/lib/ui_bibz/ui/ux/tables/table_pagination_per_page.rb

@@ -70,8 +70,8 @@ module UiBibz::Ui::Ux::Tables
       content_tag :div, class: 'table-pagination-per-page' do
         concat results_count_html
         concat UiBibz::Utils::Internationalization.new("ui_bibz.table.pagination.per_page", default: "Per page: ").translate
-        store.parameters.each do |k,v|
-          concat tag(:input, type: 'hidden', name: k, value: v) if !default_parameters?(k) && !v.blank?
+        store.parameters.with_indifferent_access.reject{ |k, v| default_parameters?(k) || v.blank? }.each do |k,v|
+          concat tag(:input, type: 'hidden', name: k, value: v)
         end
         concat select_tag('per_page', options_for_select([5, 10, 20, 30, 50, 100, 200, 500], store.per_page), class: 'form-control')
         concat tag(:input, type: 'hidden', name: 'store_id', value: store.id) unless store.id.nil? # If there is more 1 table in html page
@@ -91,7 +91,7 @@ module UiBibz::Ui::Ux::Tables
     end
 
     def default_parameters?(k)
-      %w(store_id search controller action utf8).include?(k)
+      %w(store_id search controller action page link_type utf8).include?(k)
     end
 
   end

data/lib/ui_bibz/ui/ux/tables/table_search_field.rb

@@ -45,6 +45,7 @@ module UiBibz::Ui::Ux::Tables
       content_tag :div, html_options do
         concat content_tag(:span, UiBibz::Ui::Core::Glyph.new('search').render, class: 'input-group-addon')
         concat tag(:input, type: 'search', value: search_content, name: 'search', class: 'form-control', placeholder: search_placeholder_field)
+        concat tag(:input, type: 'hidden', name: 'link_type', value: 'search')
         concat content_tag(:span, UiBibz::Ui::Core::Glyph.new('times-circle').render, class: 'clear-search-btn input-group-addon')
       end
     end
@@ -52,12 +53,13 @@ module UiBibz::Ui::Ux::Tables
     def search_field_html_in_wrap
       content_tag :div, html_options do
         concat content_tag(:span, UiBibz::Ui::Core::Glyph.new('search').render, class: 'input-group-addon')
-        store.parameters.each do |k,v|
-          concat tag(:input, type: 'hidden', name: k, value: v) unless default_parameters?(k)
+        store.parameters.with_indifferent_access.reject{ |k,_|  default_parameters?(k) }.each do |k,v|
+          concat tag(:input, type: 'hidden', name: k, value: v)
         end
         concat tag(:input, type: 'hidden', name: 'store_id', value: store.id) unless store.id.nil? # if there is more one table in html page
+        concat tag(:input, type: 'hidden', name: 'link_type', value: 'search')
         concat tag(:input, type: 'search', value: search_content, name: 'search', class: 'form-control', placeholder: search_placeholder_field)
-        concat content_tag(:span, clear_button, class: 'input-group-btn')
+        concat content_tag(:span, clear_button, class: 'input-group-btn clear-search-btn')
       end
     end
 
@@ -101,7 +103,7 @@ module UiBibz::Ui::Ux::Tables
     end
 
     def default_parameters?(k)
-      %w(store_id search controller action utf8).include?(k)
+      %w(store_id search controller action utf8 link_type).include?(k)
     end
 
   end

data/lib/ui_bibz/version.rb

@@ -1,3 +1,3 @@
 module UiBibz
-  VERSION = "2.0.0.alpha28"
+  VERSION = "2.0.0.alpha29"
 end

data/lib/ui_bibz.rb

@@ -57,7 +57,7 @@ module UiBibz
         end
 
         module Texts
-          autoload :AutocompleteField,       "ui_bibz/ui/core/forms/texts/autocomplete_field"
+          autoload :AutoCompleteField,       "ui_bibz/ui/core/forms/texts/auto_complete_field"
           autoload :SurroundField,           "ui_bibz/ui/core/forms/texts/surround_field"
         end
 
@@ -92,6 +92,7 @@ module UiBibz
 
       # Other section
       autoload :Alert,                   "ui_bibz/ui/core/alert"
+      autoload :ConnectedComponent,      "ui_bibz/ui/core/connected_component"
       autoload :Component,               "ui_bibz/ui/core/component"
       autoload :Glyph,                   "ui_bibz/ui/core/glyph"
       autoload :Jumbotron,               "ui_bibz/ui/core/jumbotron"

data/test/dummy/app/models/continent.rb

@@ -0,0 +1,3 @@
+class Continent < ActiveRecord::Base
+  has_many :countries
+end

data/test/dummy/app/models/country.rb

@@ -0,0 +1,3 @@
+class Country < ActiveRecord::Base
+  belongs_to :continent
+end

data/test/dummy/db/migrate/20170309084406_continents.rb

@@ -0,0 +1,9 @@
+class Continents < ActiveRecord::Migration[5.0]
+  def change
+    create_table :continents do |t|
+      t.string :name
+
+      t.timestamps null: false
+    end
+  end
+end

data/test/dummy/db/migrate/20170309084453_countries.rb

@@ -0,0 +1,10 @@
+class Countries < ActiveRecord::Migration[5.0]
+  def change
+    create_table :countries do |t|
+      t.string  :name
+      t.integer :continent_id
+
+      t.timestamps null: false
+    end
+  end
+end

data/test/dummy/db/schema.rb

@@ -1,5 +1,4 @@
-# encoding: UTF-8
-# This file is auto-generated from the current status of the database. Instead
+# This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
@@ -11,7 +10,20 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150123191805) do
+ActiveRecord::Schema.define(version: 20170309084453) do
+
+  create_table "continents", force: :cascade do |t|
+    t.string   "name"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  create_table "countries", force: :cascade do |t|
+    t.string   "name"
+    t.integer  "continent_id"
+    t.datetime "created_at",   null: false
+    t.datetime "updated_at",   null: false
+  end
 
   create_table "users", force: :cascade do |t|
     t.string   "name_fr"