ui_bibz 2.5.2 → 3.0.0.alpha3

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

@@ -8,12 +8,11 @@ module UiBibzInputs
     def input_html_options
       opts = super
       input_classes = UiBibz::Utils::Screwdriver.join_classes(@builder.options[:input_html].try(:[], :class), options[:input_html].try(:[], :class), options[:class])
-      opts = opts.merge({ prompt: options[:prompt] })               unless options[:prompt].blank?
-      opts = opts.merge({ disabled: options[:disabled] })           unless options[:disabled].blank?
-      opts = opts.merge({ include_blank: options[:include_blank] }) unless options[:include_blank].blank?
-      opts = opts.merge({ multiple: options[:multiple] })           unless options[:multiple].blank?
-      opts = (@builder.options[:input_html] || {}).merge(options[:input_html] || {}).merge(opts || {}).merge({ class: input_classes })
-      opts
+      opts = opts.merge({ prompt: options[:prompt] })               if options[:prompt].present?
+      opts = opts.merge({ disabled: options[:disabled] })           if options[:disabled].present?
+      opts = opts.merge({ include_blank: options[:include_blank] }) if options[:include_blank].present?
+      opts = opts.merge({ multiple: options[:multiple] })           if options[:multiple].present?
+      (@builder.options[:input_html] || {}).merge(options[:input_html] || {}).merge(opts || {}).merge({ class: input_classes })
     end
 
     def new_options
@@ -57,9 +56,7 @@ module UiBibzInputs
     end
 
     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}]"
+      "#{@builder.object_name}[#{attribute_name}]"
     end
 
     def collection

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

@@ -22,7 +22,7 @@ module UiBibzInputs
     private
 
     def string?
-      input_type == :string
+      input_type == :string || input_type == :citext
     end
   end
 end

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module UiBibzInputs
+  class UiChoiceFieldInput < CollectionInput
+    include UiBibz::Ui::Core::Forms::Choices
+
+    def input(_wrapper_options)
+      UiBibz::Ui::Core::Forms::Choices::Choice.new(input_attribute_name, new_options, new_input_html_options).render
+    end
+
+    def new_input_html_options
+      input_html_options.merge({ checked: value.nil? ? false : value })
+    end
+
+    def value
+      @value ||= @builder.object.send(attribute_name)
+    end
+
+    def new_options
+      options.merge({ label: options[:old_label] || attribute_name.to_s.titleize })
+    end
+  end
+end

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

@@ -4,8 +4,9 @@ module UiBibzInputs
   class UiNumberFieldInput < UiTextFieldInput
     include UiBibz::Ui::Core::Forms::Numbers
 
-    def input(_wrapper_options)
-      UiBibz::Ui::Core::Forms::Numbers::NumberField.new(input_attribute_name, options, input_html_options).render
+    def input(wrapper_options)
+      merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
+      UiBibz::Ui::Core::Forms::Numbers::NumberField.new(input_attribute_name, options, merged_input_options).render
     end
   end
 end

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

@@ -2,8 +2,9 @@
 
 module UiBibzInputs
   class UiSelectFieldInput < CollectionInput
-    def input(_wrapper_options)
-      UiBibz::Ui::Core::Forms::Selects::SelectField.new(input_attribute_name, new_options, input_html_options).render
+    def input(wrapper_options)
+      merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
+      UiBibz::Ui::Core::Forms::Selects::SelectField.new(input_attribute_name, new_options, merged_input_options).render
     end
   end
 end

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

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module UiBibzInputs
+  class UiSliderFieldInput < UiTextFieldInput
+    include UiBibz::Ui::Core::Forms::Numbers
+
+    def input(_wrapper_options)
+      input_html_options[:id] = @builder.options[:html][:id]
+      UiBibz::Ui::Core::Forms::Numbers::SliderField.new(input_attribute_name, options, input_html_options).render
+    end
+  end
+end

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

@@ -4,8 +4,14 @@ module UiBibzInputs
   class UiTextFieldInput < StringInput
     include UiBibz::Ui::Core::Forms::Texts
 
-    def input(_wrapper_options)
-      UiBibz::Ui::Core::Forms::Texts::TextField.new(input_attribute_name, options, input_html_options).render
+    def input(wrapper_options)
+      unless string?
+        input_html_classes.unshift('string')
+        input_html_options[:type] ||= input_type if html5?
+      end
+
+      merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
+      UiBibz::Ui::Core::Forms::Texts::TextField.new(input_attribute_name, options, merged_input_options).render
     end
   end
 end

data/lib/ui_bibz/rails/engine.rb

@@ -1,10 +1,7 @@
 # frozen_string_literal: true
 
 # to load pagination in rails app
-require 'will_paginate'
-require 'jquery-rails'
-require 'popper_js'
-require 'bootstrap'
+require 'will_paginate' if system('gem list -i will_paginate', out: File::NULL)
 require 'simple_form' if system('gem list -i simple_form', out: File::NULL)
 
 module UiBibz
@@ -25,16 +22,8 @@ module UiBibz
         ActionView::Base.include UiBibzForm
       end
 
-      initializer 'font-awesome-sass.assets.precompile', group: :all do |app|
-        %w[eot svg ttf woff woff2].each do |ext|
-          app.config.assets.precompile << "fonts/fa-brands-400.#{ext}"
-          app.config.assets.precompile << "fonts/fa-regular-400.#{ext}"
-          app.config.assets.precompile << "fonts/fa-solid-900.#{ext}"
-        end
-      end
-
       config.after_initialize do
-        warn '[Ui Bibz] Ui Bibz is not configured in the application and will use the default values.' + ' Use `rails generate ui_bibz:install` to generate the Ui Bibz configuration.' unless UiBibz.configured?
+        warn '[Ui Bibz] Ui Bibz is not configured in the application and will use the default values. Use `rails generate ui_bibz:install` to generate the Ui Bibz configuration.' unless UiBibz.configured?
       end
     end
   end

data/lib/ui_bibz/railtie.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module UiBibz
+  class Railtie < ::Rails::Railtie
+  end
+end

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

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+module UiBibz::Ui::Concerns::CardItemableConcern #:nodoc:
+  extend ActiveSupport::Concern
+  include UiBibz::Ui::Concerns::HtmlConcern
+
+  included do
+    # Add Header which is a component
+    def header(content = nil, options = nil, html_options = nil, &block)
+      options, content = inherit_options(content, options, block)
+      @header = if tapped?(block)
+                  UiBibz::Ui::Core::Boxes::Components::CardHeader.new(content, options, html_options).tap(&block).render
+                else
+                  UiBibz::Ui::Core::Boxes::Components::CardHeader.new(content, options, html_options, &block).render
+                end
+    end
+
+    # Add Body div which is a component
+    def body(content = nil, options = nil, html_options = nil, &block)
+      options, content = inherit_options(content, options, block)
+      if tapped?(block)
+        content = (content || {}).merge(collapse: options.try(:[], :collapse), parent_collapse: @options[:parent_collapse])
+        @items << UiBibz::Ui::Core::Boxes::Components::CardBody.new(content, options, html_options).tap(&block).render
+      else
+        options = (options || {}).merge(collapse: options.try(:[], :collapse), parent_collapse: @options[:parent_collapse])
+        @items << UiBibz::Ui::Core::Boxes::Components::CardBody.new(content, options, html_options, &block).render
+      end
+    end
+
+    # Add Footer which is a component
+    def footer(content = nil, options = nil, html_options = nil, &block)
+      options, content = inherit_options(content, options, block)
+      @footer = UiBibz::Ui::Core::Boxes::Components::CardFooter.new(content, options, html_options, &block).render
+    end
+
+    # Add List group which is a component
+    def list_group(content = nil, options = nil, html_options = nil, &block)
+      @items << UiBibz::Ui::Core::Boxes::Components::CardListGroup.new(content, options, html_options).tap(&block).render
+    end
+
+    # Add Image which is a component
+    def image(content = nil, options = nil, html_options = nil, &block)
+      @items << UiBibz::Ui::Core::Boxes::Components::CardImage.new(content, options, html_options, &block).render
+    end
+
+    # Add a row whih is a component
+    def row(content = nil, options = nil, html_options = nil, &block)
+      options, content = inherit_options(content, options, block)
+      @items << if tapped?(block)
+                  UiBibz::Ui::Core::Boxes::Components::CardRow.new(content, options, html_options).tap(&block).render
+                else
+                  UiBibz::Ui::Core::Boxes::Components::CardRow.new(content, options, html_options, &block).render
+                end
+    end
+
+    def inherit_options(content, options, block)
+      if block.nil?
+        options = (options || {}).merge({ outline: @options[:outline], status: @options[:status] })
+      else
+        content = (content || {}).merge({ outline: @options[:outline], status: @options[:status] })
+      end
+      [options, content]
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module UiBibz::Ui::Concerns::HtmlConcern #:nodoc:
+  extend ActiveSupport::Concern
+
+  included do
+    def html(content = nil, &block)
+      if !block.nil?
+        context = eval('self', block.binding) # rubocop:disable Style/EvalWithLocation
+        @items << context.capture(&block)
+      else
+        @items << content
+      end
+    end
+  end
+end

data/lib/ui_bibz/ui/core/boxes/card.rb

@@ -5,11 +5,11 @@ require 'ui_bibz/ui/core/boxes/components/card_footer'
 require 'ui_bibz/ui/core/boxes/components/card_body'
 require 'ui_bibz/ui/core/boxes/components/card_image'
 require 'ui_bibz/ui/core/boxes/components/card_list_group'
+require 'ui_bibz/ui/core/boxes/components/card_row'
 module UiBibz::Ui::Core::Boxes
   # Create a card
   #
   # This element is an extend of UiBibz::Ui::Core::Component.
-  # You can use tap method to add header, body or footer element.
   #
   # ==== Attributes
   #
@@ -67,7 +67,7 @@ module UiBibz::Ui::Core::Boxes
   #     content
   #   end
   #
-  #   card(options = { tap: true }, html_options = {}) do |p|
+  #   card(options = {}, html_options = {}) do |p|
   #     p.header(content, options = {}, html_options = {})
   #     # or
   #     p.header(options = {}, html_options = {}) do
@@ -88,50 +88,14 @@ module UiBibz::Ui::Core::Boxes
   #   end
   #
   class Card < UiBibz::Ui::Core::Component
+    include UiBibz::Ui::Concerns::CardItemableConcern
+
     # See UiBibz::Ui::Core::Component.initialize
     def initialize(content = nil, options = nil, html_options = nil, &block)
       super
       @items = @content.nil? ? [] : [UiBibz::Ui::Core::Boxes::Components::CardBody.new(@content).render]
     end
 
-    # Add Header which is a component
-    def header(content = nil, options = nil, html_options = nil, &block)
-      options, content = inherit_options(content, options, block)
-      @header = if tap?(content, options)
-                  UiBibz::Ui::Core::Boxes::Components::CardHeader.new(content, options, html_options).tap(&block).render
-                else
-                  UiBibz::Ui::Core::Boxes::Components::CardHeader.new(content, options, html_options, &block).render
-                end
-    end
-
-    # Add Body div which is a component
-    def body(content = nil, options = nil, html_options = nil, &block)
-      options, content = inherit_options(content, options, block)
-      if tap?(content, options)
-        content = (content || {}).merge(collapse: options.try(:[], :collapse), parent_collapse: @options[:parent_collapse])
-        @items << UiBibz::Ui::Core::Boxes::Components::CardBody.new(content, options, html_options).tap(&block).render
-      else
-        options = (options || {}).merge(collapse: options.try(:[], :collapse), parent_collapse: @options[:parent_collapse])
-        @items << UiBibz::Ui::Core::Boxes::Components::CardBody.new(content, options, html_options, &block).render
-      end
-    end
-
-    # Add Footer which is a component
-    def footer(content = nil, options = nil, html_options = nil, &block)
-      options, content = inherit_options(content, options, block)
-      @footer = UiBibz::Ui::Core::Boxes::Components::CardFooter.new(content, options, html_options, &block).render
-    end
-
-    # Add List group which is a component
-    def list_group(content = nil, options = nil, html_options = nil, &block)
-      @items << UiBibz::Ui::Core::Boxes::Components::CardListGroup.new(content, options, html_options).tap(&block).render
-    end
-
-    # Add Image which is a component
-    def image(content = nil, options = nil, html_options = nil, &block)
-      @items << UiBibz::Ui::Core::Boxes::Components::CardImage.new(content, options, html_options, &block).render
-    end
-
     # Render html tag
     def pre_render
       content_tag :div, html_structure, html_options
@@ -143,15 +107,6 @@ module UiBibz::Ui::Core::Boxes
       [@header, @items.join, @footer].compact.join.html_safe
     end
 
-    def inherit_options(content, options, block)
-      if block.nil?
-        options = (options || {}).merge({ outline: @options[:outline], status: @options[:status] })
-      else
-        content = (content || {}).merge({ outline: @options[:outline], status: @options[:status] })
-      end
-      [options, content]
-    end
-
     def component_html_classes
       ['card', text, type, tab_pane, outline]
     end
@@ -169,7 +124,7 @@ module UiBibz::Ui::Core::Boxes
     end
 
     def card_block
-      'card-block' if !@options[:block].nil? || @options[:tap].nil?
+      'card-block' if !@options[:block].nil? || @tapped
     end
 
     def type

data/lib/ui_bibz/ui/core/boxes/card_accordion.rb

@@ -31,6 +31,8 @@ module UiBibz::Ui::Core::Boxes
   #   end.render
   #
   class CardAccordion < UiBibz::Ui::Core::Component
+    include UiBibz::Ui::Concerns::HtmlConcern
+
     # See UiBibz::Ui::Core::Component.initialize
     def initialize(content = nil, options = nil, html_options = nil, &block)
       super

data/lib/ui_bibz/ui/core/boxes/card_column.rb

@@ -31,6 +31,8 @@ module UiBibz::Ui::Core::Boxes
   #   end.render
   #
   class CardColumn < UiBibz::Ui::Core::Component
+    include UiBibz::Ui::Concerns::HtmlConcern
+
     # See UiBibz::Ui::Core::Component.initialize
     def initialize(content = nil, options = nil, html_options = nil, &block)
       super
@@ -43,7 +45,7 @@ module UiBibz::Ui::Core::Boxes
     end
 
     def card(content = nil, options = nil, html_options = nil, &block)
-      @items << if tap? content, options
+      @items << 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

data/lib/ui_bibz/ui/core/boxes/card_deck.rb

@@ -31,6 +31,8 @@ module UiBibz::Ui::Core::Boxes
   #   end.render
   #
   class CardDeck < UiBibz::Ui::Core::Component
+    include UiBibz::Ui::Concerns::HtmlConcern
+
     # See UiBibz::Ui::Core::Component.initialize
     def initialize(content = nil, options = nil, html_options = nil, &block)
       super
@@ -45,7 +47,7 @@ module UiBibz::Ui::Core::Boxes
     end
 
     def card(content = nil, options = nil, html_options = nil, &block)
-      @items << if tap? content, options
+      @items << 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

data/lib/ui_bibz/ui/core/boxes/card_grid.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module UiBibz::Ui::Core::Boxes
+  # Create a card grid
+  #
+  # ==== 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::CardGrid.new(content, options = nil, html_options = nil)
+  #
+  #   UiBibz::Ui::Core::Boxes::CardGrid.new(options = nil, html_options = nil) do |cg|
+  #     cg.card content, options, html_options, &block
+  #   end
+  #
+  # ==== Examples
+  #
+  #   UiBibz::Ui::Core::Boxes::CardGrid.new do |cg|
+  #     cg.card 'Exemple 1'
+  #     cg.card 'Exemple 2'
+  #     cg.card 'Exemple 3'
+  #   end.render
+  #
+  class CardGrid < UiBibz::Ui::Core::Layouts::Row
+    include UiBibz::Ui::Concerns::HtmlConcern
+
+    # See UiBibz::Ui::Core::Component.initialize
+    def initialize(content = nil, options = nil, html_options = nil, &block)
+      super
+    end
+
+    # Render html tag
+    def pre_render
+      content_tag :div, @items.join.html_safe, html_options
+    end
+
+    def card(content = nil, options = nil, html_options = nil, &block)
+      @items << content_tag(:div, 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
+                                  end, class: 'col')
+    end
+
+    private
+
+    def component_html_classes
+      super << 'card-grid'
+    end
+  end
+end