trestle 0.9.6 → 0.9.7

data/lib/generators/trestle/install/templates/trestle.rb.erb

@@ -70,6 +70,7 @@ Trestle.configure do |config|
   # Specify helper modules to expose to the admin.
   #
   # config.helper :all
+  # config.helper -> { CustomHelper }
 
   # Register callbacks to run before, after or around all Trestle actions.
   #
@@ -123,7 +124,7 @@ Trestle.configure do |config|
   #   def render; end
   # end
   #
-  # config.form_field :custom, CustomFormField
+  # config.form_field :custom, -> { CustomFormField }
 
   # == Debugging Options
   #

data/lib/trestle/configurable.rb

@@ -15,6 +15,12 @@ module Trestle
       options.fetch(name) {
         if defaults.key?(name)
           value = defaults[name]
+
+          # Avoid references to the same instance of a default value
+          if value.respond_to?(:dup) && !value.is_a?(Proc)
+            value = value.dup
+          end
+
           assign(name, value)
         end
       }

data/lib/trestle/configuration.rb

@@ -54,18 +54,17 @@ module Trestle
       menus << Navigation::Block.new(&block)
     end
 
-
     ## Extension Options
 
     # [Internal] List of helper modules to include in all Trestle controllers
-    option :helpers, []
+    option :helpers, Lazy::List.new
 
     # [Internal] Container module for block-defined helpers
     option :helper_module, Module.new
 
     # Register global helpers available to all Trestle admins
     def helper(*helpers, &block)
-      self.helpers += helpers
+      self.helpers << helpers
       self.helper_module.module_eval(&block) if block_given?
     end
 
@@ -82,8 +81,8 @@ module Trestle
     option :default_adapter, Adapters.compose(Adapters::ActiveRecordAdapter, Adapters::DraperAdapter)
 
     # Register a custom form field class
-    def form_field(name, klass)
-      Form::Builder.register(name, klass)
+    def form_field(name, field)
+      Form::Builder.register(name, field)
     end
 
     # [Internal] List of registered hooks

data/lib/trestle/form/builder.rb

@@ -9,7 +9,7 @@ module Trestle
       undef_method :display
 
       cattr_accessor :fields
-      self.fields = {}
+      self.fields = Lazy::Hash.new
 
       def errors(name)
         if object.respond_to?(:errors) && object.errors.respond_to?(:[])
@@ -19,14 +19,14 @@ module Trestle
         end
       end
 
-      def self.register(name, klass)
+      def self.register(name, field)
         rename_existing_helper_method(name)
-        self.fields[name] = klass
+        self.fields[name] = field
       end
 
     protected
       def respond_to_missing?(name, include_all=false)
-        self.class.fields.has_key?(name) || super
+        self.class.fields.key?(name) || super
       end
 
       def method_missing(name, *args, &block)

data/lib/trestle/lazy.rb

@@ -0,0 +1,56 @@
+module Trestle
+  module Lazy
+    module Constantize
+      def constantize(value)
+        case value
+        when String
+          value.safe_constantize
+        when Proc
+          value.call
+        else
+          value
+        end
+      end
+    end
+
+    class List
+      include Enumerable
+      include Constantize
+
+      def initialize(*items)
+        @list = items
+      end
+
+      def each(&block)
+        @list.each do |item|
+          yield constantize(item)
+        end
+      end
+
+      def <<(items)
+        @list += Array(items)
+      end
+    end
+
+    class Hash
+      include Enumerable
+      include Constantize
+
+      delegate :[]=, :key?, to: :@hash
+
+      def initialize
+        @hash = {}
+      end
+
+      def each(&block)
+        @hash.each do |key, value|
+          yield key, constantize(value)
+        end
+      end
+
+      def [](key)
+        constantize(@hash[key])
+      end
+    end
+  end
+end

data/lib/trestle/navigation/item.rb

@@ -17,7 +17,7 @@ module Trestle
       end
 
       def <=>(other)
-        priority <=> other.priority
+        [priority, name] <=> [other.priority, other.name]
       end
 
       def priority

data/lib/trestle/table/column.rb

@@ -108,7 +108,7 @@ module Trestle
 
         def column_value(instance)
           if @column.block
-            if defined?(Haml) && Haml::Helpers.block_is_haml?(@column.block)
+            if block_is_legacy_haml?
               # In order for table column blocks to work properly within Haml templates,
               # the _hamlout local variable needs to be defined in the scope of the block,
               # so that the Haml version of the capture method is used. Because we
@@ -131,6 +131,10 @@ module Trestle
             instance.send(@column.field)
           end
         end
+
+        def block_is_legacy_haml?
+          defined?(Haml) && Haml::Helpers.respond_to?(:block_is_haml?) && Haml::Helpers.block_is_haml?(@column.block)
+        end
       end
     end
   end

data/lib/trestle/version.rb

@@ -1,3 +1,3 @@
 module Trestle
-  VERSION = "0.9.6"
+  VERSION = "0.9.7"
 end

data/lib/trestle.rb

@@ -11,6 +11,7 @@ module Trestle
   require_relative "trestle/adapters"
   require_relative "trestle/attribute"
   require_relative "trestle/breadcrumb"
+  require_relative "trestle/lazy"
   require_relative "trestle/configurable"
   require_relative "trestle/configuration"
   require_relative "trestle/display"

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trestle",
-  "version": "0.9.6",
+  "version": "0.9.7",
   "description": "A modern, responsive admin framework for Ruby on Rails",
   "homepage": "https://trestle.io",
   "repository": "https://github.com/TrestleAdmin/trestle.git",