ui_bibz 2.0.0.alpha29 → 2.0.0.alpha30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eba8735c72e14ff037beabdc38c39cdca776757f
-  data.tar.gz: a1fa0ddb5be8b7056ab83e32258249ccf49bed1c
+  metadata.gz: 4e95355ea721ae8b499aa2062ee1b516a6e28235
+  data.tar.gz: 0245101963fbaefb1525f0dc4cdfd6b9021dd02a
 SHA512:
-  metadata.gz: dd839687955389dd26fe3a3e355ff4d7803ecff01982d2f83fd0eaf99bcb8517ea3facc18bdd88c716656f010dc2cdbe5508102162f7b5780cb88fcbe157e84b
-  data.tar.gz: 4710b15b4581678be50bb53b0efb12db286676b1b15baafb5c39eff30161d0989105712ae83650529bf0e258f506ae9c6a660a513140c8fc0ad32be06a230554
+  metadata.gz: 0e18e4012b7059d30f707b005805971d0f0a6d26a95cf441eb23c797554cdba1d1e7f39428ed7d124cb11b36c2b7cbbcb16680087cc7d23aefb93b95c19d50ae
+  data.tar.gz: 4cc538fed4faeb12b190a13921d466d23969642252d4c517334f3731f75e844cb9d6ed44c5a14ced75c014e60e8511aff40284b827b0da13118e50b78d3de709

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ui_bibz (2.0.0.alpha29)
+    ui_bibz (2.0.0.alpha30)
       bootstrap (= 4.0.0.alpha5)
       font-awesome-sass
       haml
@@ -143,7 +143,7 @@ GEM
     simple_form (3.4.0)
       actionpack (> 4, < 5.1)
       activemodel (> 4, < 5.1)
-    simplecov (0.13.0)
+    simplecov (0.14.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)

data/app/assets/javascripts/form.coffee

@@ -31,10 +31,11 @@
 
   formula: ->
     me = this
-    formula_input_field = $('.formula-field')
-    me.updateFormulaField(formula_input_field)
+    formula_input_fields = $('.formula-field')
+    formula_input_fields.each ->
+      me.updateFormulaField($(this))
 
-    formula_input_field.on 'keyup', ->
+    formula_input_fields.on 'keyup', ->
       me.updateFormulaField($(this))
 
   updateFormulaField: (field) ->

data/app/inputs/custom_inputs/auto_complete_field_input.rb

@@ -1,15 +1,16 @@
 module CustomInputs
-  class AutoCompleteFieldInput < SimpleForm::Inputs::CollectionInput
+  class AutoCompleteFieldInput < CollectionInput
     include UiBibz::Ui::Core::Forms::Texts
-    include ActionView::Helpers::FormOptionsHelper
 
     def input(wrapper_options)
-      label_method, value_method = detect_collection_methods
-      options = options || {}
-      options = options.merge({ builder: @builder })
-      options = options.merge(option_tags: options_from_collection_for_select(collection, label_method, label_method))
+      UiBibz::Ui::Core::Forms::Texts::AutoCompleteField.new(input_attribute_name, new_options, input_html_options).render
+    end
 
-      UiBibz::Ui::Core::Forms::Texts::AutoCompleteField.new(attribute_name, options, input_html_options).render
+    def input_html_options
+      opts = super
+      opts = opts.merge({ disabled: options[:disabled] })           unless options[:disabled].blank?
+      opts = opts.merge({ value: @builder.object.send(attribute_name) })
+      opts
     end
   end
 end

data/app/inputs/custom_inputs/collection_input.rb

@@ -14,16 +14,17 @@ module CustomInputs
 
     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,
-          input_options
+          @builder.object.send(attribute_name)
         )})
       else
         options.merge({ option_tags: options_from_collection_for_select(
-          collection, value_method, label_method, input_options
+          collection, value_method, label_method, @builder.object.send(attribute_name)
         )})
       end
     end
@@ -35,11 +36,18 @@ module CustomInputs
       end
     end
 
+    def input_attribute_name
+      "#{ @builder.object.class.to_s.parameterize.underscore }[#{ attribute_name }]"
+    end
+
     def collection
-      if options[:grouped]
-        @collection ||= grouped_collection.map { |collection| collection.try(:send, group_method) }.detect(&:present?) || []
-      else
-        @collection ||= options[:collection]
+      @collection ||= begin
+        if options[:grouped]
+          grouped_collection.map { |collection| collection.try(:send, group_method) }.detect(&:present?) || []
+        else
+          collection = options.delete(:collection) || self.class.boolean_collection
+          collection.respond_to?(:call) ? collection.call : collection.to_a
+        end
       end
     end
 

data/app/inputs/custom_inputs/date_picker_field_input.rb

@@ -1,10 +1,9 @@
 module CustomInputs
-  class DatePickerFieldInput < SimpleForm::Inputs::StringInput
+  class DatePickerFieldInput < StringInput
     include UiBibz::Ui::Core::Forms::Dates
 
     def input(wrapper_options)
-      options = @options.merge({ builder: @builder })
-      UiBibz::Ui::Core::Forms::Dates::DatePickerField.new(attribute_name, options, input_html_options).render
+      UiBibz::Ui::Core::Forms::Dates::DatePickerField.new(input_attribute_name, options, input_html_options).render
     end
 
   end

data/app/inputs/custom_inputs/dropdown_select_field_input.rb

@@ -2,7 +2,7 @@ module CustomInputs
   class DropdownSelectFieldInput < CollectionInput
 
     def input(wrapper_options)
-      UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new(attribute_name, new_options, input_html_options).render
+      UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new(input_attribute_name, new_options, input_html_options).render
     end
 
   end

data/app/inputs/custom_inputs/formula_field_input.rb

@@ -1,10 +1,17 @@
 module CustomInputs
-  class FormulaFieldInput < SimpleForm::Inputs::StringInput
+  class FormulaFieldInput < StringInput
     include UiBibz::Ui::Core::Forms::Numbers
 
     def input(wrapper_options)
-      options = @options.merge({ builder: @builder })
-      UiBibz::Ui::Core::Forms::Numbers::FormulaField.new(attribute_name, options, input_html_options).render
+      UiBibz::Ui::Core::Forms::Numbers::FormulaField.new(input_attribute_name, options, input_html_options).render
+    end
+
+    def input_html_options
+      super.merge({ value: @builder.object.send(attribute_name), formula_field_value: @builder.object.send(options[:formula_field_name] || attribute_formula_name)})
+    end
+
+    def attribute_formula_name
+      "#{ attribute_name }_formula"
     end
 
   end

data/app/inputs/custom_inputs/markdown_editor_field_input.rb

@@ -1,10 +1,9 @@
 module CustomInputs
-  class MarkdownEditorFieldInput < SimpleForm::Inputs::StringInput
+  class MarkdownEditorFieldInput < StringInput
     include UiBibz::Ui::Core::Forms::Textareas
 
     def input(wrapper_options)
-      options = @options.merge({ builder: @builder })
-      UiBibz::Ui::Core::Forms::Textareas::MarkdownEditorField.new(attribute_name, options, input_html_options).render
+      UiBibz::Ui::Core::Forms::Textareas::MarkdownEditorField.new(input_attribute_name, options, input_html_options).render
     end
 
   end

data/app/inputs/custom_inputs/multi_column_field_input.rb

@@ -1,63 +1,9 @@
 module CustomInputs
-  # multi_column_input manages collection and grouped_collection
-  class MultiColumnFieldInput < SimpleForm::Inputs::CollectionInput
+  class MultiColumnFieldInput < CollectionInput
     include UiBibz::Ui::Core::Forms::Selects
 
     def input(wrapper_options)
-      label_method, value_method = detect_collection_methods
-      i = UiBibz::Ui::Core::Forms::Selects::MultiColumnField.new(attribute_name, options, input_html_options)
-
-      input_options.delete(:prompt)
-      input_options.merge!({include_blank: false})
-
-      if options[:grouped] == true
-        @builder.grouped_collection_select(
-          attribute_name, grouped_collection,
-          group_method, group_label_method,
-          value_method, label_method,
-          input_options, i.html_options
-        )
-      else
-        @builder.collection_select(
-         attribute_name, collection, value_method, label_method,
-         input_options, i.html_options
-        )
-      end
-    end
-
-    def grouped_collection
-      @grouped_collection ||= begin
-        grouped_collection = options.delete(:collection)
-        grouped_collection.respond_to?(:call) ? grouped_collection.call : grouped_collection.to_a
-      end
-    end
-
-    # Sample collection
-    #def group_collection
-      #@group_collection ||= grouped_collection.map { |collection| collection.try(:send, group_method) }.detect(&:present?) || []
-    #end
-
-    def collection
-      if options[:grouped]
-        @collection ||= grouped_collection.map { |collection| collection.try(:send, group_method) }.detect(&:present?) || []
-      else
-        @collection ||= options[:collection]
-      end
-    end
-
-    def group_method
-      @group_method ||= options.delete(:group_method)
-    end
-
-    def group_label_method
-      label = options.delete(:group_label_method)
-
-      unless label
-        common_method_for = detect_common_display_methods(detect_collection_classes(grouped_collection))
-        label = common_method_for[:label]
-      end
-
-      label
+      UiBibz::Ui::Core::Forms::Selects::MultiColumnField.new(attribute_name, new_options, input_html_options).render
     end
 
   end

data/app/inputs/custom_inputs/select_field_input.rb

@@ -2,7 +2,7 @@ module CustomInputs
   class SelectFieldInput < CollectionInput
 
     def input(wrapper_options)
-      UiBibz::Ui::Core::Forms::Selects::SelectField.new(attribute_name, new_options, input_html_options).render
+      UiBibz::Ui::Core::Forms::Selects::SelectField.new(input_attribute_name, new_options, input_html_options).render
     end
   end
 end

data/app/inputs/custom_inputs/string_input.rb

@@ -0,0 +1,13 @@
+module CustomInputs
+  class StringInput < SimpleForm::Inputs::StringInput
+
+    def input(wrapper_options)
+      super
+    end
+
+    def input_attribute_name
+      "#{ @builder.object.class.to_s.parameterize.underscore }[#{ attribute_name }]"
+    end
+
+  end
+end

data/app/inputs/custom_inputs/surround_field_input.rb

@@ -1,10 +1,9 @@
 module CustomInputs
-  class SurroundFieldInput < SimpleForm::Inputs::StringInput
+  class SurroundFieldInput < StringInput
     include UiBibz::Ui::Core::Forms::Texts
 
     def input(wrapper_options)
-      options = @options.merge({ builder: @builder })
-      UiBibz::Ui::Core::Forms::Texts::SurroundField.new(attribute_name, options, input_html_options).render
+      UiBibz::Ui::Core::Forms::Texts::SurroundField.new(input_attribute_name, options, input_html_options).render
     end
 
   end

data/app/inputs/custom_inputs/switch_field_input.rb

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

data/lib/ui_bibz/ui/core/forms/dates/date_picker_field.rb

@@ -67,11 +67,7 @@ module UiBibz::Ui::Core::Forms::Dates
   private
 
     def text_field_input_tag name
-      if options[:builder].nil?
-        text_field_tag name, html_options[:value], html_options
-      else
-        options[:builder].text_field name, html_options
-      end
+      text_field_tag name, html_options[:value], html_options
     end
 
     def component_html_data

data/lib/ui_bibz/ui/core/forms/numbers/formula_field.rb

@@ -56,19 +56,11 @@ module UiBibz::Ui::Core::Forms::Numbers
     private
 
     def text_field_input_tag
-      if options[:builder].nil?
-        text_field_tag content, html_options[:value], readonly: true, class: 'formula-field-result form-control'
-      else
-        options[:builder].text_field content, readonly: true, class: 'formula-field-result form-control'
-      end
+      text_field_tag content, html_options.delete(:value), readonly: true, class: 'formula-field-result form-control'
     end
 
     def text_field_formula_input_tag
-      if options[:builder].nil?
-        text_field_tag formula_field_name, '', html_options
-      else
-        options[:builder].text_field formula_field_name, html_options
-      end
+      text_field_tag formula_field_name, html_options.delete(:formula_field_value), html_options.except(:value)
     end
 
     def component_html_classes
@@ -86,14 +78,18 @@ module UiBibz::Ui::Core::Forms::Numbers
     end
 
     def formula_field_name
-      options[:formula_field_name] || "#{ content }_formula"
+      options[:formula_field_name] || content_formula_name
+    end
+
+    def content_formula_name
+      content.to_s.split('').select{ |i| i == "]" }.count > 0 ? content.to_s.gsub(/]$/, "_formula]") : "#{ content }_formula"
     end
 
     def formula_field_sign
       content_tag :span, '=', class: 'formula-field-sign input-group-addon'
     end
 
-     def status
+    def status
       "has-#{ options[:status] }" if options[:status]
     end
 

data/lib/ui_bibz/ui/core/forms/textareas/markdown_editor_field.rb

@@ -53,11 +53,7 @@ module UiBibz::Ui::Core::Forms::Textareas
 
     # Render html tag
     def render
-      if options[:builder].nil?
-        text_area_tag content, html_options[:value], html_options
-      else
-        options[:builder].text_area content, html_options
-      end
+      text_area_tag content, html_options[:value], html_options
     end
 
     private

data/lib/ui_bibz/ui/core/forms/texts/auto_complete_field.rb

@@ -75,11 +75,7 @@ module UiBibz::Ui::Core::Forms::Texts
     end
 
     def text_field_input_tag
-      if options[:builder].nil?
-        text_field_tag content, html_options[:value], html_options
-      else
-        options[:builder].text_field content, html_options
-      end
+      text_field_tag content, html_options[:value], html_options
     end
 
     def component_html_options

data/lib/ui_bibz/ui/core/forms/texts/surround_field.rb

@@ -63,11 +63,7 @@ module UiBibz::Ui::Core::Forms::Texts
 
     # Simple_form or not
     def text_field_input_tag
-      if options[:builder].nil?
-        text_field_tag content, html_options[:value], html_options
-      else
-        options[:builder].text_field content, html_options
-      end
+      text_field_tag content, html_options[:value], html_options
     end
 
     def component_html_classes

data/lib/ui_bibz/ui/core/navs/components/navbar_form.rb

@@ -47,10 +47,10 @@ module UiBibz::Ui::Core::Navs
       init_haml_helpers
       @options = options
       if type == :form_for
-        @form = form_for(model_or_url, options, &block)
+        @form = form_for(model_or_url, new_option, &block)
       else
         #@form = form_tag(model_or_url, class: "navbar-form form-inline #{ position }", block)
-        html_options = html_options_for_form(model_or_url, { class: "navbar-form form-inline #{ position }" })
+        html_options = html_options_for_form(model_or_url, new_option)
         @form = form_tag_with_body(html_options, capture(&block))
       end
     end
@@ -62,6 +62,10 @@ module UiBibz::Ui::Core::Navs
 
   private
 
+    def new_option
+      (@options || {}).merge({ class: "navbar-form form-inline #{ position }" })
+    end
+
     def protect_against_forgery?
       false
     end

data/lib/ui_bibz/version.rb

@@ -1,3 +1,3 @@
 module UiBibz
-  VERSION = "2.0.0.alpha29"
+  VERSION = "2.0.0.alpha30"
 end

data/test/dummy/db/migrate/20150123191805_create_users.rb

@@ -5,6 +5,9 @@ class CreateUsers < ActiveRecord::Migration
       t.string :name_en
       t.string :body_fr
       t.string :body_en
+      t.boolean :active
+      t.float   :price
+      t.string  :price_formula
 
       t.timestamps null: false
     end

data/test/dummy/db/schema.rb

@@ -30,8 +30,11 @@ ActiveRecord::Schema.define(version: 20170309084453) do
     t.string   "name_en"
     t.string   "body_fr"
     t.string   "body_en"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.boolean  "active"
+    t.float    "price"
+    t.string   "price_formula"
+    t.datetime "created_at",    null: false
+    t.datetime "updated_at",    null: false
   end
 
 end

data/test/factories/user.rb

@@ -4,5 +4,6 @@ FactoryGirl.define do
     name_en "Name en"
     body_fr "Body fr"
     body_en "Body en"
+    active  true
   end
 end

data/test/simple_form_test.rb

@@ -7,8 +7,8 @@ include SimpleForm::ActionViewExtensions::FormHelper
 class SimpleFormTest < ActionView::TestCase
 
   setup do
-    User.where(name_fr: 'test1').first_or_create
-    User.where(name_fr: 'test2').first_or_create
+    User.where(name_fr: 'test1', active: true).first_or_create
+    User.where(name_fr: 'test2', active: false).first_or_create
     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
@@ -24,18 +24,18 @@ class SimpleFormTest < ActionView::TestCase
       f.input :name_fr, as: :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 class=\"auto_complete_field optional form-control\" autocomplete=\"true\" list=\"name_fr-datalist\" type=\"text\" value=\"test1\" name=\"user[name_fr]\" id=\"user_name_fr\" /><datalist id=\"name_fr-datalist\"><option value=\"test1\">test1</option>
-<option value=\"test2\">test2</option></datalist></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 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>
+<option value=\"2\">test2</option></datalist></div></form>"
 
     assert_equal expected, actual
   end
 
   test 'date picker field input in simple form' do
     actual = simple_form_for @user do |f|
-      f.input :name_fr, as: :date_picker_field
+      f.input :created_at, as: :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_name_fr\"><label class=\"control-label date_picker_field optional\" for=\"user_name_fr\">Name fr</label><input 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\" type=\"text\" value=\"test1\" name=\"user[name_fr]\" id=\"user_name_fr\" /></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 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>"
 
     assert_equal expected, actual
   end
@@ -45,7 +45,7 @@ class SimpleFormTest < ActionView::TestCase
       f.input :name_fr, as: :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=\"name_fr\" id=\"name_fr\" class=\"dropdown_select_field optional dropdown-select-field\"><option value=\"\" label=\" \"></option><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 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>
 <option value=\"2\">test2</option></select></div></form>"
 
     assert_equal expected, actual
@@ -57,18 +57,21 @@ class SimpleFormTest < ActionView::TestCase
       f.input :name_fr, as: :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=\"name_fr\" id=\"name_fr\" class=\"dropdown_select_field optional dropdown-select-field\"><option value=\"\" label=\" \"></option><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 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>
 <option value=\"2\">Deutchland</option></optgroup></select></div></form>"
 
     assert_equal expected, actual
   end
 
   test 'formula field input in simple form' do
+    @user.price         = 3.0
+    @user.price_formula = "1+2"
+
     actual = simple_form_for @user do |f|
-      f.input :name_fr, as: :formula_field
+      f.input :price, as: :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_name_fr\"><label class=\"control-label formula_field optional\" for=\"user_name_fr\">Name fr</label><div class=\"input-group formula_field\"><input class=\"formula_field optional formula-field form-control\" type=\"text\" name=\"user[name_fr_formula]\" id=\"user_name_fr_formula\" /><span class=\"formula-field-sign input-group-addon\">=</span><input readonly=\"readonly\" class=\"formula-field-result form-control\" type=\"text\" value=\"test1\" name=\"user[name_fr]\" id=\"user_name_fr\" /><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 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>"
 
     assert_equal expected, actual
   end
@@ -78,8 +81,8 @@ class SimpleFormTest < ActionView::TestCase
       f.input :name_fr, as: :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 class=\"markdown_editor_field optional\" data-provide=\"markdown\" data-iconlibrary=\"fa\" name=\"user[name_fr]\" id=\"user_name_fr\">
-test1</textarea></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 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\">
+</textarea></div></form>"
 
     assert_equal expected, actual
   end
@@ -89,7 +92,7 @@ test1</textarea></div></form>"
       f.input :name_fr, as: :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><input name=\"user[name_fr][]\" type=\"hidden\" value=\"\" /><select class=\"multi_column_field optional multi-column-field\" multiple=\"multiple\" name=\"user[name_fr][]\" id=\"user_name_fr\"><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 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>
 <option value=\"2\">test2</option></select></div></form>"
 
     assert_equal expected, actual
@@ -123,17 +126,17 @@ test1</textarea></div></form>"
       f.input :name_fr, as: :surround_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 class=\"surround_field optional form-control\" type=\"text\" value=\"test1\" name=\"user[name_fr]\" id=\"user_name_fr\" /></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 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>"
 
     assert_equal expected, actual
   end
 
   test 'switch field input in simple form' do
     actual = simple_form_for @user do |f|
-      f.input :name_fr, as: :switch_field, collection: @users, label_method: :name_fr
+      f.input :active, as: :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_name_fr\"><label class=\"control-label switch_field optional\" for=\"user_name_fr\">Name fr</label><input name=\"user[name_fr]\" type=\"hidden\" value=\"0\" /><input class=\"switch_field optional switch-field\" type=\"checkbox\" value=\"1\" name=\"user[name_fr]\" id=\"user_name_fr\" /></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 switch_field optional user_active\"><label class=\"control-label switch_field optional\" for=\"user_active\">Active</label><input type=\"checkbox\" name=\"user[active]\" id=\"user_active\" class=\"switch_field optional switch-field\" /></div></form>"
 
     assert_equal expected, actual
   end
@@ -153,7 +156,7 @@ test1</textarea></div></form>"
       f.input :name_fr, as: :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=\"name_fr\" id=\"name_fr\" class=\"select_field optional select-field form-control\"><option value=\"\" label=\" \"></option><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 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>
 <option value=\"2\">test2</option></select></div></form>"
 
     assert_equal expected, actual
@@ -164,8 +167,8 @@ test1</textarea></div></form>"
       f.input :name_fr, as: :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=\"name_fr\" id=\"name_fr\" class=\"select_field optional select-field form-control\"><option value=\"\" label=\" \"></option><option value=\"1\">test1</option>
-<option value=\"2\">test2</option></select><span class=\"input-group-btn\"><button data-connect=\"{&quot;events&quot;:&quot;click&quot;,&quot;mode&quot;:&quot;remote&quot;,&quot;target&quot;:{&quot;selector&quot;:&quot;#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> </button></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 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\"><button 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> </button></span></div></div></form>"
 
     assert_equal expected, actual
   end
@@ -176,7 +179,33 @@ test1</textarea></div></form>"
       f.input :name_fr, as: :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=\"name_fr\" id=\"name_fr\" class=\"select_field optional select-field form-control\"><option value=\"\" label=\" \"></option><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 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>
+<option value=\"2\">Deutchland</option></optgroup></select></div></form>"
+
+    assert_equal expected, actual
+  end
+
+  test 'test collection with selected option in select field into simple form' do
+
+    @user.name_fr = 1
+    actual = simple_form_for @user do |f|
+      f.input :name_fr, as: :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>
+<option value=\"2\">Deutchland</option></select></div></form>"
+
+    assert_equal expected, actual
+  end
+
+  test 'test collection with selected optiongroup in select field into simple form' do
+
+    @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
+    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>
 <option value=\"2\">Deutchland</option></optgroup></select></div></form>"
 
     assert_equal expected, actual

data/test/ui/core/forms/numbers/formula_field_test.rb

@@ -5,7 +5,7 @@ class FormulaFieldTest < ActionView::TestCase
 
     test 'formula_field' do
       actual = UiBibz::Ui::Core::Forms::Numbers::FormulaField.new('value').render
-      expected = "<div class=\"input-group formula_field\"><input type=\"text\" name=\"value_formula\" id=\"value_formula\" value=\"\" class=\"formula-field form-control\" /><span class=\"formula-field-sign input-group-addon\">=</span><input type=\"text\" name=\"value\" id=\"value\" 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>"
+      expected = "<div class=\"input-group formula_field\"><input type=\"text\" name=\"value_formula\" id=\"value_formula\" class=\"formula-field form-control\" /><span class=\"formula-field-sign input-group-addon\">=</span><input type=\"text\" name=\"value\" id=\"value\" 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>"
 
       assert_equal expected, actual
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ui_bibz
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha29
+  version: 2.0.0.alpha30
 platform: ruby
 authors:
 - Thooams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-13 00:00:00.000000000 Z
+date: 2017-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -243,6 +243,7 @@ files:
 - app/inputs/custom_inputs/multi_select_field_input.rb
 - app/inputs/custom_inputs/radio_field_input.rb
 - app/inputs/custom_inputs/select_field_input.rb
+- app/inputs/custom_inputs/string_input.rb
 - app/inputs/custom_inputs/surround_field_input.rb
 - app/inputs/custom_inputs/switch_field_input.rb
 - config/initializers/will_paginate.rb
@@ -381,7 +382,6 @@ files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
-- test/dummy/db/migrate/20150123191721_user.rb
 - test/dummy/db/migrate/20150123191805_create_users.rb
 - test/dummy/db/migrate/20170309084406_continents.rb
 - test/dummy/db/migrate/20170309084453_countries.rb
@@ -518,7 +518,6 @@ test_files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config/secrets.yml
-- test/dummy/db/migrate/20150123191721_user.rb
 - test/dummy/db/migrate/20150123191805_create_users.rb
 - test/dummy/db/migrate/20170309084406_continents.rb
 - test/dummy/db/migrate/20170309084453_countries.rb

data/test/dummy/db/migrate/20150123191721_user.rb

@@ -1,4 +0,0 @@
-class User < ActiveRecord::Migration
-  def change
-  end
-end