ui_bibz 2.0.0.alpha24 → 2.0.0.alpha26

data/app/inputs/custom_inputs/switch_input.rb

@@ -1,10 +1,10 @@
 module CustomInputs
   class SwitchInput < SimpleForm::Inputs::Base
-    include UiBibz::Ui::Core::Inputs
+    include UiBibz::Ui::Core::Forms::Choices
 
     def input(wrapper_options)
       options = @options.merge({ builder: @builder })
-      UiBibz::Ui::Core::Inputs::SwitchField.new(attribute_name, options, input_html_options).render
+      UiBibz::Ui::Core::Forms::Choices::SwitchField.new(attribute_name, options, input_html_options).render
     end
 
   end

data/config/initializers/will_paginate.rb

@@ -0,0 +1,79 @@
+require 'will_paginate/view_helpers/action_view'
+
+module WillPaginate
+  module ActionView
+    def will_paginate(collection = nil, options = {})
+      options, collection = collection, nil if collection.is_a? Hash
+      collection ||= infer_collection_from_controller
+
+      options = options.symbolize_keys
+      options[:renderer] ||= BootstrapLinkRenderer
+      options[:previous_label] = '«'
+      options[:next_label] = '»'
+      options[:inner_window] = 2
+
+      super(collection, options)
+    end
+
+    class BootstrapLinkRenderer < LinkRenderer
+      ELLIPSIS = '&hellip;'
+
+      def to_html
+        list_items = pagination.map do |item|
+          case item
+            when Fixnum
+              page_number(item)
+            else
+              send(item)
+          end
+        end.join(@options[:link_separator])
+
+        list_wrapper = tag :ul, list_items, class: 'pagination', role: 'group'
+        tag :nav, list_wrapper, class: @options[:class]
+      end
+
+      def container_attributes
+        super.except(*[:link_options])
+      end
+
+      protected
+
+      def page_number(page)
+        link_options = @options[:link_options] || {}
+
+        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)
+          tag :li, link(page, page, link_options), class: 'page-item'
+        end
+      end
+
+      def previous_or_next_page(page, text, classname)
+        link_options = @options[:link_options] || {}
+
+        if page
+          link_wrapper = link(text, page, link_options.merge(class: 'page-link'))
+          tag :li, link_wrapper, class: '%s page-item' % classname
+        else
+          span_wrapper = tag(:span, text, class: 'page-link')
+          tag :li, span_wrapper, class: '%s page-item disabled' % classname
+        end
+      end
+
+      def gap
+        tag :li, tag(:i, ELLIPSIS, class: 'page-link'), class: 'page-item disabled'
+      end
+
+      def previous_page
+        num = @collection.current_page > 1 && @collection.current_page - 1
+        previous_or_next_page num, @options[:previous_label], 'previous'
+      end
+
+      def next_page
+        num = @collection.current_page < @collection.total_pages && @collection.current_page + 1
+        previous_or_next_page num, @options[:next_label], 'next'
+      end
+    end
+  end
+end

data/lib/ui_bibz.rb

@@ -13,17 +13,6 @@ module UiBibz
     # Core
     module Core
 
-      # Button section
-      module Buttons
-        autoload :Button,                  "ui_bibz/ui/core/buttons/button"
-        autoload :ButtonChoice,            "ui_bibz/ui/core/buttons/button_choice"
-        autoload :ButtonDropdown,          "ui_bibz/ui/core/buttons/button_dropdown"
-        autoload :ButtonGroup,             "ui_bibz/ui/core/buttons/button_group"
-        autoload :ButtonLink,              "ui_bibz/ui/core/buttons/button_link"
-        autoload :ButtonSplitDropdown,     "ui_bibz/ui/core/buttons/button_split_dropdown"
-      end
-
-      # Card section
       module Cards
         autoload :Card,                    "ui_bibz/ui/core/cards/card"
         autoload :CardColumn,              "ui_bibz/ui/core/cards/card_column"
@@ -31,45 +20,82 @@ module UiBibz
         autoload :CardGroup,               "ui_bibz/ui/core/cards/card_group"
       end
 
-      # Input section
-      module Inputs
-        autoload :AutocompleteField,       "ui_bibz/ui/core/inputs/autocomplete_field"
-        autoload :DatePickerField,         "ui_bibz/ui/core/inputs/date_picker_field"
-        autoload :DropdownSelectField,     "ui_bibz/ui/core/inputs/dropdown_select_field"
-        autoload :FormulaField,            "ui_bibz/ui/core/inputs/formula_field"
-        autoload :MarkdownEditorField,     "ui_bibz/ui/core/inputs/markdown_editor_field"
-        autoload :MultiColumnField,        "ui_bibz/ui/core/inputs/multi_column_field"
-        autoload :MultiSelectField,        "ui_bibz/ui/core/inputs/multi_select_field"
-        autoload :SurroundField,           "ui_bibz/ui/core/inputs/surround_field"
-        autoload :SwitchField,             "ui_bibz/ui/core/inputs/switch_field"
+      module Dropdowns
+        autoload :Dropdown,                "ui_bibz/ui/core/dropdowns/dropdown"
+        autoload :SplitDropdown,           "ui_bibz/ui/core/dropdowns/split_dropdown"
+      end
+
+      module Forms
+
+        module Dates
+          autoload :DatePickerField,         "ui_bibz/ui/core/forms/dates/date_picker_field"
+        end
+
+        module Choices
+          autoload :SwitchField,             "ui_bibz/ui/core/forms/choices/switch_field"
+          autoload :CheckboxField,           "ui_bibz/ui/core/forms/choices/checkbox_field"
+          autoload :RadioField,              "ui_bibz/ui/core/forms/choices/radio_field"
+        end
+
+        module Numbers
+          autoload :FormulaField,            "ui_bibz/ui/core/forms/numbers/formula_field"
+        end
+
+        module Selects
+          autoload :DropdownSelectField,     "ui_bibz/ui/core/forms/selects/dropdown_select_field"
+          autoload :MultiColumnField,        "ui_bibz/ui/core/forms/selects/multi_column_field"
+          autoload :MultiSelectField,        "ui_bibz/ui/core/forms/selects/multi_select_field"
+        end
+
+        module Buttons
+          autoload :Button,                  "ui_bibz/ui/core/forms/buttons/button"
+          autoload :ButtonChoice,            "ui_bibz/ui/core/forms/buttons/button_choice"
+          autoload :ButtonGroup,             "ui_bibz/ui/core/forms/buttons/button_group"
+          autoload :ButtonLink,              "ui_bibz/ui/core/forms/buttons/button_link"
+        end
+
+        module Texts
+          autoload :AutocompleteField,       "ui_bibz/ui/core/forms/texts/autocomplete_field"
+          autoload :SurroundField,           "ui_bibz/ui/core/forms/texts/surround_field"
+        end
+
+        module Textareas
+          autoload :MarkdownEditorField,     "ui_bibz/ui/core/forms/textareas/markdown_editor_field"
+        end
+
       end
 
-      # Layout section
       module Layouts
         autoload :Row,                     "ui_bibz/ui/core/layouts/row"
         autoload :Col,                     "ui_bibz/ui/core/layouts/col"
         autoload :Container,               "ui_bibz/ui/core/layouts/container"
       end
 
-      # Nav section
+      module Lists
+        autoload :ListGroup,              "ui_bibz/ui/core/lists/list_group"
+      end
+
       module Navs
         autoload :Nav,                     "ui_bibz/ui/core/navs/nav"
         autoload :Navbar,                  "ui_bibz/ui/core/navs/navbar"
       end
 
+      module Paths
+        autoload :Breadcrumb,             "ui_bibz/ui/core/paths/breadcrumb"
+      end
+
+      module Windows
+        autoload :Modal,                  "ui_bibz/ui/core/windows/modal"
+      end
+
       # Other section
       autoload :Alert,                   "ui_bibz/ui/core/alert"
-      autoload :Breadcrumb,              "ui_bibz/ui/core/breadcrumb/breadcrumb"
       autoload :Component,               "ui_bibz/ui/core/component"
-      autoload :Dropdown,                "ui_bibz/ui/core/dropdown/dropdown"
       autoload :Glyph,                   "ui_bibz/ui/core/glyph"
       autoload :Jumbotron,               "ui_bibz/ui/core/jumbotron"
       autoload :Tag,                     "ui_bibz/ui/core/tag"
-      autoload :ListGroup,               "ui_bibz/ui/core/list/list_group"
-      autoload :Modal,                   "ui_bibz/ui/core/modal/modal"
       autoload :Progress,                "ui_bibz/ui/core/progress"
-      autoload :Stars,                   "ui_bibz/ui/core/stars"
-      autoload :Tab,                     "ui_bibz/ui/core/nav/tab"
+      autoload :Star,                    "ui_bibz/ui/core/star"
     end
 
     # Ux

data/lib/ui_bibz/helpers/ui_core_helper.rb

@@ -7,7 +7,7 @@ module UiBibz::Helpers::UiCoreHelper
   # +options+ (Hash)
   # +html_options+ (Hash)
   def button content = nil, options = nil, html_options = nil, &block
-    UiBibz::Ui::Core::Buttons::Button.new(content, options, html_options, &block).render
+    UiBibz::Ui::Core::Forms::Buttons::Button.new(content, options, html_options, &block).render
   end
 
   # Button Choice Component
@@ -15,16 +15,7 @@ module UiBibz::Helpers::UiCoreHelper
   # +options+ (Hash)
   # +html_options+ (Hash)
   def button_choice content = nil, options = nil, html_options = nil, &block
-    UiBibz::Ui::Core::Buttons::ButtonChoice.new(content, options, html_options, &block).render
-  end
-
-  # Button Dropdown Component
-  #
-  # +name+ (String) [Required]
-  # +options+ (Hash)
-  # +html_options+ (Hash)
-  def button_dropdown name, options = nil, html_options = nil, &block
-    UiBibz::Ui::Core::Buttons::ButtonDropdown.new(name, options, html_options).tap(&block).render
+    UiBibz::Ui::Core::Forms::Buttons::ButtonChoice.new(content, options, html_options, &block).render
   end
 
   # Button Group Component
@@ -32,7 +23,7 @@ module UiBibz::Helpers::UiCoreHelper
   # +options+ (Hash)
   # +html_options+ (Hash)
   def button_group content = nil, options = nil, html_options = nil, &block
-    UiBibz::Ui::Core::Buttons::ButtonGroup.new(content, options, html_options, &block).render
+    UiBibz::Ui::Core::Forms::Buttons::ButtonGroup.new(content, options, html_options, &block).render
   end
 
   # Button Link Component
@@ -40,17 +31,9 @@ module UiBibz::Helpers::UiCoreHelper
   # +options+ (Hash)
   # +html_options+ (Hash)
   def button_link content = nil, options = nil, html_options = nil, &block
-    UiBibz::Ui::Core::Buttons::ButtonLink.new(content, options, html_options, &block).render
+    UiBibz::Ui::Core::Forms::Buttons::ButtonLink.new(content, options, html_options, &block).render
   end
 
-  # Button Split Dropdown Component
-  #
-  # +name+ (String) [Required]
-  # +options+ (Hash)
-  # +html_options+ (Hash)
-  def button_split_dropdown name, options = nil, html_options = nil, &block
-    UiBibz::Ui::Core::Buttons::ButtonSplitDropdown.new(name, options, html_options).tap(&block).render
-  end
 
   # Button section end ----------------------------------------------------
 
@@ -104,7 +87,7 @@ module UiBibz::Helpers::UiCoreHelper
   # +options+ (Hash)
   # +html_options+ (Hash)
   def date_picker_field content = nil, options = nil, html_options = nil, &block
-    UiBibz::Ui::Core::Inputs::DatePickerField.new(content, options, html_options, &block).render
+    UiBibz::Ui::Core::Forms::Dates::DatePickerField.new(content, options, html_options, &block).render
   end
 
   # Markdown Editor Field Component
@@ -112,7 +95,7 @@ module UiBibz::Helpers::UiCoreHelper
   # +options+ (Hash)
   # +html_options+ (Hash)
   def markdown_editor_field content = nil, options = nil, html_options = nil, &block
-    UiBibz::Ui::Core::Inputs::MarkdownEditorField.new(content, options, html_options, &block).render
+    UiBibz::Ui::Core::Forms::Textareas::MarkdownEditorField.new(content, options, html_options, &block).render
   end
 
   # Multi Column Field Component
@@ -120,7 +103,7 @@ module UiBibz::Helpers::UiCoreHelper
   # +options+ (Hash)
   # +html_options+ (Hash)
   def multi_column_field content = nil, options = nil, html_options = nil, &block
-    UiBibz::Ui::Core::Inputs::MultiColumnField.new(content, options, html_options, &block).render
+    UiBibz::Ui::Core::Forms::Selects::MultiColumnField.new(content, options, html_options, &block).render
   end
 
   # Multi Select Field Component
@@ -128,7 +111,7 @@ module UiBibz::Helpers::UiCoreHelper
   # +options+ (Hash)
   # +html_options+ (Hash)
   def multi_select_field content = nil, options = nil, html_options = nil, &block
-    UiBibz::Ui::Core::Inputs::MultiSelectField.new(content, options, html_options, &block).render
+    UiBibz::Ui::Core::Forms::Selects::MultiSelectField.new(content, options, html_options, &block).render
   end
 
   # Formula Field Component
@@ -136,7 +119,7 @@ module UiBibz::Helpers::UiCoreHelper
   # +options+ (Hash)
   # +html_options+ (Hash)
   def formula_field content = nil, options = nil, html_options = nil, &block
-    UiBibz::Ui::Core::Inputs::FormulaField.new(content, options, html_options, &block).render
+    UiBibz::Ui::Core::Forms::Numbers::FormulaField.new(content, options, html_options, &block).render
   end
 
   # Surround Field Component
@@ -144,7 +127,7 @@ module UiBibz::Helpers::UiCoreHelper
   # +options+ (Hash)
   # +html_options+ (Hash)
   def surround_field content = nil, options = nil, html_options = nil, &block
-    UiBibz::Ui::Core::Inputs::SurroundField.new(content, options, html_options, &block).render
+    UiBibz::Ui::Core::Forms::Texts::SurroundField.new(content, options, html_options, &block).render
   end
 
   # Switch Field Component
@@ -152,7 +135,23 @@ module UiBibz::Helpers::UiCoreHelper
   # +options+ (Hash)
   # +html_options+ (Hash)
   def switch_field content = nil, options = nil, html_options = nil, &block
-    UiBibz::Ui::Core::Inputs::SwitchField.new(content, options, html_options, &block).render
+    UiBibz::Ui::Core::Forms::Choices::SwitchField.new(content, options, html_options, &block).render
+  end
+
+  # Checkbox Field Component
+  #
+  # +options+ (Hash)
+  # +html_options+ (Hash)
+  def checkbox_field content = nil, options = nil, html_options = nil, &block
+    UiBibz::Ui::Core::Forms::Choices::CheckboxField.new(content, options, html_options, &block).render
+  end
+
+  # Radio Field Component
+  #
+  # +options+ (Hash)
+  # +html_options+ (Hash)
+  def radio_field content = nil, options = nil, html_options = nil, &block
+    UiBibz::Ui::Core::Forms::Choices::RadioField.new(content, options, html_options, &block).render
   end
 
   # Dropdown Select Field Component
@@ -160,7 +159,7 @@ module UiBibz::Helpers::UiCoreHelper
   # +options+ (Hash)
   # +html_options+ (Hash)
   def dropdown_select_field content = nil, options = nil, html_options = nil, &block
-    UiBibz::Ui::Core::Inputs::DropdownSelectField.new(content, options, html_options, &block).render
+    UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new(content, options, html_options, &block).render
   end
 
   # Autocomplete Field Component
@@ -168,7 +167,7 @@ module UiBibz::Helpers::UiCoreHelper
   # +options+ (Hash)
   # +html_options+ (Hash)
   def autocomplete_field content = nil, options = nil, html_options = nil, &block
-    UiBibz::Ui::Core::Inputs::AutocompleteField.new(content, options, html_options, &block).render
+    UiBibz::Ui::Core::Forms::Texts::AutocompleteField.new(content, options, html_options, &block).render
   end
 
   # Input section end ----------------------------------------------------
@@ -241,9 +240,9 @@ module UiBibz::Helpers::UiCoreHelper
   #
   def breadcrumb content = nil, options = nil, html_options = nil, &block
     if is_tap(content, options)
-      UiBibz::Ui::Core::Breadcrumb.new(content, options, html_options).tap(&block).render
+      UiBibz::Ui::Core::Paths::Breadcrumb.new(content, options, html_options).tap(&block).render
     else
-      UiBibz::Ui::Core::Breadcrumb.new(content, options, html_options, &block).render
+      UiBibz::Ui::Core::Paths::Breadcrumb.new(content, options, html_options, &block).render
     end
   end
 
@@ -253,7 +252,16 @@ module UiBibz::Helpers::UiCoreHelper
   # +options+ (Hash)
   # +html_options+ (Hash)
   def dropdown name, options = nil, html_options = nil, &block
-    UiBibz::Ui::Core::Dropdown.new(name, options, html_options).tap(&block).render
+    UiBibz::Ui::Core::Dropdowns::Dropdown.new(name, options, html_options).tap(&block).render
+  end
+
+  # Split Dropdown Component
+  #
+  # +name+ (String) [Required]
+  # +options+ (Hash)
+  # +html_options+ (Hash)
+  def split_dropdown name, options = nil, html_options = nil, &block
+    UiBibz::Ui::Core::Dropdowns::SplitDropdown.new(name, options, html_options).tap(&block).render
   end
 
   # Glyph Component
@@ -293,7 +301,7 @@ module UiBibz::Helpers::UiCoreHelper
   # +options+ (Hash)
   # +html_options+ (Hash)
   def list_group content = nil, options = nil, html_options = nil, &block
-    UiBibz::Ui::Core::ListGroup.new(content, options, html_options).tap(&block).render
+    UiBibz::Ui::Core::Lists::ListGroup.new(content, options, html_options).tap(&block).render
   end
 
   # Modal Component
@@ -301,7 +309,7 @@ module UiBibz::Helpers::UiCoreHelper
   # +options+ (Hash)
   # +html_options+ (Hash)
   def modal content = nil, options = nil, html_options = nil, &block
-    UiBibz::Ui::Core::Modal.new(content, options, html_options).tap(&block).render
+    UiBibz::Ui::Core::Windows::Modal.new(content, options, html_options).tap(&block).render
   end
 
   # Progress Component
@@ -316,8 +324,8 @@ module UiBibz::Helpers::UiCoreHelper
   #
   # +options+ (Hash)
   # +html_options+ (Hash)
-  def stars content = nil, options = nil, html_options = nil, &block
-    UiBibz::Ui::Core::Stars.new(content, options, html_options, &block).render
+  def star content = nil, options = nil, html_options = nil, &block
+    UiBibz::Ui::Core::Star.new(content, options, html_options, &block).render
   end
 
   # Other section end ----------------------------------------------------

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

@@ -78,8 +78,7 @@ module UiBibz::Ui::Core
     end
 
     def status
-      sym = options[:status] || :info
-      "alert-#{ sym }"
+      "alert-#{ options[:status] || :info  }"
     end
 
   end

data/lib/ui_bibz/ui/core/{breadcrumb/breadcrumb.rb → breadcrumb.rb}

@@ -17,7 +17,7 @@ module UiBibz::Ui::Core
   #
   # ==== Components
   #
-  # +link+ is UiBibz::Ui::Core::BreadcrumbLink component
+  # +link+ is UiBibz::Ui::Core::BreadCrumb::Components::BreadcrumbLink component
   #
   # ==== Signatures
   #
@@ -53,7 +53,7 @@ module UiBibz::Ui::Core
   #
   #   breadcrumb({store: @users, link_label: name, link_url: user_path(:id)})
   #
-  class Breadcrumb < Component
+  class Breadcrumb < UiBibz::Ui::Core::Component
 
     # See UiBibz::Ui::Core::Component.initialize
     def initialize content = nil, options = nil, html_options = nil, &block
@@ -70,7 +70,7 @@ module UiBibz::Ui::Core
     # Add breadcrumb link items
     # See UiBibz::Ui::Core::BreadcrumbLink
     def link content = nil, options = nil, html_options = nil, &block
-      @links << BreadcrumbLink.new(content, options, html_options, &block).render
+      @links << UiBibz::Ui::Core::Breadcrumbs::Components::BreadcrumbLink.new(content, options, html_options, &block).render
     end
 
     private
@@ -98,9 +98,9 @@ module UiBibz::Ui::Core
     def generate_links
       @options[:store].each do |item|
         if item == @options[:store].last
-          @links << BreadcrumbLink.new(item.send(link_label), status: :disabled).render
+          @links << UiBibz::Ui::Core::Breadcrumb::Components::BreadcrumbLink.new(item.send(link_label), status: :disabled).render
         else
-          @links << BreadcrumbLink.new(item.send(link_label), url: inject_url(link_url, item)).render
+          @links << UiBibz::Ui::Core::Breadcrumb::Components::BreadcrumbLink.new(item.send(link_label), url: inject_url(link_url, item)).render
         end
       end
     end