trestle 0.8.13 → 0.9.0

data/lib/trestle/form/field.rb

@@ -7,9 +7,9 @@ module Trestle
 
       def initialize(builder, template, name, options={}, &block)
         @builder, @template, @name, @block = builder, template, name, block
-
         @options = defaults.merge(options)
-        extract_options!
+
+        normalize_options!
       end
 
       def errors
@@ -25,7 +25,11 @@ module Trestle
       end
 
       def render
-        form_group do
+        if @wrapper
+          form_group do
+            field
+          end
+        else
           field
         end
       end
@@ -38,11 +42,27 @@ module Trestle
         Trestle::Options.new(readonly: admin.readonly?)
       end
 
-      def extract_options!
-        @wrapper = extract_wrapper_options(*Fields::FormGroup::WRAPPER_OPTIONS).merge(options.delete(:wrapper))
+      def normalize_options!
+        extract_wrapper_options!
+        assign_error_class!
+      end
+
+    protected
+      def extract_wrapper_options!
+        unless options[:wrapper] == false
+          @wrapper = extract_wrapper_options(*Fields::FormGroup::WRAPPER_OPTIONS).merge(options.delete(:wrapper))
+        end
+      end
+
+      def assign_error_class!
+        @options[:class] = Array(@options[:class])
+        @options[:class] << error_class if errors.any?
+      end
+
+      def error_class
+        "is-invalid"
       end
 
-    private
       def extract_wrapper_options(*keys)
         wrapper = Trestle::Options.new
         keys.each { |k| wrapper[k] = options.delete(k) if options.key?(k) }

data/lib/trestle/form/fields.rb

@@ -9,6 +9,9 @@ module Trestle
 
         autoload :DatePicker
 
+        autoload :CheckBoxHelpers
+        autoload :RadioButtonHelpers
+
         autoload :CheckBox
         autoload :CollectionCheckBoxes
         autoload :CollectionRadioButtons

data/lib/trestle/form/fields/check_box.rb

@@ -2,12 +2,12 @@ module Trestle
   class Form
     module Fields
       class CheckBox < Field
+        include CheckBoxHelpers
+
         attr_reader :checked_value, :unchecked_value
 
         def initialize(builder, template, name, options = {}, checked_value = "1", unchecked_value = "0")
           super(builder, template, name, options)
-
-          @options = defaults.merge(options)
           @checked_value, @unchecked_value = checked_value, unchecked_value
         end
 
@@ -16,18 +16,19 @@ module Trestle
         end
 
         def field
-          content_tag(:div, class: options.delete(:class)) do
-            content_tag(:label) do
-              safe_join([
-                builder.raw_check_box(name, options, checked_value, unchecked_value),
-                options[:label] || admin.human_attribute_name(name)
-              ], " ")
-            end
+          wrapper_class = options.delete(:class)
+          wrapper_class = default_wrapper_class if wrapper_class.empty?
+
+          content_tag(:div, class: wrapper_class) do
+            safe_join([
+              builder.raw_check_box(name, options.merge(class: input_class), checked_value, unchecked_value),
+              builder.label(name, options[:label] || admin.human_attribute_name(name), class: label_class, value: (checked_value if options[:multiple]))
+            ])
           end
         end
 
-        def defaults
-          super.merge(class: ["checkbox"])
+        def extract_wrapper_options!
+          # Intentional no-op
         end
       end
     end

data/lib/trestle/form/fields/check_box_helpers.rb

@@ -0,0 +1,46 @@
+module Trestle
+  class Form
+    module Fields
+      module CheckBoxHelpers
+        def custom?
+          options[:custom] != false
+        end
+
+        def switch?
+          options[:switch]
+        end
+
+        def inline?
+          options[:inline]
+        end
+
+        def default_wrapper_class
+          if custom?
+            [
+              "custom-control",
+              switch? ? "custom-switch" : "custom-checkbox",
+              ("custom-control-inline" if inline?)
+            ].compact
+          else
+            [
+              "form-check",
+              ("form-check-inline" if inline?)
+            ].compact
+          end
+        end
+
+        def input_class
+          custom? ? ["custom-control-input"] : ["form-check-input"]
+        end
+
+        def label_class
+          custom? ? ["custom-control-label"] : ["form-check-label"]
+        end
+
+        def defaults
+          Trestle::Options.new(disabled: admin.readonly?)
+        end
+      end
+    end
+  end
+end

data/lib/trestle/form/fields/collection_check_boxes.rb

@@ -2,23 +2,33 @@ module Trestle
   class Form
     module Fields
       class CollectionCheckBoxes < Field
+        include CheckBoxHelpers
+
         attr_reader :collection, :value_method, :text_method, :html_options
 
-        def initialize(builder, template, name, collection, value_method, text_method, options={}, html_options={})
-          super(builder, template, name, options)
+        def initialize(builder, template, name, collection, value_method, text_method, options={}, html_options={}, &block)
+          super(builder, template, name, options, &block)
 
           @collection, @value_method, @text_method = collection, value_method, text_method
           @html_options = default_html_options.merge(html_options)
         end
 
         def field
-          content_tag(:div, class: "checkboxes") do
-            builder.raw_collection_check_boxes(name, collection, value_method, text_method, options, html_options) do |b|
-              b.label(class: "checkbox-inline") { b.check_box + b.text }
+          builder.raw_collection_check_boxes(name, collection, value_method, text_method, options, html_options) do |b|
+            if block
+              block.call(b)
+            else
+              content_tag(:div, class: default_wrapper_class) do
+                b.check_box(class: input_class) + b.label(class: label_class) { b.text }
+              end
             end
           end
         end
 
+        def defaults
+          super.merge(inline: true)
+        end
+
         def default_html_options
           Trestle::Options.new
         end

data/lib/trestle/form/fields/collection_radio_buttons.rb

@@ -2,23 +2,33 @@ module Trestle
   class Form
     module Fields
       class CollectionRadioButtons < Field
+        include RadioButtonHelpers
+
         attr_reader :collection, :value_method, :text_method, :html_options
 
-        def initialize(builder, template, name, collection, value_method, text_method, options={}, html_options={})
-          super(builder, template, name, options)
+        def initialize(builder, template, name, collection, value_method, text_method, options={}, html_options={}, &block)
+          super(builder, template, name, options, &block)
 
           @collection, @value_method, @text_method = collection, value_method, text_method
           @html_options = default_html_options.merge(html_options)
         end
 
         def field
-          content_tag(:div, class: "radio-buttons") do
-            builder.raw_collection_radio_buttons(name, collection, value_method, text_method, options, html_options) do |b|
-              b.label(class: "radio-inline") { b.radio_button + b.text }
+          builder.raw_collection_radio_buttons(name, collection, value_method, text_method, options, html_options) do |b|
+            if block
+              block.call(b)
+            else
+              content_tag(:div, class: default_wrapper_class) do
+                b.radio_button(class: input_class) + b.label(class: label_class) { b.text }
+              end
             end
           end
         end
 
+        def defaults
+          super.merge(inline: true)
+        end
+
         def default_html_options
           Trestle::Options.new
         end

data/lib/trestle/form/fields/date_picker.rb

@@ -1,5 +1,5 @@
 module Trestle::Form::Fields::DatePicker
-  def extract_options!
+  def normalize_options!
     options[:prepend] ||= options.delete(:icon) { default_icon }
 
     unless options[:disabled] || options[:readonly]

data/lib/trestle/form/fields/file_field.rb

@@ -3,7 +3,26 @@ module Trestle
     module Fields
       class FileField < Field
         def field
-          builder.raw_file_field(name, options)
+          if custom?
+            content_tag(:div, class: "custom-file") do
+              concat builder.raw_file_field(name, options.merge(class: "custom-file-input"))
+              concat builder.label(name, choose_file_text, class: "custom-file-label", data: { browse: browse_text })
+            end
+          else
+            builder.raw_file_field(name, options)
+          end
+        end
+
+        def custom?
+          options[:custom] != false
+        end
+
+        def choose_file_text
+          I18n.t("trestle.file.choose_file", default: "Choose file")
+        end
+
+        def browse_text
+          I18n.t("trestle.file.browse", default: "Browse")
         end
       end
     end

data/lib/trestle/form/fields/form_control.rb

@@ -13,9 +13,9 @@ module Trestle
         def input_group
           if @prepend || @append
             content_tag(:div, class: "input-group") do
-              concat input_group_addon(@prepend) if @prepend
+              concat content_tag(:div, input_group_addon(@prepend), class: "input-group-prepend") if @prepend
               concat yield
-              concat input_group_addon(@append) if @append
+              concat content_tag(:div, input_group_addon(@append), class: "input-group-append") if @append
             end
           else
             yield
@@ -24,7 +24,7 @@ module Trestle
 
         def input_group_addon(addon)
           if addon[:wrap]
-            content_tag(:span, addon[:content], class: "input-group-addon")
+            content_tag(:span, addon[:content], class: "input-group-text")
           else
             addon[:content]
           end
@@ -34,7 +34,7 @@ module Trestle
           super.merge(class: ["form-control"])
         end
 
-        def extract_options!
+        def normalize_options!
           super
 
           @prepend = { content: options.delete(:prepend),  wrap: true }  if options[:prepend]

data/lib/trestle/form/fields/form_group.rb

@@ -5,8 +5,6 @@ module Trestle
         WRAPPER_OPTIONS = [:help, :label, :hide_label]
 
         def render
-          options[:class] << 'has-error' if errors.any?
-
           content_tag(:div, options.except(*WRAPPER_OPTIONS)) do
             concat label unless options[:label] == false
             concat template.capture(&block) if block
@@ -16,7 +14,7 @@ module Trestle
         end
 
         def help_message
-          classes = ["help-block"]
+          classes = ["form-text"]
 
           if options[:help].is_a?(Hash)
             message = options[:help][:text]
@@ -29,7 +27,7 @@ module Trestle
         end
 
         def error_message
-          content_tag(:p, class: "help-block") do
+          content_tag(:p, class: "invalid-feedback") do
             safe_join([icon("fa fa-warning"), errors.first], " ")
           end
         end
@@ -39,11 +37,16 @@ module Trestle
         end
 
         def defaults
-          super.merge(class: ["form-group"])
+          Trestle::Options.new(class: ["form-group"])
+        end
+
+      protected
+        def extract_wrapper_options!
+          # Intentional no-op
         end
 
-        def extract_options!
-          # Do not call super
+        def error_class
+          "has-error"
         end
       end
     end

data/lib/trestle/form/fields/radio_button.rb

@@ -2,6 +2,8 @@ module Trestle
   class Form
     module Fields
       class RadioButton < Field
+        include RadioButtonHelpers
+
         attr_reader :tag_value
 
         def initialize(builder, template, name, tag_value, options={})
@@ -15,15 +17,20 @@ module Trestle
         end
 
         def field
-          content_tag(:div, class: "radio") do
-            content_tag(:label) do
-              safe_join([
-                builder.raw_radio_button(name, tag_value, options),
-                options[:label] || tag_value.to_s.humanize
-              ], " ")
-            end
+          wrapper_class = options.delete(:class)
+          wrapper_class = default_wrapper_class if wrapper_class.empty?
+
+          content_tag(:div, class: wrapper_class) do
+            safe_join([
+              builder.raw_radio_button(name, tag_value, options.merge(class: input_class)),
+              builder.label(name, options[:label] || tag_value.to_s.humanize, value: tag_value, class: label_class)
+            ])
           end
         end
+
+        def extract_wrapper_options!
+          # Intentional no-op
+        end
       end
     end
   end

data/lib/trestle/form/fields/radio_button_helpers.rb

@@ -0,0 +1,38 @@
+module Trestle
+  class Form
+    module Fields
+      module RadioButtonHelpers
+        def custom?
+          options[:custom] != false
+        end
+
+        def inline?
+          options[:inline]
+        end
+
+        def default_wrapper_class
+          if custom?
+            [
+              "custom-control",
+              "custom-radio",
+              ("custom-control-inline" if inline?)
+            ].compact
+          else
+            [
+              "form-check",
+              ("form-check-inline" if inline?)
+          ].compact
+          end
+        end
+
+        def input_class
+          custom? ? ["custom-control-input"] : ["form-check-input"]
+        end
+
+        def label_class
+          custom? ? ["custom-control-label"] : ["form-check-label"]
+        end
+      end
+    end
+  end
+end

data/lib/trestle/form/fields/range_field.rb

@@ -5,6 +5,16 @@ module Trestle
         def field
           builder.raw_range_field(name, options)
         end
+
+        def custom?
+          options[:custom] != false
+        end
+
+        def normalize_options!
+          options.reverse_merge!(class: ["custom-range"]) if custom?
+
+          super
+        end
       end
     end
   end

data/lib/trestle/form/renderer.rb

@@ -6,7 +6,7 @@ module Trestle
       include HookHelper
 
       # Whitelisted helpers will concatenate their result to the output buffer when called.
-      WHITELISTED_HELPERS = [:row, :col, :render, :tab, :table, :divider, :h1, :h2, :h3, :h4, :h5, :h6, :panel, :well]
+      WHITELISTED_HELPERS = [:row, :col, :render, :tab, :table, :divider, :h1, :h2, :h3, :h4, :h5, :h6, :card, :panel, :well]
 
       # Raw block helpers will pass their block argument directly to the method
       # without wrapping it in a new output buffer.