trestle 0.8.13 → 0.9.4

data/lib/trestle/configuration.rb

@@ -22,6 +22,9 @@ module Trestle
     # Default timestamp precision
     option :timestamp_precision, :minutes
 
+    # Theme stylesheet compilation (requires Sass support)
+    option :theme, defined?(Sass) || defined?(SassC)
+
 
     ## Mounting Options
 
@@ -38,7 +41,7 @@ module Trestle
     option :root, -> { Trestle.config.path }
 
     # Initial breadcrumbs to display in the breadcrumb trail
-    option :root_breadcrumbs, -> { [Trestle::Breadcrumb.new(I18n.t("admin.breadcrumbs.home", default: "Home"), Trestle.config.root)] }
+    option :root_breadcrumbs, -> { [Trestle::Breadcrumb.new(I18n.t(:"admin.breadcrumbs.home", default: "Home"), Trestle.config.root)] }
 
     # Default icon class to use when it is not explicitly provided
     option :default_navigation_icon, "fa fa-arrow-circle-o-right"
@@ -102,8 +105,8 @@ module Trestle
       -> { ActiveSupport::Dependencies.autoload_paths.grep(/\/app\/admin\Z/) }
     ]
 
-    # When to reload Trestle admin within a to_prepare block (`:always` or `:on_update`)
-    option :reload, :on_update
+    # [DEPRECATED] When to reload Trestle admin within a to_prepare block
+    deprecated_option :reload, "The config.reload option is deprecated. Admins are now always reloaded when config.to_prepare is called."
 
 
     ## Debugging

data/lib/trestle/engine.rb

@@ -1,16 +1,16 @@
+require "sprockets/railtie"
+
 module Trestle
   class Engine < ::Rails::Engine
     isolate_namespace Trestle
     self.routes.default_scope = {}
 
     # Application assets
-    config.assets.precompile << "trestle/admin.css" << "trestle/admin.js"
+    config.assets.precompile << "trestle/admin.css" << "trestle/admin.js" << "trestle/custom.css"
 
     # Vendor assets
     %w(eot svg ttf woff woff2).each do |ext|
-      config.assets.precompile << "trestle/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.#{ext}"
-      config.assets.precompile << "trestle/font-awesome/fonts/fontawesome-webfont.#{ext}"
-      config.assets.precompile << "trestle/ionicons/fonts/ionicons.#{ext}"
+      config.assets.precompile << "trestle/fa-*.#{ext}"
     end
 
     initializer "trestle.automount" do |app|
@@ -27,6 +27,14 @@ module Trestle
       end
     end
 
+    initializer "trestle.theme" do |app|
+      # Enable theme compilation
+      if Trestle.config.theme
+        app.config.assets.paths << root.join("frontend/theme").to_s
+        app.config.assets.precompile << "trestle/theme.css"
+      end
+    end
+
     initializer "trestle.turbolinks" do |app|
       # Optional turbolinks
       app.config.assets.precompile << "turbolinks.js" if Trestle.config.turbolinks
@@ -36,16 +44,9 @@ module Trestle
       Engine.reset_helpers!
     end
 
-    config.to_prepare do
-      if Trestle.config.reload == :always
-        Engine.reloader.execute
-      else
-        Engine.reloader.execute_if_updated
-      end
-    end
-
-    def reloader
-      @reloader ||= Trestle::Reloader.new
+    config.after_initialize do |app|
+      reloader = Trestle::Reloader.new(*app.watchable_args)
+      reloader.install(app) unless app.config.eager_load
     end
 
     def reset_helpers!

data/lib/trestle/form.rb

@@ -1,12 +1,10 @@
 module Trestle
   class Form
-    extend ActiveSupport::Autoload
-
-    autoload :Automatic
-    autoload :Builder
-    autoload :Field
-    autoload :Fields
-    autoload :Renderer
+    require_relative "form/automatic"
+    require_relative "form/builder"
+    require_relative "form/field"
+    require_relative "form/fields"
+    require_relative "form/renderer"
 
     attr_reader :options, :block
 

data/lib/trestle/form/automatic.rb

@@ -1,8 +1,8 @@
 module Trestle
   class Form
     class Automatic < Form
-      def initialize(admin)
-        super() do |instance|
+      def initialize(admin, options={})
+        super(options) do |instance|
           admin.default_form_attributes.each do |attribute|
             if attribute.array?
               if [:string, :text].include?(attribute.type)

data/lib/trestle/form/builder.rb

@@ -1,3 +1,5 @@
+require "action_view/helpers"
+
 module Trestle
   class Form
     class Builder < ActionView::Helpers::FormBuilder
@@ -48,6 +50,3 @@ module Trestle
     end
   end
 end
-
-# Load all form fields
-Trestle::Form::Fields.eager_load!

data/lib/trestle/form/field.rb

@@ -8,18 +8,20 @@ module Trestle
       def initialize(builder, template, name, options={}, &block)
         @builder, @template, @name, @block = builder, template, name, block
 
-        @options = defaults.merge(options)
-        extract_options!
+        assign_options!(options)
+        normalize_options!
       end
 
       def errors
-        errors = builder.errors(name)
-        errors += builder.errors(name.to_s.sub(/_id$/, '')) if name.to_s =~ /_id$/
-        errors
+        error_keys.map { |key| builder.errors(key) }.flatten
       end
 
       def form_group(opts={})
-        @builder.form_group(name, @wrapper.merge(opts)) do
+        if @wrapper
+          @builder.form_group(name, @wrapper.merge(opts)) do
+            yield
+          end
+        else
           yield
         end
       end
@@ -35,18 +37,63 @@ module Trestle
       end
 
       def defaults
-        Trestle::Options.new(readonly: admin.readonly?)
+        Trestle::Options.new(readonly: readonly?)
+      end
+
+      def disabled?
+        options[:disabled]
       end
 
-      def extract_options!
-        @wrapper = extract_wrapper_options(*Fields::FormGroup::WRAPPER_OPTIONS).merge(options.delete(:wrapper))
+      def readonly?
+        options[:readonly] || admin.readonly?
+      end
+
+      def normalize_options!
+        extract_wrapper_options!
+        assign_error_class!
+      end
+
+    protected
+      def assign_options!(options)
+        # Assign @options first so that it can be referenced from within #defaults if required
+        @options = Trestle::Options.new(options)
+        @options = defaults.merge(options)
+      end
+
+      def extract_wrapper_options!
+        wrapper = options.delete(:wrapper)
+
+        unless wrapper == false
+          @wrapper = extract_options(*Fields::FormGroup::WRAPPER_OPTIONS)
+          @wrapper.merge!(wrapper) if wrapper.is_a?(Hash)
+        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
+
+      def error_keys
+        keys = [name]
+
+        # Singular associations (belongs_to)
+        keys << name.to_s.sub(/_id$/, '') if name.to_s =~ /_id$/
+
+         # Collection associations (has_many / has_and_belongs_to_many)
+        keys << name.to_s.sub(/_ids$/, 's') if name.to_s =~ /_ids$/
+
+        keys
       end
 
-    private
-      def extract_wrapper_options(*keys)
-        wrapper = Trestle::Options.new
-        keys.each { |k| wrapper[k] = options.delete(k) if options.key?(k) }
-        wrapper
+      def extract_options(*keys)
+        extracted = Trestle::Options.new
+        keys.each { |k| extracted[k] = options.delete(k) if options.key?(k) }
+        extracted
       end
     end
   end

data/lib/trestle/form/fields.rb

@@ -1,44 +1,15 @@
 module Trestle
   class Form
     module Fields
-      extend ActiveSupport::Autoload
+      require_relative "fields/form_control"
+      require_relative "fields/form_group"
 
-      eager_autoload do
-        autoload :FormControl
-        autoload :FormGroup
+      require_relative "fields/date_picker"
 
-        autoload :DatePicker
+      require_relative "fields/check_box_helpers"
+      require_relative "fields/radio_button_helpers"
 
-        autoload :CheckBox
-        autoload :CollectionCheckBoxes
-        autoload :CollectionRadioButtons
-        autoload :CollectionSelect
-        autoload :ColorField
-        autoload :DateField
-        autoload :DateSelect
-        autoload :DatetimeField
-        autoload :DatetimeSelect
-        autoload :EmailField
-        autoload :FileField
-        autoload :GroupedCollectionSelect
-        autoload :MonthField
-        autoload :NumberField
-        autoload :RadioButton
-        autoload :RangeField
-        autoload :SearchField
-        autoload :Select
-        autoload :StaticField
-        autoload :TagSelect
-        autoload :TelephoneField
-        autoload :TextArea
-        autoload :TextField
-        autoload :TimeField
-        autoload :TimeSelect
-        autoload :TimeZoneSelect
-        autoload :UrlField
-        autoload :PasswordField
-        autoload :WeekField
-      end
+      Dir.glob("#{__dir__}/fields/*.rb") { |f| require_relative f }
     end
   end
 end

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: 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