trestle 0.9.8 → 0.10.0.pre

data/lib/trestle/color.rb

@@ -0,0 +1,113 @@
+module Trestle
+  class Color
+    attr_reader :r, :g, :b
+
+    def initialize(r, g, b)
+      @r, @g, @b = r, g, b
+    end
+
+    def hex
+      "##{[r, g, b].map { |i| i < 16 ? "0#{i.to_s(16)}" : i.to_s(16) }.join}"
+    end
+
+    def rgb
+      [r, g, b]
+    end
+
+    def hsl
+      r = @r / 255.0
+      g = @g / 255.0
+      b = @b / 255.0
+
+      min = [r, g, b].min
+      max = [r, g, b].max
+
+      h = s = l = (max + min) / 2.0
+
+      if max == min
+        h = 0
+        s = 0
+      else
+        d = max - min
+        s = l >= 0.5 ? d / (2 - max - min) : d / (max + min)
+
+        case max
+        when r
+          h = (g - b) / d + (g < b ? 6 : 0)
+        when g
+          h = (b - r) / d + 2
+        when b
+          h = (r - g) / d + 4
+        end
+
+        h /= 6.0
+      end
+
+      [(h*360).round, (s*100).round, (l*100).round]
+    end
+
+    def self.parse(str)
+      if str.starts_with?("#") && str.length.in?([4, 7])
+        parse_hex(str)
+      elsif str.starts_with?("rgb")
+        parse_rgb(str)
+      elsif str.starts_with?("hsl")
+        parse_hsl(str)
+      else
+        raise ArgumentError, "Could not parse color code: #{str}"
+      end
+    end
+
+    def self.parse_hex(str)
+      str = str.sub(/^#/, "")
+
+      if str.length == 3
+        str = str[0] * 2 + str[1] * 2 + str[2] * 2
+      end
+
+      new(str[0, 2].hex, str[2, 2].hex, str[4, 2].hex)
+    end
+
+    def self.parse_rgb(str)
+      match = str.match(/^rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)$/)
+      new(match[1].to_i, match[2].to_i, match[3].to_i)
+    end
+
+    def self.parse_hsl(str)
+      match = str.match(/^hsl\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)$/)
+      h, s, l = match[1].to_f, match[2].to_f, match[3].to_f
+
+      h /= 360
+      s /= 100
+      l /= 100
+
+      if s == 0
+        r = g = b = l.to_f
+      else
+        q = l < 0.5 ? l * (1 + s) : l + s - l * s
+        p = 2 * l - q
+
+        r = hue_to_rgb(p, q, h + 1/3.0)
+        g = hue_to_rgb(p, q, h)
+        b = hue_to_rgb(p, q, h - 1/3.0)
+      end
+
+      new((r * 255).round, (g * 255).round, (b * 255).round)
+    end
+
+    def self.hue_to_rgb(p, q, t)
+      t += 1 if t < 0
+      t -= 1 if t > 1
+
+      if t < 1 / 6.0
+        p + (q - p) * 6 * t
+      elsif t < 1 / 2.0
+        q
+      elsif t < 2 / 3.0
+        p + (q - p) * (2 / 3.0 - t) * 6
+      else
+        p
+      end
+    end
+  end
+end

data/lib/trestle/configurable.rb

@@ -71,11 +71,11 @@ module Trestle
 
       def deprecated_option(name, message=nil)
         define_method("#{name}=") do |value|
-          ActiveSupport::Deprecation.warn(message)
+          Trestle.deprecator.warn(message)
         end
 
         define_method(name) do |*args|
-          ActiveSupport::Deprecation.warn(message)
+          Trestle.deprecator.warn(message)
         end
       end
     end

data/lib/trestle/configuration.rb

@@ -22,8 +22,19 @@ module Trestle
     # Default timestamp precision
     option :timestamp_precision, :minutes
 
-    # Theme stylesheet compilation (requires Sass support)
-    option :theme, defined?(Sass) || defined?(SassC)
+    # Theme colors
+    option :theme, {}
+
+    def theme=(colors)
+      if [true, false].include?(colors)
+        Trestle.deprecator.warn("Passing a boolean to config.theme is deprecated. Please pass primary and secondary theme colors as a hash.")
+      else
+        original = fetch(:colors) || {}
+        colors = colors.transform_values { |color| Trestle::Color.parse(color) }
+
+        assign(:theme, original.merge(colors))
+      end
+    end
 
 
     ## Mounting Options
@@ -68,8 +79,8 @@ module Trestle
       self.helper_module.module_eval(&block) if block_given?
     end
 
-    # Enable or disable Turbolinks within the Trestle admin
-    option :turbolinks, defined?(Turbolinks)
+    # [DEPRECATED] Enable or disable Turbolinks within the Trestle admin
+    deprecated_option :turbolinks, "The config.turbolinks option is deprecated. Turbo is included and enabled by default within Trestle."
 
     # List of parameters that should persist across requests when paginating or reordering
     option :persistent_params, [:sort, :order, :scope]
@@ -94,10 +105,7 @@ module Trestle
     end
 
     # List of i18n keys to pass into the Trestle.i18n JavaScript object
-    option :javascript_i18n_keys, [
-      "trestle.confirmation.title", "trestle.confirmation.delete", "trestle.confirmation.cancel", "trestle.dialog.error",
-      "admin.buttons.ok", "admin.datepicker.formats.date", "admin.datepicker.formats.datetime", "admin.datepicker.formats.time"
-    ]
+    option :javascript_i18n_keys, []
 
     # List of load paths for where to find admin definitions
     option :load_paths, [

data/lib/trestle/engine.rb

@@ -1,17 +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" << "trestle/custom.css"
+    initializer "trestle.sprockets" do |app|
+      # Sprockets manifest
+      config.assets.precompile << "trestle/manifest.js"
+    end if defined?(Sprockets)
 
-    # Vendor assets
-    %w(eot svg ttf woff woff2).each do |ext|
-      config.assets.precompile << "trestle/fa-*.#{ext}"
-    end
+    initializer "trestle.propshaft" do |app|
+      app.config.assets.excluded_paths << Trestle::Engine.root.join("app/assets/sprockets")
+    end if defined?(Propshaft)
 
     initializer "trestle.automount" do |app|
       if Trestle.config.automount
@@ -21,23 +20,30 @@ module Trestle
       end
     end
 
+    initializer "trestle.deprecator" do |app|
+      app.deprecators[:trestle] = Trestle.deprecator if app.respond_to?(:deprecators)
+    end
+
     initializer "trestle.draper" do |app|
       if defined?(Draper)
         Draper::CollectionDecorator.delegate :current_page, :total_pages, :limit_value, :entry_name, :total_count, :offset_value, :last_page?
       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
+    initializer "turbo.mimetype" do
+      Mime::Type.register "text/vnd.turbo-stream.html", :turbo_stream unless Mime[:turbo_stream]
     end
 
-    initializer "trestle.turbolinks" do |app|
-      # Optional turbolinks
-      app.config.assets.precompile << "turbolinks.js" if Trestle.config.turbolinks
+    initializer "turbo.renderer" do
+      ActiveSupport.on_load(:action_controller) do
+        # Compatibility fix for Rails 5.2
+        delegate :media_type, to: "@_response" unless instance_methods.include?(:media_type)
+
+        ActionController::Renderers.add :turbo_stream do |turbo_streams_html, options|
+          self.content_type = Mime[:turbo_stream] if media_type.nil?
+          turbo_streams_html
+        end
+      end
     end
 
     config.to_prepare do

data/lib/trestle/form/automatic.rb

@@ -31,7 +31,9 @@ module Trestle
               when :datetime
                 datetime_field attribute.name
               when :boolean
-                check_box attribute.name
+                form_group label: false do
+                  check_box attribute.name
+                end
               when :enum
                 collection_radio_buttons attribute.name, attribute.options[:values] || [], :first, :last
               when :json, :jsonb

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

@@ -2,10 +2,6 @@ module Trestle
   class Form
     module Fields
       module CheckBoxHelpers
-        def custom?
-          options[:custom] != false
-        end
-
         def switch?
           options[:switch]
         end
@@ -15,26 +11,19 @@ module Trestle
         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
+          [
+            "form-check",
+            ("form-switch" if switch?),
+            ("form-check-inline" if inline?)
+          ].compact
         end
 
         def input_class
-          custom? ? ["custom-control-input"] : ["form-check-input"]
+          ["form-check-input"]
         end
 
         def label_class
-          custom? ? ["custom-control-label"] : ["form-check-label"]
+          ["form-check-label"]
         end
 
         def defaults

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: disabled? || readonly?, data: { enable_select2: true })
+          Trestle::Options.new(class: ["form-select"], disabled: disabled? || readonly?, data: { controller: "select" })
         end
       end
     end

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

@@ -2,6 +2,10 @@ class Trestle::Form::Fields::ColorField < Trestle::Form::Fields::FormControl
   def field
     builder.raw_color_field(name, options)
   end
+
+  def defaults
+    super.merge(class: ["form-control-color"])
+  end
 end
 
 Trestle::Form::Builder.register(:color_field, Trestle::Form::Fields::ColorField)

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

@@ -4,6 +4,10 @@ class Trestle::Form::Fields::DateField < Trestle::Form::Fields::FormControl
   def field
     builder.raw_date_field(name, options)
   end
+
+  def controller
+    "datepicker"
+  end
 end
 
 Trestle::Form::Builder.register(:date_field, Trestle::Form::Fields::DateField)

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

@@ -4,13 +4,15 @@ module Trestle::Form::Fields::DatePicker
       options[:prepend] ||= options.delete(:icon) { default_icon }
     end
 
-    if enable_date_picker?
-      options.reverse_merge!(data: { picker: true, allow_clear: true })
-    end
-
     super
   end
 
+  def defaults
+    defaults = super
+    defaults.merge!(data: { controller: controller, allow_clear: true }) if enable_date_picker?
+    defaults
+  end
+
   def default_icon
     icon("fa fa-calendar")
   end
@@ -18,4 +20,8 @@ module Trestle::Form::Fields::DatePicker
   def enable_date_picker?
     !disabled? && !readonly? && options[:picker] != false
   end
+
+  def controller
+    "datepicker"
+  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: readonly?, data: { enable_select2: true })
+          Trestle::Options.new(class: ["form-select"], disabled: readonly?, data: { controller: "select" })
         end
       end
     end

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

@@ -4,6 +4,10 @@ class Trestle::Form::Fields::DatetimeField < Trestle::Form::Fields::FormControl
   def field
     builder.raw_datetime_field(name, options)
   end
+
+  def controller
+    "datetimepicker"
+  end
 end
 
 Trestle::Form::Builder.register(:datetime_field, Trestle::Form::Fields::DatetimeField)

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: readonly?, data: { enable_select2: true })
+          Trestle::Options.new(class: ["form-select"], disabled: readonly?, data: { controller: "select" })
         end
       end
     end

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

@@ -1,31 +1,6 @@
-module Trestle
-  class Form
-    module Fields
-      class FileField < Field
-        def field
-          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
+class Trestle::Form::Fields::FileField < Trestle::Form::Fields::FormControl
+  def field
+    builder.raw_file_field(name, options)
   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 content_tag(:div, input_group_addon(@prepend), class: "input-group-prepend") if @prepend
+              concat input_group_addon(@prepend) if @prepend
               concat yield
-              concat content_tag(:div, input_group_addon(@append), class: "input-group-append") if @append
+              concat input_group_addon(@append) if @append
             end
           else
             yield

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

@@ -42,7 +42,7 @@ module Trestle
         end
 
         def label
-          builder.label(name, options[:label], class: ["control-label", ("sr-only" if options[:hide_label])].compact)
+          builder.label(name, options[:label], class: ["form-label", ("visually-hidden" if options[:hide_label])].compact)
         end
 
         def defaults

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"], disabled: disabled? || readonly?, data: { enable_select2: true })
+          Trestle::Options.new(class: ["form-select"], disabled: disabled? || readonly?, data: { controller: "select" })
         end
       end
     end

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

@@ -2,35 +2,23 @@ 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?)
+          [
+            "form-check",
+            ("form-check-inline" if inline?)
           ].compact
-          end
         end
 
         def input_class
-          custom? ? ["custom-control-input"] : ["form-check-input"]
+          ["form-check-input"]
         end
 
         def label_class
-          custom? ? ["custom-control-label"] : ["form-check-label"]
+          ["form-check-label"]
         end
       end
     end

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

@@ -6,12 +6,8 @@ module Trestle
           builder.raw_range_field(name, options)
         end
 
-        def custom?
-          options[:custom] != false
-        end
-
         def defaults
-          custom? ? super.merge(class: ["custom-range"]) : super
+          super.merge(class: ["form-range"])
         end
       end
     end

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

@@ -18,13 +18,29 @@ module Trestle
         end
 
         def default_html_options
-          Trestle::Options.new(class: ["form-control"], disabled: disabled? || readonly?, data: { enable_select2: true })
+          Trestle::Options.new(class: ["form-select"], disabled: disabled? || readonly?, data: { controller: "select", placeholder: placeholder, allow_clear: clearable? })
         end
 
         def default_choices
           builder.object.send(name) if builder.object
         end
 
+        def placeholder
+          prompt = options[:prompt] || options[:include_blank]
+
+          if prompt.kind_of?(String)
+            prompt
+          elsif options[:prompt]
+            I18n.translate("helpers.select.prompt", default: "Please select")
+          elsif options[:include_blank]
+            ""
+          end
+        end
+
+        def clearable?
+          options[:allow_clear] || options[:prompt].present? || options[:include_blank].present?
+        end
+
         # Allows an array of model instances (or a scope) to be
         # passed to the select field as the list of choices.
         class Choices

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

@@ -8,6 +8,10 @@ class Trestle::Form::Fields::TimeField < Trestle::Form::Fields::FormControl
   def default_icon
     icon("fa fa-clock-o")
   end
+
+  def controller
+    "timepicker"
+  end
 end
 
 Trestle::Form::Builder.register(:time_field, Trestle::Form::Fields::TimeField)

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: readonly?, data: { enable_select2: true })
+          Trestle::Options.new(class: ["form-select"], disabled: readonly?, data: { controller: "select" })
         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: disabled? || readonly?, data: { enable_select2: true })
+          Trestle::Options.new(class: ["form-select"], disabled: disabled? || readonly?, data: { controller: "select" })
         end
       end
     end

data/lib/trestle/form/renderer.rb

@@ -23,6 +23,9 @@ module Trestle
       # that they can be delegated to the form builder or template by method_missing.
       undef_method :select, :display
 
+      # These methods defined in ActionView::Helpers::CaptureHelper should be called directly on the existing template object.
+      delegate :content_for, :content_for?, :provide, to: :@template
+
       delegate :concat, to: :output_buffer
 
       def initialize(template, form=nil)

data/lib/trestle/form.rb

@@ -10,10 +10,25 @@ module Trestle
 
     def initialize(options={}, &block)
       @options, @block = options, block
+
+      if @options[:modal] == true
+        @options[:modal] = {}
+      end
+
+      if options[:dialog]
+        Trestle.deprecator.warn("`form dialog: true` is deprecated. Please use `form modal: true` instead.", caller_locations(3))
+        @options.delete(:dialog)
+        @options[:modal] = {}
+      end
+    end
+
+    def modal?
+      options[:modal]
     end
 
     def dialog?
-      options[:dialog] == true
+      Trestle.deprecator.warn("`Trestle::Form#dialog?` is deprecated. Please use `modal?` instead.")
+      options[:modal]
     end
 
     def render(template, instance)

data/lib/trestle/hook/helpers.rb

@@ -24,7 +24,7 @@ module Trestle
 
       def hook_sets
         @_hook_sets ||= [
-          (admin.hooks if defined?(admin) && admin),
+          (admin.hooks if defined?(admin) && admin.respond_to?(:hooks)),
           Trestle.config.hooks
         ].compact
       end

data/lib/trestle/reloader.rb

@@ -38,17 +38,8 @@ module Trestle
 
       app.reloaders << reloader
 
-      if app.respond_to?(:reloader)
-        # Rails >= 5.0
-        app.reloader.to_run do
-          reloader.execute_if_updated
-          true # Rails <= 5.1
-        end
-      else
-        # Rails 4.2
-        ActionDispatch::Reloader.to_prepare do
-          reloader.execute_if_updated
-        end
+      app.reloader.to_run do
+        reloader.execute_if_updated
       end
 
       reloader.execute

data/lib/trestle/resource/builder.rb

@@ -14,13 +14,6 @@ module Trestle
         admin.adapter_class = adapter
       end
 
-      def remove_action(*actions)
-        actions.each do |action|
-          controller.remove_possible_method(action.to_sym)
-          admin.actions.delete(action.to_sym)
-        end
-      end
-
       def collection(&block)
         admin.define_adapter_method(:collection, &block)
       end
@@ -85,7 +78,7 @@ module Trestle
 
       def scopes(options={}, &block)
         admin.scopes.options.merge!(options)
-        admin.scopes.append(&block) if block_given?
+        admin.scopes.append(options, &block) if block_given?
       end
 
       def scope(name, scope=nil, options={}, &block)