trestle 0.9.0 → 0.9.5

data/lib/trestle/navigation/item.rb

@@ -55,6 +55,10 @@ module Trestle
         Badge.new(options[:badge]) if badge?
       end
 
+      def html_options
+        options.except(:admin, :badge, :group, :icon, :if, :label, :priority, :unless)
+      end
+
       def visible?(context)
         if options[:if]
           context.instance_exec(&options[:if])

data/lib/trestle/reloader.rb

@@ -1,17 +1,13 @@
 module Trestle
   class Reloader
-    delegate :execute, :updated?, to: :updater
+    delegate :execute, :execute_if_updated, :updated?, to: :updater
 
-    def execute_if_updated
-      if defined?(@updater)
-        updater.execute_if_updated
-      else
-        updater.execute
-      end
+    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
 
@@ -37,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

data/lib/trestle/resource.rb

@@ -1,11 +1,9 @@
 module Trestle
   class Resource < Admin
-    extend ActiveSupport::Autoload
-
-    autoload :AdapterMethods
-    autoload :Builder
-    autoload :Collection
-    autoload :Controller
+    require_relative "resource/adapter_methods"
+    require_relative "resource/builder"
+    require_relative "resource/collection"
+    require_relative "resource/toolbar"
 
     include AdapterMethods
 
@@ -50,9 +48,10 @@ module Trestle
       Collection.new(self, options).prepare(params)
     end
 
-    # Evaluates the admin's scope block(s) and returns a hash of Scope objects keyed by the scope name
+    # Evaluates the admin's scope block(s) using the adapter context
+    # and returns a hash of Scope objects keyed by the scope name.
     def scopes
-      @scopes ||= self.class.scopes.evaluate(@context)
+      @scopes ||= Scopes.new(self.class.scopes, adapter)
     end
 
     class << self
@@ -62,7 +61,7 @@ module Trestle
       end
 
       def scopes
-        @scopes ||= Scopes.new(self)
+        @scopes ||= Scopes::Definition.new
       end
 
       def column_sorts

data/lib/trestle/resource/builder.rb

@@ -2,7 +2,7 @@ module Trestle
   class Resource
     class Builder < Admin::Builder
       self.admin_class = Resource
-      self.controller = Controller
+      self.controller = -> { ResourceController }
 
       def adapter(&block)
         klass = admin.adapter_class
@@ -83,8 +83,9 @@ module Trestle
         admin.define_adapter_method(:count, &block)
       end
 
-      def scopes(&block)
-        admin.scopes.append(&block)
+      def scopes(options={}, &block)
+        admin.scopes.options.merge!(options)
+        admin.scopes.append(&block) if block_given?
       end
 
       def scope(name, scope=nil, options={}, &block)

data/lib/trestle/resource/collection.rb

@@ -42,15 +42,11 @@ module Trestle
       def apply_scopes(collection, params)
         unscoped = collection(params)
 
-        active_scopes(params).reduce(collection) do |collection, scope|
+        scopes.active(params).reduce(collection) do |collection, scope|
           merge_scopes(collection, scope.apply(unscoped))
         end
       end
 
-      def active_scopes(params)
-        scopes.values.select { |s| s.active?(params) }
-      end
-
       def apply_sorting(collection, params)
         return collection unless params[:sort]
 

data/lib/trestle/resource/toolbar.rb

@@ -0,0 +1,42 @@
+module Trestle
+  class Resource
+    module Toolbar
+      class Builder < Trestle::Toolbar::Builder
+        delegate :admin, :instance, to: :@template
+        delegate :translate, :t, to: :admin
+
+        def new
+          link(t("buttons.new", default: "New %{model_name}"), action: :new, style: :light, icon: "fa fa-plus", class: "btn-new-resource") if action?(:new)
+        end
+
+        def save
+          button(t("buttons.save", default: "Save %{model_name}"), style: :success)
+        end
+
+        def delete
+          link(t("buttons.delete", default: "Delete %{model_name}"), instance, action: :destroy, method: :delete, style: :danger, icon: "fa fa-trash", data: { toggle: "confirm-delete", placement: "bottom" }) if action?(:destroy)
+        end
+
+        def dismiss
+          button(t("buttons.ok", default: "OK"), style: :light, data: { dismiss: "modal" }) if @template.dialog_request?
+        end
+        alias ok dismiss
+
+        def save_or_dismiss(action=:update)
+          if action?(action)
+            save
+          else
+            dismiss
+          end
+        end
+
+        builder_method :new, :save, :delete, :dismiss, :ok, :save_or_dismiss
+
+      protected
+        def action?(action)
+          admin.actions.include?(action)
+        end
+      end
+    end
+  end
+end

data/lib/trestle/scopes.rb

@@ -1,23 +1,50 @@
 module Trestle
   class Scopes
-    extend ActiveSupport::Autoload
+    require_relative "scopes/block"
+    require_relative "scopes/definition"
+    require_relative "scopes/scope"
 
-    autoload :Block
-    autoload :Scope
+    include Enumerable
 
-    attr_reader :admin, :blocks
+    delegate :options, to: :@definition
 
-    def initialize(admin)
-      @admin = admin
-      @blocks = []
+    def initialize(definition, context)
+      @definition = definition
+      @scopes = @definition.evaluate(context)
     end
 
-    def append(&block)
-      @blocks << Block.new(admin, &block)
+    def classes
+      [
+        'scopes',
+        ('grouped' if grouped?),
+        layout_class,
+        options[:class]
+      ].compact
     end
 
-    def evaluate(context)
-      @blocks.map { |block| block.scopes(context) }.flatten.index_by(&:name)
+    def each(&block)
+      @scopes.values.each(&block)
+    end
+
+    def grouped?
+      options[:group] != false && any?(&:group)
+    end
+
+    def grouped
+      if grouped?
+        group_by(&:group)
+      else
+        { nil => @scopes.values.flatten }
+      end
+    end
+
+    def active(params)
+      select { |s| s.active?(params) }
+    end
+
+  private
+    def layout_class
+      "columns" if %w(column columns).include?(options[:layout].to_s)
     end
   end
 end

data/lib/trestle/scopes/block.rb

@@ -1,16 +1,17 @@
 module Trestle
   class Scopes
     class Block
-      attr_reader :block, :admin
+      attr_reader :block
 
-      def initialize(admin=nil, &block)
-        @admin = admin
+      def initialize(&block)
         @block = block
       end
 
+      # Evaluates the scope block within the given admin context
+      # and returns an array of the scopes that were defined.
       def scopes(context)
-        context = Evaluator.new(@admin, context)
-        context.instance_exec(@admin, &block)
+        context = Evaluator.new(context)
+        context.instance_exec(context, &block)
         context.scopes
       end
 
@@ -19,8 +20,8 @@ module Trestle
 
         attr_reader :scopes
 
-        def initialize(admin, context=nil)
-          @admin, @context = admin, context
+        def initialize(context=nil)
+          @context = context
           @scopes = []
         end
 
@@ -30,7 +31,7 @@ module Trestle
             scope = nil
           end
 
-          scopes << Scope.new(@admin, name, options, &(scope || block))
+          scopes << Scope.new(@context, name, options, &(scope || block))
         end
       end
     end

data/lib/trestle/scopes/definition.rb

@@ -0,0 +1,22 @@
+module Trestle
+  class Scopes
+    class Definition
+      attr_reader :blocks, :options
+
+      def initialize
+        @blocks = []
+        @options = {}
+      end
+
+      def append(&block)
+        @blocks << Block.new(&block)
+      end
+
+      # Evaluates each of the scope blocks within the given admin context
+      # and returns a hash of Scope objects keyed by the scope name.
+      def evaluate(context)
+        @blocks.map { |block| block.scopes(context) }.flatten.index_by(&:name)
+      end
+    end
+  end
+end

data/lib/trestle/scopes/scope.rb

@@ -8,11 +8,15 @@ module Trestle
       end
 
       def to_param
-        name
+        name unless default?
       end
 
       def label
-        @options[:label] || I18n.t("admin.scopes.#{name}", default: name.to_s.humanize.titleize)
+        @options[:label] || @admin.t("scopes.#{name}", default: name.to_s.humanize.titleize)
+      end
+
+      def group
+        @options[:group]
       end
 
       def default?

data/lib/trestle/tab.rb

@@ -1,3 +1,5 @@
+require "action_view/helpers"
+
 module Trestle
   class Tab
     include ActionView::Helpers::TagHelper

data/lib/trestle/table.rb

@@ -1,22 +1,27 @@
 module Trestle
   class Table
-    extend ActiveSupport::Autoload
-
-    autoload :Automatic
-    autoload :Builder
-    autoload :Column
-    autoload :ActionsColumn
-    autoload :SelectColumn
-    autoload :Row
-
-    attr_reader :columns, :options
+    require_relative "table/automatic"
+    require_relative "table/builder"
+    require_relative "table/column"
+    require_relative "table/actions_column"
+    require_relative "table/select_column"
+    require_relative "table/row"
+
+    attr_reader :columns
     attr_writer :row
+    attr_accessor :options
 
     def initialize(options={})
       @options = options
       @columns = []
     end
 
+    def with_options(opts={})
+      dup.tap do |table|
+        table.options = options.merge(opts)
+      end
+    end
+
     def admin
       Trestle.lookup(options[:admin]) if options.key?(:admin)
     end
@@ -38,7 +43,7 @@ module Trestle
     end
 
     def row
-      @row || Row.new(self)
+      @row || Row.new
     end
 
     class Renderer
@@ -49,7 +54,7 @@ module Trestle
       end
 
       def row
-        @row ||= @table.row.renderer(@template)
+        @row ||= @table.row.renderer(table: @table, template: @template)
       end
 
       def columns

data/lib/trestle/table/actions_column.rb

@@ -1,10 +1,10 @@
 module Trestle
   class Table
     class ActionsColumn
-      attr_reader :table, :toolbar, :options
+      attr_reader :toolbar, :options
 
-      def initialize(table, options={}, &block)
-        @table, @options = table, options
+      def initialize(options={}, &block)
+        @options = options
         @toolbar = Toolbar.new(ActionsBuilder)
 
         if block_given?
@@ -14,8 +14,8 @@ module Trestle
         end
       end
 
-      def renderer(template)
-        Renderer.new(self, template)
+      def renderer(table:, template:)
+        Renderer.new(self, table: table, template: template)
       end
 
       def default_actions
@@ -71,7 +71,7 @@ module Trestle
         end
 
         def content(instance)
-          @template.render_toolbar(@column.toolbar, instance, table.admin)
+          @template.render_toolbar(@column.toolbar, instance, @table.admin)
         end
       end
     end

data/lib/trestle/table/automatic.rb

@@ -13,15 +13,15 @@ module Trestle
         admin.default_table_attributes.map.with_index do |attribute, index|
           case attribute.type
           when :association
-            Column.new(self, attribute.association_name, sort: false)
+            Column.new(attribute.association_name, sort: false)
           else
-            Column.new(self, attribute.name, link: index.zero?, align: (:center if [:datetime, :boolean].include?(attribute.type)))
+            Column.new(attribute.name, link: index.zero?, align: (:center if [:datetime, :boolean].include?(attribute.type)))
           end
         end
       end
 
       def actions_column
-        ActionsColumn.new(self)
+        ActionsColumn.new
       end
     end
   end