ui_bibz 2.0.0.beta2.6 → 2.0.0

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

@@ -61,4 +61,8 @@ module UiBibz::Helpers::Ui::UxHelper
     end
   end
 
+  def ui_panel content = nil, options = nil, html_options = nil, &block
+    UiBibz::Ui::Ux::Containers::Panel.new(content, options, html_options).tap(&block).render
+  end
+
 end

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

@@ -0,0 +1,38 @@
+module UiBibzForm
+  if defined?(SimpleForm)
+    class UiBibzFormBuilder < SimpleForm::FormBuilder
+      include ActionView::Helpers::TagHelper
+      include ActionView::Helpers::TextHelper
+      include UiBibz::Utils
+
+      attr_accessor :output_buffer
+
+      def ui_surround_field 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('form-group', 'surround_field', 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::Surrounds::SurroundField.new(content, opts, html_options).tap(&block).render
+        end
+      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
+      end
+
+    end
+  end
+end

data/{app → lib/ui_bibz}/inputs/ui_bibz_inputs/collection_input.rb

@@ -17,17 +17,21 @@ module UiBibzInputs
     def new_options
       label_method, value_method = detect_collection_methods
 
-      if options[:grouped] == true
-        options.merge({ option_tags: option_groups_from_collection_for_select(
-          grouped_collection,
-          group_method, group_label_method,
-          value_method, label_method,
-          new_value
-        )})
+      if options[:option_tags].nil?
+        if options[:grouped] == true
+          options.merge({ option_tags: option_groups_from_collection_for_select(
+            grouped_collection,
+            group_method, group_label_method,
+            value_method, label_method,
+            new_value
+          )})
+        else
+          options.merge({ option_tags: options_from_collection_for_select(
+            collection, value_method, label_method, new_value
+          )})
+        end
       else
-        options.merge({ option_tags: options_from_collection_for_select(
-          collection, value_method, label_method, new_value
-        )})
+        options
       end
     end
 
@@ -51,7 +55,7 @@ module UiBibzInputs
     end
 
     def input_attribute_name
-      "#{ @builder.object.class.to_s.underscore }[#{ attribute_name }]"
+      "#{ @builder.object.class.to_s.parameterize.underscore }[#{ attribute_name }]"
     end
 
     def collection

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

@@ -0,0 +1,10 @@
+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
+    end
+
+  end
+end

data/lib/ui_bibz/rails/engine.rb

@@ -4,15 +4,7 @@ require 'jquery-rails'
 require 'popper_js'
 require 'bootstrap'
 require "font-awesome-sass"
-
-# Javascript requires
-#require 'rails-assets-tether'
-#require 'rails-assets-bootstrap-datepicker'
-#require 'rails-assets-bootstrap-select'
-#
-# not compatible with boostrap 4
-#require 'rails-assets-bootstrap-switch'
-#require 'rails-assets-bootstrap-multiselect'
+require 'simple_form' if system('gem list -i simple_form')
 
 module UiBibz
   module Rails
@@ -26,6 +18,8 @@ module UiBibz
         ActionView::Base.send :include, UiBibz::Helpers::Ui::UxHelper
       end
 
+      config.autoload_paths += Dir["#{config.root}/lib/ui_bibz/inputs/**/"] if defined?(::SimpleForm)
+
     end
   end
 end

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

@@ -127,7 +127,7 @@ module UiBibz::Ui::Core::Boxes
     end
 
     # Render html tag
-    def render
+    def pre_render
       content_tag :div, html_structure, html_options
     end
 

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

@@ -38,7 +38,7 @@ module UiBibz::Ui::Core::Boxes
     end
 
     # Render html tag
-    def render
+    def pre_render
       content_tag :div, @items.join.html_safe, html_options
     end
 

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

@@ -38,7 +38,7 @@ module UiBibz::Ui::Core::Boxes
     end
 
     # Render html tag
-    def render
+    def pre_render
       content_tag :div, html_options do
         content_tag :div, @items.join.html_safe, class: 'card-deck'
       end

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

@@ -38,7 +38,7 @@ module UiBibz::Ui::Core::Boxes
     end
 
     # Render html tag
-    def render
+    def pre_render
       content_tag :div, @items.join.html_safe, html_options
     end
 

data/lib/ui_bibz/ui/core/boxes/components/body/card_body_link.rb

@@ -37,7 +37,7 @@ module UiBibz::Ui::Core::Boxes::Components::Body
     end
 
     # Render html tag
-    def render
+    def pre_render
       link_to content, options[:url], html_options
     end
 

data/lib/ui_bibz/ui/core/boxes/components/body/card_body_text.rb

@@ -37,7 +37,7 @@ module UiBibz::Ui::Core::Boxes::Components::Body
     end
 
     # Render html tag
-    def render
+    def pre_render
       content_tag :p, content.html_safe, html_options
     end
 

data/lib/ui_bibz/ui/core/boxes/components/body/card_body_title.rb

@@ -37,7 +37,7 @@ module UiBibz::Ui::Core::Boxes::Components::Body
     end
 
     # Render html tag
-    def render
+    def pre_render
       content_tag :h4, content, html_options
     end
 

data/lib/ui_bibz/ui/core/boxes/components/card_body.rb

@@ -41,7 +41,7 @@ module UiBibz::Ui::Core::Boxes::Components
     end
 
     # Render html tag
-    def render
+    def pre_render
       content_tag :div, @items.join.html_safe, html_options
     end
 

data/lib/ui_bibz/ui/core/boxes/components/card_footer.rb

@@ -37,7 +37,7 @@ module UiBibz::Ui::Core::Boxes::Components
     end
 
     # Render html tag
-    def render
+    def pre_render
       content_tag :div, glyph_and_content_html, html_options
     end
 

data/lib/ui_bibz/ui/core/boxes/components/card_header.rb

@@ -37,7 +37,7 @@ module UiBibz::Ui::Core::Boxes::Components
     end
 
     # Render html tag
-    def render
+    def pre_render
       content_tag :div, glyph_and_content_html, html_options
     end
 

data/lib/ui_bibz/ui/core/boxes/components/card_image.rb

@@ -39,7 +39,7 @@ module UiBibz::Ui::Core::Boxes::Components
     end
 
     # Render html tag
-    def render
+    def pre_render
       #image_tag asset_path("assets/#{content}"), html_options
       image_tag content, html_options
     end

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

@@ -48,7 +48,7 @@ module UiBibz::Ui::Core::Boxes
     end
 
     # Render html tag
-    def render
+    def pre_render
       content_tag :div, html_options do
         if fluid
           UiBibz::Ui::Core::Layouts::Container.new(content).render

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

@@ -52,8 +52,13 @@ module UiBibz::Ui::Core
     def initialize content = nil, options = nil, html_options = nil, &block
       if !block.nil?
         @html_options, @options = options, content
-        context  = eval("self", block.binding)
-        @content = context.capture(&block)
+        read_cache = Rails.cache.read(@options.try(:[], :cache))
+        if read_cache.nil?
+          context  = eval("self", block.binding)
+          @content = context.capture(&block)
+        else
+          @content = read_cache
+        end
       else
         if content.kind_of?(Hash)
           @html_options, @options = options, content
@@ -67,8 +72,13 @@ module UiBibz::Ui::Core
       init_component_html_options
     end
 
-    # Render html tag
+    # Render html tag with or without cache
     def render
+      render_with_or_without_cache
+    end
+
+    # Render without cache
+    def pre_render
       glyph_and_content_html
     end
 
@@ -87,6 +97,12 @@ module UiBibz::Ui::Core
 
     # Override this method to add html data
     def component_html_data
+      # To stimulusjs
+      add_html_data :target, options.try(:delete, :target)
+      add_html_data :controller, options.try(:delete, :controller)
+      add_html_data :action, options.try(:delete, :action)
+      # To turbolinks
+      add_html_data :turbolinks, options.try(:delete, :turbolinks)
     end
 
     # Override this method to add html Options
@@ -115,6 +131,21 @@ module UiBibz::Ui::Core
 
   private
 
+    def render_with_or_without_cache
+      if options[:cache]
+        cache      = Rails.cache
+        read_cache = cache.read(options[:cache])
+        if read_cache
+          read_cache
+        else
+          cache.write(options[:cache], pre_render)
+          pre_render
+        end
+      else
+        pre_render
+      end
+    end
+
     def init_options
       @options = component_options.merge(@options)
     end

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

@@ -57,7 +57,7 @@ module UiBibz::Ui::Core::Forms::Buttons
     end
 
     # Render html tag
-    def render
+    def pre_render
       button_html_tag
     end
 
@@ -65,7 +65,7 @@ module UiBibz::Ui::Core::Forms::Buttons
 
     def button_html_tag
       content_tag :button, html_options do
-        concat glyph_and_content_html(options[:text].nil? ? @content : ' ')
+        concat glyph_and_content_html(options[:text].nil? ? @content : '')
         concat badge_html unless options[:badge].nil?
       end
     end
@@ -78,11 +78,15 @@ module UiBibz::Ui::Core::Forms::Buttons
       opts = super
       opts = opts.merge(toggle)                   unless options[:toggle].nil?
       opts = opts.merge(active_html_options)      if options[:state] == :active
-      opts = opts.merge(html_title)               if options[:text] == false
       opts = opts.merge({ disabled: 'disabled' }) if options[:state] == :disabled
       opts
     end
 
+    def component_html_data
+      super
+      action
+    end
+
     def status
       ["btn", outline, options[:status]].compact.join('-')
     end
@@ -91,10 +95,6 @@ module UiBibz::Ui::Core::Forms::Buttons
       "outline" unless options[:outline].nil?
     end
 
-    def html_title
-      { title: content }
-    end
-
     def toggle
       { "data-toggle" => 'button', "aria-pressed" => false, "autocomplete" => "off" }
     end
@@ -111,6 +111,10 @@ module UiBibz::Ui::Core::Forms::Buttons
       "without-text" unless options[:text].nil?
     end
 
+    def action
+      add_html_data('action', options[:action]) unless options[:action].nil?
+    end
+
     def badge_html
       if options[:badge].kind_of? Hash
         options[:badge][:status] = options[:badge][:status] || options[:status] || :secondary

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

@@ -51,7 +51,7 @@ module UiBibz::Ui::Core::Forms::Buttons
     end
 
     # Render html tag
-    def render
+    def pre_render
       content_tag :div, @items.join.html_safe, html_options
     end
 
@@ -86,6 +86,10 @@ module UiBibz::Ui::Core::Forms::Buttons
       @items << @options[:form].input(attribute_name, options.merge({ label: false, wrapper: false }), &block)
     end
 
+    def html content = nil, options = nil, html_options = nil, &block
+      @items << UiBibz::Ui::Core::Component.new(content, options, html_options, &block).render
+    end
+
   private
 
     def component_html_classes

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

@@ -59,7 +59,7 @@ module UiBibz::Ui::Core::Forms::Buttons
     end
 
     # Render html tag
-    def render
+    def pre_render
       button_link_html_tag
     end
 

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

@@ -56,7 +56,7 @@ module UiBibz::Ui::Core::Forms::Buttons
       super
     end
 
-    def render
+    def pre_render
       button_refresh_html_tag
     end
 
@@ -68,7 +68,7 @@ module UiBibz::Ui::Core::Forms::Buttons
 
     def component_options
       options[:connect] = cnt_opts
-      super.merge({ glyph: 'refresh', status: options[:status] })
+      super.merge({ glyph: 'sync-alt', status: options[:status] })
     end
 
     def component_html_classes