trestle 0.8.3 → 0.8.4

data/lib/trestle/admin.rb

@@ -24,7 +24,7 @@ module Trestle
       end
 
       def breadcrumb
-        Breadcrumb.new(admin_name.titleize.pluralize, path)
+        Breadcrumb.new(admin_name.titleize, path)
       end
 
       def admin_name

data/lib/trestle/attribute.rb

@@ -1,53 +1,30 @@
 module Trestle
   class Attribute
-    attr_reader :admin, :name, :type
+    attr_reader :name, :type, :options
 
-    def initialize(admin, name, type)
-      @admin, @name, @type = admin, name.to_sym, type
+    def initialize(name, type, options={})
+      @name, @type, @options = name.to_sym, type, options
     end
 
-    def association?
-      type == :association
-    end
-
-    def boolean?
-      type == :boolean
-    end
-
-    def text?
-      type == :text
-    end
-
-    def datetime?
-      [:datetime, :time, :date].include?(type)
-    end
-
-    def primary_key?
-      name.to_s == admin.model.primary_key
-    end
-
-    def inheritance_column?
-      name.to_s == admin.model.inheritance_column
-    end
-
-    def counter_cache?
-      name.to_s.end_with?("_count")
+    def array?
+      options[:array] == true
     end
 
     class Association < Attribute
-      attr_reader :association_class
-
-      def initialize(admin, name, association_class)
-        super(admin, name, :association)
-        @association_class = association_class
+      def initialize(name, options={})
+        super(name, :association, options)
       end
 
       def association_name
-        name.to_s.sub(/_id$/, "")
+        options[:name] || name.to_s.sub(/_id$/, "")
+      end
+
+      def association_class
+        options[:class].respond_to?(:call) ? options[:class].call : options[:class]
       end
 
-      def association_admin
-        Trestle.admins[association_class.name.underscore.pluralize]
+      def polymorphic?
+        options[:polymorphic] == true
       end
     end
   end

data/lib/trestle/breadcrumb.rb

@@ -11,10 +11,16 @@ module Trestle
     end
 
     class Trail
+      include Enumerable
+
       def initialize(breadcrumbs=[])
         @breadcrumbs = Array(breadcrumbs)
       end
 
+      def ==(other)
+        to_a == other.to_a
+      end
+
       def dup
         self.class.new(@breadcrumbs.dup)
       end

data/lib/trestle/configuration.rb

@@ -67,7 +67,7 @@ module Trestle
     option :display_methods, [:display_name, :full_name, :name, :title, :username, :login, :email, :to_s]
 
     # Default adapter class used by all admin resources
-    option :default_adapter, Adapters::Adapter.compose(Adapters::ActiveRecordAdapter, Adapters::DraperAdapter)
+    option :default_adapter, Adapters.compose(Adapters::ActiveRecordAdapter, Adapters::DraperAdapter)
 
     # Register a custom form field class
     def form_field(name, klass)

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
+        @block = Proc.new 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/resource.rb

@@ -39,10 +39,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 +97,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])
@@ -152,8 +152,12 @@ module Trestle
       end
 
       def default_model_name
-        model_name = model.model_name
-        model_name.respond_to?(:human) ? model_name.human : model_name.to_s.titleize
+        if model.respond_to?(:model_name)
+          model_name = model.model_name
+          model_name.respond_to?(:human) ? model_name.human : model_name.to_s.titleize
+        else
+          model.name.titleize
+        end
       end
     end
   end

data/lib/trestle/resource/builder.rb

@@ -18,9 +18,10 @@ module Trestle
         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

data/lib/trestle/resource/controller.rb

@@ -3,26 +3,52 @@ module Trestle
     class Controller < Admin::Controller
       def index
         self.collection = admin.prepare_collection(params)
+
+        respond_to do |format|
+          format.html
+          format.json { render json: collection }
+        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 }
+        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 %{model_name} was successfully created.")
+              redirect_to action: :show, id: admin.to_param(instance)
+            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"
+            end
+            format.json { render json: instance.errors, status: :unprocessable_entity }
+          end
         end
       end
 
       def show
         self.instance = admin.find_instance(params)
+
+        respond_to do |format|
+          format.html
+          format.json { render json: instance }
+        end
       end
 
       def edit
@@ -31,27 +57,45 @@ 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 %{model_name} was successfully updated.")
+              redirect_to action: :show, id: admin.to_param(instance)
+            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"
+            end
+            format.json { render json: instance.errors, status: :unprocessable_entity }
+          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 %{model_name} was successfully deleted.")
+            else
+              flash[:message] = flash_message("failure.destroy", default: "Could not delete %{model_name}.")
+            end
 
-        redirect_to action: :index
+            redirect_to action: :index
+          end
+          format.json { head :no_content }
+          format.js
+        end
       end
 
     protected