trestle 0.8.5 → 0.8.6

data/lib/trestle/reloader.rb

@@ -34,7 +34,7 @@ module Trestle
     end
 
     def load_paths
-      ActiveSupport::Dependencies.autoload_paths.grep(/\/app\/admin\Z/)
+      Trestle.config.load_paths.map { |path| path.respond_to?(:call) ? path.call : path }.flatten.map(&:to_s)
     end
 
   private

data/lib/trestle/resource.rb

@@ -5,6 +5,9 @@ module Trestle
     autoload :Builder
     autoload :Controller
 
+    RESOURCE_ACTIONS = [:index, :show, :new, :create, :edit, :update, :destroy]
+    READONLY_ACTIONS = [:index, :show]
+
     class << self
       def adapter
         @adapter ||= Trestle.config.default_adapter.new(self)
@@ -122,26 +125,38 @@ module Trestle
         @model_name ||= Trestle::ModelName.new(model)
       end
 
+      def actions
+        @actions ||= (readonly? ? READONLY_ACTIONS : RESOURCE_ACTIONS).dup
+      end
+
       def readonly?
         options[:readonly]
       end
 
-      def breadcrumb
-        Breadcrumb.new(model_name.plural.titleize, path)
+      def default_breadcrumb
+        Breadcrumb.new(I18n.t("admin.breadcrumbs.#{admin_name}", default: model_name.plural.titleize), path)
       end
 
       def routes
         admin = self
 
         Proc.new do
-          resources admin.admin_name, controller: admin.controller_namespace, as: admin.route_name, path: admin.options[:path], except: admin.disabled_routes do
+          resources admin.admin_name, controller: admin.controller_namespace, as: admin.route_name, path: admin.options[:path], except: (RESOURCE_ACTIONS - admin.actions) do
             instance_exec(&admin.additional_routes) if admin.additional_routes
           end
         end
       end
 
-      def disabled_routes
-        readonly? ? [:new, :create, :edit, :update, :destroy] : []
+      def return_locations
+        @return_locations ||= {
+          create:  Proc.new { |instance| path(:show, id: to_param(instance)) },
+          update:  Proc.new { |instance| path(:show, id: to_param(instance)) },
+          destroy: Proc.new { path(:index) }
+        }
+      end
+
+      def return_location(action, instance=nil)
+        instance_exec(instance, &return_locations[action])
       end
 
     private

data/lib/trestle/resource/builder.rb

@@ -14,6 +14,13 @@ module Trestle
         admin.adapter = adapter
       end
 
+      def remove_action(*actions)
+        actions.each do |action|
+          controller.remove_possible_method(action.to_sym)
+          admin.actions.delete(action.to_sym)
+        end
+      end
+
       def collection(&block)
         admin.collection = block
       end
@@ -83,6 +90,14 @@ module Trestle
 
         admin.scopes[name] = Scope.new(admin, name, options, &(scope || block))
       end
+
+      def return_to(options={}, &block)
+        actions = options.key?(:on) ? Array(options[:on]) : [:create, :update, :destroy]
+
+        actions.each do |action|
+          admin.return_locations[action.to_sym] = block
+        end
+      end
     end
   end
 end

data/lib/trestle/resource/controller.rb

@@ -1,12 +1,15 @@
 module Trestle
   class Resource
     class Controller < Admin::Controller
+      after_action :set_trestle_location_header
+
       def index
         self.collection = admin.prepare_collection(params)
 
         respond_to do |format|
           format.html
           format.json { render json: collection }
+          format.js
         end
       end
 
@@ -16,6 +19,7 @@ module Trestle
         respond_to do |format|
           format.html
           format.json { render json: instance }
+          format.js
         end
       end
 
@@ -26,7 +30,7 @@ module Trestle
           respond_to do |format|
             format.html do
               flash[:message] = flash_message("success.create", default: "The %{lowercase_model_name} was successfully created.")
-              redirect_to action: :show, id: admin.to_param(instance)
+              redirect_to(admin.return_location(:create, instance), turbolinks: false)
             end
             format.json { render json: instance, status: :created, location: { action: :show, id: admin.to_param(instance) } }
             format.js
@@ -35,9 +39,10 @@ module Trestle
           respond_to do |format|
             format.html do
               flash.now[:error] = flash_message("failure.create", default: "Please correct the errors below.")
-              render "new"
+              render "new", status: :unprocessable_entity
             end
             format.json { render json: instance.errors, status: :unprocessable_entity }
+            format.js
           end
         end
       end
@@ -48,6 +53,7 @@ module Trestle
         respond_to do |format|
           format.html
           format.json { render json: instance }
+          format.js
         end
       end
 
@@ -63,7 +69,7 @@ module Trestle
           respond_to do |format|
             format.html do
               flash[:message] = flash_message("success.update", default: "The %{lowercase_model_name} was successfully updated.")
-              redirect_to action: :show, id: admin.to_param(instance)
+              redirect_to(admin.return_location(:update, instance), turbolinks: false)
             end
             format.json { render json: instance, status: :ok }
             format.js
@@ -72,9 +78,10 @@ module Trestle
           respond_to do |format|
             format.html do
               flash.now[:error] = flash_message("failure.update", default: "Please correct the errors below.")
-              render "show"
+              render "show", status: :unprocessable_entity
             end
             format.json { render json: instance.errors, status: :unprocessable_entity }
+            format.js
           end
         end
       end
@@ -87,14 +94,14 @@ module Trestle
           format.html do
             if success
               flash[:message] = flash_message("success.destroy", default: "The %{lowercase_model_name} was successfully deleted.")
-              redirect_to action: :index
+              redirect_to admin.return_location(:destroy)
             else
               flash[:error] = flash_message("failure.destroy", default: "Could not delete %{lowercase_model_name}.")
 
               if self.instance = admin.find_instance(params)
                 redirect_to action: :show, id: admin.to_param(instance)
               else
-                redirect_to action: :index
+                redirect_to admin.return_location(:destroy)
               end
             end
           end
@@ -113,6 +120,12 @@ module Trestle
       def flash_message(type, options={})
         t("trestle.flash.#{type}", options.merge(model_name: admin.model_name, lowercase_model_name: admin.model_name.downcase))
       end
+
+      def set_trestle_location_header
+        unless request.headers["X-Trestle-Dialog"]
+          headers["X-Trestle-Location"] = request.path
+        end
+      end
     end
   end
 end

data/lib/trestle/table.rb

@@ -23,6 +23,10 @@ module Trestle
       options[:sortable] == true
     end
 
+    def autolink?
+      options[:autolink] != false
+    end
+
     def renderer(template)
       Renderer.new(self, template)
     end

data/lib/trestle/table/actions_column.rb

@@ -13,8 +13,10 @@ module Trestle
       end
 
       def default_actions
+        admin = table.admin
+
         ->(action) do
-          action.delete
+          action.delete if admin && admin.actions.include?(:destroy)
         end
       end
 
@@ -23,29 +25,29 @@ module Trestle
 
         delegate :table, to: :@column
 
-        delegate :icon, :admin_url_for, :concat, :link_to, to: :@template
+        delegate :concat, :icon, :link_to, :admin_url_for, :admin_link_to, to: :@template
 
         def initialize(column, template, instance)
           @column, @template, @instance = column, template, instance
         end
 
         def show
-          button(icon("fa fa-info"), admin_url_for(instance, admin: table.admin, action: :show), class: "btn-info")
+          button(icon("fa fa-info"), instance, action: :show, class: "btn-info")
         end
 
         def edit
-          button(icon("fa fa-pencil"), admin_url_for(instance, admin: table.admin, action: :edit), class: "btn-warning")
+          button(icon("fa fa-pencil"), instance, action: :edit, class: "btn-warning")
         end
 
         def delete
-          button(icon("fa fa-trash"), admin_url_for(instance, admin: table.admin, action: :destroy), method: :delete, class: "btn-danger", data: { toggle: "confirm-delete", placement: "left" })
+          button(icon("fa fa-trash"), instance, action: :destroy, method: :delete, class: "btn-danger", data: { toggle: "confirm-delete", placement: "left" })
         end
 
-        def button(content, url, options={})
+        def button(content, instance_or_url, options={})
           options[:class] = Array(options[:class])
           options[:class] << "btn" unless options[:class].include?("btn")
 
-          concat link_to(content, url, options)
+          concat admin_link_to(content, instance_or_url, options.reverse_merge(admin: table.admin))
         end
         alias_method :link, :button
       end

data/lib/trestle/table/column.rb

@@ -39,7 +39,7 @@ module Trestle
       end
 
       class Renderer
-        delegate :options, to: :@column
+        delegate :options, :table, to: :@column
 
         def initialize(column, template)
           @column, @template = column, template
@@ -58,11 +58,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.admin)
+            content = @template.admin_link_to(content, instance, admin: options[:admin] || table.admin)
           end
 
           content

data/lib/trestle/table/row.rb

@@ -21,9 +21,15 @@ module Trestle
 
         def options(instance)
           options = Trestle::Options.new
-          options.merge!(data: { url: admin_url_for(instance) }) if table.admin
+
+          if table.admin && table.autolink?
+            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
 

data/lib/trestle/version.rb

@@ -1,3 +1,3 @@
 module Trestle
-  VERSION = "0.8.5"
+  VERSION = "0.8.6"
 end

data/trestle.gemspec

@@ -35,9 +35,9 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "railties",           ">= 4.2.0"
   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.0.1"
+  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"

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();
       }
     });