trestle 0.8.11 → 0.8.12

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

@@ -15,6 +15,10 @@ Trestle.configure do |config|
   #
   # config.site_logo_small = "logo-small.png"
 
+  # Speficy a favicon to be used within the admin.
+  #
+  # config.favicon = "favicon.ico"
+
   # Set the text shown in the page footer within the admin.
   # Defaults to 'Powered by Trestle'.
   #

data/lib/trestle.rb

@@ -17,6 +17,7 @@ module Trestle
   autoload :Configurable
   autoload :Configuration
   autoload :Display
+  autoload :EvaluationContext
   autoload :Form
   autoload :Hook
   autoload :ModelName
@@ -24,7 +25,7 @@ module Trestle
   autoload :Options
   autoload :Reloader
   autoload :Resource
-  autoload :Scope
+  autoload :Scopes
   autoload :Tab
   autoload :Table
   autoload :Toolbar
@@ -57,8 +58,9 @@ module Trestle
     config.configure(&block)
   end
 
-  def self.navigation
-    Navigation.build(config.menus + admins.values.map(&:menu).compact)
+  def self.navigation(context)
+    blocks = config.menus + admins.values.map(&:menu).compact
+    Navigation.build(blocks, context)
   end
 end
 

data/lib/trestle/adapters/adapter.rb

@@ -1,6 +1,8 @@
 module Trestle
   module Adapters
     class Adapter
+      include EvaluationContext
+
       attr_reader :admin
       delegate :model, to: :admin
 
@@ -179,23 +181,6 @@ module Trestle
       def default_form_attributes
         raise NotImplementedError
       end
-
-    protected
-      # Missing methods are called on the given context if available.
-      #
-      # We include private methods as methods such as current_user
-      # are usually declared as private or protected.
-      def method_missing(name, *args, &block)
-        if @context && @context.respond_to?(name, true)
-          @context.send(name, *args, &block)
-        else
-          super
-        end
-      end
-
-      def respond_to_missing?(name, include_private=false)
-        (@context && @context.respond_to?(name, true)) || super
-      end
     end
   end
 end

data/lib/trestle/configuration.rb

@@ -13,6 +13,9 @@ module Trestle
     # Custom image for the collapsed/tablet navigation
     option :site_logo_small
 
+    # Favicon used within the admin
+    option :favicon
+
     # Text shown in the admin page footer
     option :footer, -> { I18n.t("trestle.footer", default: "Powered by Trestle") }
 

data/lib/trestle/evaluation_context.rb

@@ -0,0 +1,24 @@
+module Trestle
+  # This module facilitiates the delegation of missing methods to a given @context variable.
+  #
+  # This allows code such as adapter and navigation blocks to be evaluated with access to methods from
+  # both the Adapter/Navigation instance, as well as the controller/view from where they are invoked.
+  module EvaluationContext
+  protected
+    # Missing methods are called on the given context if available.
+    #
+    # We include private methods as methods such as current_user
+    # are usually declared as private or protected.
+    def method_missing(name, *args, &block)
+      if @context && @context.respond_to?(name, true)
+        @context.send(name, *args, &block)
+      else
+        super
+      end
+    end
+
+    def respond_to_missing?(name, include_private=false)
+      (@context && @context.respond_to?(name, true)) || super
+    end
+  end
+end

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

@@ -2,6 +2,10 @@ class Trestle::Form::Fields::PasswordField < Trestle::Form::Fields::FormControl
   def field
     builder.raw_password_field(name, options)
   end
+
+  def defaults
+    super.merge(autocomplete: "new-password")
+  end
 end
 
 Trestle::Form::Builder.register(:password_field, Trestle::Form::Fields::PasswordField)

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

@@ -7,7 +7,9 @@ module Trestle
         def initialize(builder, template, name, choices=nil, options={}, html_options={}, &block)
           super(builder, template, name, options, &block)
 
-          @choices = Choices.new(choices || default_choices)
+          @choices = choices || default_choices
+          @choices = Choices.new(@choices) if @choices.nil? || @choices.is_a?(Enumerable)
+
           @html_options = default_html_options.merge(html_options)
         end
 

data/lib/trestle/form/renderer.rb

@@ -3,6 +3,7 @@ module Trestle
     class Renderer
       include ::ActionView::Context
       include ::ActionView::Helpers::CaptureHelper
+      include HookHelper
 
       # Whitelisted helpers will concatenate their result to the output buffer when called.
       WHITELISTED_HELPERS = [:row, :col, :render, :tab, :table, :divider, :h1, :h2, :h3, :h4, :h5, :h6, :panel, :well]

data/lib/trestle/navigation.rb

@@ -29,12 +29,12 @@ module Trestle
       sorted.first.first if sorted.any?
     end
 
-    def visible(context)
-      self.class.new(items.select { |item| item.visible?(context) })
-    end
-
-    def self.build(blocks)
-      new(blocks.map(&:items).flatten)
+    def self.build(blocks, context)
+      new(blocks.map { |block|
+        block.items(context)
+      }.flatten.select { |item|
+        item.visible?(context)
+      })
     end
 
   private

data/lib/trestle/navigation/block.rb

@@ -8,19 +8,19 @@ module Trestle
         @block = block
       end
 
-      def items
-        context = Context.new(@admin)
+      def items(context)
+        context = Evaluator.new(@admin, context)
         context.instance_exec(@admin, &block)
         context.items
       end
 
-      class Context
-        include Rails.application.routes.url_helpers if Rails.application
+      class Evaluator
+        include EvaluationContext
 
         attr_reader :items
 
-        def initialize(admin=nil)
-          @admin = admin
+        def initialize(admin=nil, context=nil)
+          @admin, @context = admin, context
           @items = []
         end
 

data/lib/trestle/resource.rb

@@ -50,6 +50,11 @@ 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
+    def scopes
+      @scopes ||= self.class.scopes.evaluate(@context)
+    end
+
     class << self
       # Deprecated: use instance method instead
       def prepare_collection(params, options={})
@@ -57,7 +62,7 @@ module Trestle
       end
 
       def scopes
-        @scopes ||= {}
+        @scopes ||= Scopes.new(self)
       end
 
       def column_sorts

data/lib/trestle/resource/builder.rb

@@ -83,13 +83,14 @@ module Trestle
         admin.define_adapter_method(:count, &block)
       end
 
+      def scopes(&block)
+        admin.scopes.append(&block)
+      end
+
       def scope(name, scope=nil, options={}, &block)
-        if scope.is_a?(Hash)
-          options = scope
-          scope = nil
+        scopes do
+          scope(name, scope, options, &block)
         end
-
-        admin.scopes[name] = Scope.new(admin, name, options, &(scope || block))
       end
 
       def return_to(options={}, &block)

data/lib/trestle/scopes.rb

@@ -0,0 +1,23 @@
+module Trestle
+  class Scopes
+    extend ActiveSupport::Autoload
+
+    autoload :Block
+    autoload :Scope
+
+    attr_reader :admin, :blocks
+
+    def initialize(admin)
+      @admin = admin
+      @blocks = []
+    end
+
+    def append(&block)
+      @blocks << Block.new(admin, &block)
+    end
+
+    def evaluate(context)
+      @blocks.map { |block| block.scopes(context) }.flatten.index_by(&:name)
+    end
+  end
+end

data/lib/trestle/scopes/block.rb

@@ -0,0 +1,38 @@
+module Trestle
+  class Scopes
+    class Block
+      attr_reader :block, :admin
+
+      def initialize(admin=nil, &block)
+        @admin = admin
+        @block = block
+      end
+
+      def scopes(context)
+        context = Evaluator.new(@admin, context)
+        context.instance_exec(@admin, &block)
+        context.scopes
+      end
+
+      class Evaluator
+        include EvaluationContext
+
+        attr_reader :scopes
+
+        def initialize(admin, context=nil)
+          @admin, @context = admin, context
+          @scopes = []
+        end
+
+        def scope(name, scope=nil, options={}, &block)
+          if scope.is_a?(Hash)
+            options = scope
+            scope = nil
+          end
+
+          scopes << Scope.new(@admin, name, options, &(scope || block))
+        end
+      end
+    end
+  end
+end

data/lib/trestle/scopes/scope.rb

@@ -0,0 +1,49 @@
+module Trestle
+  class Scopes
+    class Scope
+      attr_reader :name, :options, :block
+
+      def initialize(admin, name, options={}, &block)
+        @admin, @name, @options, @block = admin, name, options, block
+      end
+
+      def to_param
+        name
+      end
+
+      def label
+        @options[:label] || I18n.t("admin.scopes.#{name}", default: name.to_s.humanize.titleize)
+      end
+
+      def default?
+        @options[:default] == true
+      end
+
+      def apply(collection)
+        if @block
+          if @block.arity == 1
+            @admin.instance_exec(collection, &@block)
+          else
+            @admin.instance_exec(&@block)
+          end
+        else
+          collection.public_send(name)
+        end
+      end
+
+      def count(collection)
+        @admin.count(@admin.merge_scopes(collection, apply(collection)))
+      end
+
+      def active?(params)
+        active_scopes = Array(params[:scope])
+
+        if active_scopes.any?
+          active_scopes.include?(to_param.to_s)
+        else
+          default?
+        end
+      end
+    end
+  end
+end

data/lib/trestle/toolbar.rb

@@ -4,9 +4,20 @@ module Trestle
 
     autoload :Builder
     autoload :Context
+    autoload :Menu
+
+    autoload_at "trestle/toolbar/item" do
+      autoload :Button
+      autoload :Dropdown
+      autoload :Link
+    end
 
     def initialize(builder=Builder)
       @builder = builder
+      clear!
+    end
+
+    def clear!
       @blocks = []
     end
 

data/lib/trestle/toolbar/builder.rb

@@ -5,17 +5,16 @@ module Trestle
         @template = template
       end
 
-      def button(content, options={})
-        options[:class] = button_classes_from_options(options)
-
-        button_tag(button_label(content, options), options)
+      def button(label, options={}, &block)
+        Button.new(@template, label, options, &block)
       end
 
-      def link(content, instance_or_url={}, options={})
-        options = instance_or_url if instance_or_url.is_a?(Hash)
-        options[:class] = button_classes_from_options(options)
+      def link(label, instance_or_url={}, options={}, &block)
+        Link.new(@template, label, instance_or_url, options, &block)
+      end
 
-        admin_link_to(button_label(content, options), instance_or_url, options)
+      def dropdown(label=nil, options={}, &block)
+        Dropdown.new(@template, label, options, &block)
       end
 
       # Only methods explicitly tagged as builder methods will be automatically
@@ -28,25 +27,7 @@ module Trestle
         self.builder_methods += methods
       end
 
-      builder_method :button, :link
-
-    private
-      delegate :admin_link_to, :button_tag, :content_tag, :safe_join, :icon, to: :@template
-
-      def button_classes_from_options(options)
-        classes = (options[:class] || "").split("\s")
-        classes.unshift("btn-#{options.delete(:style) || "default"}")
-        classes.unshift("btn") unless classes.include?("btn")
-        classes.push("has-icon") if options[:icon]
-        classes
-      end
-
-      def button_label(content, options)
-        icon = icon(options.delete(:icon)) if options[:icon]
-        label = content_tag(:span, content, class: "btn-label")
-
-        safe_join([icon, label].compact, " ")
-      end
+      builder_method :button, :link, :dropdown
     end
   end
 end

data/lib/trestle/toolbar/item.rb

@@ -0,0 +1,118 @@
+module Trestle
+  class Toolbar
+    class Item
+      attr_reader :label, :menu
+
+      delegate :admin_link_to, :button_tag, :content_tag, :safe_join, :icon, to: :@template
+
+      def initialize(template, label, options={}, &block)
+        @template = template
+        @label, @options, @block = label, options
+
+        @menu = Menu.new(template)
+        @menu.build(&block) if block_given?
+
+        @icon = options.delete(:icon)
+        @style = options.delete(:style)
+      end
+
+      def ==(other)
+        to_s == other.to_s
+      end
+
+      def to_s
+        if menu.items.any?
+          content_tag(:div, class: "btn-group", role: "group") do
+            safe_join([render, render_menu], "\n")
+          end
+        else
+          render
+        end
+      end
+
+      def render
+        raise NotImplementedError
+      end
+
+      def render_menu
+        [
+          menu.render_toggle(class: button_style_classes),
+          menu.render_items
+        ]
+      end
+
+      def options
+        @options.merge(class: button_classes)
+      end
+
+      def button_classes
+        classes = (@options[:class] || "").split(/\s/)
+        classes.push(*button_style_classes)
+        classes.push("has-icon") if @icon
+        classes.uniq
+      end
+
+      def button_label(content, options)
+        icon = icon(@icon) if @icon
+        label = content_tag(:span, content, class: "btn-label")
+
+        safe_join([icon, label].compact, " ")
+      end
+
+      def button_style
+        @style || "default"
+      end
+
+      def button_style_classes
+        ["btn", "btn-#{button_style}"]
+      end
+    end
+
+    class Button < Item
+      def render
+        button_tag(button_label(label, options), options)
+      end
+    end
+
+    class Link < Item
+      attr_reader :instance_or_url
+
+      def initialize(template, label, instance_or_url={}, options={}, &block)
+        if instance_or_url.is_a?(Hash)
+          super(template, label, instance_or_url, &block)
+        else
+          super(template, label, options, &block)
+          @instance_or_url = instance_or_url
+        end
+      end
+
+      def render
+        if @instance_or_url
+          admin_link_to(button_label(label, options), instance_or_url, options)
+        else
+          admin_link_to(button_label(label, options), options)
+        end
+      end
+    end
+
+    class Dropdown < Button
+      def options
+        super.merge(type: "button", data: { toggle: "dropdown" })
+      end
+
+      def label
+        safe_join([
+          super, content_tag(:span, "", class: "caret")
+        ], " ")
+      end
+
+      def button_style_classes
+        super + ["dropdown-toggle"]
+      end
+
+      def render_menu
+        [menu.render_items]
+      end
+    end
+  end
+end