trestle 0.9.3 → 0.9.4

data/frontend/js/index.js

@@ -29,6 +29,7 @@ import Dialog from './components/dialog'
 import './components/file'
 import './components/form'
 import './components/gallery'
+import './components/pagination'
 import './components/select'
 import './components/sidebar'
 import './components/table'

data/lib/trestle/admin.rb

@@ -90,12 +90,12 @@ module Trestle
         defaults = [:"admin.#{i18n_key}.#{key}", :"admin.#{key}"]
         defaults << options[:default] if options[:default]
 
-        I18n.t(defaults.shift, options.merge(default: defaults))
+        I18n.t(defaults.shift, **options.merge(default: defaults))
       end
       alias t translate
 
       def parameter_name
-        admin_name.singularize
+        unscope_path(admin_name.singularize)
       end
 
       def route_name
@@ -165,6 +165,16 @@ module Trestle
       def validate!
         # No validations by default. This can be overridden in subclasses.
       end
+
+    private
+      def unscope_path(path)
+        path = path.to_s
+        if i = path.rindex("/")
+          path[(i + 1)..-1]
+        else
+          path
+        end
+      end
     end
   end
 end

data/lib/trestle/engine.rb

@@ -44,12 +44,9 @@ module Trestle
       Engine.reset_helpers!
     end
 
-    config.to_prepare do
-      Engine.reloader.execute
-    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/field.rb

@@ -17,17 +17,17 @@ module Trestle
       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
 
       def render
-        if @wrapper
-          form_group do
-            field
-          end
-        else
+        form_group do
           field
         end
       end
@@ -40,6 +40,10 @@ module Trestle
         Trestle::Options.new(readonly: readonly?)
       end
 
+      def disabled?
+        options[:disabled]
+      end
+
       def readonly?
         options[:readonly] || admin.readonly?
       end
@@ -57,8 +61,11 @@ module Trestle
       end
 
       def extract_wrapper_options!
-        unless options[:wrapper] == false
-          @wrapper = extract_wrapper_options(*Fields::FormGroup::WRAPPER_OPTIONS).merge(options.delete(:wrapper))
+        wrapper = options.delete(:wrapper)
+
+        unless wrapper == false
+          @wrapper = extract_options(*Fields::FormGroup::WRAPPER_OPTIONS)
+          @wrapper.merge!(wrapper) if wrapper.is_a?(Hash)
         end
       end
 
@@ -83,10 +90,10 @@ module Trestle
         keys
       end
 
-      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/collection_select.rb

@@ -16,7 +16,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-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 normalize_options!
-    options[:prepend] ||= options.delete(:icon) { default_icon }
+    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/file_field.rb

@@ -18,7 +18,7 @@ module Trestle
         end
 
         def choose_file_text
-          I18n.t("trestle.file.choose_file", default: "Choose file")
+          I18n.t("trestle.file.choose_file", default: "Choose file...")
         end
 
         def browse_text

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

@@ -4,12 +4,19 @@ module Trestle
       class FormGroup < Field
         WRAPPER_OPTIONS = [:help, :label, :hide_label]
 
+        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
 
@@ -48,6 +55,10 @@ module Trestle
         def error_class
           "has-error"
         end
+
+        def error_keys
+          name ? super : []
+        end
       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/range_field.rb

@@ -10,10 +10,8 @@ module Trestle
           options[:custom] != false
         end
 
-        def normalize_options!
-          options.reverse_merge!(class: ["custom-range"]) if custom?
-
-          super
+        def defaults
+          custom? ? super.merge(class: ["custom-range"]) : super
         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: 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

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

@@ -9,7 +9,7 @@ module Trestle
         end
 
         def default_html_options
-          super.merge(multiple: true, class: "tag-select", disabled: readonly?, data: { tags: true })
+          super.merge(multiple: true, class: ["tag-select"], data: { tags: 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: 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

@@ -7,11 +7,13 @@ module Trestle
       include ::ActionView::Context
       include ::ActionView::Helpers::CaptureHelper
 
+      # 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, :hook, :render, :tab, :table, :divider, :h1, :h2, :h3, :h4, :h5, :h6, :card, :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)
@@ -23,34 +26,5 @@ module Trestle
     def evaluate(context, *args)
       context.instance_exec(*args, &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
-    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

data/lib/trestle/hook/set.rb

@@ -0,0 +1,32 @@
+module Trestle
+  class Hook
+    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
+    end
+  end
+end

data/lib/trestle/reloader.rb

@@ -1,9 +1,13 @@
 module Trestle
   class Reloader
-    delegate :execute, :updated?, to: :updater
+    delegate :execute, :execute_if_updated, :updated?, to: :updater
+
+    def initialize(files, dirs = {})
+      @files, @dirs = files, dirs
+    end
 
     def updater
-      @updater ||= ActiveSupport::FileUpdateChecker.new([], compile_load_paths) do
+      @updater ||= ActiveSupport::FileUpdateChecker.new(@files, @dirs) do
         begin
           clear
 
@@ -29,9 +33,25 @@ module Trestle
       Trestle.config.load_paths.map { |path| path.respond_to?(:call) ? path.call : path }.flatten.map(&:to_s)
     end
 
-  private
-    def compile_load_paths
-      Hash[*load_paths.map { |path| [path, "rb"] }.flatten]
+    def install(app)
+      reloader = self
+
+      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
+      end
+
+      reloader.execute
     end
   end
 end