trestle 0.8.3 → 0.8.6

data/lib/trestle/form/automatic.rb

@@ -2,28 +2,36 @@ module Trestle
   class Form
     class Automatic < Form
       def initialize(admin)
-        @block = Proc.new do
-          admin.default_attributes.each do |attribute|
-            next if attribute.primary_key?
-            next if attribute.inheritance_column?
-            next if attribute.counter_cache?
-
-            case attribute.type
-            when :association
-              options = attribute.association_class.all.map { |instance| [display(instance), instance.id] }
-              prompt = "- Select #{admin.model.human_attribute_name(attribute.association_name)} -"
-
-              select attribute.name, options, include_blank: prompt
-            when :text
-              text_area attribute.name
-            when :date
-              date_field attribute.name
-            when :datetime
-              datetime_field attribute.name
-            when :boolean
-              check_box attribute.name
+        super() do |instance|
+          admin.default_form_attributes.each do |attribute|
+            if attribute.array?
+              if [:string, :text].include?(attribute.type)
+                select attribute.name, nil, {}, { multiple: true, data: { tags: true, select_on_close: true }}
+              end
             else
-              text_field attribute.name
+              case attribute.type
+              when :association
+                if attribute.polymorphic?
+                  static_field attribute.name do
+                    associated_instance = instance.public_send(attribute.association_name)
+                    admin_link_to format_value(associated_instance), associated_instance
+                  end
+                else
+                  prompt = I18n.t("admin.form.select.prompt", default: "- Select %{attribute_name} -", attribute_name: admin.human_attribute_name(attribute.association_name))
+
+                  select attribute.name, attribute.association_class.all, include_blank: prompt
+                end
+              when :text
+                text_area attribute.name
+              when :date
+                date_field attribute.name
+              when :datetime
+                datetime_field attribute.name
+              when :boolean
+                check_box attribute.name
+              else
+                text_field attribute.name
+              end
             end
           end
         end

data/lib/trestle/form/builder.rb

@@ -9,6 +9,10 @@ module Trestle
       cattr_accessor :fields
       self.fields = {}
 
+      def errors(name)
+        object.errors[name].to_a
+      end
+
       def self.register(name, klass)
         rename_existing_helper_method(name)
         self.fields[name] = klass

data/lib/trestle/form/field.rb

@@ -13,8 +13,8 @@ module Trestle
       end
 
       def errors
-        errors = builder.object.errors[name]
-        errors += builder.object.errors[name.to_s.sub(/_id$/, '')] if name.to_s =~ /_id$/
+        errors = builder.errors(name)
+        errors += builder.errors(name.to_s.sub(/_id$/, '')) if name.to_s =~ /_id$/
         errors
       end
 

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

@@ -20,7 +20,7 @@ module Trestle
             content_tag(:label) do
               safe_join([
                 builder.raw_check_box(name, options, checked_value, unchecked_value),
-                options[:label] || admin.model.human_attribute_name(name)
+                options[:label] || admin.human_attribute_name(name)
               ], " ")
             end
           end

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

@@ -16,7 +16,7 @@ module Trestle
         end
 
         def default_html_options
-          Trestle::Options.new(class: ["form-control"])
+          Trestle::Options.new(class: ["form-control"], data: { enable_select2: true })
         end
       end
     end

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

@@ -17,7 +17,7 @@ module Trestle
         end
 
         def default_html_options
-          Trestle::Options.new(class: ["form-control"])
+          Trestle::Options.new(class: ["form-control"], data: { enable_select2: true })
         end
       end
     end

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

@@ -17,7 +17,7 @@ module Trestle
         end
 
         def default_html_options
-          Trestle::Options.new(class: ["form-control"])
+          Trestle::Options.new(class: ["form-control"], data: { enable_select2: true })
         end
       end
     end

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

@@ -16,7 +16,7 @@ module Trestle
         end
 
         def default_html_options
-          Trestle::Options.new(class: ["form-control"])
+          Trestle::Options.new(class: ["form-control"], data: { enable_select2: true })
         end
       end
     end

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

@@ -7,7 +7,7 @@ module Trestle
         def initialize(builder, template, name, choices=nil, options={}, html_options={}, &block)
           super(builder, template, name, options, &block)
 
-          @choices = Choices.new(choices)
+          @choices = Choices.new(choices || builder.object.send(name))
           @html_options = default_html_options.merge(html_options)
         end
 
@@ -16,7 +16,7 @@ module Trestle
         end
 
         def default_html_options
-          Trestle::Options.new(class: ["form-control"])
+          Trestle::Options.new(class: ["form-control"], data: { enable_select2: true })
         end
 
         # Allows an array of model instances (or a scope) to be

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

@@ -3,8 +3,7 @@ module Trestle
     module Fields
       class TagSelect < Select
         def initialize(builder, template, name, options={}, html_options={})
-          choices = builder.object.send(name)
-          super(builder, template, name, choices, options, html_options)
+          super(builder, template, name, nil, options, html_options)
         end
 
         def default_html_options

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

@@ -17,7 +17,7 @@ module Trestle
         end
 
         def default_html_options
-          Trestle::Options.new(class: ["form-control"])
+          Trestle::Options.new(class: ["form-control"], data: { enable_select2: true })
         end
       end
     end

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

@@ -16,7 +16,7 @@ module Trestle
         end
 
         def default_html_options
-          Trestle::Options.new(class: ["form-control"])
+          Trestle::Options.new(class: ["form-control"], data: { enable_select2: true })
         end
       end
     end

data/lib/trestle/form.rb

@@ -8,10 +8,14 @@ module Trestle
     autoload :Fields
     autoload :Renderer
 
-    attr_reader :block
+    attr_reader :options, :block
 
-    def initialize(&block)
-      @block = block
+    def initialize(options={}, &block)
+      @options, @block = options, block
+    end
+
+    def dialog?
+      options[:dialog] == true
     end
 
     def render(template, instance)

data/lib/trestle/model_name.rb

@@ -0,0 +1,64 @@
+require "active_model/naming"
+
+module Trestle
+  class ModelName
+    attr_reader :klass
+
+    delegate :downcase, :upcase, :titleize, :titlecase, to: :to_s
+
+    def initialize(klass)
+      @klass = klass
+      @name = klass.respond_to?(:model_name) ? klass.model_name : ActiveModel::Name.new(klass)
+    end
+
+    def ==(other)
+      other.is_a?(self.class) && klass == other.klass
+    end
+
+    def to_s
+      singular
+    end
+
+    def singular(options={})
+      human(default_singular, options)
+    end
+    alias_method :singularize, :singular
+
+    def plural(options={})
+      if i18n_supported? && i18n_pluralizations_available?
+        human(default_plural, { count: :many }.merge(options))
+      else
+        default_plural
+      end
+    end
+    alias_method :pluralize, :plural
+
+  protected
+    # Default singular version if it cannot be determined from i18n
+    def default_singular
+      @name.name.demodulize.titleize
+    end
+
+    # Default plural version if it cannot be determined from i18n
+    def default_plural
+      singular.pluralize(I18n.locale)
+    end
+
+    # Safely delegates to ActiveModel::Name#human, catching exceptions caused by missing pluralizations
+    def human(default, options={})
+      @name.human(options.merge(default: default))
+    rescue I18n::InvalidPluralizationData
+      default
+    end
+
+    # Checks if the model can be translated by ActiveModel
+    def i18n_supported?
+      klass.respond_to?(:lookup_ancestors) && klass.respond_to?(:i18n_scope)
+    end
+
+    # Checks if multiple pluralization forms (e.g. zero/one/few/many/other) are available from i18n
+    def i18n_pluralizations_available?
+      @name.human(count: nil).is_a?(Hash)
+    end
+  end
+end

data/lib/trestle/navigation/group.rb

@@ -40,6 +40,10 @@ module Trestle
       def label
         I18n.t("admin.navigation.groups.#{name}", default: name.to_s.titlecase)
       end
+
+      def id
+        name.to_s.parameterize
+      end
     end
 
     class NullGroup
@@ -59,6 +63,10 @@ module Trestle
         NullGroup.hash
       end
 
+      def id
+        nil
+      end
+
       def <=>(other)
         -1
       end

data/lib/trestle/navigation/item.rb

@@ -40,7 +40,7 @@ module Trestle
       end
 
       def label
-        I18n.t("admin.navigation.items.#{name}", default: name.to_s.titlecase)
+        options[:label] || I18n.t("admin.navigation.items.#{name}", default: name.to_s.titlecase)
       end
 
       def icon

data/lib/trestle/options.rb

@@ -4,13 +4,15 @@ module Trestle
       self[hash]
     end
 
-    def merge(other)
-      dup.merge!(other)
+    def merge(other, &block)
+      dup.merge!(other, &block)
     end
 
-    def merge!(other)
-      deep_merge!(other || {}) do |key, v1, v2|
-        if v1.is_a?(Array)
+    def merge!(other, &block)
+      super(other || {}) do |key, v1, v2|
+        if v1.is_a?(Hash) && v2.is_a?(Hash)
+          v1.merge(v2, &block)
+        elsif v1.is_a?(Array)
           v1 + Array(v2)
         else
           v2

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

@@ -14,13 +14,21 @@ 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
 
-      def instance(&block)
+      def find_instance(&block)
         admin.find_instance = block
       end
+      alias instance find_instance
 
       def build_instance(&block)
         admin.build_instance = block
@@ -82,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,28 +1,60 @@
 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
 
       def new
-        self.instance = admin.build_instance
+        self.instance = admin.build_instance({}, params)
+
+        respond_to do |format|
+          format.html
+          format.json { render json: instance }
+          format.js
+        end
       end
 
       def create
-        self.instance = admin.build_instance(admin.permitted_params(params))
+        self.instance = admin.build_instance(admin.permitted_params(params), params)
 
         if admin.save_instance(instance)
-          flash[:message] = flash_message("success.create", default: "The %{model_name} was successfully created.")
-          redirect_to action: :show, id: admin.to_param(instance)
+          respond_to do |format|
+            format.html do
+              flash[:message] = flash_message("success.create", default: "The %{lowercase_model_name} was successfully created.")
+              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
+          end
         else
-          flash.now[:error] = flash_message("failure.create", default: "Please correct the errors below.")
-          render "new"
+          respond_to do |format|
+            format.html do
+              flash.now[:error] = flash_message("failure.create", default: "Please correct the errors below.")
+              render "new", status: :unprocessable_entity
+            end
+            format.json { render json: instance.errors, status: :unprocessable_entity }
+            format.js
+          end
         end
       end
 
       def show
         self.instance = admin.find_instance(params)
+
+        respond_to do |format|
+          format.html
+          format.json { render json: instance }
+          format.js
+        end
       end
 
       def edit
@@ -31,27 +63,51 @@ module Trestle
 
       def update
         self.instance = admin.find_instance(params)
-        admin.update_instance(instance, admin.permitted_params(params))
+        admin.update_instance(instance, admin.permitted_params(params), params)
 
         if admin.save_instance(instance)
-          flash[:message] = flash_message("success.update", default: "The %{model_name} was successfully updated.")
-          redirect_to action: :show, id: admin.to_param(instance)
+          respond_to do |format|
+            format.html do
+              flash[:message] = flash_message("success.update", default: "The %{lowercase_model_name} was successfully updated.")
+              redirect_to(admin.return_location(:update, instance), turbolinks: false)
+            end
+            format.json { render json: instance, status: :ok }
+            format.js
+          end
         else
-          flash.now[:error] = flash_message("failure.update", default: "Please correct the errors below.")
-          render "show"
+          respond_to do |format|
+            format.html do
+              flash.now[:error] = flash_message("failure.update", default: "Please correct the errors below.")
+              render "show", status: :unprocessable_entity
+            end
+            format.json { render json: instance.errors, status: :unprocessable_entity }
+            format.js
+          end
         end
       end
 
       def destroy
         self.instance = admin.find_instance(params)
+        success = admin.delete_instance(instance)
 
-        if admin.delete_instance(instance)
-          flash[:message] = flash_message("success.destroy", default: "The %{model_name} was successfully deleted.")
-        else
-          flash[:error] = flash_message("failure.destroy", default: "Could not delete %{model_name}.")
-        end
+        respond_to do |format|
+          format.html do
+            if success
+              flash[:message] = flash_message("success.destroy", default: "The %{lowercase_model_name} was successfully deleted.")
+              redirect_to admin.return_location(:destroy)
+            else
+              flash[:error] = flash_message("failure.destroy", default: "Could not delete %{lowercase_model_name}.")
 
-        redirect_to action: :index
+              if self.instance = admin.find_instance(params)
+                redirect_to action: :show, id: admin.to_param(instance)
+              else
+                redirect_to admin.return_location(:destroy)
+              end
+            end
+          end
+          format.json { head :no_content }
+          format.js
+        end
       end
 
     protected
@@ -62,7 +118,13 @@ module Trestle
       helper_method :instance
 
       def flash_message(type, options={})
-        t("trestle.flash.#{type}", options.merge(model_name: admin.model_name.underscore.humanize(capitalize: false)))
+        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

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)
@@ -39,10 +42,12 @@ module Trestle
       adapter_method :decorate_collection
       adapter_method :unscope
       adapter_method :merge_scopes
+      adapter_method :count
       adapter_method :sort
       adapter_method :paginate
-      adapter_method :count
-      adapter_method :default_attributes
+      adapter_method :human_attribute_name
+      adapter_method :default_table_attributes
+      adapter_method :default_form_attributes
 
       attr_accessor :decorator
 
@@ -95,9 +100,7 @@ module Trestle
         return collection unless params[:sort]
 
         field = params[:sort].to_sym
-
-        order = params[:order].downcase
-        order = "asc" unless %w(asc desc).include?(order)
+        order = params[:order].to_s.downcase == "desc" ? :desc : :asc
 
         if column_sorts.has_key?(field)
           instance_exec(collection, order, &column_sorts[field])
@@ -119,29 +122,41 @@ module Trestle
       end
 
       def model_name
-        options[:as] || default_model_name
+        @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.pluralize, 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
@@ -150,11 +165,6 @@ module Trestle
       rescue NameError
         raise NameError, "Unable to find model #{admin_name.classify}. Specify a different model using Trestle.resource(:#{admin_name}, model: MyModel)"
       end
-
-      def default_model_name
-        model_name = model.model_name
-        model_name.respond_to?(:human) ? model_name.human : model_name.to_s.titleize
-      end
     end
   end
 end

data/lib/trestle/scope.rb

@@ -20,7 +20,7 @@ module Trestle
 
     def apply(collection)
       if @block
-        @block.call
+        @admin.instance_exec(&@block)
       else
         collection.public_send(name)
       end