ui_bibz 2.0.0.alpha32 → 2.0.0.beta2

data/lib/ui_bibz/ui/{core → extensions/core}/component/klass_extension.rb

@@ -1,8 +1,7 @@
 module KlassExtension
 
   def join_classes *classes
-    klasses = [*classes].flatten.compact.uniq.reject(&:blank?)
-    klasses.empty? ? nil : klasses
+    UiBibz::Utils::Screwdriver.join_classes classes
   end
 
   # Override this method to add a status class

data/lib/ui_bibz/ui/extensions/core/forms/connect_extension.rb

@@ -0,0 +1,31 @@
+module ConnectExtension
+
+  private
+
+  def component_html_data
+    super
+    connect_options
+  end
+
+  def connect_options_selector
+    content.to_s.parameterize.underscore
+  end
+
+  def connect_opts
+    selector = options[:refresh][:target][:selector]
+    options[:refresh][:target][:selector] = selector.blank? ? "##{ connect_options_selector }" : selector
+
+    options[:refresh].merge({
+      connect: {
+        target: options[:refresh].delete(:target),
+        event:  options[:refresh].delete(:event),
+        mode:   options[:refresh].delete(:mode)
+      }
+    })
+  end
+
+  def connect_options
+    add_html_data('connect', options[:connect]) if options[:connect]
+  end
+
+end

data/lib/ui_bibz/ui/extensions/core/forms/surround_extension.rb

@@ -0,0 +1,48 @@
+require 'ui_bibz/ui/extensions/core/forms/connect_extension'
+module SurroundExtension
+  include ConnectExtension
+
+  private
+
+  def surrounded?
+    !options[:append].nil? || !options[:prepend].nil? || !options[:refresh].nil? || !options[:surrounded].nil?
+  end
+
+  def surround_wrapper_tag ct_tag
+    UiBibz::Ui::Core::Forms::Surrounds::SurroundField.new(class: surround_classes).tap do |sf|
+      sf.addon options[:append]           unless options[:append].nil?
+      sf.html ct_tag
+      sf.button_refresh connect_opts      unless options[:refresh].nil?
+      sf.addon options[:prepend]          unless options[:prepend].nil?
+    end.render
+  end
+
+  def surround_field field_tag, options = {}
+    surrounded? ? surround_wrapper_tag(field_tag) : field_tag
+  end
+
+  def input_group_classes
+  end
+
+  def surround_classes
+    [input_group_refresh, input_group_classes]
+  end
+
+  def input_group_refresh
+    "field-refresh" unless options[:refresh].nil?
+  end
+
+  def input_group_classes
+    [input_group_status, input_group_size]
+  end
+
+  # :lg, :sm or :xs
+  def input_group_size
+    "input-group-#{ options[:size] }" unless options[:size].nil?
+  end
+
+  def input_group_status
+    "has-#{ options[:status] }" unless options[:status].nil?
+  end
+
+end

data/lib/ui_bibz/utils/internationalization.rb

@@ -1,4 +1,13 @@
 module UiBibz::Utils
+  class Screwdriver
+    include Singleton
+
+    def self.join_classes *classes
+      klasses = [*classes].flatten.compact.uniq.reject(&:blank?)
+      klasses.empty? ? nil : klasses
+    end
+
+  end
   class Internationalization
 
     def initialize translation, options = {}

data/lib/ui_bibz/version.rb

@@ -1,3 +1,3 @@
 module UiBibz
-  VERSION = "2.0.0.alpha32"
+  VERSION = "2.0.0.beta2"
 end

data/lib/ui_bibz.rb

@@ -42,6 +42,7 @@ module UiBibz
         end
 
         module Selects
+          autoload :AbstractSelect,          "ui_bibz/ui/core/forms/selects/abstract_select"
           autoload :DropdownSelectField,     "ui_bibz/ui/core/forms/selects/dropdown_select_field"
           autoload :SelectField,             "ui_bibz/ui/core/forms/selects/select_field"
           autoload :MultiColumnField,        "ui_bibz/ui/core/forms/selects/multi_column_field"
@@ -54,11 +55,16 @@ module UiBibz
           autoload :ButtonGroup,             "ui_bibz/ui/core/forms/buttons/button_group"
           autoload :ButtonLink,              "ui_bibz/ui/core/forms/buttons/button_link"
           autoload :ButtonRefresh,           "ui_bibz/ui/core/forms/buttons/button_refresh"
+          autoload :ButtonToolbar,           "ui_bibz/ui/core/forms/buttons/button_toolbar"
+        end
+
+        module Surrounds
+          autoload :SurroundField,           "ui_bibz/ui/core/forms/surrounds/surround_field"
         end
 
         module Texts
           autoload :AutoCompleteField,       "ui_bibz/ui/core/forms/texts/auto_complete_field"
-          autoload :SurroundField,           "ui_bibz/ui/core/forms/texts/surround_field"
+          autoload :TextField,               "ui_bibz/ui/core/forms/texts/text_field"
         end
 
         module Textareas
@@ -80,23 +86,30 @@ module UiBibz
       module Navs
         autoload :Nav,                     "ui_bibz/ui/core/navs/nav"
         autoload :Navbar,                  "ui_bibz/ui/core/navs/navbar"
+        autoload :Pagination,              "ui_bibz/ui/core/navs/pagination"
+      end
+
+      module Notifications
+        autoload :Alert,                   "ui_bibz/ui/core/notifications/alert"
       end
 
       module Paths
         autoload :Breadcrumb,             "ui_bibz/ui/core/paths/breadcrumb"
       end
 
+      module Progresses
+        autoload :ProgressBar,            "ui_bibz/ui/core/progresses/progress_bar"
+      end
+
       module Windows
         autoload :Modal,                  "ui_bibz/ui/core/windows/modal"
       end
 
       # Other section
-      autoload :Alert,                   "ui_bibz/ui/core/alert"
-      autoload :ConnectedComponent,      "ui_bibz/ui/core/connected_component"
       autoload :Component,               "ui_bibz/ui/core/component"
       autoload :Glyph,                   "ui_bibz/ui/core/glyph"
       autoload :Jumbotron,               "ui_bibz/ui/core/jumbotron"
-      autoload :Tag,                     "ui_bibz/ui/core/tag"
+      autoload :Badge,                   "ui_bibz/ui/core/badge"
       autoload :Progress,                "ui_bibz/ui/core/progress"
       autoload :Star,                    "ui_bibz/ui/core/star"
     end
@@ -117,9 +130,12 @@ module UiBibz
   end
 
   module Helpers
-    autoload :UiCoreHelper, "ui_bibz/helpers/ui_core_helper"
-    autoload :UiUxHelper,   "ui_bibz/helpers/ui_ux_helper"
-    autoload :UtilsHelper,  "ui_bibz/helpers/utils_helper"
+    module Ui
+      autoload :CoreHelper,  "ui_bibz/helpers/ui/core_helper"
+      autoload :UxHelper,    "ui_bibz/helpers/ui/ux_helper"
+      module Core end
+    end
+    autoload :UtilsHelper, "ui_bibz/helpers/utils_helper"
   end
 
   module Concerns

data/test/simple_form_test.rb

@@ -1,14 +1,16 @@
 # encoding: UTF-8
 require 'test_helper'
-require 'simple_form'
-
-include SimpleForm::ActionViewExtensions::FormHelper
 
 class SimpleFormTest < ActionView::TestCase
 
+  include SimpleForm::ActionViewExtensions::FormHelper
+  include UiBibz::Helpers::UtilsHelper
+
   setup do
-    User.where(name_fr: 'test1', active: true).first_or_create
-    User.where(name_fr: 'test2', active: false).first_or_create
+    user = User.where(name_fr: 'test1', name_en: 'test1 en', active: true).first_or_create
+    user.update_attribute(:created_at, "2017-04-26 14:48:43 UTC")
+    user = User.where(name_fr: 'test2', name_en: 'test2 en', active: false).first_or_create
+    user.update_attribute(:created_at, "2017-04-26 14:48:43 UTC")
     continent = Continent.where(name: 'Europe').first_or_create
     Country.where(name: 'France', continent_id: continent.id).first_or_create
     Country.where(name: 'Deutchland', continent_id: continent.id).first_or_create
@@ -21,10 +23,10 @@ class SimpleFormTest < ActionView::TestCase
 
   test 'auto complete field input in simple form' do
     actual = simple_form_for @user do |f|
-      f.input :name_fr, as: :auto_complete_field, collection: @users, label_method: :name_fr
+      f.input :name_fr, as: :ui_auto_complete_field, collection: @users, label_method: :name_fr
     end
 
-    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group auto_complete_field optional user_name_fr\"><label class=\"control-label auto_complete_field optional\" for=\"user_name_fr\">Name fr</label><input type=\"text\" name=\"user[name_fr]\" id=\"user_name_fr\" value=\"test1\" class=\"auto_complete_field optional form-control\" autocomplete=\"true\" list=\"user_name_fr-datalist\" /><datalist id=\"user_name_fr-datalist\"><option value=\"1\">test1</option>
+    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_auto_complete_field optional user_name_fr\"><label class=\"control-label ui_auto_complete_field optional\" for=\"user_name_fr\">Name fr</label><input type=\"text\" name=\"user[name_fr]\" id=\"user_name_fr\" value=\"test1\" class=\"ui_auto_complete_field optional form-control auto-complete-field\" autocomplete=\"true\" list=\"user_name_fr-datalist\" /><datalist id=\"user_name_fr-datalist\"><option value=\"1\">test1</option>
 <option value=\"2\">test2</option></datalist></div></form>"
 
     assert_equal expected, actual
@@ -32,20 +34,20 @@ class SimpleFormTest < ActionView::TestCase
 
   test 'date picker field input in simple form' do
     actual = simple_form_for @user do |f|
-      f.input :created_at, as: :date_picker_field
+      f.input :created_at, as: :ui_date_picker_field
     end
 
-    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group date_picker_field optional user_created_at\"><label class=\"control-label date_picker_field optional\" for=\"user_created_at\">Created at</label><input type=\"text\" name=\"user[created_at]\" id=\"user_created_at\" class=\"date_picker_field optional date_picker form-control\" data-date-locale=\"en\" data-provide=\"datepicker\" data-date-format=\"dd/mm/yyyy\" data-date-today-btn=\"linked\" /></div></form>"
+    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_date_picker_field optional user_created_at\"><label class=\"control-label ui_date_picker_field optional\" for=\"user_created_at\">Created at</label><input type=\"text\" name=\"user[created_at]\" id=\"user_created_at\" value=\"2017-04-26 14:48:43 UTC\" class=\"ui_date_picker_field optional date_picker form-control\" data-date-locale=\"en\" data-provide=\"datepicker\" data-date-format=\"yyyy-mm-dd\" data-date-today-btn=\"linked\" data-date-toggle-active=\"true\" /></div></form>"
 
     assert_equal expected, actual
   end
 
   test 'dropdown field select input in simple form' do
     actual = simple_form_for @user do |f|
-      f.input :name_fr, as: :dropdown_select_field, collection: @users, label_method: :name_fr
+      f.input :name_fr, as: :ui_dropdown_select_field, collection: @users, label_method: :name_fr
     end
 
-    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group dropdown_select_field optional user_name_fr\"><label class=\"control-label dropdown_select_field optional\" for=\"user_name_fr\">Name fr</label><select name=\"user[name_fr]\" id=\"user_name_fr\" class=\"dropdown_select_field optional dropdown-select-field\"><option value=\"1\">test1</option>
+    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_dropdown_select_field optional user_name_fr\"><label class=\"control-label ui_dropdown_select_field optional\" for=\"user_name_fr\">Name fr</label><select name=\"user[name_fr]\" id=\"user_name_fr\" class=\"ui_dropdown_select_field optional dropdown-select-field\"><option value=\"1\">test1</option>
 <option value=\"2\">test2</option></select></div></form>"
 
     assert_equal expected, actual
@@ -54,10 +56,10 @@ class SimpleFormTest < ActionView::TestCase
   test 'dropdown field select input with grouped option in simple form' do
 
     actual = simple_form_for @user do |f|
-      f.input :name_fr, as: :dropdown_select_field, collection: @continents, toto: 'lala', grouped: true, group_method: :countries
+      f.input :name_fr, as: :ui_dropdown_select_field, collection: @continents, toto: 'lala', grouped: true, group_method: :countries
     end
 
-    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group dropdown_select_field optional user_name_fr\"><label class=\"control-label dropdown_select_field optional\" for=\"user_name_fr\">Name fr</label><select name=\"user[name_fr]\" id=\"user_name_fr\" class=\"dropdown_select_field optional dropdown-select-field\"><optgroup label=\"Europe\"><option value=\"1\">France</option>
+    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_dropdown_select_field optional user_name_fr\"><label class=\"control-label ui_dropdown_select_field optional\" for=\"user_name_fr\">Name fr</label><select name=\"user[name_fr]\" id=\"user_name_fr\" class=\"ui_dropdown_select_field optional dropdown-select-field\"><optgroup label=\"Europe\"><option value=\"1\">France</option>
 <option value=\"2\">Deutchland</option></optgroup></select></div></form>"
 
     assert_equal expected, actual
@@ -68,20 +70,20 @@ class SimpleFormTest < ActionView::TestCase
     @user.price_formula = "1+2"
 
     actual = simple_form_for @user do |f|
-      f.input :price, as: :formula_field
+      f.input :price, as: :ui_formula_field
     end
 
-    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group formula_field optional user_price\"><label class=\"control-label formula_field optional\" for=\"user_price\">Price</label><div class=\"input-group formula_field\"><input type=\"text\" name=\"user[price_formula]\" id=\"user_price_formula\" value=\"1+2\" class=\"formula_field optional formula-field form-control\" /><span class=\"formula-field-sign input-group-addon\">=</span><input type=\"text\" name=\"user[price]\" id=\"user_price\" value=\"3.0\" readonly=\"readonly\" class=\"formula-field-result form-control\" /><span class=\"formula-field-alert input-group-addon\" data-toggle=\"tooltip\"><i class=\"glyph-danger glyph fa fa-exclamation-triangle\"></i></span></div></div></form>"
+    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_formula_field optional user_price\"><label class=\"control-label ui_formula_field optional\" for=\"user_price\">Price</label><div class=\"formula_field input-group\"><input type=\"text\" name=\"user[price_formula]\" id=\"user_price_formula\" value=\"1+2\" class=\"ui_formula_field optional formula-field form-control\" formula_field_value=\"1+2\" /><span class=\"formula-field-sign input-group-addon\">=</span><input type=\"text\" name=\"user[price]\" id=\"user_price\" value=\"3.0\" class=\"formula-field-result form-control\" readonly=\"readonly\" /><span data-toggle=\"tooltip\" class=\"formula-field-alert input-group-addon\"><i class=\"glyph-danger glyph fa fa-exclamation-triangle\"></i></span></div></div></form>"
 
     assert_equal expected, actual
   end
 
   test 'mardown editor field input in simple form' do
     actual = simple_form_for @user do |f|
-      f.input :name_fr, as: :markdown_editor_field
+      f.input :name_fr, as: :ui_markdown_editor_field
     end
 
-    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group markdown_editor_field optional user_name_fr\"><label class=\"control-label markdown_editor_field optional\" for=\"user_name_fr\">Name fr</label><textarea name=\"user[name_fr]\" id=\"user_name_fr\" class=\"markdown_editor_field optional\" data-provide=\"markdown\" data-iconlibrary=\"fa\">
+    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_markdown_editor_field optional user_name_fr\"><label class=\"control-label ui_markdown_editor_field optional\" for=\"user_name_fr\">Name fr</label><textarea name=\"user[name_fr]\" id=\"user_name_fr\" class=\"ui_markdown_editor_field optional\" data-provide=\"markdown\" data-iconlibrary=\"fa\">
 </textarea></div></form>"
 
     assert_equal expected, actual
@@ -89,10 +91,10 @@ class SimpleFormTest < ActionView::TestCase
 
   test 'multi column field input in simple form' do
     actual = simple_form_for @user do |f|
-      f.input :name_fr, as: :multi_column_field, collection: @users, label_method: :name_fr
+      f.input :name_fr, as: :ui_multi_column_field, collection: @users, label_method: :name_fr
     end
 
-    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group multi_column_field optional user_name_fr\"><label class=\"control-label multi_column_field optional\" for=\"user_name_fr\">Name fr</label><select name=\"name_fr[]\" id=\"name_fr\" class=\"multi_column_field optional multi-column-field\" multiple=\"multiple\"><option value=\"1\">test1</option>
+    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_multi_column_field optional user_name_fr\"><label class=\"control-label ui_multi_column_field optional\" for=\"user_name_fr\">Name fr</label><select name=\"name_fr[]\" id=\"name_fr\" class=\"ui_multi_column_field optional multi-column-field\" multiple=\"multiple\"><option value=\"1\">test1</option>
 <option value=\"2\">test2</option></select></div></form>"
 
     assert_equal expected, actual
@@ -100,10 +102,10 @@ class SimpleFormTest < ActionView::TestCase
 
   test 'multi select field input in simple form' do
     actual = simple_form_for @user do |f|
-      f.input :name_fr, as: :multi_select_field, collection: @users, label_method: :name_fr
+      f.input :name_fr, as: :ui_multi_select_field, collection: @users, label_method: :name_fr
     end
 
-    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group multi_select_field optional user_name_fr\"><label class=\"control-label multi_select_field optional\" for=\"user_name_fr\">Name fr</label><select name=\"name_fr[]\" id=\"name_fr\" class=\"multi_select_field optional btn-secondary multi-select-field\" multiple=\"multiple\"><option value=\"1\">test1</option>
+    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_multi_select_field optional user_name_fr\"><label class=\"control-label ui_multi_select_field optional\" for=\"user_name_fr\">Name fr</label><select name=\"name_fr[]\" id=\"name_fr\" class=\"ui_multi_select_field optional btn-secondary multi-select-field\" multiple=\"multiple\"><option value=\"1\">test1</option>
 <option value=\"2\">test2</option></select></div></form>"
 
     assert_equal expected, actual
@@ -112,21 +114,21 @@ class SimpleFormTest < ActionView::TestCase
   test 'multi select input with grouped option in simple form' do
 
     actual = simple_form_for @user do |f|
-      f.input :name_fr, as: :multi_select_field, collection: @continents, toto: 'lala', grouped: true, group_method: :countries
+      f.input :name_fr, as: :ui_multi_select_field, collection: @continents, toto: 'lala', grouped: true, group_method: :countries
     end
 
-    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group multi_select_field optional user_name_fr\"><label class=\"control-label multi_select_field optional\" for=\"user_name_fr\">Name fr</label><select name=\"name_fr[]\" id=\"name_fr\" class=\"multi_select_field optional btn-secondary multi-select-field\" multiple=\"multiple\"><optgroup label=\"Europe\"><option value=\"1\">France</option>
+    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_multi_select_field optional user_name_fr\"><label class=\"control-label ui_multi_select_field optional\" for=\"user_name_fr\">Name fr</label><select name=\"name_fr[]\" id=\"name_fr\" class=\"ui_multi_select_field optional btn-secondary multi-select-field\" multiple=\"multiple\"><optgroup label=\"Europe\"><option value=\"1\">France</option>
 <option value=\"2\">Deutchland</option></optgroup></select></div></form>"
 
     assert_equal expected, actual
   end
 
-  test 'surround field input in simple form' do
+  test 'text field input in simple form' do
     actual = simple_form_for @user do |f|
-      f.input :name_fr, as: :surround_field
+      f.input :name_fr, as: :ui_text_field
     end
 
-    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group surround_field optional user_name_fr\"><label class=\"control-label surround_field optional\" for=\"user_name_fr\">Name fr</label><input type=\"text\" name=\"user[name_fr]\" id=\"user_name_fr\" class=\"surround_field optional form-control\" /></div></form>"
+    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_text_field optional user_name_fr\"><label class=\"control-label ui_text_field optional\" for=\"user_name_fr\">Name fr</label><input type=\"text\" name=\"user[name_fr]\" id=\"user_name_fr\" value=\"test1\" class=\"ui_text_field optional form-control\" /></div></form>"
 
     assert_equal expected, actual
   end
@@ -134,30 +136,30 @@ class SimpleFormTest < ActionView::TestCase
   test 'switch field input in simple form' do
     @user.active = true
     actual = simple_form_for @user do |f|
-      f.input :active, as: :switch_field, collection: @users, label_method: :name_fr
+      f.input :active, as: :ui_switch_field, collection: @users, label_method: :name_fr
     end
 
-    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group switch_field optional user_active\"><label class=\"control-label switch_field optional\" for=\"user_active\">Active</label><div class=\"switch-field-container\"><input type=\"hidden\" name=\"user[active]\" id=\"user_active\" value=\"0\" /><input type=\"checkbox\" name=\"user[active]\" id=\"user_active\" value=\"1\" class=\"switch_field optional switch-field\" checked=\"checked\" /></div></div></form>"
+    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_switch_field optional user_active\"><label class=\"control-label ui_switch_field optional\" for=\"user_active\">Active</label><div class=\"switch-field-container\"><input type=\"hidden\" name=\"user[active]\" id=\"user_active\" value=\"0\" /><input type=\"checkbox\" name=\"user[active]\" id=\"user_active\" value=\"1\" class=\"ui_switch_field optional switch-field\" checked=\"checked\" /></div></div></form>"
 
     assert_equal expected, actual
   end
 
   test 'radio field input in simple form' do
     actual = simple_form_for @user do |f|
-      f.input :name_fr, as: :radio_field, collection: @users, label_method: :name_fr
+      f.input :name_fr, as: :ui_radio_field, collection: @users, label_method: :name_fr
     end
 
-    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group radio_field optional user_name_fr\"><label class=\"control-label radio_field optional\">Name fr</label><input type=\"hidden\" name=\"user[name_fr]\" value=\"\" /><div class=\"radio radio_field optional abc-radio-default radio abc-radio\"><input class=\"radio_field optional abc-radio-default radio abc-radio\" type=\"radio\" value=\"1\" name=\"user[name_fr]\" id=\"user_name_fr_1\" /><label class=\"collection_radio_buttons\" for=\"user_name_fr_1\">test1</label></div><div class=\"radio radio_field optional abc-radio-default radio abc-radio\"><input class=\"radio_field optional abc-radio-default radio abc-radio\" type=\"radio\" value=\"2\" name=\"user[name_fr]\" id=\"user_name_fr_2\" /><label class=\"collection_radio_buttons\" for=\"user_name_fr_2\">test2</label></div></div></form>"
+    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_radio_field optional user_name_fr\"><label class=\"control-label ui_radio_field optional\">Name fr</label><input type=\"hidden\" name=\"user[name_fr]\" value=\"\" /><div class=\"radio ui_radio_field optional abc-radio-default radio abc-radio\"><input class=\"ui_radio_field optional abc-radio-default radio abc-radio\" type=\"radio\" value=\"1\" name=\"user[name_fr]\" id=\"user_name_fr_1\" /><label class=\"collection_radio_buttons\" for=\"user_name_fr_1\">test1</label></div><div class=\"radio ui_radio_field optional abc-radio-default radio abc-radio\"><input class=\"ui_radio_field optional abc-radio-default radio abc-radio\" type=\"radio\" value=\"2\" name=\"user[name_fr]\" id=\"user_name_fr_2\" /><label class=\"collection_radio_buttons\" for=\"user_name_fr_2\">test2</label></div></div></form>"
 
     assert_equal expected, actual
   end
 
   test 'select field input in simple form' do
     actual = simple_form_for @user do |f|
-      f.input :name_fr, as: :select_field, collection: @users, label_method: :name_fr
+      f.input :name_fr, as: :ui_select_field, collection: @users, label_method: :name_fr
     end
 
-     expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group select_field optional user_name_fr\"><label class=\"control-label select_field optional\" for=\"user_name_fr\">Name fr</label><select name=\"user[name_fr]\" id=\"user_name_fr\" class=\"select_field optional select-field form-control\"><option value=\"1\">test1</option>
+     expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_select_field optional user_name_fr\"><label class=\"control-label ui_select_field optional\" for=\"user_name_fr\">Name fr</label><select name=\"user[name_fr]\" id=\"user_name_fr\" class=\"ui_select_field optional select-field form-control\"><option value=\"1\">test1</option>
 <option value=\"2\">test2</option></select></div></form>"
 
     assert_equal expected, actual
@@ -165,11 +167,11 @@ class SimpleFormTest < ActionView::TestCase
 
   test 'select field input with refresh button in simple form' do
     actual = simple_form_for @user do |f|
-      f.input :name_fr, as: :select_field, refresh: { target: { data: [] }}, collection: @users, label_method: :name_fr
+      f.input :name_fr, as: :ui_select_field, refresh: { target: { data: [] }}, collection: @users, label_method: :name_fr
     end
 
-     expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group select_field optional user_name_fr\"><label class=\"control-label select_field optional\" for=\"user_name_fr\">Name fr</label><div class=\"input-group field-refresh\"><select name=\"user[name_fr]\" id=\"user_name_fr\" class=\"select_field optional select-field form-control\"><option value=\"1\">test1</option>
-<option value=\"2\">test2</option></select><span class=\"input-group-btn\"><span data-connect=\"{&quot;events&quot;:&quot;click&quot;,&quot;mode&quot;:&quot;remote&quot;,&quot;target&quot;:{&quot;selector&quot;:&quot;#user_name_fr&quot;,&quot;url&quot;:&quot;&quot;,&quot;data&quot;:[]}}\" class=\"btn-primary ui-bibz-connect input-refresh-button btn\"><i class=\"glyph fa fa-refresh\"></i> </span></span></div></div></form>"
+     expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_select_field optional user_name_fr\"><label class=\"control-label ui_select_field optional\" for=\"user_name_fr\">Name fr</label><div class=\"field-refresh input-group\"><select name=\"user[name_fr]\" id=\"user_name_fr\" class=\"ui_select_field optional select-field form-control\"><option value=\"1\">test1</option>
+<option value=\"2\">test2</option></select><div class=\"input-group-btn\"><span data-connect=\"{&quot;events&quot;:&quot;click&quot;,&quot;mode&quot;:&quot;remote&quot;,&quot;target&quot;:{&quot;selector&quot;:&quot;#user_name_fr&quot;,&quot;url&quot;:&quot;&quot;,&quot;data&quot;:[]}}\" class=\"btn-primary ui-bibz-connect btn input-refresh-button\"><i class=\"glyph fa fa-refresh\"></i> </span></div></div></div></form>"
 
     assert_equal expected, actual
   end
@@ -177,10 +179,10 @@ class SimpleFormTest < ActionView::TestCase
   test 'select input with grouped option in simple form' do
 
     actual = simple_form_for @user do |f|
-      f.input :name_fr, as: :select_field, collection: @continents, toto: 'lala', grouped: true, group_method: :countries
+      f.input :name_fr, as: :ui_select_field, collection: @continents, toto: 'lala', grouped: true, group_method: :countries
     end
 
-    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group select_field optional user_name_fr\"><label class=\"control-label select_field optional\" for=\"user_name_fr\">Name fr</label><select name=\"user[name_fr]\" id=\"user_name_fr\" class=\"select_field optional select-field form-control\"><optgroup label=\"Europe\"><option value=\"1\">France</option>
+    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_select_field optional user_name_fr\"><label class=\"control-label ui_select_field optional\" for=\"user_name_fr\">Name fr</label><select name=\"user[name_fr]\" id=\"user_name_fr\" class=\"ui_select_field optional select-field form-control\"><optgroup label=\"Europe\"><option value=\"1\">France</option>
 <option value=\"2\">Deutchland</option></optgroup></select></div></form>"
 
     assert_equal expected, actual
@@ -190,10 +192,10 @@ class SimpleFormTest < ActionView::TestCase
 
     @user.name_fr = 1
     actual = simple_form_for @user do |f|
-      f.input :name_fr, as: :select_field, collection: @countries
+      f.input :name_fr, as: :ui_select_field, collection: @countries
     end
 
-    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group select_field optional user_name_fr\"><label class=\"control-label select_field optional\" for=\"user_name_fr\">Name fr</label><select name=\"user[name_fr]\" id=\"user_name_fr\" class=\"select_field optional select-field form-control\"><option selected=\"selected\" value=\"1\">France</option>
+    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_select_field optional user_name_fr\"><label class=\"control-label ui_select_field optional\" for=\"user_name_fr\">Name fr</label><select name=\"user[name_fr]\" id=\"user_name_fr\" class=\"ui_select_field optional select-field form-control\"><option selected=\"selected\" value=\"1\">France</option>
 <option value=\"2\">Deutchland</option></select></div></form>"
 
     assert_equal expected, actual
@@ -203,13 +205,28 @@ class SimpleFormTest < ActionView::TestCase
 
     @user.name_fr = 1
     actual = simple_form_for @user do |f|
-      f.input :name_fr, as: :select_field, collection: @continents, toto: 'lala', grouped: true, group_method: :countries
+      f.input :name_fr, as: :ui_select_field, collection: @continents, toto: 'lala', grouped: true, group_method: :countries
     end
 
-    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group select_field optional user_name_fr\"><label class=\"control-label select_field optional\" for=\"user_name_fr\">Name fr</label><select name=\"user[name_fr]\" id=\"user_name_fr\" class=\"select_field optional select-field form-control\"><optgroup label=\"Europe\"><option selected=\"selected\" value=\"1\">France</option>
+    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_select_field optional user_name_fr\"><label class=\"control-label ui_select_field optional\" for=\"user_name_fr\">Name fr</label><select name=\"user[name_fr]\" id=\"user_name_fr\" class=\"ui_select_field optional select-field form-control\"><optgroup label=\"Europe\"><option selected=\"selected\" value=\"1\">France</option>
 <option value=\"2\">Deutchland</option></optgroup></select></div></form>"
 
     assert_equal expected, actual
   end
+
+#   test 'test surround field into simple form' do
+#     actual = ui_form_for @user do |f|
+#       concat(f.ui_surround_field do |sf|
+#         sf.input :name_en, as: :text_field
+#         sf.addon("€")
+#       end)
+#       concat f.input(:name_fr, as: :ui_auto_complete_field, collection: @users, label_method: :name_fr)
+#     end
+#
+#     expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div><div class=\"input-group\"><input type=\"text\" name=\"user[name_en]\" id=\"user_name_en\" value=\"test1 en\" class=\"text_field optional form-control\" /><span class=\"input-group-addon\">€</span></div></div><div class=\"form-group ui_auto_complete_field optional user_name_fr\"><label class=\"control-label ui_auto_complete_field optional\" for=\"user_name_fr\">Name fr</label><input type=\"text\" name=\"user[name_fr]\" id=\"user_name_fr\" value=\"test1\" class=\"ui_auto_complete_field optional form-control auto-complete-field\" autocomplete=\"true\" list=\"user_name_fr-datalist\" /><datalist id=\"user_name_fr-datalist\"><option value=\"1\">test1</option>
+# <option value=\"2\">test2</option></datalist></div></form>"
+#
+#     assert_equal expected, actual
+#   end
 end
 

data/test/ui/core/badge_test.rb

@@ -0,0 +1,19 @@
+require 'test_helper'
+class BadgeTest < ActionView::TestCase
+  include UiBibz::Helpers::Ui::CoreHelper
+
+  test 'badge' do
+    actual   = ui_badge 'state', status: :success, glyph: 'pencil'
+    expected = "<span class=\"badge-success badge\"><i class=\"glyph fa fa-pencil\"></i> state</span>"
+
+    assert_equal expected, actual
+  end
+
+  test 'badge pill' do
+    actual   = ui_badge 'state', status: :success, type: :pill, glyph: 'pencil'
+    expected = "<span class=\"badge-success badge badge-pill\"><i class=\"glyph fa fa-pencil\"></i> state</span>"
+
+    assert_equal expected, actual
+  end
+
+end