trestle 0.9.1 → 0.9.2

data/lib/trestle.rb

@@ -37,6 +37,8 @@ module Trestle
     autoload :Helpers
     autoload :Layout
     autoload :Location
+    autoload :Title
+    autoload :Toolbars
   end
 
   mattr_accessor :admins
@@ -71,6 +73,17 @@ module Trestle
     blocks = config.menus + admins.values.map(&:menu).compact
     Navigation.build(blocks, context)
   end
+
+  def self.i18n_fallbacks(locale=I18n.locale)
+    if I18n.respond_to?(:fallbacks)
+      I18n.fallbacks[locale]
+    elsif locale.to_s.include?("-")
+      fallback = locale.to_s.split("-").first
+      [locale, fallback]
+    else
+      [locale]
+    end
+  end
 end
 
 require "trestle/engine" if defined?(Rails)

data/lib/trestle/adapters/active_record_adapter.rb

@@ -30,7 +30,7 @@ module Trestle
       end
 
       def count(collection)
-        collection.count
+        collection.count(:all)
       end
 
       def sort(collection, field, order)

data/lib/trestle/admin.rb

@@ -67,7 +67,10 @@ module Trestle
       end
 
       def default_breadcrumb
-        Breadcrumb.new(human_admin_name, path)
+        deprecated = I18n.t(:"admin.breadcrumbs.#{i18n_key}", default: human_admin_name)
+        label = translate("breadcrumbs.index", default: deprecated)
+
+        Breadcrumb.new(label, path)
       end
 
       def admin_name
@@ -79,7 +82,7 @@ module Trestle
       end
 
       def human_admin_name
-        I18n.t("admin.breadcrumbs.#{i18n_key}", default: default_human_admin_name)
+        translate("name", default: default_human_admin_name)
       end
 
       def default_human_admin_name

data/lib/trestle/admin/builder.rb

@@ -53,7 +53,11 @@ module Trestle
       end
 
       def form(options={}, &block)
-        admin.form = Form.new(options, &block)
+        if block_given?
+          admin.form = Form.new(options, &block)
+        else
+          admin.form = Form::Automatic.new(admin, options)
+        end
       end
 
       def hook(name, options={}, &block)

data/lib/trestle/admin/controller.rb

@@ -21,7 +21,14 @@ module Trestle
 
     protected
       def breadcrumbs
-        @breadcrumbs ||= admin.breadcrumbs.dup
+        @_breadcrumbs ||= admin.breadcrumbs.dup
+      end
+
+      def flash_message(type, title:, message:)
+        {
+          title:   admin.t("flash.#{type}.title", default: title),
+          message: admin.t("flash.#{type}.message", default: message)
+        }
       end
     end
   end

data/lib/trestle/application_controller.rb

@@ -8,5 +8,7 @@ module Trestle
     include Controller::Helpers
     include Controller::Layout
     include Controller::Location
+    include Controller::Title
+    include Controller::Toolbars
   end
 end

data/lib/trestle/configuration.rb

@@ -41,7 +41,7 @@ module Trestle
     option :root, -> { Trestle.config.path }
 
     # Initial breadcrumbs to display in the breadcrumb trail
-    option :root_breadcrumbs, -> { [Trestle::Breadcrumb.new(I18n.t("admin.breadcrumbs.home", default: "Home"), Trestle.config.root)] }
+    option :root_breadcrumbs, -> { [Trestle::Breadcrumb.new(I18n.t(:"admin.breadcrumbs.home", default: "Home"), Trestle.config.root)] }
 
     # Default icon class to use when it is not explicitly provided
     option :default_navigation_icon, "fa fa-arrow-circle-o-right"

data/lib/trestle/controller/breadcrumbs.rb

@@ -10,7 +10,7 @@ module Trestle
 
     protected
       def breadcrumbs
-        @breadcrumbs ||= Breadcrumb::Trail.new(Trestle.config.root_breadcrumbs)
+        @_breadcrumbs ||= Breadcrumb::Trail.new(Trestle.config.root_breadcrumbs)
       end
 
       def breadcrumb(label, path=nil)

data/lib/trestle/controller/title.rb

@@ -0,0 +1,20 @@
+module Trestle
+  module Controller
+    module Title
+      extend ActiveSupport::Concern
+
+      included do
+        helper_method :default_title
+      end
+
+    protected
+      def title(title=nil)
+        @_title = title if title
+      end
+
+      def default_title
+        @_title || action_name.titleize
+      end
+    end
+  end
+end

data/lib/trestle/controller/toolbars.rb

@@ -0,0 +1,30 @@
+module Trestle
+  module Controller
+    module Toolbars
+      extend ActiveSupport::Concern
+
+      included do
+        helper_method :toolbars
+        helper_method :toolbar
+      end
+
+    protected
+      def toolbars
+        @_toolbars ||= {}
+      end
+
+      def toolbar(name, options={}, &block)
+        builder = options[:builder] || default_toolbar_builder
+
+        toolbar = (toolbars[name.to_s] ||= Toolbar.new(builder))
+        toolbar.clear! if options[:clear]
+        toolbar.prepend(&block) if block_given?
+        toolbar
+      end
+
+      def default_toolbar_builder
+        Toolbar::Builder
+      end
+    end
+  end
+end

data/lib/trestle/form/automatic.rb

@@ -1,8 +1,8 @@
 module Trestle
   class Form
     class Automatic < Form
-      def initialize(admin)
-        super() do |instance|
+      def initialize(admin, options={})
+        super(options) do |instance|
           admin.default_form_attributes.each do |attribute|
             if attribute.array?
               if [:string, :text].include?(attribute.type)

data/lib/trestle/form/field.rb

@@ -7,8 +7,8 @@ module Trestle
 
       def initialize(builder, template, name, options={}, &block)
         @builder, @template, @name, @block = builder, template, name, block
-        @options = defaults.merge(options)
 
+        assign_options!(options)
         normalize_options!
       end
 
@@ -39,7 +39,11 @@ module Trestle
       end
 
       def defaults
-        Trestle::Options.new(readonly: admin.readonly?)
+        Trestle::Options.new(readonly: readonly?)
+      end
+
+      def readonly?
+        options[:readonly] || admin.readonly?
       end
 
       def normalize_options!
@@ -48,6 +52,12 @@ module Trestle
       end
 
     protected
+      def assign_options!(options)
+        # Assign @options first so that it can be referenced from within #defaults if required
+        @options = Trestle::Options.new(options)
+        @options = defaults.merge(options)
+      end
+
       def extract_wrapper_options!
         unless options[:wrapper] == false
           @wrapper = extract_wrapper_options(*Fields::FormGroup::WRAPPER_OPTIONS).merge(options.delete(:wrapper))

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

@@ -38,7 +38,7 @@ module Trestle
         end
 
         def defaults
-          Trestle::Options.new(disabled: admin.readonly?)
+          Trestle::Options.new(disabled: readonly?)
         end
       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"], disabled: admin.readonly?, data: { enable_select2: true })
+          Trestle::Options.new(class: ["form-control"], disabled: readonly?, 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"], disabled: admin.readonly?, data: { enable_select2: true })
+          Trestle::Options.new(class: ["form-control"], disabled: readonly?, 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"], disabled: admin.readonly?, data: { enable_select2: true })
+          Trestle::Options.new(class: ["form-control"], disabled: readonly?, data: { enable_select2: true })
         end
       end
     end

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

@@ -18,7 +18,7 @@ module Trestle
         end
 
         def default_html_options
-          Trestle::Options.new(class: ["form-control"], disabled: admin.readonly?, data: { enable_select2: true })
+          Trestle::Options.new(class: ["form-control"], disabled: readonly?, data: { enable_select2: true })
         end
 
         def default_choices

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

@@ -18,9 +18,13 @@ module Trestle
           if block
             template.capture(&block)
           else
-            content_tag(:p, value, class: "form-control-static")
+            content_tag(:p, value || default_value, class: "form-control-static")
           end
         end
+
+        def default_value
+          builder.object.send(name) if builder.object
+        end
       end
     end
   end

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", disabled: admin.readonly?, data: { tags: true })
+          super.merge(multiple: true, class: "tag-select", disabled: readonly?, data: { tags: true })
         end
       end
     end

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"], disabled: admin.readonly?, data: { enable_select2: true })
+          Trestle::Options.new(class: ["form-control"], disabled: readonly?, 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"], disabled: admin.readonly?, data: { enable_select2: true })
+          Trestle::Options.new(class: ["form-control"], disabled: readonly?, data: { enable_select2: true })
         end
       end
     end

data/lib/trestle/navigation/item.rb

@@ -55,6 +55,10 @@ module Trestle
         Badge.new(options[:badge]) if badge?
       end
 
+      def html_options
+        options.except(:admin, :badge, :group, :icon, :if, :label, :priority, :unless)
+      end
+
       def visible?(context)
         if options[:if]
           context.instance_exec(&options[:if])

data/lib/trestle/resource.rb

@@ -6,6 +6,7 @@ module Trestle
     autoload :Builder
     autoload :Collection
     autoload :Controller
+    autoload :Toolbar
 
     include AdapterMethods
 

data/lib/trestle/resource/controller.rb

@@ -1,174 +1,17 @@
 module Trestle
   class Resource
     class Controller < Admin::Controller
-      before_action :load_collection, only: [:index]
-      before_action :load_instance, only: [:show, :edit, :update, :destroy]
+      extend ActiveSupport::Autoload
 
-      def index
-        respond_to do |format|
-          format.html
-          format.json { render json: collection }
+      autoload :Actions
+      autoload :DataMethods
+      autoload :Redirection
+      autoload :Toolbar
 
-          yield format if block_given?
-        end
-      end
-
-      def new
-        self.instance = admin.build_instance(params.key?(admin.parameter_name) ? admin.permitted_params(params) : {}, params)
-
-        respond_to do |format|
-          format.html
-          format.json { render json: instance }
-
-          yield format if block_given?
-        end
-      end
-
-      def create
-        self.instance = admin.build_instance(admin.permitted_params(params), params)
-
-        if admin.save_instance(instance, params)
-          respond_to do |format|
-            format.html do
-              flash[:message] = flash_message("create.success", title: "Success!", message: "The %{lowercase_model_name} was successfully created.")
-              redirect_to_return_location(:create, instance, default: admin.instance_path(instance))
-            end
-            format.json { render json: instance, status: :created, location: admin.instance_path(instance) }
-
-            yield format if block_given?
-          end
-        else
-          respond_to do |format|
-            format.html do
-              flash.now[:error] = flash_message("create.failure", title: "Warning!", message: "Please correct the errors below.")
-              render "new", status: :unprocessable_entity
-            end
-            format.json { render json: instance.errors, status: :unprocessable_entity }
-
-            yield format if block_given?
-          end
-        end
-      end
-
-      def show
-        if admin.singular? && instance.nil?
-          respond_to do |format|
-            format.html { redirect_to action: :new }
-            format.json { head :not_found }
-
-            yield format if block_given?
-          end
-        else
-          respond_to do |format|
-            format.html
-            format.json { render json: instance }
-
-            yield format if block_given?
-          end
-        end
-      end
-
-      def edit
-        if admin.singular? && instance.nil?
-          respond_to do |format|
-            format.html { redirect_to action: :new }
-            format.json { head :not_found }
-
-            yield format if block_given?
-          end
-        else
-          respond_to do |format|
-            format.html
-            format.json { render json: instance }
-
-            yield format if block_given?
-          end
-        end
-      end
-
-      def update
-        admin.update_instance(instance, admin.permitted_params(params), params)
-
-        if admin.save_instance(instance, params)
-          respond_to do |format|
-            format.html do
-              flash[:message] = flash_message("update.success", title: "Success!", message: "The %{lowercase_model_name} was successfully updated.")
-              redirect_to_return_location(:update, instance, default: admin.instance_path(instance))
-            end
-            format.json { render json: instance, status: :ok }
-
-            yield format if block_given?
-          end
-        else
-          respond_to do |format|
-            format.html do
-              flash.now[:error] = flash_message("update.failure", title: "Warning!", message: "Please correct the errors below.")
-              render "show", status: :unprocessable_entity
-            end
-            format.json { render json: instance.errors, status: :unprocessable_entity }
-
-            yield format if block_given?
-          end
-        end
-      end
-
-      def destroy
-        success = admin.delete_instance(instance, params)
-
-        respond_to do |format|
-          format.html do
-            if success
-              flash[:message] = flash_message("destroy.success", title: "Success!", message: "The %{lowercase_model_name} was successfully deleted.")
-              redirect_to_return_location(:destroy, instance, default: admin.path(:index))
-            else
-              flash[:error] = flash_message("destroy.failure", title: "Warning!", message: "Could not delete %{lowercase_model_name}.")
-
-              if self.instance = admin.find_instance(params)
-                redirect_to_return_location(:update, instance, default: admin.instance_path(instance))
-              else
-                redirect_to_return_location(:destroy, instance, default: admin.path(:index))
-              end
-            end
-          end
-          format.json { head :no_content }
-
-          yield format if block_given?
-        end
-      end
-
-    protected
-      def load_instance
-        self.instance = admin.find_instance(params)
-      end
-
-      def load_collection
-        self.collection = admin.prepare_collection(params)
-      end
-
-      attr_accessor :instance, :collection
-      helper_method :instance, :collection
-
-      def flash_message(type, title:, message:)
-        {
-          title:   admin.t("flash.#{type}.title", default: title),
-          message: admin.t("flash.#{type}.message", default: message)
-        }
-      end
-
-      def redirect_to_return_location(action, instance, default:)
-        if admin.return_locations[action] && !dialog_request?
-          location = instance_exec(instance, &admin.return_locations[action])
-
-          case location
-          when :back
-            redirect_back fallback_location: default, turbolinks: false
-          else
-            redirect_to location, turbolinks: false
-          end
-        else
-          redirect_to default, turbolinks: false
-        end
-      end
+      include Actions
+      include DataMethods
+      include Redirection
+      include Toolbar
     end
   end
 end