trestle 0.8.9 → 0.8.10

data/lib/trestle/configuration.rb

@@ -16,6 +16,9 @@ module Trestle
     # Text shown in the admin page footer
     option :footer, -> { I18n.t("trestle.footer", default: "Powered by Trestle") }
 
+    # Default timestamp precision
+    option :timestamp_precision, :minutes
+
 
     ## Mounting Options
 
@@ -28,8 +31,11 @@ module Trestle
 
     ## Navigation Options
 
+    # Path to consider the application root (for title links and breadcrumbs)
+    option :root, -> { Trestle.config.path }
+
     # Initial breadcrumbs to display in the breadcrumb trail
-    option :root_breadcrumbs, -> { [Trestle::Breadcrumb.new(I18n.t("admin.breadcrumbs.home", default: "Home"), Trestle.config.path)] }
+    option :root_breadcrumbs, -> { [Trestle::Breadcrumb.new(I18n.t("admin.breadcrumbs.home", default: "Home"), Trestle.config.root)] }
 
     # Default icon class to use when it is not explicitly provided
     option :default_navigation_icon, "fa fa-arrow-circle-o-right"
@@ -78,8 +84,8 @@ module Trestle
     option :hooks, Hash.new { |h, k| h[k] = [] }
 
     # Register an extension hook
-    def hook(name, &block)
-      hooks[name.to_s] << block
+    def hook(name, options={}, &block)
+      hooks[name.to_s] << Hook.new(name.to_s, options, &block)
     end
 
     # List of i18n keys to pass into the Trestle.i18n JavaScript object

data/lib/trestle/engine.rb

@@ -7,9 +7,11 @@ module Trestle
     config.assets.precompile << "trestle/admin.css" << "trestle/admin.js"
 
     # Vendor assets
-    config.assets.precompile << %r(trestle/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular\.(?:eot|svg|ttf|woff|woff2)$)
-    config.assets.precompile << %r(trestle/font-awesome/fonts/fontawesome-webfont\.(?:eot|svg|ttf|woff|woff2)$)
-    config.assets.precompile << %r(trestle/ionicons/fonts/ionicons\.(?:eot|svg|ttf|woff)$)
+    %w(eot svg ttf woff woff2).each do |ext|
+      config.assets.precompile << "trestle/bootstrap-sass/assets/fonts/bootstrap/glyphicons-halflings-regular.#{ext}"
+      config.assets.precompile << "trestle/font-awesome/fonts/fontawesome-webfont.#{ext}"
+      config.assets.precompile << "trestle/ionicons/fonts/ionicons.#{ext}"
+    end
 
     initializer "trestle.automount" do |app|
       if Trestle.config.automount

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

@@ -13,15 +13,23 @@ module Trestle
         def input_group
           if @prepend || @append
             content_tag(:div, class: "input-group") do
-              concat content_tag(:span, @prepend, class: "input-group-addon") if @prepend
+              concat input_group_addon(@prepend) if @prepend
               concat yield
-              concat content_tag(:span, @append, class: "input-group-addon") if @append
+              concat input_group_addon(@append) if @append
             end
           else
             yield
           end
         end
 
+        def input_group_addon(addon)
+          if addon[:wrap]
+            content_tag(:span, addon[:content], class: "input-group-addon")
+          else
+            addon[:content]
+          end
+        end
+
         def defaults
           super.merge(class: ["form-control"])
         end
@@ -29,8 +37,10 @@ module Trestle
         def extract_options!
           super
 
-          @prepend = options.delete(:prepend)
-          @append  = options.delete(:append)
+          @prepend = { content: options.delete(:prepend),  wrap: true }  if options[:prepend]
+          @prepend = { content: options.delete(:prepend!), wrap: false } if options[:prepend!]
+          @append  = { content: options.delete(:append),   wrap: true }  if options[:append]
+          @append  = { content: options.delete(:append!),  wrap: false } if options[:append!]
         end
       end
     end

data/lib/trestle/form/renderer.rb

@@ -5,11 +5,11 @@ module Trestle
       include ::ActionView::Helpers::CaptureHelper
 
       # Whitelisted helpers will concatenate their result to the output buffer when called.
-      WHITELISTED_HELPERS = [:row, :col, :render, :tab, :toolbar, :table, :divider, :h1, :h2, :h3, :h4, :h5, :h6, :panel, :well]
+      WHITELISTED_HELPERS = [:row, :col, :render, :tab, :table, :divider, :h1, :h2, :h3, :h4, :h5, :h6, :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 = [:table]
+      RAW_BLOCK_HELPERS = [:table, :toolbar]
 
       # The #select and #display methods are defined on Kernel. Undefine them so
       # that they can be delegated to the form builder or template by method_missing.

data/lib/trestle/hook.rb

@@ -0,0 +1,27 @@
+module Trestle
+  class Hook
+    attr_reader :name, :options, :block
+
+    def initialize(name, options={}, &block)
+      @name, @options, @block = name, options, block
+    end
+
+    def ==(other)
+      other.is_a?(self.class) && name == other.name && options == other.options && block == other.block
+    end
+
+    def visible?(context)
+      if options[:if]
+        context.instance_exec(&options[:if])
+      elsif options[:unless]
+        !context.instance_exec(&options[:unless])
+      else
+        true
+      end
+    end
+
+    def evaluate(context)
+      context.instance_exec(&block)
+    end
+  end
+end

data/lib/trestle/table/actions_column.rb

@@ -1,11 +1,17 @@
 module Trestle
   class Table
     class ActionsColumn
-      attr_reader :table, :options, :block
+      attr_reader :table, :toolbar, :options
 
       def initialize(table, options={}, &block)
         @table, @options = table, options
-        @block = block_given? ? block : default_actions
+        @toolbar = Toolbar.new(ActionsBuilder)
+
+        if block_given?
+          @toolbar.append(&block)
+        else
+          @toolbar.append(&default_actions)
+        end
       end
 
       def renderer(template)
@@ -13,43 +19,46 @@ module Trestle
       end
 
       def default_actions
-        admin = table.admin
-
-        ->(action) do
-          action.delete if admin && admin.actions.include?(:destroy)
+        ->(toolbar, instance, admin) do
+          toolbar.delete if admin && admin.actions.include?(:destroy)
         end
       end
 
-      class ActionsBuilder
-        attr_reader :instance
-
-        delegate :table, to: :@column
+      class ActionsBuilder < Toolbar::Builder
+        attr_reader :instance, :admin
 
-        delegate :concat, :icon, :link_to, :admin_url_for, :admin_link_to, to: :@template
+        def initialize(template, instance, admin)
+          super(template)
 
-        def initialize(column, template, instance)
-          @column, @template, @instance = column, template, instance
+          @instance, @admin = instance, admin
         end
 
         def show
-          button(icon("fa fa-info"), instance, action: :show, class: "btn-info")
+          link(t("buttons.show", default: "Show"), instance, admin: admin, action: :show, icon: "fa fa-info", style: :info)
         end
 
         def edit
-          button(icon("fa fa-pencil"), instance, action: :edit, class: "btn-warning")
+          link(t("buttons.edit", default: "Edit"), instance, admin: admin, action: :edit, icon: "fa fa-pencil", style: :warning)
         end
 
         def delete
-          button(icon("fa fa-trash"), instance, action: :destroy, method: :delete, class: "btn-danger", data: { toggle: "confirm-delete", placement: "left" })
+          link(t("buttons.delete", default: "Delete"), instance, admin: admin, action: :destroy, method: :delete, icon: "fa fa-trash", style: :danger, data: { toggle: "confirm-delete", placement: "left" })
         end
 
-        def button(content, instance_or_url, options={})
-          options[:class] = Array(options[:class])
-          options[:class] << "btn" unless options[:class].include?("btn")
+        builder_method :show, :edit, :delete
 
-          concat admin_link_to(content, instance_or_url, options.reverse_merge(admin: table.admin))
+        # Disallow button tags within the actions toolbar. Alias to link for backwards compatibility.
+        alias button link
+
+      private
+        def translate(key, options={})
+          if admin
+            admin.translate(key, options)
+          else
+            I18n.t(:"admin.#{key}", options)
+          end
         end
-        alias_method :link, :button
+        alias t translate
       end
 
       class Renderer < Column::Renderer
@@ -62,11 +71,7 @@ module Trestle
         end
 
         def content(instance)
-          builder = ActionsBuilder.new(@column, @template, instance)
-
-          @template.with_output_buffer do
-            @template.instance_exec(builder, &@column.block)
-          end
+          @template.render_toolbar(@column.toolbar, instance, table.admin)
         end
       end
     end

data/lib/trestle/table/column.rb

@@ -53,6 +53,7 @@ module Trestle
           return if options.key?(:header) && options[:header].in?([nil, false])
 
           header = @column.header
+          header = @template.instance_exec(&header) if header.respond_to?(:call)
           header = @template.sort_link(header, @column.sort_field, @column.sort_options) if @column.sortable?
           header
         end

data/lib/trestle/toolbar.rb

@@ -0,0 +1,43 @@
+module Trestle
+  class Toolbar
+    extend ActiveSupport::Autoload
+
+    autoload :Builder
+    autoload :Context
+
+    def initialize(builder=Builder)
+      @builder = builder
+      @blocks = []
+    end
+
+    def groups(template, *args)
+      Enumerator.new do |y|
+        @blocks.each do |block|
+          builder = @builder.new(template, *args)
+          block.evaluate(builder, template, y, *args)
+        end
+      end
+    end
+
+    def append(&block)
+      @blocks.push(Block.new(&block))
+    end
+
+    def prepend(&block)
+      @blocks.unshift(Block.new(&block))
+    end
+
+    # Wraps a toolbar block to provide evaluation within the context of a template and enumerator
+    class Block
+      def initialize(&block)
+        @block = block
+      end
+
+      def evaluate(builder, template, enumerator, *args)
+        context = Context.new(builder, enumerator, *args)
+        result = template.capture { template.instance_exec(context, *args, &@block) }
+        enumerator << [result] if result.present?
+      end
+    end
+  end
+end

data/lib/trestle/toolbar/builder.rb

@@ -0,0 +1,52 @@
+module Trestle
+  class Toolbar
+    class Builder
+      def initialize(template)
+        @template = template
+      end
+
+      def button(content, options={})
+        options[:class] = button_classes_from_options(options)
+
+        button_tag(button_label(content, options), options)
+      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)
+
+        admin_link_to(button_label(content, options), instance_or_url, options)
+      end
+
+      # Only methods explicitly tagged as builder methods will be automatically
+      # appended to the toolbar when called by Toolbar::Context.
+
+      class_attribute :builder_methods
+      self.builder_methods = []
+
+      def self.builder_method(*methods)
+        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
+    end
+  end
+end

data/lib/trestle/toolbar/context.rb

@@ -0,0 +1,39 @@
+module Trestle
+  class Toolbar
+    # The toolbar Context is the object that is yielded to a toolbar block and handles the delegation of builder methods.
+    class Context
+      attr_reader :builder
+
+      def initialize(builder, enumerator, *args)
+        @builder, @enumerator = builder, enumerator
+        @args = args
+      end
+
+      def group
+        if @current_group
+          yield
+        else
+          @current_group = []
+          yield
+          @enumerator << @current_group
+          @current_group = nil
+        end
+      end
+
+    private
+      def respond_to_missing?(name, include_all=false)
+        builder.respond_to?(name) || super
+      end
+
+      def method_missing(name, *args, &block)
+        result = builder.send(name, *args, &block)
+
+        if builder.builder_methods.include?(name)
+          group { @current_group << result }
+        else
+          result
+        end
+      end
+    end
+  end
+end

data/lib/trestle/version.rb

@@ -1,3 +1,3 @@
 module Trestle
-  VERSION = "0.8.9"
+  VERSION = "0.8.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trestle
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.8.10
 platform: ruby
 authors:
 - Sam Pohlenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-24 00:00:00.000000000 Z
+date: 2018-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -242,6 +242,7 @@ files:
 - app/assets/stylesheets/trestle/components/_tabs.scss
 - app/assets/stylesheets/trestle/components/_tags.scss
 - app/assets/stylesheets/trestle/components/_timestamp.scss
+- app/assets/stylesheets/trestle/components/_toolbars.scss
 - app/assets/stylesheets/trestle/components/_turbolinks.scss
 - app/assets/stylesheets/trestle/components/_wells.scss
 - app/assets/stylesheets/trestle/core/_defaults.scss
@@ -276,7 +277,7 @@ files:
 - app/helpers/trestle/tab_helper.rb
 - app/helpers/trestle/table_helper.rb
 - app/helpers/trestle/timestamp_helper.rb
-- app/helpers/trestle/title_helper.rb
+- app/helpers/trestle/toolbars_helper.rb
 - app/helpers/trestle/url_helper.rb
 - app/views/kaminari/trestle/_first_page.html.erb
 - app/views/kaminari/trestle/_gap.html.erb
@@ -304,6 +305,7 @@ files:
 - app/views/trestle/shared/_footer.html.erb
 - app/views/trestle/shared/_header.html.erb
 - app/views/trestle/shared/_sidebar.html.erb
+- app/views/trestle/shared/_title.html.erb
 - app/views/trestle/table/_pagination.html.erb
 - app/views/trestle/table/_table.html.erb
 - bin/console
@@ -313,8 +315,12 @@ files:
 - config/locales/cs.yml
 - config/locales/en.rb
 - config/locales/en.yml
+- config/locales/es-MX.yml
+- config/locales/es.yml
 - config/locales/fr.rb
 - config/locales/fr.yml
+- config/locales/lv.rb
+- config/locales/lv.yml
 - config/locales/nl.rb
 - config/locales/nl.yml
 - config/locales/pl.rb
@@ -393,6 +399,7 @@ files:
 - lib/trestle/form/fields/url_field.rb
 - lib/trestle/form/fields/week_field.rb
 - lib/trestle/form/renderer.rb
+- lib/trestle/hook.rb
 - lib/trestle/model_name.rb
 - lib/trestle/navigation.rb
 - lib/trestle/navigation/block.rb
@@ -413,6 +420,9 @@ files:
 - lib/trestle/table/column.rb
 - lib/trestle/table/row.rb
 - lib/trestle/table/select_column.rb
+- lib/trestle/toolbar.rb
+- lib/trestle/toolbar/builder.rb
+- lib/trestle/toolbar/context.rb
 - lib/trestle/version.rb
 - trestle.gemspec
 - vendor/assets/bower_components/trestle/bootstrap-confirmation2/bootstrap-confirmation.js