trestle 0.8.4 → 0.8.11

data/lib/trestle/table/column.rb

@@ -31,24 +31,47 @@ module Trestle
       def header
         if options[:header]
           options[:header]
-        elsif admin = table.options[:admin]
-          admin.human_attribute_name(field)
+        elsif table.admin
+          table.admin.t("table.headers.#{field}", default: table.admin.human_attribute_name(field))
         else
-          field.to_s.humanize.titleize
+          I18n.t("admin.table.headers.#{field}", default: field.to_s.humanize.titleize)
         end
       end
 
       class Renderer
-        delegate :options, to: :@column
+        delegate :options, :table, to: :@column
 
         def initialize(column, template)
           @column, @template = column, template
         end
 
+        def render(instance)
+          @template.content_tag(:td, content(instance), class: classes, data: data)
+        end
+
+        def render?
+          if options.key?(:if)
+            if options[:if].respond_to?(:call)
+              @template.instance_exec(&options[:if])
+            else
+              options[:if]
+            end
+          elsif options.key?(:unless)
+            if options[:unless].respond_to?(:call)
+              !@template.instance_exec(&options[:unless])
+            else
+              !options[:unless]
+            end
+          else
+            true
+          end
+        end
+
         def header
-          return if options.has_key?(:header) && options[:header].in?([nil, false])
+          return if options.key?(:header) && options[:header].in?([nil, false])
 
-          header = I18n.t("admin.table.headers.#{@column.field}", default: @column.header)
+          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
@@ -58,11 +81,12 @@ module Trestle
           content = @template.format_value(value, options)
 
           if value.respond_to?(:id) && options[:link] != false
+            # Column value was a model instance (e.g. from an association).
             # Automatically link to instance's admin if available
             content = @template.admin_link_to(content, value)
           elsif options[:link]
             # Explicitly link to the specified admin, or the table's admin
-            content = @template.admin_link_to(content, instance, admin: options[:admin] || @column.table.options[:admin])
+            content = @template.admin_link_to(content, instance, admin: options[:admin] || table.admin)
           end
 
           content
@@ -86,10 +110,17 @@ module Trestle
               # evaluate the block using instance_exec, we need to set this up manually.
               -> {
                 _hamlout = eval('_hamlout', @column.block.binding)
-                @template.capture { @template.instance_exec(instance, &@column.block).to_s }
+                value = nil
+                buffer = @template.capture { value = @template.instance_exec(instance, &@column.block) }
+                value.is_a?(String) ? buffer : value
               }.call
             else
-              @template.capture { @template.instance_exec(instance, &@column.block).to_s }
+              # Capture both the immediate value and captured output of the block.
+              # If the result of the block is a string, then use the contents of the buffer.
+              # Otherwise return the result of the block as a raw value (for auto-formatting).
+              value = nil
+              buffer = @template.capture { value = @template.instance_exec(instance, &@column.block) }
+              value.is_a?(String) ? buffer : value
             end
           else
             instance.send(@column.field)

data/lib/trestle/table/row.rb

@@ -19,17 +19,33 @@ module Trestle
           @row, @template = row, template
         end
 
+        def columns
+          table.columns.map { |column| column.renderer(@template) }.select(&:render?)
+        end
+
+        def render(instance)
+          @template.content_tag(:tr, options(instance)) do
+            @template.safe_join(columns.map { |column| column.render(instance) }, "\n")
+          end
+        end
+
         def options(instance)
           options = Trestle::Options.new
-          options.merge!(data: { url: admin_url_for(instance) }) if table.options[:admin]
+
+          if table.admin && table.autolink? && table.admin.actions.include?(:show)
+            options.merge!(data: { url: admin_url_for(instance) })
+            options.merge!(data: { behavior: "dialog" }) if table.admin.form.dialog?
+          end
+
           options.merge!(@row.options)
           options.merge!(@template.instance_exec(instance, &@row.block)) if @row.block
+
           options
         end
 
       protected
         def admin_url_for(instance)
-          @template.admin_url_for(instance, admin: table.options[:admin])
+          @template.admin_url_for(instance, admin: table.admin)
         end
       end
     end

data/lib/trestle/table.rb

@@ -17,10 +17,22 @@ module Trestle
       @columns = []
     end
 
+    def admin
+      Trestle.lookup(options[:admin]) if options.key?(:admin)
+    end
+
     def sortable?
       options[:sortable] == true
     end
 
+    def autolink?
+      options[:autolink] != false
+    end
+
+    def header?
+      options[:header] != false
+    end
+
     def renderer(template)
       Renderer.new(self, template)
     end
@@ -30,7 +42,7 @@ module Trestle
     end
 
     class Renderer
-      delegate :options, to: :@table
+      delegate :options, :header?, to: :@table
 
       def initialize(table, template)
         @table, @template = table, template
@@ -41,7 +53,11 @@ module Trestle
       end
 
       def columns
-        @columns ||= @table.columns.map { |column| column.renderer(@template) }
+        @columns ||= row.columns
+      end
+
+      def id
+        options[:id]
       end
 
       def classes

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/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/version.rb

@@ -1,3 +1,3 @@
 module Trestle
-  VERSION = "0.8.4"
+  VERSION = "0.8.11"
 end

data/lib/trestle.rb

@@ -18,6 +18,8 @@ module Trestle
   autoload :Configuration
   autoload :Display
   autoload :Form
+  autoload :Hook
+  autoload :ModelName
   autoload :Navigation
   autoload :Options
   autoload :Reloader
@@ -25,17 +27,20 @@ module Trestle
   autoload :Scope
   autoload :Tab
   autoload :Table
+  autoload :Toolbar
 
   mattr_accessor :admins
   self.admins = {}
 
   def self.admin(name, options={}, &block)
-    admin = Admin::Builder.build(name, options, &block)
-    self.admins[admin.admin_name] = admin
+    register(Admin::Builder.create(name, options, &block))
   end
 
   def self.resource(name, options={}, &block)
-    admin = Resource::Builder.build(name, options, &block)
+    register(Resource::Builder.create(name, options, &block))
+  end
+
+  def self.register(admin)
     self.admins[admin.admin_name] = admin
   end
 
@@ -53,7 +58,7 @@ module Trestle
   end
 
   def self.navigation
-    Navigation.new(config.menus + admins.values.map(&:menu).compact)
+    Navigation.build(config.menus + admins.values.map(&:menu).compact)
   end
 end
 

data/trestle.gemspec

@@ -34,14 +34,16 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.2.2"
 
   spec.add_dependency "railties",           ">= 4.2.0"
-  spec.add_dependency "sass-rails",         "~> 5.0.6"
-  spec.add_dependency "autoprefixer-rails", "~> 7.1.2"
-  spec.add_dependency "kaminari",           "~> 1.0.1"
+  spec.add_dependency "activemodel",        ">= 4.2.0"
+  spec.add_dependency "sass-rails",         ">= 5.0.6"
+  spec.add_dependency "autoprefixer-rails", ">= 7.1.2"
+  spec.add_dependency "kaminari",           "~> 1.1.0"
 
   spec.add_development_dependency "bundler",     "~> 1.12"
   spec.add_development_dependency "rake",        "~> 10.0"
   spec.add_development_dependency "rspec-rails", "~> 3.5"
   spec.add_development_dependency "rspec-html-matchers", "~> 0.7.1"
+  spec.add_development_dependency "database_cleaner",    "~> 1.6.2"
 
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "turbolinks"

data/vendor/assets/bower_components/trestle/select2/dist/js/select2.full.js

@@ -1,5 +1,5 @@
 /*!
- * Select2 4.0.3
+ * Select2 4.0.5
  * https://select2.github.io
  *
  * Released under the MIT license
@@ -9,19 +9,33 @@
   if (typeof define === 'function' && define.amd) {
     // AMD. Register as an anonymous module.
     define(['jquery'], factory);
-  } else if (typeof exports === 'object') {
+  } else if (typeof module === 'object' && module.exports) {
     // Node/CommonJS
-    factory(require('jquery'));
+    module.exports = function (root, jQuery) {
+      if (jQuery === undefined) {
+        // require('jQuery') returns a factory that requires window to
+        // build a jQuery instance, we normalize how we use modules
+        // that require this pattern but the window provided is a noop
+        // if it's defined (how jquery works)
+        if (typeof window !== 'undefined') {
+          jQuery = require('jquery');
+        }
+        else {
+          jQuery = require('jquery')(root);
+        }
+      }
+      factory(jQuery);
+      return jQuery;
+    };
   } else {
     // Browser globals
     factory(jQuery);
   }
-}(function (jQuery) {
+} (function (jQuery) {
   // This is needed so we can catch the AMD loader configuration and use it
   // The inner file should be wrapped (by `banner.start.js`) in a function that
   // returns the AMD loader references.
-  var S2 =
-(function () {
+  var S2 =(function () {
   // Restore the Select2 AMD loader so it can be used
   // Needed mostly in the language files, where the loader is not inserted
   if (jQuery && jQuery.fn && jQuery.fn.select2 && jQuery.fn.select2.amd) {
@@ -30,13 +44,11 @@
 var S2;(function () { if (!S2 || !S2.requirejs) {
 if (!S2) { S2 = {}; } else { require = S2; }
 /**
- * @license almond 0.3.1 Copyright (c) 2011-2014, The Dojo Foundation All Rights Reserved.
- * Available via the MIT or new BSD license.
- * see: http://github.com/jrburke/almond for details
+ * @license almond 0.3.3 Copyright jQuery Foundation and other contributors.
+ * Released under MIT license, http://github.com/requirejs/almond/LICENSE
  */
 //Going sloppy to avoid 'use strict' string cost, but strict practices should
 //be followed.
-/*jslint sloppy: true */
 /*global setTimeout: false */
 
 var requirejs, require, define;
@@ -64,60 +76,58 @@ var requirejs, require, define;
      */
     function normalize(name, baseName) {
         var nameParts, nameSegment, mapValue, foundMap, lastIndex,
-            foundI, foundStarMap, starI, i, j, part,
+            foundI, foundStarMap, starI, i, j, part, normalizedBaseParts,
             baseParts = baseName && baseName.split("/"),
             map = config.map,
             starMap = (map && map['*']) || {};
 
         //Adjust any relative paths.
-        if (name && name.charAt(0) === ".") {
-            //If have a base name, try to normalize against it,
-            //otherwise, assume it is a top-level require that will
-            //be relative to baseUrl in the end.
-            if (baseName) {
-                name = name.split('/');
-                lastIndex = name.length - 1;
-
-                // Node .js allowance:
-                if (config.nodeIdCompat && jsSuffixRegExp.test(name[lastIndex])) {
-                    name[lastIndex] = name[lastIndex].replace(jsSuffixRegExp, '');
-                }
+        if (name) {
+            name = name.split('/');
+            lastIndex = name.length - 1;
+
+            // If wanting node ID compatibility, strip .js from end
+            // of IDs. Have to do this here, and not in nameToUrl
+            // because node allows either .js or non .js to map
+            // to same file.
+            if (config.nodeIdCompat && jsSuffixRegExp.test(name[lastIndex])) {
+                name[lastIndex] = name[lastIndex].replace(jsSuffixRegExp, '');
+            }
 
-                //Lop off the last part of baseParts, so that . matches the
-                //"directory" and not name of the baseName's module. For instance,
-                //baseName of "one/two/three", maps to "one/two/three.js", but we
-                //want the directory, "one/two" for this normalization.
-                name = baseParts.slice(0, baseParts.length - 1).concat(name);
-
-                //start trimDots
-                for (i = 0; i < name.length; i += 1) {
-                    part = name[i];
-                    if (part === ".") {
-                        name.splice(i, 1);
-                        i -= 1;
-                    } else if (part === "..") {
-                        if (i === 1 && (name[2] === '..' || name[0] === '..')) {
-                            //End of the line. Keep at least one non-dot
-                            //path segment at the front so it can be mapped
-                            //correctly to disk. Otherwise, there is likely
-                            //no path mapping for a path starting with '..'.
-                            //This can still fail, but catches the most reasonable
-                            //uses of ..
-                            break;
-                        } else if (i > 0) {
-                            name.splice(i - 1, 2);
-                            i -= 2;
-                        }
+            // Starts with a '.' so need the baseName
+            if (name[0].charAt(0) === '.' && baseParts) {
+                //Convert baseName to array, and lop off the last part,
+                //so that . matches that 'directory' and not name of the baseName's
+                //module. For instance, baseName of 'one/two/three', maps to
+                //'one/two/three.js', but we want the directory, 'one/two' for
+                //this normalization.
+                normalizedBaseParts = baseParts.slice(0, baseParts.length - 1);
+                name = normalizedBaseParts.concat(name);
+            }
+
+            //start trimDots
+            for (i = 0; i < name.length; i++) {
+                part = name[i];
+                if (part === '.') {
+                    name.splice(i, 1);
+                    i -= 1;
+                } else if (part === '..') {
+                    // If at the start, or previous value is still ..,
+                    // keep them so that when converted to a path it may
+                    // still work when converted to a path, even though
+                    // as an ID it is less than ideal. In larger point
+                    // releases, may be better to just kick out an error.
+                    if (i === 0 || (i === 1 && name[2] === '..') || name[i - 1] === '..') {
+                        continue;
+                    } else if (i > 0) {
+                        name.splice(i - 1, 2);
+                        i -= 2;
                     }
                 }
-                //end trimDots
-
-                name = name.join("/");
-            } else if (name.indexOf('./') === 0) {
-                // No baseName, so this is ID is resolved relative
-                // to baseUrl, pull off the leading dot.
-                name = name.substring(2);
             }
+            //end trimDots
+
+            name = name.join('/');
         }
 
         //Apply map config if available.
@@ -230,32 +240,39 @@ var requirejs, require, define;
         return [prefix, name];
     }
 
+    //Creates a parts array for a relName where first part is plugin ID,
+    //second part is resource ID. Assumes relName has already been normalized.
+    function makeRelParts(relName) {
+        return relName ? splitPrefix(relName) : [];
+    }
+
     /**
      * Makes a name map, normalizing the name, and using a plugin
      * for normalization if necessary. Grabs a ref to plugin
      * too, as an optimization.
      */
-    makeMap = function (name, relName) {
+    makeMap = function (name, relParts) {
         var plugin,
             parts = splitPrefix(name),
-            prefix = parts[0];
+            prefix = parts[0],
+            relResourceName = relParts[1];
 
         name = parts[1];
 
         if (prefix) {
-            prefix = normalize(prefix, relName);
+            prefix = normalize(prefix, relResourceName);
             plugin = callDep(prefix);
         }
 
         //Normalize according
         if (prefix) {
             if (plugin && plugin.normalize) {
-                name = plugin.normalize(name, makeNormalize(relName));
+                name = plugin.normalize(name, makeNormalize(relResourceName));
             } else {
-                name = normalize(name, relName);
+                name = normalize(name, relResourceName);
             }
         } else {
-            name = normalize(name, relName);
+            name = normalize(name, relResourceName);
             parts = splitPrefix(name);
             prefix = parts[0];
             name = parts[1];
@@ -302,13 +319,14 @@ var requirejs, require, define;
     };
 
     main = function (name, deps, callback, relName) {
-        var cjsModule, depName, ret, map, i,
+        var cjsModule, depName, ret, map, i, relParts,
             args = [],
             callbackType = typeof callback,
             usingExports;
 
         //Use name if no relName
         relName = relName || name;
+        relParts = makeRelParts(relName);
 
         //Call the callback to define the module, if necessary.
         if (callbackType === 'undefined' || callbackType === 'function') {
@@ -317,7 +335,7 @@ var requirejs, require, define;
             //Default to [require, exports, module] if no deps
             deps = !deps.length && callback.length ? ['require', 'exports', 'module'] : deps;
             for (i = 0; i < deps.length; i += 1) {
-                map = makeMap(deps[i], relName);
+                map = makeMap(deps[i], relParts);
                 depName = map.f;
 
                 //Fast path CommonJS standard dependencies.
@@ -373,7 +391,7 @@ var requirejs, require, define;
             //deps arg is the module name, and second arg (if passed)
             //is just the relName.
             //Normalize module name, if it contains . or ..
-            return callDep(makeMap(deps, callback).f);
+            return callDep(makeMap(deps, makeRelParts(callback)).f);
         } else if (!deps.splice) {
             //deps is a config object, not an array.
             config = deps;
@@ -1837,7 +1855,7 @@ S2.define('select2/selection/search',[
     var $search = $(
       '<li class="select2-search select2-search--inline">' +
         '<input class="select2-search__field" type="search" tabindex="-1"' +
-        ' autocomplete="off" autocorrect="off" autocapitalize="off"' +
+        ' autocomplete="off" autocorrect="off" autocapitalize="none"' +
         ' spellcheck="false" role="textbox" aria-autocomplete="list" />' +
       '</li>'
     );
@@ -3191,7 +3209,7 @@ S2.define('select2/data/select',[
       }
     }
 
-    if (data.id) {
+    if (data.id !== undefined) {
       option.value = data.id;
     }
 
@@ -3550,7 +3568,10 @@ S2.define('select2/data/tags',[
           }, true)
         );
 
-        var checkText = option.text === params.term;
+        var optionText = (option.text || '').toUpperCase();
+        var paramsTerm = (params.term || '').toUpperCase();
+
+        var checkText = optionText === paramsTerm;
 
         if (checkText || checkChildren) {
           if (child) {
@@ -3888,7 +3909,7 @@ S2.define('select2/dropdown/search',[
     var $search = $(
       '<span class="select2-search select2-search--dropdown">' +
         '<input class="select2-search__field" type="search" tabindex="-1"' +
-        ' autocomplete="off" autocorrect="off" autocapitalize="off"' +
+        ' autocomplete="off" autocorrect="off" autocapitalize="none"' +
         ' spellcheck="false" role="textbox" />' +
       '</span>'
     );
@@ -3941,7 +3962,7 @@ S2.define('select2/dropdown/search',[
     });
 
     container.on('focus', function () {
-      if (container.isOpen()) {
+      if (!container.isOpen()) {
         self.$search.focus();
       }
     });