trestle 0.8.13 → 0.9.4

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

@@ -16,7 +16,7 @@ module Trestle
         end
 
         def default_html_options
-          Trestle::Options.new(class: ["form-control"], disabled: admin.readonly?, data: { enable_select2: true })
+          Trestle::Options.new(class: ["form-control"], disabled: disabled? || readonly?, data: { enable_select2: true })
         end
       end
     end

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

@@ -1,9 +1,11 @@
 module Trestle::Form::Fields::DatePicker
-  def extract_options!
-    options[:prepend] ||= options.delete(:icon) { default_icon }
+  def normalize_options!
+    unless options[:prepend] == false
+      options[:prepend] ||= options.delete(:icon) { default_icon }
+    end
 
-    unless options[:disabled] || options[:readonly]
-      options.reverse_merge!(data: { picker: options.delete(:picker) { true }, allow_clear: true })
+    if enable_date_picker?
+      options.reverse_merge!(data: { picker: true, allow_clear: true })
     end
 
     super
@@ -12,4 +14,8 @@ module Trestle::Form::Fields::DatePicker
   def default_icon
     icon("fa fa-calendar")
   end
+
+  def enable_date_picker?
+    !disabled? && !readonly? && options[:picker] != false
+  end
 end

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

@@ -17,7 +17,7 @@ module Trestle
         end
 
         def default_html_options
-          Trestle::Options.new(class: ["form-control"], disabled: admin.readonly?, data: { enable_select2: true })
+          Trestle::Options.new(class: ["form-control"], disabled: readonly?, data: { enable_select2: true })
         end
       end
     end

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

@@ -17,7 +17,7 @@ module Trestle
         end
 
         def default_html_options
-          Trestle::Options.new(class: ["form-control"], disabled: admin.readonly?, data: { enable_select2: true })
+          Trestle::Options.new(class: ["form-control"], disabled: readonly?, data: { enable_select2: true })
         end
       end
     end

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

@@ -4,19 +4,24 @@ module Trestle
       class FormGroup < Field
         WRAPPER_OPTIONS = [:help, :label, :hide_label]
 
-        def render
-          options[:class] << 'has-error' if errors.any?
+        def initialize(builder, template, name=nil, options={}, &block)
+          # Normalize options passed as name parameter
+          name, options = nil, name if name.is_a?(Hash)
+
+          super(builder, template, name, options, &block)
+        end
 
+        def render
           content_tag(:div, options.except(*WRAPPER_OPTIONS)) do
-            concat label unless options[:label] == false
+            concat label if name && options[:label] != false
             concat template.capture(&block) if block
             concat help_message if options[:help]
-            concat error_message if errors.any?
+            concat error_message if name && errors.any?
           end
         end
 
         def help_message
-          classes = ["help-block"]
+          classes = ["form-text"]
 
           if options[:help].is_a?(Hash)
             message = options[:help][:text]
@@ -29,7 +34,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 +44,20 @@ 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 error_class
+          "has-error"
         end
 
-        def extract_options!
-          # Do not call super
+        def error_keys
+          name ? super : []
         end
       end
     end

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

@@ -16,7 +16,7 @@ module Trestle
         end
 
         def default_html_options
-          Trestle::Options.new(class: ["form-control"], data: { enable_select2: true })
+          Trestle::Options.new(class: ["form-control"], disabled: disabled? || readonly?, data: { enable_select2: true })
         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,14 @@ module Trestle
         def field
           builder.raw_range_field(name, options)
         end
+
+        def custom?
+          options[:custom] != false
+        end
+
+        def defaults
+          custom? ? super.merge(class: ["custom-range"]) : super
+        end
       end
     end
   end

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

@@ -18,7 +18,7 @@ module Trestle
         end
 
         def default_html_options
-          Trestle::Options.new(class: ["form-control"], disabled: admin.readonly?, data: { enable_select2: true })
+          Trestle::Options.new(class: ["form-control"], disabled: disabled? || readonly?, data: { enable_select2: true })
         end
 
         def default_choices
@@ -44,8 +44,7 @@ module Trestle
         protected
           def option_text_and_value(option)
             if !option.is_a?(String) && option.respond_to?(:first) && option.respond_to?(:last)
-              option = option.reject { |e| Hash === e } if Array === option
-              [option.first, option.last]
+              option
             elsif option.respond_to?(:id)
               [Trestle::Display.new(option).to_s, option.id]
             else

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

@@ -5,8 +5,8 @@ module Trestle
         attr_reader :value
 
         def initialize(builder, template, name, value=nil, options={}, &block)
-          if block_given? && value.is_a?(Hash)
-            options = value
+          if value.is_a?(Hash)
+            @value, options = nil, value
           else
             @value = value
           end
@@ -18,9 +18,13 @@ module Trestle
           if block
             template.capture(&block)
           else
-            content_tag(:p, value, class: "form-control-static")
+            content_tag(:p, value || default_value, class: "form-control-static")
           end
         end
+
+        def default_value
+          builder.object.send(name) if builder.object
+        end
       end
     end
   end

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

@@ -1,3 +1,5 @@
+require_relative "select"
+
 module Trestle
   class Form
     module Fields
@@ -7,7 +9,7 @@ module Trestle
         end
 
         def default_html_options
-          super.merge(multiple: true, class: "tag-select", disabled: admin.readonly?, data: { tags: true })
+          super.merge(multiple: true, class: ["tag-select"], data: { tags: true })
         end
       end
     end

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

@@ -17,7 +17,7 @@ module Trestle
         end
 
         def default_html_options
-          Trestle::Options.new(class: ["form-control"], disabled: admin.readonly?, data: { enable_select2: true })
+          Trestle::Options.new(class: ["form-control"], disabled: readonly?, data: { enable_select2: true })
         end
       end
     end

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

@@ -16,7 +16,7 @@ module Trestle
         end
 
         def default_html_options
-          Trestle::Options.new(class: ["form-control"], disabled: admin.readonly?, data: { enable_select2: true })
+          Trestle::Options.new(class: ["form-control"], disabled: disabled? || readonly?, data: { enable_select2: true })
         end
       end
     end

data/lib/trestle/form/renderer.rb

@@ -1,15 +1,19 @@
+require "action_view/context"
+require "action_view/helpers"
+
 module Trestle
   class Form
     class Renderer
       include ::ActionView::Context
       include ::ActionView::Helpers::CaptureHelper
-      include HookHelper
+
+      # Include hook helpers directly so that they are evaluated in the context of the renderer instead of the template.
+      include Hook::Helpers
 
       # 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.
+      # Raw block helpers will pass their block argument directly to the method without wrapping it in a new output buffer.
       RAW_BLOCK_HELPERS = [:table, :toolbar]
 
       # The #select and #display methods are defined on Kernel. Undefine them so

data/lib/trestle/hook.rb

@@ -1,5 +1,8 @@
 module Trestle
   class Hook
+    require_relative "hook/helpers"
+    require_relative "hook/set"
+
     attr_reader :name, :options, :block
 
     def initialize(name, options={}, &block)
@@ -20,37 +23,8 @@ module Trestle
       end
     end
 
-    def evaluate(context)
-      context.instance_exec(&block)
-    end
-
-    class Set
-      attr_reader :hooks
-
-      def initialize
-        @hooks = {}
-      end
-
-      def append(name, options={}, &block)
-        hooks[name.to_s] ||= []
-        hooks[name.to_s] << Hook.new(name.to_s, options, &block)
-      end
-
-      def any?(name)
-        hooks.key?(name.to_s) && hooks[name.to_s].any?
-      end
-
-      def for(name)
-        hooks.fetch(name.to_s) { [] }
-      end
-
-      def empty?
-        hooks.empty?
-      end
-
-      def ==(other)
-        other.is_a?(self.class) && hooks == other.hooks
-      end
+    def evaluate(context, *args)
+      context.instance_exec(*args, &block)
     end
   end
 end

data/lib/trestle/hook/helpers.rb

@@ -0,0 +1,33 @@
+module Trestle
+  class Hook
+    module Helpers
+      def hook(name, *args, &block)
+        hooks = hooks(name)
+
+        if hooks.any?
+          safe_join(hooks.map { |hook|
+            hook.evaluate(self, *args)
+          }, "\n")
+        elsif block_given?
+          capture(*args, &block)
+        end
+      end
+
+      def hook?(name)
+        hooks(name).any?
+      end
+
+    protected
+      def hooks(name)
+        hook_sets.map { |set| set.for(name) }.inject(&:+).select { |h| h.visible?(self) }
+      end
+
+      def hook_sets
+        @_hook_sets ||= [
+          (admin.hooks if defined?(admin) && admin),
+          Trestle.config.hooks
+        ].compact
+      end
+    end
+  end
+end