ui_bibz 2.5.2 → 3.0.0.alpha3

data/README.md

@@ -1,4 +1,4 @@
-![Ui Bibz logo](https://repository-images.githubusercontent.com/29547689/3b149e00-a3f6-11e9-9144-e96702055f08)
+![Ui Bibz logo](https://repository-images.githubusercontent.com/29547689/e29b2180-0d59-11eb-89f3-4541571d7c67)
 
 [![Gem Version](https://badge.fury.io/rb/ui_bibz.svg)](http://badge.fury.io/rb/ui_bibz)
 [![Build Status](https://travis-ci.org/thooams/Ui-Bibz.svg)](https://travis-ci.org/thooams/Ui-Bibz)
@@ -6,63 +6,20 @@
 [![Test Coverage](https://codeclimate.com/github/thooams/Ui-Bibz/badges/coverage.svg)](https://codeclimate.com/github/thooams/Ui-Bibz)
 [![Inline docs](http://inch-ci.org/github/thooams/Ui-Bibz.svg?branch=master)](http://inch-ci.org/github/thooams/Ui-Bibz)
 [![security](https://hakiri.io/github/thooams/Ui-Bibz/master.svg)](https://hakiri.io/github/thooams/Ui-Bibz/master)
-[![Dependency Status](https://gemnasium.com/thooams/Ui-Bibz.svg)](https://gemnasium.com/thooams/Ui-Bibz)
 ![Ruby](https://github.com/thooams/Ui-Bibz/workflows/Ruby/badge.svg)
 
 This project rocks and uses MIT-LICENSE.
 
 # Ui Bibz
-> Ui Bibz is a [Ui framework](http://fr.wikipedia.org/wiki/Framework_d%27interface)
-> to allow build an interface very quickly and simply
-> using [Ruby on Rails 4](http://rubyonrails.org/) and [Boostrap 4](http://getbootstrap.com/).
-
-Ui Bibz load [boostrap](http://getbootstrap.com/) and [awesomefont](http://fontawesome.io/).
+> Ui Bibz is an [Ui framework](https://en.wikipedia.org/wiki/CSS_framework)
+> that allows you to build an interface very quickly and simply
+> using [Ruby on Rails 6](http://rubyonrails.org/) and [Boostrap 5](http://getbootstrap.com/).
 
+Ui Bibz load [Bootstrap](http://getbootstrap.com/) and [Font Awesome](http://fontawesome.io/).
 
 ## Documentation
-Full documentation is here :
-[Ui Bibz](http://hummel.link/Ui-Bibz/)
-
-
-## Installation
-
-Add it to your Gemfile
-For bootstrap v4:
-
-```
-gem 'ui_bibz'
-```
-
-For bootstrap v3:
-
-```
-gem 'ui_bibz', '~> 1.2.5.3'
-```
-
-Run the following command to install it:
-
-```
-bundle install
-```
-
-## Configuration
-
-Put this line in: /app/assets/stylesheets/applications.css
-
-```
-*= require ui_bibz
-```
-
-Put this line in: /app/assets/javascripts/applications.js
-
-```
-//= require ui_bibz
-```
-
-Ps: You can use sass variables into Boostrap.
-
-## And after
-
-* See documentation [here](https://ui-bibz-documentation.herokuapp.com/) for boostrap 4.
-* See documentation [here](http://hummel.link/Ui-Bibz/1.2.5/) for boostrap 3.
+Full documentation is here with bootstrap 5:
+[Ui Bibz v3](http://hummel.link/Ui-Bibz/docs/v3/)
 
+Older documentation is here with bootstrap 4:
+[Ui Bibz v2.5](http://hummel.link/Ui-Bibz/docs/v2.5/)

data/Rakefile

@@ -7,8 +7,8 @@ rescue LoadError
 end
 
 require 'rdoc/task'
-# Maintain your gem's version:
 require 'ui_bibz/infos'
+
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.main      = 'README.md'
   rdoc.rdoc_dir  = "rdoc-v#{UiBibz::VERSION}"
@@ -22,9 +22,10 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/ui_bibz/helpers/*.rb')
 end
 
-Bundler::GemHelper.install_tasks
+require 'bundler/gem_tasks'
 
 require 'rake/testtask'
+
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
   t.libs << 'test'

data/bin/test

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+$LOAD_PATH << File.expand_path('../test', __dir__)
+
+require 'bundler/setup'
+require 'rails/plugin/test'

data/config/initializers/will_paginate.rb

@@ -49,7 +49,8 @@ module WillPaginate
         if page == current_page
           tag :li, tag(:span, page, class: 'page-link'), class: 'page-item active'
         else
-          link_options.merge! class: 'page-link', rel: rel_value(page)
+          link_options[:class] = 'page-link'
+          link_options[:rel] = rel_value(page)
           tag :li, link(page, page, link_options), class: 'page-item'
         end
       end

data/lib/ui_bibz.rb

@@ -4,6 +4,10 @@ require 'action_view'
 require 'will_paginate'
 require 'will-paginate-i18n'
 
+# require "zeitwerk"
+# loader = Zeitwerk::Loader.for_gem
+# loader.setup # ready!
+#
 module UiBibzForm
   autoload :UiBibzFormBuilder, 'ui_bibz/inputs/ui_bibz_form/ui_bibz_form_builder'
 end
@@ -14,6 +18,7 @@ module UiBibzInputs
   autoload :StringInput,                'ui_bibz/inputs/ui_bibz_inputs/string_input'
   autoload :UiAutoCompleteFieldInput,   'ui_bibz/inputs/ui_bibz_inputs/ui_auto_complete_field_input'
   autoload :UiChoiceGroupInput,         'ui_bibz/inputs/ui_bibz_inputs/ui_choice_group_input'
+  autoload :UiChoiceFieldInput,         'ui_bibz/inputs/ui_bibz_inputs/ui_choice_field_input'
   autoload :UiDatePickerFieldInput,     'ui_bibz/inputs/ui_bibz_inputs/ui_date_picker_field_input'
   autoload :UiDropdownSelectFieldInput, 'ui_bibz/inputs/ui_bibz_inputs/ui_dropdown_select_field_input'
   autoload :UiFormulaFieldInput,        'ui_bibz/inputs/ui_bibz_inputs/ui_formula_field_input'
@@ -28,6 +33,7 @@ module UiBibzInputs
   autoload :UiTextFieldInput,           'ui_bibz/inputs/ui_bibz_inputs/ui_text_field_input'
   autoload :UiFileFieldInput,           'ui_bibz/inputs/ui_bibz_inputs/ui_file_field_input'
   autoload :UiRangeFieldInput,          'ui_bibz/inputs/ui_bibz_inputs/ui_range_field_input'
+  autoload :UiSliderFieldInput,         'ui_bibz/inputs/ui_bibz_inputs/ui_slider_field_input'
 end
 
 module UiBibz
@@ -62,11 +68,18 @@ module UiBibz
   module Utils
     autoload :Screwdriver,             'ui_bibz/utils/screwdriver'
     autoload :GlyphChanger,            'ui_bibz/utils/glyph_changer'
+    autoload :BreakdownClassNameGenerator, 'ui_bibz/utils/breakdown_class_name_generator'
   end
 
   module Ui
     # Base
-    autoload :Base,                    'ui_bibz/ui/base'
+    autoload :Base, 'ui_bibz/ui/base'
+
+    # Concerns
+    module Concerns
+      autoload :HtmlConcern,         'ui_bibz/ui/concerns/html_concern'
+      autoload :CardItemableConcern, 'ui_bibz/ui/concerns/card_itemable_concern'
+    end
 
     # Core
     module Core
@@ -75,6 +88,7 @@ module UiBibz
         autoload :CardAccordion,           'ui_bibz/ui/core/boxes/card_accordion'
         autoload :CardColumn,              'ui_bibz/ui/core/boxes/card_column'
         autoload :CardDeck,                'ui_bibz/ui/core/boxes/card_deck'
+        autoload :CardGrid,                'ui_bibz/ui/core/boxes/card_grid'
         autoload :CardGroup,               'ui_bibz/ui/core/boxes/card_group'
         autoload :Jumbotron,               'ui_bibz/ui/core/boxes/jumbotron'
       end
@@ -105,6 +119,8 @@ module UiBibz
           autoload :FormulaField,            'ui_bibz/ui/core/forms/numbers/formula_field'
           autoload :NumberField,             'ui_bibz/ui/core/forms/numbers/number_field'
           autoload :RangeField,              'ui_bibz/ui/core/forms/numbers/range_field'
+          autoload :SliderField,             'ui_bibz/ui/core/forms/numbers/slider_field'
+          autoload :SliderHeader,            'ui_bibz/ui/core/forms/numbers/slider_header'
         end
 
         module Selects
@@ -138,7 +154,6 @@ module UiBibz
 
       module Icons
         autoload :Glyph,                   'ui_bibz/ui/core/icons/glyph'
-        autoload :GlyphGroup,              'ui_bibz/ui/core/icons/glyph_group'
         autoload :Star,                    'ui_bibz/ui/core/icons/star'
       end
 

data/lib/ui_bibz/concerns/models/searchable.rb

@@ -62,7 +62,7 @@ module UiBibz::Concerns::Models::Searchable
       sql = generate_parent_sort_query sql if @params[:parent]
 
       # Main query with argument or not
-      sql = search_by_query sql unless @tmp_params[:search].blank?
+      sql = search_by_query sql if @tmp_params[:search].present?
 
       generate_sql sql, column_args
     end
@@ -80,7 +80,7 @@ module UiBibz::Concerns::Models::Searchable
     end
 
     def self.generate_count_sql(sql)
-      sq = "SELECT * FROM (#{sql.group(table_name + '.id').to_sql}) countable ORDER BY countable.count #{@tmp_params[:direction] || asc}"
+      sq = "SELECT * FROM (#{sql.group("#{table_name}.id").to_sql}) countable ORDER BY countable.count #{@tmp_params[:direction] || asc}"
       paginate_by_sql(sq, page: @tmp_params[:page], per_page: @session[:per_page])
     end
 
@@ -134,7 +134,7 @@ module UiBibz::Concerns::Models::Searchable
             sql_attributes = sql_attributes.merge(Hash["#{attribute}_#{i}".to_sym, "%#{pattern}%"])
           end
         end
-        sql_query << '(' + sql_subquery.join(' OR ') + ')'
+        sql_query << "(#{sql_subquery.join(' OR ')})"
       end
 
       sql.where([sql_query.join(' AND '), sql_attributes])

data/lib/ui_bibz/helpers/ui/core/boxes_helper.rb

@@ -9,7 +9,7 @@ module UiBibz::Helpers::Ui::Core::BoxesHelper
   # Option +tap: true+ is required if you want add +header+, +block+ or
   # +footer+.
   def ui_card(content = nil, options = nil, html_options = nil, &block)
-    if tap?(content, options)
+    if tapped?(block)
       UiBibz::Ui::Core::Boxes::Card.new(content, options, html_options).tap(&block).render
     else
       UiBibz::Ui::Core::Boxes::Card.new(content, options, html_options, &block).render
@@ -41,6 +41,14 @@ module UiBibz::Helpers::Ui::Core::BoxesHelper
     UiBibz::Ui::Core::Boxes::CardDeck.new(content, options, html_options).tap(&block).render
   end
 
+  # Card Grid Component
+  #
+  # +options+ (Hash)
+  # +html_options+ (Hash)
+  def ui_card_grid(content = nil, options = nil, html_options = nil, &block)
+    UiBibz::Ui::Core::Boxes::CardGrid.new(content, options, html_options).tap(&block).render
+  end
+
   # Card Column Component
   #
   # +options+ (Hash)

data/lib/ui_bibz/helpers/ui/core/forms_helper.rb

@@ -181,6 +181,24 @@ module UiBibz::Helpers::Ui::Core::FormsHelper
     UiBibz::Ui::Core::Forms::Numbers::RangeField.new(name, options, html_options, &block).render
   end
 
+  # Slider Component
+  #
+  # +name+ (String) [Required]
+  # +options+ (Hash)
+  # +html_options+ (Hash)
+  def ui_slider_field(name, options = nil, html_options = nil, &block)
+    UiBibz::Ui::Core::Forms::Numbers::SliderField.new(name, options, html_options, &block).render
+  end
+
+  # Slider Header Component
+  #
+  # +name+ (String) [Required]
+  # +options+ (Hash)
+  # +html_options+ (Hash)
+  def ui_slider_header(options, html_options = nil, &block)
+    UiBibz::Ui::Core::Forms::Numbers::SliderHeader.new(nil, options, html_options, &block).render
+  end
+
   # File Component
   #
   # +name+ (String) [Required]

data/lib/ui_bibz/helpers/ui/core/layouts_helper.rb

@@ -6,7 +6,11 @@ module UiBibz::Helpers::Ui::Core::LayoutsHelper
   # +options+ (Hash)
   # +html_options+ (Hash)
   def ui_row(content = nil, options = nil, html_options = nil, &block)
-    UiBibz::Ui::Core::Layouts::Row.new(content, options, html_options, &block).render
+    if tapped?(block)
+      UiBibz::Ui::Core::Layouts::Row.new(content, options, html_options).tap(&block).render
+    else
+      UiBibz::Ui::Core::Layouts::Row.new(content, options, html_options, &block).render
+    end
   end
 
   # Col Component
@@ -14,7 +18,11 @@ module UiBibz::Helpers::Ui::Core::LayoutsHelper
   # +options+ (Hash)
   # +html_options+ (Hash)
   def ui_col(content = nil, options = nil, html_options = nil, &block)
-    UiBibz::Ui::Core::Layouts::Col.new(content, options, html_options, &block).render
+    if tapped?(block)
+      UiBibz::Ui::Core::Layouts::Col.new(content, options, html_options).tap(&block).render
+    else
+      UiBibz::Ui::Core::Layouts::Col.new(content, options, html_options, &block).render
+    end
   end
 
   # Container Component

data/lib/ui_bibz/helpers/ui/core/lists_helper.rb

@@ -14,7 +14,7 @@ module UiBibz::Helpers::Ui::Core::ListsHelper
   # +options+ (Hash)
   # +html_options+ (Hash)
   def ui_list(content = nil, options = nil, html_options = nil, &block)
-    if tap?(content, options)
+    if tapped?(block)
       UiBibz::Ui::Core::Lists::Components::List.new(content, options, html_options).tap(&block).render
     else
       UiBibz::Ui::Core::Lists::Components::List.new(content, options, html_options, &block).render

data/lib/ui_bibz/helpers/ui/core/notifications_helper.rb

@@ -7,7 +7,7 @@ module UiBibz::Helpers::Ui::Core::NotificationsHelper
   # +html_options+ (Hash)
   #
   def ui_alert(content = nil, options = nil, html_options = nil, &block)
-    if tap?(content, options)
+    if tapped?(block)
       UiBibz::Ui::Core::Notifications::Alert.new(content, options, html_options).tap(&block).render
     else
       UiBibz::Ui::Core::Notifications::Alert.new(content, options, html_options, &block).render
@@ -28,7 +28,7 @@ module UiBibz::Helpers::Ui::Core::NotificationsHelper
   # +options+ (Hash)
   # +html_options+ (Hash)
   def ui_progress_bar(percentage = nil, options = nil, html_options = nil, &block)
-    if tap?(percentage, options)
+    if tapped?(block)
       UiBibz::Ui::Core::Notifications::ProgressBar.new(percentage, options, html_options).tap(&block).render
     else
       UiBibz::Ui::Core::Notifications::ProgressBar.new(percentage, options, html_options, &block).render
@@ -40,7 +40,11 @@ module UiBibz::Helpers::Ui::Core::NotificationsHelper
   # +options+ (Hash)
   # +html_options+ (Hash)
   def ui_toast(content = nil, options = nil, html_options = nil, &block)
-    UiBibz::Ui::Core::Notifications::Toast.new(content, options, html_options).tap(&block).render
+    if tapped?(block)
+      UiBibz::Ui::Core::Notifications::Toast.new(content, options, html_options).tap(&block).render
+    else
+      UiBibz::Ui::Core::Notifications::Toast.new(content, options, html_options, &block).render
+    end
   end
 
   # Spinner Component
@@ -54,7 +58,7 @@ module UiBibz::Helpers::Ui::Core::NotificationsHelper
 
   private
 
-  def tap?(content, options)
-    (content[:tap] if content.is_a?(Hash)) || (options[:tap] unless options.nil?)
+  def tapped?(block)
+    UiBibz::Utils::Screwdriver.tapped?(block)
   end
 end

data/lib/ui_bibz/helpers/ui/ux_helper.rb

@@ -6,10 +6,8 @@ module UiBibz::Helpers::Ui::UxHelper
   # +options+ (Hash)
   # +html_options+ (Hash)
   #
-  # Option +tap: true+ is required if you want add +header+, +block+ or
-  # +footer+.
   def ui_table(content = nil, options = nil, html_options = nil, &block)
-    if tap?(content, options)
+    if tapped?(block)
       UiBibz::Ui::Ux::Tables::Table.new(content, options, html_options).tap(&block).render
     else
       UiBibz::Ui::Ux::Tables::Table.new(content, options, html_options, &block).render
@@ -52,10 +50,8 @@ module UiBibz::Helpers::Ui::UxHelper
   # +options+ (Hash) [Required]
   # +html_options+ (Hash)
   #
-  # Option +tap: true+ is required if you want add +header+, +block+ or
-  # +footer+.
   def ui_table_card(content = nil, options = nil, html_options = nil, &block)
-    if tap?(content, options)
+    if tapped?(block)
       UiBibz::Ui::Ux::Tables::TableCard.new(content, options, html_options).tap(&block).render
     else
       UiBibz::Ui::Ux::Tables::TableCard.new(content, options, html_options, &block).render

data/lib/ui_bibz/infos.rb

@@ -2,10 +2,16 @@
 
 module UiBibz
   NAME                = 'Ui Bibz'
-  VERSION             = '2.5.2'
-  DESCRIPTION         = 'A Rails Interface Framework using Bootstrap.'
-  SUMMARY             = 'Create your project with Ui Bibz. Over a thirty reusable components built to provide iconography, dropdowns, input groups, navigation, alerts, and much more.'
+  SLUG                = 'ui_bibz'
+  BOOTSTRAP_VERSION   = '5.0.0.alpha2'
+  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'
-  FONTAWESOME_VERSION = '5.12.1'
-  BOOTSTRAP_VERSION   = '4.4.1'
+  FONTAWESOME_VERSION = '5.15.1'
+  HOMEPAGE            = 'http://thooams.github.io/Ui-Bibz/'
+  REPO                = 'git+https://github.com/thooams/Ui-Bibz.git'
+  EMAIL               = 'thomas@hummel.link'
+  AUTHOR              = 'Thooams'
+  VERSION             = '3.0.0.alpha3'
+  AUTHORS = ['Thooams'].freeze
 end

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

@@ -18,7 +18,7 @@ module UiBibzForm
       surround_field = UiBibz::Ui::Core::Forms::Surrounds::SurroundField.new(content, opts, html_options).tap(&block)
       errors_text    = surround_field.errors.flatten.to_sentence
       required       = surround_field.required_fields.any? { |u| u == true }
-      wrapper_classes = UiBibz::Utils::Screwdriver.join_classes(('has-error' unless errors_text.blank?), wrapper_html.try(:[], :class))
+      wrapper_classes = UiBibz::Utils::Screwdriver.join_classes(('has-error' if errors_text.present?), wrapper_html.try(:[], :class))
       label_classes = UiBibz::Utils::Screwdriver.join_classes(('required' if required), 'control-label')
       abbr_html     = content_tag('abbr', I18n.t(:"simple_form.required.mark", default: '*'), title: I18n.t(:"simple_form.required.text", default: 'required')) if required
 
@@ -27,7 +27,7 @@ module UiBibzForm
       content_tag :div, wrapper_html do
         concat content_tag(:label, "#{abbr_html} #{content[:label]}".html_safe, class: label_classes) if content[:label]
         concat surround_field.render
-        concat content_tag(:span, errors_text || content[:hint], class: 'help-block') if !errors_text.blank? || !content[:hint].nil?
+        concat content_tag(:span, errors_text || content[:hint], class: 'help-block') if errors_text.present? || !content[:hint].nil?
       end
     end
 
@@ -43,6 +43,19 @@ module UiBibzForm
         concat UiBibz::Ui::Core::Forms::Buttons::ButtonGroup.new(content, opts, html_options).tap(&block).render
       end
     end
+
+    def ui_choice_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::Choices::ChoiceGroup.new(content, opts, html_options).tap(&block).render
+      end
+    end
   end
   # end
 end

data/lib/ui_bibz/inputs/ui_bibz_inputs/base_input.rb

@@ -4,10 +4,6 @@ module UiBibzInputs
   class BaseInput < SimpleForm::Inputs::Base
     include ActionView::Helpers::FormTagHelper
 
-    def input(wrapper_options)
-      super
-    end
-
     def options
       super.merge({ value: @builder.object.send(attribute_name) }).merge(@builder.options[:input_html] || {})
     end
@@ -15,9 +11,10 @@ module UiBibzInputs
     private
 
     def input_attribute_name
-      new_attribute_name = @builder.lookup_model_names.first.to_s
-      new_attribute_name += "[#{@builder.lookup_model_names.second}_attributes]" if @builder.lookup_model_names.second
-      new_attribute_name + "[#{attribute_name}]"
+      # new_attribute_name = @builder.lookup_model_names.first.to_s
+      # new_attribute_name += "[#{@builder.lookup_model_names.second}_attributes]" if @builder.lookup_model_names.second
+      # new_attribute_name + "[#{attribute_name}]"
+      "#{@builder.object_name}[#{attribute_name}]"
     end
   end
 end