ui_bibz 3.0.0.beta14 → 3.0.0.beta15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c7d0fa9075ddd53e329885fd916d87ddd4c0a83f704323122c45c8e2d35cd48
-  data.tar.gz: 791f22fc1fa9a1d41f1fcb91eefc181c93ca3827a295acec4a6814f532735528
+  metadata.gz: a24ee2f7f963d13b2f79652d8e02c196072e3d674c1f528a92b121598f6ccd08
+  data.tar.gz: 9dd65d798d69e14c08de9c5e2fd6c198e0df7def2fe06e22341124f1a96e2d05
 SHA512:
-  metadata.gz: 8f13b92c62b6dad28625dfad5ccaee634f85a8dcc62979bf208e50e182ee86cfcf9a1a669290f950354795003b0cefe6323ee6623f66471ded08bf8aaf19b28c
-  data.tar.gz: 226d1646f90d50e034b43753a3cb79b944b4f9b617d3d126fe582c384d6e4af063d9baf5bb9dbf7f2836d5bec2d39e82fb0dadee505916a487d9899d05fe26b3
+  metadata.gz: f634662ead3cda0d2d6898352f9634666c3282d3e066a18eed7c76e3dd03b955b7cc465955584140d81a3d73e38f443fd537756f684d9d01e1831d6dc6cc90e0
+  data.tar.gz: 2d7b682c66482d611ec5ac47751027529caa59b5672bab233e9c413b0e3c45e82ec69c471330aae1a05002ea41aa353fd35de33e5677aa41b8ff3e70bf91e42b

data/.github/workflows/ci.yml

@@ -23,6 +23,6 @@ jobs:
     - name: Test with Rake
       uses: paambaati/codeclimate-action@v2.7.5
       env:
-        CC_TEST_REPORTER_ID: 7e50558afc7a861280e3194a765a159e9ea5bdd22d2ebe6c13e5e23fe914c66b
+        CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
       with:
         coverageCommand: bundle exec rake

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ui_bibz (3.0.0.beta14)
+    ui_bibz (3.0.0.beta15)
       will-paginate-i18n
       will_paginate (~> 3.3.0)
       will_paginate-bootstrap4
@@ -95,7 +95,7 @@ GEM
       haml (>= 4.0, < 6)
       nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
-    i18n (1.8.8)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
     iniparse (1.5.0)
     jquery-rails (4.4.0)

data/lib/ui_bibz.rb

@@ -78,6 +78,8 @@ module UiBibz
     module Concerns
       autoload :HtmlConcern,         'ui_bibz/ui/concerns/html_concern'
       autoload :CardItemableConcern, 'ui_bibz/ui/concerns/card_itemable_concern'
+      autoload :NavigationConcern,   'ui_bibz/ui/concerns/navigation_concern'
+      autoload :NotificationConcern, 'ui_bibz/ui/concerns/notification_concern'
     end
 
     # Core

data/lib/ui_bibz/infos.rb

@@ -3,7 +3,7 @@
 module UiBibz
   NAME                = 'Ui Bibz'
   SLUG                = 'ui_bibz'
-  BOOTSTRAP_VERSION   = '5.0.0.beta1'
+  BOOTSTRAP_VERSION   = '5.0.0.beta2'
   DESCRIPTION         = "A Rails Interface Framework using Bootstrap #{BOOTSTRAP_VERSION}."
   SUMMARY             = "Ui Bibz is an Ui Framework that allows you to build an interface very quickly and simply using Bootstrap #{BOOTSTRAP_VERSION}."
   LICENSE             = 'MIT'
@@ -12,6 +12,6 @@ module UiBibz
   REPO                = 'git+https://github.com/thooams/ui_bibz.git'
   EMAIL               = 'thomas@hummel.link'
   AUTHOR              = 'Thooams [Thomas HUMMEL]'
-  VERSION             = '3.0.0.beta14'
+  VERSION             = '3.0.0.beta15'
   AUTHORS = ['Thooams'].freeze
 end

data/lib/ui_bibz/inputs/ui_bibz_form/ui_bibz_form_builder.rb

@@ -32,19 +32,16 @@ module UiBibzForm
     end
 
     def ui_button_group(content = nil, opts = nil, html_options = nil, &block)
-      content = (options || {}).merge(content || {})
-      content = content.merge(template: @template, form: self)
-
-      input_classes = UiBibz::Utils::Screwdriver.join_classes('button_group', options[:input_html].try(:[], :class))
-      wrapper_html = (options[:input_html] || {}).merge({ class: input_classes })
-
-      content_tag :div, wrapper_html do
-        concat content_tag(:label, content[:label]) unless content[:label].nil?
-        concat UiBibz::Ui::Core::Forms::Buttons::ButtonGroup.new(content, opts, html_options).tap(&block).render
-      end
+      ui_component_group_by(UiBibz::Ui::Core::Forms::Buttons::ButtonGroup, content, opts, html_options, &block)
     end
 
     def ui_choice_group(content = nil, opts = nil, html_options = nil, &block)
+      ui_component_group_by(UiBibz::Ui::Core::Forms::Choices::ChoiceGroup, content, opts, html_options, &block)
+    end
+
+    private
+
+    def ui_component_group_by(component_class, content = nil, opts = nil, html_options = nil, &block)
       content = (options || {}).merge(content || {})
       content = content.merge(template: @template, form: self)
 
@@ -53,7 +50,7 @@ module UiBibzForm
 
       content_tag :div, wrapper_html do
         concat content_tag(:label, content[:label]) unless content[:label].nil?
-        concat UiBibz::Ui::Core::Forms::Choices::ChoiceGroup.new(content, opts, html_options).tap(&block).render
+        concat component_class.new(content, opts, html_options).tap(&block).render
       end
     end
   end

data/lib/ui_bibz/ui/concerns/navigation_concern.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module UiBibz::Ui::Concerns::NavigationConcern #:nodoc:
+  extend ActiveSupport::Concern
+
+  included do
+    def spacer(num = 'auto')
+      kls = " me-#{num}"
+      @items.last.html_options[:class].nil? ? @items.last.html_options[:class] = kls : @items.last.html_options[:class] << kls
+    end
+  end
+end

data/lib/ui_bibz/ui/concerns/notification_concern.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module UiBibz::Ui::Concerns::NotificationConcern #:nodoc:
+  extend ActiveSupport::Concern
+
+  included do
+    def data_attributes
+      self.class.const_get('DATA_ATTRIBUTES').map do |data_attribute|
+        options[data_attribute].to_s.blank? ? nil : { "data-bs-#{data_attribute}" => data_attribute_value(data_attribute) }
+      end.compact.reduce(&:merge) || {}
+    end
+  end
+end

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

@@ -122,6 +122,10 @@ module UiBibz::Ui::Core
       # To turbolinks
       data_turbolinks = html_options.try(:[], :data).try(:[], :turbolinks) || options.try(:delete, :turbolinks)
       add_html_data(:turbolinks, value: data_turbolinks) unless data_turbolinks.nil?
+
+      # To Turbo
+      data_turbo = html_options.try(:[], :data).try(:[], :turbo) || options.try(:delete, :turbo)
+      add_html_data(:turbo, value: data_turbo) unless data_turbo.nil?
     end
 
     # Override this method to add html Options

data/lib/ui_bibz/ui/core/forms/choices/components/choice.rb

@@ -82,10 +82,14 @@ module UiBibz::Ui::Core::Forms::Choices
       if options[:label]
         content_tag :label, options[:label], html_options.merge(for: input_id)
       else
-        content_tag :label, html_options.merge(for: input_id) do
-          concat glyph_and_content_html(options[:text].nil? ? @content : ' ')
-          concat badge_html unless options[:badge].nil?
-        end
+        generated_label
+      end
+    end
+
+    def generated_label
+      content_tag :label, html_options.merge(for: input_id) do
+        concat glyph_and_content_html(options[:text].nil? ? @content : ' ')
+        concat badge_html unless options[:badge].nil?
       end
     end
 

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

@@ -67,6 +67,7 @@ module UiBibz::Ui::Core::Navigations
   #
   class Nav < UiBibz::Ui::Core::Component
     include UiBibz::Ui::Concerns::HtmlConcern
+    include UiBibz::Ui::Concerns::NavigationConcern
 
     # See UiBibz::Ui::Core::Component.initialize
     def initialize(content = nil, options = nil, html_options = nil, &block)
@@ -108,11 +109,6 @@ module UiBibz::Ui::Core::Navigations
       @items << NavDropdown.new(content, options, html_options).tap(&block)
     end
 
-    def spacer(num = 'auto')
-      kls = " me-#{num}"
-      @items.last.html_options[:class].nil? ? @items.last.html_options[:class] = kls : @items.last.html_options[:class] << kls
-    end
-
     protected
 
     def component_html_classes

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

@@ -75,6 +75,7 @@ module UiBibz::Ui::Core::Navigations
   #
   class Navbar < UiBibz::Ui::Core::Component
     include UiBibz::Ui::Concerns::HtmlConcern
+    include UiBibz::Ui::Concerns::NavigationConcern
 
     # See UiBibz::Ui::Core::Component.initialize
     def initialize(content = nil, options = nil, html_options = nil, &block)
@@ -124,11 +125,6 @@ module UiBibz::Ui::Core::Navigations
       @brand = UiBibz::Ui::Core::Navigations::NavbarBrand.new(content, options, html_options, &block).render
     end
 
-    def spacer(num = 'auto')
-      kls = " me-#{num}"
-      @items.last.html_options[:class].nil? ? @items.last.html_options[:class] = kls : @items.last.html_options[:class] << kls
-    end
-
     def id
       @id ||= generate_id('navbar-id')
     end

data/lib/ui_bibz/ui/core/notifications/popover.rb

@@ -47,6 +47,8 @@ module UiBibz::Ui::Core::Notifications
   #   ui_glyph("diamond", popover: { title: "My content", position: :right})
   #
   class Popover < UiBibz::Ui::Core::Component
+    include UiBibz::Ui::Concerns::NotificationConcern
+
     # Note that for security reasons the sanitize, sanitizeFn, and allowList
     # options cannot be supplied using data attributes.
     # https://getbootstrap.com/docs/5.0/components/popovers/#options
@@ -76,12 +78,6 @@ module UiBibz::Ui::Core::Notifications
       end
     end
 
-    def data_attributes
-      DATA_ATTRIBUTES.map do |data_attribute|
-        options[data_attribute].to_s.blank? ? nil : { "data-bs-#{data_attribute}" => data_attribute_value(data_attribute) }
-      end.compact.reduce(&:merge) || {}
-    end
-
     def data_attribute_value(data_attribute)
       options[data_attribute].is_a?(String) ? options[data_attribute].html_safe : options[data_attribute]
     end

data/lib/ui_bibz/ui/core/notifications/tooltip.rb

@@ -48,6 +48,8 @@ module UiBibz::Ui::Core::Notifications
   #   ui_glyph("diamond", tooltip: { title: "My content", position: :right})
   #
   class Tooltip < UiBibz::Ui::Core::Component
+    include UiBibz::Ui::Concerns::NotificationConcern
+
     # Note that for security reasons the sanitize, sanitizeFn, and allowList
     # options cannot be supplied using data attributes.
     # https://getbootstrap.com/docs/5.0/components/tooltips/#options
@@ -76,12 +78,6 @@ module UiBibz::Ui::Core::Notifications
       end
     end
 
-    def data_attributes
-      DATA_ATTRIBUTES.map do |data_attribute|
-        options[data_attribute].to_s.blank? ? nil : { "data-bs-#{data_attribute}" => data_attribute_value(data_attribute) }
-      end.compact.reduce(&:merge) || {}
-    end
-
     def data_attribute_value(data_attribute)
       options[data_attribute].is_a?(String) ? options[data_attribute].html_safe : options[data_attribute]
     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_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/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 data-toggle=\"buttons\" 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

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.beta15
 platform: ruby
 authors:
 - Thooams [Thomas HUMMEL]
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-11 00:00:00.000000000 Z
+date: 2021-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -240,7 +240,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A Rails Interface Framework using Bootstrap 5.0.0.beta1.
+description: A Rails Interface Framework using Bootstrap 5.0.0.beta2.
 email: thomas@hummel.link
 executables:
 - test
@@ -312,6 +312,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
@@ -666,7 +668,7 @@ rubygems_version: 3.1.2
 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.beta2.
 test_files:
 - test/dummy/README.rdoc
 - test/dummy/Rakefile