trestle 0.8.6 → 0.8.7

data/lib/trestle/adapters/sequel_adapter.rb

@@ -34,10 +34,6 @@ module Trestle
         instance.destroy
       end
 
-      def unscope(scope)
-        scope.unfiltered
-      end
-
       def merge_scopes(scope, other)
         scope.intersect(other)
       end

data/lib/trestle/admin.rb

@@ -8,7 +8,6 @@ module Trestle
     class << self
       attr_accessor :menu
 
-      attr_accessor :table
       attr_accessor :form
 
       attr_accessor :additional_routes
@@ -20,6 +19,20 @@ module Trestle
         @options ||= {}
       end
 
+      def tables
+        @tables ||= {}
+      end
+
+      # Deprecated: Use `tables[:index]` instead
+      def table
+        tables[:index]
+      end
+
+      # Deprecated: Use `tables[:index]=` instead
+      def table=(table)
+        tables[:index] = table
+      end
+
       def breadcrumbs
         Breadcrumb::Trail.new(Array(Trestle.config.root_breadcrumbs) + [breadcrumb])
       end
@@ -75,6 +88,10 @@ module Trestle
       def railtie_routes_url_helpers(include_path_helpers=true)
         Trestle.railtie_routes_url_helpers(include_path_helpers)
       end
+
+      def build(&block)
+        Admin::Builder.build(self, &block)
+      end
     end
   end
 end

data/lib/trestle/admin/builder.rb

@@ -11,23 +11,29 @@ module Trestle
 
       delegate :helper, :before_action, :after_action, :around_action, to: :@controller
 
-      def initialize(name, options={})
+      def initialize(admin)
+        @admin, @controller = admin, admin.const_get(:AdminController)
+      end
+
+      def self.create(name, options={}, &block)
         # Create admin subclass
-        @admin = Class.new(admin_class)
-        @admin.options = options
+        admin = Class.new(admin_class)
+        admin.options = options
 
         # Define a constant based on the admin name
         scope = options[:scope] || Object
-        scope.const_set("#{name.to_s.camelize}Admin", @admin)
+        scope.const_set("#{name.to_s.camelize}Admin", admin)
 
         # Define admin controller class
         # This is done using class_eval rather than Class.new so that the full
         # class name and parent chain is set when Rails' inherited hooks are called.
-        @admin.class_eval("class AdminController < #{self.class.controller.name}; end")
+        admin.class_eval("class AdminController < #{controller.name}; end")
 
         # Set a reference on the controller class to the admin class
-        @controller = @admin.const_get("AdminController")
-        @controller.instance_variable_set("@admin", @admin)
+        controller = admin.const_get(:AdminController)
+        controller.instance_variable_set("@admin", admin)
+
+        admin.build(&block)
       end
 
       def menu(*args, &block)
@@ -38,8 +44,14 @@ module Trestle
         end
       end
 
-      def table(options={}, &block)
-        admin.table = Table::Builder.build(options.reverse_merge(admin: admin, sortable: true), &block)
+      def table(name_or_options={}, options={}, &block)
+        if name_or_options.is_a?(Hash)
+          name, options = :index, name_or_options.reverse_merge(admin: admin, sortable: true)
+        else
+          name = name_or_options
+        end
+
+        admin.tables[name] = Table::Builder.build(options, &block)
       end
 
       def form(options={}, &block)
@@ -47,7 +59,7 @@ module Trestle
       end
 
       def admin(&block)
-        @admin.singleton_class.class_eval(&block) if block_given?
+        @admin.instance_eval(&block) if block_given?
         @admin
       end
 

data/lib/trestle/form/automatic.rb

@@ -13,8 +13,11 @@ module Trestle
               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
+                    if associated_instance = instance.public_send(attribute.association_name)
+                      admin_link_to format_value(associated_instance), associated_instance
+                    else
+                      content_tag(:span, I18n.t("admin.format.blank"), class: "blank")
+                    end
                   end
                 else
                   prompt = I18n.t("admin.form.select.prompt", default: "- Select %{attribute_name} -", attribute_name: admin.human_attribute_name(attribute.association_name))

data/lib/trestle/form/builder.rb

@@ -10,7 +10,11 @@ module Trestle
       self.fields = {}
 
       def errors(name)
-        object.errors[name].to_a
+        if object.respond_to?(:errors) && object.errors.respond_to?(:[])
+          object.errors[name].to_a
+        else
+          []
+        end
       end
 
       def self.register(name, klass)

data/lib/trestle/form/field.rb

@@ -39,7 +39,7 @@ module Trestle
       end
 
       def extract_options!
-        @wrapper = extract_wrapper_options(:help, :label, :hide_label).merge(options.delete(:wrapper))
+        @wrapper = extract_wrapper_options(*Fields::FormGroup::WRAPPER_OPTIONS).merge(options.delete(:wrapper))
       end
 
     private

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

@@ -2,10 +2,12 @@ module Trestle
   class Form
     module Fields
       class FormGroup < Field
+        WRAPPER_OPTIONS = [:help, :label, :hide_label]
+
         def render
           options[:class] << 'has-error' if errors.any?
 
-          content_tag(:div, options) do
+          content_tag(:div, options.except(*WRAPPER_OPTIONS)) do
             concat label unless options[:label] == false
             concat block.call if block
             concat help_message if options[:help]

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 || builder.object.send(name))
+          @choices = Choices.new(choices || default_choices)
           @html_options = default_html_options.merge(html_options)
         end
 
@@ -19,6 +19,10 @@ module Trestle
           Trestle::Options.new(class: ["form-control"], data: { enable_select2: true })
         end
 
+        def default_choices
+          builder.object.send(name) if builder.object
+        end
+
         # Allows an array of model instances (or a scope) to be
         # passed to the select field as the list of choices.
         class Choices

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

@@ -7,7 +7,7 @@ module Trestle
         end
 
         def default_html_options
-          super.merge(multiple: true, class: "tag-select", data: { tags: true, select_on_close: true })
+          super.merge(multiple: true, class: "tag-select", data: { tags: true })
         end
       end
     end

data/lib/trestle/form/renderer.rb

@@ -5,7 +5,7 @@ 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]
+      WHITELISTED_HELPERS = [:row, :col, :render, :tab, :toolbar, :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.

data/lib/trestle/navigation.rb

@@ -7,12 +7,10 @@ module Trestle
     autoload :Group
     autoload :NullGroup, "trestle/navigation/group"
 
-    def initialize(blocks)
-      @blocks = blocks
-    end
+    attr_reader :items
 
-    def items
-      @blocks.map(&:items).flatten
+    def initialize(items)
+      @items = items
     end
 
     def by_group
@@ -28,6 +26,14 @@ module Trestle
       sorted.first.first if sorted.any?
     end
 
+    def visible(context)
+      self.class.new(items.select { |item| item.visible?(context) })
+    end
+
+    def self.build(blocks)
+      new(blocks.map(&:items).flatten)
+    end
+
   private
     def stable_sort(items)
       items.sort_by.with_index { |item, i| [item, i] }

data/lib/trestle/navigation/item.rb

@@ -55,6 +55,16 @@ module Trestle
         Badge.new(options[:badge]) if badge?
       end
 
+      def visible?(context)
+        if options[:if]
+          context.instance_exec(&options[:if])
+        elsif options[:unless]
+          !context.instance_exec(&options[:unless])
+        else
+          true
+        end
+      end
+
       class Badge
         attr_reader :text
 

data/lib/trestle/resource.rb

@@ -3,11 +3,17 @@ module Trestle
     extend ActiveSupport::Autoload
 
     autoload :Builder
+    autoload :Collection
     autoload :Controller
 
     RESOURCE_ACTIONS = [:index, :show, :new, :create, :edit, :update, :destroy]
     READONLY_ACTIONS = [:index, :show]
 
+    class_attribute :decorator
+
+    class_attribute :pagination_options
+    self.pagination_options = {}
+
     class << self
       def adapter
         @adapter ||= Trestle.config.default_adapter.new(self)
@@ -20,10 +26,11 @@ module Trestle
       # Defines a method that can be overridden with a custom block,
       # but is otherwise delegated to the adapter instance.
       def self.adapter_method(name)
-        attr_writer name
+        block_method = :"#{name}_block"
+        attr_accessor block_method
 
         define_method(name) do |*args|
-          if override = instance_variable_get("@#{name}")
+          if override = public_send(block_method)
             instance_exec(*args, &override)
           else
             adapter.public_send(name, *args)
@@ -31,33 +38,33 @@ module Trestle
         end
       end
 
+      # Collection-focused adapter methods
       adapter_method :collection
+      adapter_method :merge_scopes
+      adapter_method :sort
+      adapter_method :paginate
+      adapter_method :finalize_collection
+      adapter_method :decorate_collection
+      adapter_method :count
+
+      # Instance-focused adapter methods
       adapter_method :find_instance
       adapter_method :build_instance
       adapter_method :update_instance
       adapter_method :save_instance
       adapter_method :delete_instance
-      adapter_method :to_param
       adapter_method :permitted_params
-      adapter_method :decorate_collection
-      adapter_method :unscope
-      adapter_method :merge_scopes
-      adapter_method :count
-      adapter_method :sort
-      adapter_method :paginate
+
+      # Common adapter methods
+      adapter_method :to_param
       adapter_method :human_attribute_name
+
+      # Automatic tables and forms adapter methods
       adapter_method :default_table_attributes
       adapter_method :default_form_attributes
 
-      attr_accessor :decorator
-
       def prepare_collection(params)
-        collection = initialize_collection(params)
-        collection = apply_scopes(collection, params)
-        collection = apply_sorting(collection, params)
-        collection = paginate(collection, params)
-        collection = decorate_collection(collection)
-        collection
+        Collection.new(self).prepare(params)
       end
 
       def initialize_collection(params)
@@ -68,47 +75,10 @@ module Trestle
         @scopes ||= {}
       end
 
-      def apply_scopes(collection, params)
-        unscoped = unscope(collection)
-
-        scopes_for(params).each do |scope|
-          collection = merge_scopes(collection, scope.apply(unscoped))
-        end
-
-        collection
-      end
-
-      def scopes_for(params)
-        result = []
-
-        if params[:scope] && scopes.has_key?(params[:scope].to_sym)
-          result << scopes[params[:scope].to_sym]
-        end
-
-        if result.empty? && default_scope = scopes.values.find(&:default?)
-          result << default_scope
-        end
-
-        result
-      end
-
       def column_sorts
         @column_sorts ||= {}
       end
 
-      def apply_sorting(collection, params)
-        return collection unless params[:sort]
-
-        field = params[:sort].to_sym
-        order = params[:order].to_s.downcase == "desc" ? :desc : :asc
-
-        if column_sorts.has_key?(field)
-          instance_exec(collection, order, &column_sorts[field])
-        else
-          sort(collection, field, order)
-        end
-      end
-
       def table
         super || Table::Automatic.new(self)
       end
@@ -148,15 +118,11 @@ module Trestle
       end
 
       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) }
-        }
+        @return_locations ||= {}
       end
 
-      def return_location(action, instance=nil)
-        instance_exec(instance, &return_locations[action])
+      def build(&block)
+        Resource::Builder.build(self, &block)
       end
 
     private

data/lib/trestle/resource/builder.rb

@@ -22,36 +22,36 @@ module Trestle
       end
 
       def collection(&block)
-        admin.collection = block
+        admin.collection_block = block
       end
 
       def find_instance(&block)
-        admin.find_instance = block
+        admin.find_instance_block = block
       end
       alias instance find_instance
 
       def build_instance(&block)
-        admin.build_instance = block
+        admin.build_instance_block = block
       end
 
       def update_instance(&block)
-        admin.update_instance = block
+        admin.update_instance_block = block
       end
 
       def save_instance(&block)
-        admin.save_instance = block
+        admin.save_instance_block = block
       end
 
       def delete_instance(&block)
-        admin.delete_instance = block
+        admin.delete_instance_block = block
       end
 
       def to_param(&block)
-        admin.to_param = block
+        admin.to_param_block = block
       end
 
       def params(&block)
-        admin.permitted_params = block
+        admin.permitted_params_block = block
       end
 
       def decorator(decorator)
@@ -59,27 +59,28 @@ module Trestle
       end
 
       def decorate_collection(&block)
-        admin.decorate_collection = block
+        admin.decorate_collection_block = block
       end
 
       def merge_scopes(&block)
-        admin.merge_scopes = block
+        admin.merge_scopes_block = block
       end
 
       def sort(&block)
-        admin.sort = block
+        admin.sort_block = block
       end
 
       def sort_column(column, &block)
         admin.column_sorts[column.to_sym] = block
       end
 
-      def paginate(&block)
-        admin.paginate = block
+      def paginate(options={}, &block)
+        admin.pagination_options = admin.pagination_options.merge(options)
+        admin.paginate_block = block
       end
 
       def count(&block)
-        admin.count = block
+        admin.count_block = block
       end
 
       def scope(name, scope=nil, options={}, &block)