ui_bibz 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8e5cc80794cc21d792fa246f74909176423e213
-  data.tar.gz: bc903615fd2bb0eb6e1fb921302dea8489353887
+  metadata.gz: d5c8ee009ca6a7751e3c7201b975e3943acb6065
+  data.tar.gz: c87cd2632f56a8e05db95992200aa3936229c904
 SHA512:
-  metadata.gz: 01e1525f051b376f294449d02c49b1d35f26c37ab0de6e0262046dba3b95f960bf7f60b0a27d4140ce33249d6807dbb932359a092f51dabd3d3825d00ebb5a53
-  data.tar.gz: f838abaffe37a46c3649328163c995b55305a3cc02807a00bc237ef2c996764323c467c56a803973568b47f3b077f6732d3607389ded84c104758c664da20186
+  metadata.gz: d2aa81787c42ae4e542c818dc55bb0aa2ecfc1abd42b1411d11e8bc38e33dbda3e2e9beebf12af73bd8704d987bb7d3400c0feb39e483f9e118c5cadf0762a2e
+  data.tar.gz: 64c48f832fc4ee7e25ee964ecf8b3fe0e8349b31b0bd3a4125a3ee7199d9034e67fd2d67859f75986092da436cc091d882e0b6fd1d005f60a7c3589552502d25

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    ui_bibz (2.1.2)
-      bootstrap (= 4.1.1)
+    ui_bibz (2.1.3)
+      bootstrap (= 4.1.3)
       haml
       haml-rails
       jquery-rails (>= 3.1.0)
@@ -57,20 +57,20 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     arel (9.0.0)
-    autoprefixer-rails (9.1.4)
+    autoprefixer-rails (9.3.1)
       execjs
     awesome_print (1.8.0)
-    bootstrap (4.1.1)
+    bootstrap (4.1.3)
       autoprefixer-rails (>= 6.0.3)
       popper_js (>= 1.12.9, < 2)
       sass (>= 3.5.2)
     builder (3.2.3)
     byebug (10.0.2)
-    codeclimate-test-reporter (1.0.8)
-      simplecov (<= 0.13)
-    concurrent-ruby (1.0.5)
+    codeclimate-test-reporter (1.0.7)
+      simplecov
+    concurrent-ruby (1.1.3)
     crass (1.0.4)
-    docile (1.1.5)
+    docile (1.3.1)
     erubi (1.7.1)
     erubis (2.7.0)
     execjs (2.7.0)
@@ -96,21 +96,21 @@ GEM
       haml (>= 4.0, < 6)
       nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
-    i18n (1.1.0)
+    i18n (1.1.1)
       concurrent-ruby (~> 1.0)
     jquery-rails (4.3.3)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (2.1.0)
-    loofah (2.2.2)
+    loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.0)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
-    method_source (0.9.0)
+    method_source (0.9.1)
     mimemagic (0.3.2)
     mini_mime (1.0.1)
     mini_portile2 (2.3.0)
@@ -119,7 +119,7 @@ GEM
     nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
     popper_js (1.14.3)
-    rack (2.0.5)
+    rack (2.0.6)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails (5.2.1)
@@ -152,7 +152,7 @@ GEM
       ffi (>= 0.5.0, < 2)
     ruby_parser (3.11.0)
       sexp_processor (~> 4.9)
-    sass (3.6.0)
+    sass (3.7.1)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -167,8 +167,8 @@ GEM
     simple_form (4.0.1)
       actionpack (>= 5.0)
       activemodel (>= 5.0)
-    simplecov (0.13.0)
-      docile (~> 1.1.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)

data/app/assets/stylesheets/_panel.scss

@@ -47,7 +47,7 @@
   }
 
   // Select last panel-toolbar
-  > .panel-toolbar:nth-last-child(2), .panel-toolbar:nth-last-child(1){
+  > .panel-toolbar:nth-last-child{
     border-bottom: none;
   }
 }
@@ -93,7 +93,7 @@
   border-bottom: $panel-border-width solid $panel-border-color;
   display: flex;
 
-  div {
+  > div:not(.dropdown) {
     position: relative;
     display: inline-flex;
     vertical-align: middle;

data/app/assets/stylesheets/fix_addon.sass

@@ -94,12 +94,19 @@ $input-group-btn-border-color: $input-border-color
     font-size: $font-size-sm
     @include border-radius($input-border-radius-sm)
 
+    svg
+      font-size: 1rem
+      margin-top: 0.1rem
+
 
   &.form-control-lg
     padding: $input-btn-padding-y-lg $input-btn-padding-x-lg
     font-size: $font-size-lg
     @include border-radius($input-border-radius-lg)
 
+  svg
+    font-size: 1.3rem
+
 
   // scss-lint:disable QualifyingElement
   // Nuke default margins from checkboxes and radios to vertically center within.

data/app/assets/stylesheets/navigations.sass

@@ -12,3 +12,6 @@
 
 .nav-link
   cursor: pointer
+
+.btn-toolbar form
+  display: inline-flex

data/app/assets/stylesheets/notifications.sass

@@ -22,3 +22,6 @@
 .fal,
 .fab
   line-height: 0.7 !important
+
+span:not(.input-group-addon) .glyph
+  margin-top: -0.1rem

data/lib/ui_bibz/infos.rb

@@ -1,9 +1,9 @@
 module UiBibz
   NAME                = "Ui Bibz"
-  VERSION             = "2.1.2"
+  VERSION             = "2.1.3"
   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."
   LICENSE             = "MIT"
-  FONTAWESOME_VERSION = "5.3.1"
-  BOOTSTRAP_VERSION   = "4.1.1"
+  FONTAWESOME_VERSION = "5.5.0"
+  BOOTSTRAP_VERSION   = "4.1.3"
 end

data/lib/ui_bibz/ui/core/forms/buttons/button_group.rb

@@ -92,6 +92,10 @@ module UiBibz::Ui::Core::Forms::Buttons
       @items << UiBibz::Ui::Core::Component.new(content, options, html_options, &block).render
     end
 
+    def choice_group content = nil, options = nil, html_options = nil, &block
+      @items << UiBibz::Ui::Core::Forms::Choices::ChoiceGroup.new(content, options, html_options).tap(&block).render
+    end
+
   private
 
     def component_html_classes

data/lib/ui_bibz/ui/core/forms/choices/checkbox_field.rb

@@ -58,14 +58,15 @@ module UiBibz::Ui::Core::Forms::Choices
   private
 
     def checkbox_field_html_tag
-      content_tag :div, html_options.except(:id) do
+      options[:action] = html_options[:data].delete(:action)
+      content_tag :div, html_options.except(:id, "data-action") do
         concat check_box_tag content, options[:value], options[:checked] || false, checkbox_html_options
         concat label_tag label_name, label_content, label_html_options
       end
     end
 
     def checkbox_html_options
-      { class: 'form-check-input', disabled: options[:state] == :disabled }
+      { class: 'form-check-input', disabled: options[:state] == :disabled, "data-action": options[:action] }
     end
 
     def label_name

data/lib/ui_bibz/ui/core/forms/choices/choice_group.rb

@@ -65,7 +65,7 @@ module UiBibz::Ui::Core::Forms::Choices
     private
 
     def component_html_classes
-      super << ['button-choice', "btn-group-toggle"]
+      super << ['button-choice', "btn-group-toggle", options.delete(:class)]
     end
 
     def component_html_options

data/lib/ui_bibz/ui/core/forms/dropdowns/dropdown.rb

@@ -110,7 +110,7 @@ module UiBibz::Ui::Core::Forms::Dropdowns
     end
 
     def button_content
-      [glyph_with_space, @content, ' ', caret].compact.join.html_safe
+      [glyph_and_content_html(options[:text].nil? ? @content : ''), ' ', caret].compact.join.html_safe
     end
 
     def button_html

data/lib/ui_bibz/ui/core/icons/star.rb

@@ -69,8 +69,8 @@ module UiBibz::Ui::Core::Icons
       stars = []
       number.times do |star|
         star += 1
-        name = star_name(star)
-        stars << UiBibz::Ui::Core::Icons::Glyph.new(name, glyph_opts).render
+        star_options = star_name(star).merge(glyph_opts)
+        stars << UiBibz::Ui::Core::Icons::Glyph.new(star_options).render
       end
       stars
     end
@@ -84,11 +84,11 @@ module UiBibz::Ui::Core::Icons
 
     def star_name star
       if star <= content
-        'star'
+        { name: 'star', style: :solid }
       elsif star > content && !content.is_a?(Integer) && star < content + 1
-        'star-half-o'
+        { name: 'star-half-alt', style: :solid }
       else
-        'star-o'
+        { name: 'star', style: :regular }
       end
     end
 

data/lib/ui_bibz/ui/core/navigations/components/toolbar_form.rb

@@ -0,0 +1,93 @@
+require 'haml'
+module UiBibz::Ui::Core::Navigations
+
+  # Create a ToolbarForm
+  #
+  # This element is an extend of ActionView::Helpers::FormHelper::FormFor to Rails
+  #
+  # ==== 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:
+  #
+  #   http://api.rubyonrails.org/classes/ActionView/Helpers/FormHelper.html#method-i-form_for
+  #   # and
+  #   http://api.rubyonrails.org/classes/ActionView/Helpers/FormTagHelper.html#method-i-form_tag
+  #
+  # ==== Signatures
+  #
+  #   UiBibz::Ui::Core::Navigations::ToolbarForm.new(options = nil, html_options = nil) do |f|
+  #     f.text_field :field
+  #     f.submit 'Submit'
+  #   end
+  #
+  # ==== Examples
+  #
+  #   UiBibz::Ui::Core::Navigations::ToolbarForm.new(position: :right) do |f|
+  #     f.text_field :field
+  #     f.submit 'Submit'
+  #   end.render
+  #
+  #   UiBibz::Ui::Core::Navigations::ToolbarForm.new('/search', type: :form_tag) do
+  #     text_field_tag :field
+  #     submit_tag 'Submit'
+  #   end.render
+  #
+  class ToolbarForm < UiBibz::Ui::Base
+    include Haml::Helpers
+    include SimpleForm::ActionViewExtensions::FormHelper if defined?(SimpleForm)
+    include UiBibz::Helpers::UtilsHelper
+    include ActionView::Helpers
+
+    attr_accessor :html_options
+
+    def initialize model_or_url, options = {}, &block
+      init_haml_helpers
+      @content      = block
+      @model_or_url = model_or_url
+      @options      = options
+      @html_options = !%i(form_for ui_form_for).include?(type) ? html_options_for_form(@model_or_url, new_option)  : new_option
+    end
+
+    # Render html tag
+    def render
+      case type
+      when :form_for
+        @form = form_for(@model_or_url, html_options, &@content)
+      when :ui_form_for
+        begin
+          @form = ui_form_for(@model_or_url, html_options, &@content)
+        ## rescue
+          ## raise 'You must install simple form to use ui_form_for.'
+        end
+      else
+        @form = form_tag_with_body(html_options, capture(&@content))
+      end
+    end
+
+  private
+
+    def new_option
+      (@options || {}).merge({ class: UiBibz::Utils::Screwdriver.join_classes("btn-group", @options[:class]) })
+    end
+
+    def protect_against_forgery?
+      false
+    end
+
+    def url
+      @options[:url]
+    end
+
+    def type
+      @options[:type] || :form_for
+    end
+
+  end
+end

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

@@ -1,3 +1,4 @@
+require 'ui_bibz/ui/core/navigations/components/toolbar_form'
 module UiBibz::Ui::Core::Navigations
 
   # Create a toolbar
@@ -70,7 +71,13 @@ module UiBibz::Ui::Core::Navigations
 
     def spacer num = "auto"
       kls = "mr-#{ num }"
-      @items.last.html_options[:class] = @items.last.html_options[:class].nil? ? kls : join_classes(@items.last.html_options[:class], kls)
+      @items.last.html_options["class"] = join_classes(@items.last.html_options.delete(:class), @items.last.html_options[:class], kls)
+    end
+
+    # Add navbar form items
+    # See UiBibz::Ui::Core::ToolbarForm
+    def form model_or_url, options = {}, &block
+      @items << UiBibz::Ui::Core::Navigations::ToolbarForm.new(model_or_url, options, &block)
     end
 
   private

data/lib/ui_bibz/ui/ux/containers/components/panel_header.rb

@@ -1,3 +1,4 @@
+require 'ui_bibz/ui/ux/containers/components/panel_tab_group'
 module UiBibz::Ui::Ux::Containers::Components
 
   # Create a panel header
@@ -52,6 +53,14 @@ module UiBibz::Ui::Ux::Containers::Components
       @actions = UiBibz::Ui::Core::Forms::Buttons::ButtonGroup.new(content, options, html_options).tap(&block).render
     end
 
+    def tab_group content = nil, options = nil, html_options = nil, &block
+      if is_tap(content, options)
+        @content = PanelTabGroup.new(content, options, html_options).tap(&block).render
+      else
+        @content = PanelTabGroup.new(content, options, html_options, &block).render
+      end
+    end
+
     private
 
     def component_html_classes

data/lib/ui_bibz/ui/ux/containers/components/panel_tab_group.rb

@@ -0,0 +1,45 @@
+module UiBibz::Ui::Ux::Containers::Components
+
+  # Create a card body
+  #
+  # ==== 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:
+  #
+  # ==== Signatures
+  #
+  #   UiBibz::Ui::Core::Boxes::PanelBody.new(content, options = nil, html_options = nil)
+  #
+  #   UiBibz::Ui::Core::Boxes::PanelBody.new(options = nil, html_options = nil) do
+  #     content
+  #   end
+  #
+  # ==== Examples
+  #
+  #   UiBibz::Ui::Core::Boxes::PanelBody.new.render
+  #
+  #   UiBibz::Ui::Core::Boxes::PanelBody.new do
+  #     'Exemple'
+  #   end.render
+  #
+  class PanelTabGroup < UiBibz::Ui::Core::Navigations::TabGroup
+
+    def initialize content = nil, options = nil, html_options = nil, &block
+      super
+    end
+
+  private
+
+    def component_html_classes
+      super << "panel-header-tabs"
+    end
+
+  end
+end

data/test/factories/user.rb

@@ -1,9 +1,9 @@
 FactoryBot.define do
   factory :user do
-    name_fr "Name fr"
-    name_en "Name en"
-    body_fr "Body fr"
-    body_en "Body en"
-    active  true
+    name_fr { "Name fr" }
+    name_en { "Name en" }
+    body_fr { "Body fr" }
+    body_en { "Body en" }
+    active  { true }
   end
 end