ui_bibz 3.0.0.beta14 → 3.0.0.beta19

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

@@ -52,7 +52,7 @@ module UiBibz::Ui::Ux::Tables
     def defaults_actions
       [
         UiBibz::Ui::Core::Forms::Dropdowns::Components::DropdownLink.new(show_name, url: { controller: @store.controller, action: 'show', id: :id }, glyph: 'eye').render,
-        UiBibz::Ui::Core::Forms::Dropdowns::Components::DropdownLink.new(edit_name, url: { controller: @store.controller, action: 'edit', id: :id }, glyph: 'pencil').render,
+        UiBibz::Ui::Core::Forms::Dropdowns::Components::DropdownLink.new(edit_name, url: { controller: @store.controller, action: 'edit', id: :id }, glyph: 'edit').render,
         UiBibz::Ui::Core::Forms::Dropdowns::Components::DropdownLink.new(delete_name, { glyph: 'trash', url: { controller: @store.controller, action: 'destroy', id: :id }, link_html_options: { data: { confirm: 'Are you sure?', method: :delete } } }).render
       ]
     end

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

@@ -8,6 +8,9 @@ module UiBibz::Ui::Ux::Tables
 
     # Store Use WillPaginate store methods
     def initialize(store)
+      raise 'Store is nil!' if store.nil?
+      raise 'Store can be created only with "table_search_pagination" method!' if store.try(:records).nil?
+
       @records = store.records
       @store   = store
       @model   = store.model

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

@@ -26,9 +26,6 @@ module UiBibz::Ui::Ux::Tables
     private
 
     def store
-      raise 'Store is nil!' if @search_field.options[:store].nil?
-      raise 'Store can be created only with "table_search_pagination" method!' if @search_field.options[:store].try(:records).nil?
-
       @store ||= Store.new @search_field.options[:store]
     end
   end

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

@@ -172,12 +172,16 @@ module UiBibz::Ui::Ux::Tables
 
     # Maybe create a class for td_content
     def td_content(record, col)
-      content = col.count ? record.send(col.data_index).count : record.send(col.data_index)
+      begin
+        content = col.count ? record.send(col.data_index).count : record.send(col.data_index)
+      rescue StandardError
+        content = nil
+      end
       unless content.nil?
         content = content.strftime(col.date_format)                    unless col.date_format.nil?
         content = link_to content, action.inject_url(col.link, record) unless col.link.nil?
-        content = col.format.call(@store.records, record)              unless col.format.nil?
       end
+      content = col.format.call(@store.records, record)              unless col.format.nil?
       content = As.new(col, record, content, @options).render unless col.as.nil?
       content
     end

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

@@ -53,9 +53,6 @@ module UiBibz::Ui::Ux::Tables
 
     # Store must be generated by *table_search_pagination* method
     def store
-      raise 'Store is nil!' if @pagination.options[:store].nil?
-      raise 'Store can be created only with "table_search_pagination" method!' if @pagination.options[:store].try(:records).nil?
-
       @store ||= Store.new @pagination.options[:store]
     end
   end

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

@@ -46,9 +46,6 @@ module UiBibz::Ui::Ux::Tables
     private
 
     def store
-      raise 'Store is nil!' if @per_page_field.options[:store].nil?
-      raise 'Store can be created only with "table_search_pagination" method!' if @per_page_field.options[:store].try(:records).nil?
-
       @store ||= Store.new @per_page_field.options[:store]
     end
 

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

@@ -42,6 +42,7 @@ module UiBibz::Ui::Ux::Tables
       content_tag :div, html_options do
         concat content_tag(:span, UiBibz::Ui::Core::Icons::Glyph.new('search').render, class: 'input-group-text')
         concat tag(:input, type: 'search', value: search_content, name: 'search', class: 'form-control', placeholder: search_placeholder_field)
+        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 content_tag(:span, UiBibz::Ui::Core::Icons::Glyph.new('times-circle').render, class: 'clear-search-btn input-group-text')
       end

data/lib/ui_bibz/utils/breakdown_class_name_generator.rb

@@ -37,9 +37,9 @@ module UiBibz::Utils
       if opts.is_a?(Hash)
         @position = opts[:position]
 
-        opts.map do |k, v|
+        opts.filter_map do |k, v|
           send(k, size, v) if POSITIONING.include?(k.to_sym)
-        end.compact.join(' ')
+        end.join(' ')
       else
         send('num', size, opts)
       end

data/lib/ui_bibz/utils/screwdriver.rb

@@ -7,7 +7,7 @@ module UiBibz::Utils
 
     class << self
       def join_classes(*classes)
-        klasses = Array(classes).flatten.map(&:to_s).compact.uniq.reject(&:blank?)
+        klasses = Array(classes).flatten.filter_map(&:to_s).uniq.reject(&:blank?)
         klasses.empty? ? nil : klasses
       end
 

data/test/simple_form_test.rb

@@ -237,31 +237,40 @@ test1</textarea></div></form>"
     assert_equal expected, actual
   end
 
-  # test 'choice field' do
-  #   actual = ui_form_for @user do |f|
-  #     f.ui_choice_group do |cg|
-  #       cg.input :name_fr, as: :ui_choice_field
-  #       cg.input :name_fr, as: :ui_choice_field
-  #     end
-  #   end
-  #
-  #   expected = "<form class=\"simple_form\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"button_group\"><div data-toggle=\"buttons\" class=\"btn-group button-choice btn-group-toggle\"><input type=\"checkbox\" autocomplete=\"off\" class=\"btn-check\" id=\"choice-21472\" /><label class=\"btn-secondary btn checkbox\" checked=\"checked\" for=\"choice-21472\">Name Fr</label><input type=\"checkbox\" autocomplete=\"off\" class=\"btn-check\" id=\"choice-13741\" /><label class=\"btn-secondary btn checkbox\" checked=\"checked\" for=\"choice-13741\">Name Fr</label></div></div></form>"
-  #
-  #   assert_equal expected, actual
-  # end
-
-  #   test 'test surround field into simple form' do
-  #     actual = ui_form_for @user do |f|
-  #       concat(f.ui_surround_field do |sf|
-  #         sf.input :name_en, as: :text_field
-  #         sf.addon("€")
-  #       end)
-  #       concat f.input(:name_fr, as: :ui_auto_complete_field, collection: @users, label_method: :name_fr)
-  #     end
-  #
-  #     expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div><div class=\"input-group\"><input type=\"text\" name=\"user[name_en]\" id=\"user_name_en\" value=\"test1 en\" class=\"text_field optional form-control\" /><span class=\"input-group-text\">€</span></div></div><div class=\"form-group ui_auto_complete_field optional user_name_fr\"><label class=\"control-label ui_auto_complete_field optional\" for=\"user_name_fr\">Name fr</label><input type=\"text\" name=\"user[name_fr]\" id=\"user_name_fr\" value=\"test1\" class=\"ui_auto_complete_field optional form-control auto-complete-field\" autocomplete=\"true\" list=\"user_name_fr-datalist\" /><datalist id=\"user_name_fr-datalist\"><option value=\"1\">test1</option>
-  # <option value=\"2\">test2</option></datalist></div></form>"
-  #
-  #     assert_equal expected, actual
-  #   end
+  test 'ui_button_group' do
+    actual = ui_form_for @user do |f|
+      f.ui_button_group do |bg|
+        bg.button "test"
+      end
+    end
+
+    expected = "<form class=\"simple_form\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"button_group\"><div class=\"btn-group\" role=\"group\"><button class=\"btn-secondary btn\">test</button></div></div></form>"
+
+    assert_equal expected, actual
+  end
+
+  test 'ui_choice_group' do
+    actual = ui_form_for @user do |f|
+      f.ui_choice_group do |cg|
+        cg.input :name_fr, as: :ui_checkbox_field
+      end
+    end
+
+    expected = "<form class=\"simple_form\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"button_group\"><div class=\"btn-group button-choice btn-group-toggle\"><div class=\"form-check\"><input type=\"checkbox\" name=\"user[name_fr]\" id=\"user_name_fr\" value=\"test1\" class=\"ui_checkbox_field optional form-check-input\" checked=\"checked\" /><label class=\"form-check-label\" for=\"user_name_fr\">Name Fr</label></div></div></div></form>"
+
+    assert_equal expected, actual
+  end
+
+  test 'test surround field into simple form' do
+    actual = ui_form_for @user do |f|
+      f.ui_surround_field do |sf|
+        sf.input :name_en, as: :ui_text_field
+        sf.addon("€")
+      end
+    end
+
+    expected = "<form class=\"simple_form\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group surround_field\"><div class=\"input-group ui_surround_field\"><input type=\"text\" name=\"user[name_en]\" id=\"user_name_en\" value=\"test1 en\" class=\"form-control string ui_text_field optional\" /><span class=\"input-group-text\">€</span></div></div></form>"
+
+    assert_equal expected, actual
+  end
 end

data/test/ui/core/forms/choices/checkbox_field_test.rb

@@ -23,4 +23,11 @@ class CheckboxFieldTest < ActionView::TestCase
 
     assert_equal expected, actual
   end
+
+  test 'checkbox_field with html_options' do
+    actual = UiBibz::Ui::Core::Forms::Choices::CheckboxField.new('John', { checked: true }, { data: { name: 'check' } }).render
+    expected = "<div class=\"form-check\"><input type=\"checkbox\" name=\"John\" id=\"John\" value=\"1\" data-name=\"check\" class=\"form-check-input\" checked=\"checked\" /><label class=\"form-check-label\" for=\"John\">John</label></div>"
+
+    assert_equal expected, actual
+  end
 end

data/test/ui/core/forms/selects/{multi_select_field_test.rb → dropdown_select_field_test.rb}

@@ -3,7 +3,7 @@
 require 'test_helper'
 
 class DropdownSelectFieldTest < ActionView::TestCase
-  test 'Multi Select Field' do
+  test 'Dropdown Select Field' do
     options  = options_for_select(Array.new(2) { |i| "option #{i}" })
     actual   = UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new('example', multiple: true, option_tags: options).render
     expected = "<select name=\"example[]\" id=\"example\" data-dropdown-classes=\"dropdown\" class=\"btn-secondary multi-select-field\" multiple=\"multiple\"><option value=\"option 0\">option 0</option>
@@ -12,10 +12,10 @@ class DropdownSelectFieldTest < ActionView::TestCase
     assert_equal expected, actual
   end
 
-  test 'Multi Select Field data html options' do
+  test 'Dropdown Select Field data html options' do
     grouped_options = { 'North America' => [['United statuss', 'US'], 'Canada'], 'Europe' => %w[Denmark Germany France] }
-    actual = UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new('example', { multiple: true, option_tags: grouped_options_for_select(grouped_options), clickable_opt_group: true, collapsible_opt_group: true, searchable: true, select_all_options: true, number_displayed: 2, status: :danger }).render
-    expected = "<select name=\"example[]\" id=\"example\" data-enable-clickable-opt-groups=\"true\" data-enable-collapsible-opt-groups=\"true\" data-enable-filtering=\"true\" data-include-select-all-option=\"true\" data-number-displayed=\"true\" data-dropdown-classes=\"dropdown\" class=\"btn-danger multi-select-field\" multiple=\"multiple\"><optgroup label=\"North America\"><option value=\"US\">United statuss</option>
+    actual = UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new('example', { multiple: true, option_tags: grouped_options_for_select(grouped_options), clickable_opt_group: true, collapsible_opt_group: true, searchable: true, non_selected_text: 'test', select_all_options: true, number_displayed: 2, status: :danger, n_selected_text: "items selected" }).render
+    expected = "<select name=\"example[]\" id=\"example\" data-enable-clickable-opt-groups=\"true\" data-enable-collapsible-opt-groups=\"true\" data-enable-filtering=\"true\" data-non-selected-text=\"test\" data-include-select-all-option=\"true\" data-number-displayed=\"true\" data-dropdown-classes=\"dropdown\" data-n-selected-text=\"items selected\" class=\"btn-danger multi-select-field\" multiple=\"multiple\"><optgroup label=\"North America\"><option value=\"US\">United statuss</option>
 <option value=\"Canada\">Canada</option></optgroup><optgroup label=\"Europe\"><option value=\"Denmark\">Denmark</option>
 <option value=\"Germany\">Germany</option>
 <option value=\"France\">France</option></optgroup></select>"
@@ -23,7 +23,7 @@ class DropdownSelectFieldTest < ActionView::TestCase
     assert_equal expected, actual
   end
 
-  test 'Multi select Field refresh option' do
+  test 'Dropdown Select Field refresh option' do
     actual = UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new('test', { multiple: true, refresh: { target: { url: '/' } } }).render
     expected = "<div class=\"field-refresh input-group ui_surround_field\"><select name=\"test[]\" id=\"test\" data-dropdown-classes=\"dropdown\" class=\"btn-secondary multi-select-field\" multiple=\"multiple\"></select><span data-connect=\"{&quot;events&quot;:&quot;click&quot;,&quot;mode&quot;:&quot;remote&quot;,&quot;target&quot;:{&quot;selector&quot;:&quot;#test&quot;,&quot;url&quot;:&quot;/&quot;,&quot;data&quot;:[]}}\" class=\"btn-secondary ui-bibz-connect btn input-refresh-button\"><i class=\"glyph fas fa-sync-alt\"></i></span></div>"
 

data/test/ui/core/notifications/toast_test.rb

@@ -9,7 +9,7 @@ class ToastTest < ActionView::TestCase
       t.header 'My header toast', glyph: 'eye', time: 'Now', class: 'my-header-toast'
       t.body 'My body toast', class: 'my-body-toast'
     end
-    expected = "<div data-bs-autohide=\"true\" class=\"my-toast toast\" role=\"alert\" aria-live=\"assertive\" aria-atomic=\"true\"><div class=\"my-header-toast toast-header\"><i class=\"me-2 glyph fas fa-eye\"></i><strong class=\"me-auto\">My header toast</strong><small class=\"text-muted\">Now</small><button class=\"ml-2 mb-1 btn-close\" data-bs-dismiss=\"toast\" aria-label=\"Close\"></button></div><div class=\"my-body-toast toast-body\">My body toast</div></div>"
+    expected = "<div data-bs-autohide=\"true\" class=\"my-toast toast align-items-center\" role=\"alert\" aria-live=\"assertive\" aria-atomic=\"true\"><div class=\"my-header-toast toast-header\"><i class=\"me-2 glyph fas fa-eye\"></i><strong class=\"me-auto\">My header toast</strong><small class=\"text-muted\">Now</small><button class=\"ml-2 mb-1 btn-close\" data-bs-dismiss=\"toast\" aria-label=\"Close\"></button></div><div class=\"my-body-toast toast-body\">My body toast</div></div>"
 
     assert_equal expected, actual
   end
@@ -18,7 +18,7 @@ class ToastTest < ActionView::TestCase
     actual = ui_toast do
       'My body toast'
     end
-    expected = "<div class=\"toast\" role=\"alert\" aria-live=\"assertive\" aria-atomic=\"true\"><div class=\"toast-body\">My body toast</div></div>"
+    expected = "<div class=\"toast align-items-center\" role=\"alert\" aria-live=\"assertive\" aria-atomic=\"true\"><div class=\"d-flex\"><div class=\"toast-body\">My body toast</div></div></div>"
 
     assert_equal expected, actual
   end

data/ui_bibz.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.description = UiBibz::DESCRIPTION
   s.license     = UiBibz::LICENSE
 
-  s.required_ruby_version = '>= 2.7'
+  s.required_ruby_version = '>= 3.0.0'
 
   s.files         = `git ls-files`.split
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.require_paths = %w[lib vendor]
 
   # Rails gems
-  s.add_development_dependency 'rails', '~> 6.0.3', '>= 6.0.3.2'
+  s.add_development_dependency 'rails', '~> 6.1.3', '>= 6.1.3.2'
 
   # Remove these dependencies after
   s.add_dependency 'will_paginate', '~> 3.3.0'
@@ -47,4 +47,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'simple_form'
   s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'yard'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ui_bibz
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta14
+  version: 3.0.0.beta19
 platform: ruby
 authors:
 - Thooams [Thomas HUMMEL]
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-11 00:00:00.000000000 Z
+date: 2021-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.3
+        version: 6.1.3
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.3.2
+        version: 6.1.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.3
+        version: 6.1.3
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.3.2
+        version: 6.1.3.2
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
@@ -240,7 +240,21 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A Rails Interface Framework using Bootstrap 5.0.0.beta1.
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: A Rails Interface Framework using Bootstrap 5.0.0.beta3.
 email: thomas@hummel.link
 executables:
 - test
@@ -312,6 +326,8 @@ files:
 - lib/ui_bibz/ui/base.rb
 - lib/ui_bibz/ui/concerns/card_itemable_concern.rb
 - lib/ui_bibz/ui/concerns/html_concern.rb
+- lib/ui_bibz/ui/concerns/navigation_concern.rb
+- lib/ui_bibz/ui/concerns/notification_concern.rb
 - lib/ui_bibz/ui/core/boxes/card.rb
 - lib/ui_bibz/ui/core/boxes/card_accordion.rb
 - lib/ui_bibz/ui/core/boxes/card_column.rb
@@ -544,8 +560,8 @@ files:
 - test/ui/core/forms/numbers/number_field_test.rb
 - test/ui/core/forms/numbers/range_field_test.rb
 - test/ui/core/forms/numbers/slider_field_test.rb
+- test/ui/core/forms/selects/dropdown_select_field_test.rb
 - test/ui/core/forms/selects/multi_column_field_test.rb
-- test/ui/core/forms/selects/multi_select_field_test.rb
 - test/ui/core/forms/selects/select_field_test.rb
 - test/ui/core/forms/surrounds/surround_field_test.rb
 - test/ui/core/forms/textareas/markdown_editor_field_test.rb
@@ -655,18 +671,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Ui Bibz is an Ui Framework that allows you to build an interface very quickly
-  and simply using Bootstrap 5.0.0.beta1.
+  and simply using Bootstrap 5.0.0.beta3.
 test_files:
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
@@ -757,8 +773,8 @@ test_files:
 - test/ui/core/forms/numbers/number_field_test.rb
 - test/ui/core/forms/numbers/range_field_test.rb
 - test/ui/core/forms/numbers/slider_field_test.rb
+- test/ui/core/forms/selects/dropdown_select_field_test.rb
 - test/ui/core/forms/selects/multi_column_field_test.rb
-- test/ui/core/forms/selects/multi_select_field_test.rb
 - test/ui/core/forms/selects/select_field_test.rb
 - test/ui/core/forms/surrounds/surround_field_test.rb
 - test/ui/core/forms/textareas/markdown_editor_field_test.rb