trestle 0.8.7 → 0.8.8

data/lib/trestle/configurable.rb

@@ -17,6 +17,12 @@ module Trestle
       @options ||= {}
     end
 
+    def as_json(options=nil)
+      @options.each_with_object({}) do |(k, v), h|
+        h[k] = v.as_json(options)
+      end
+    end
+
     def inspect
       "#<#{self.class.name || "Anonymous(Trestle::Configurable)"}>"
     end

data/lib/trestle/configuration.rb

@@ -83,13 +83,19 @@ module Trestle
     end
 
     # List of i18n keys to pass into the Trestle.i18n JavaScript object
-    option :javascript_i18n_keys, ["admin.confirmation.title", "admin.confirmation.delete", "admin.confirmation.cancel", "trestle.dialog.error", "admin.buttons.ok"]
+    option :javascript_i18n_keys, [
+      "trestle.confirmation.title", "trestle.confirmation.delete", "trestle.confirmation.cancel", "trestle.dialog.error",
+      "admin.buttons.ok", "admin.datepicker.formats.date", "admin.datepicker.formats.datetime", "admin.datepicker.formats.time"
+    ]
 
     # List of load paths for where to find admin definitions
     option :load_paths, [
       -> { ActiveSupport::Dependencies.autoload_paths.grep(/\/app\/admin\Z/) }
     ]
 
+    # When to reload Trestle admin within a to_prepare block (`:always` or `:on_update`)
+    option :reload, :on_update
+
 
     ## Debugging
 

data/lib/trestle/engine.rb

@@ -35,7 +35,11 @@ module Trestle
     end
 
     config.to_prepare do
-      Engine.reloader.execute_if_updated
+      if Trestle.config.reload == :always
+        Engine.reloader.execute
+      else
+        Engine.reloader.execute_if_updated
+      end
     end
 
     def reloader

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

@@ -1,7 +1,7 @@
 module Trestle::Form::Fields::DatePicker
   def extract_options!
-    options[:prepend] ||= options.key?(:icon) ? options.delete(:icon) : default_icon
-    options.merge!(data: { picker: options.key?(:picker) ? options.delete(:picker) : true })
+    options[:prepend] ||= options.delete(:icon) { default_icon }
+    options.reverse_merge!(data: { picker: options.delete(:picker) { true }, allow_clear: true })
 
     super
   end

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

@@ -9,7 +9,7 @@ module Trestle
 
           content_tag(:div, options.except(*WRAPPER_OPTIONS)) do
             concat label unless options[:label] == false
-            concat block.call if block
+            concat template.capture(&block) if block
             concat help_message if options[:help]
             concat error_message if errors.any?
           end

data/lib/trestle/resource.rb

@@ -99,19 +99,48 @@ module Trestle
         @actions ||= (readonly? ? READONLY_ACTIONS : RESOURCE_ACTIONS).dup
       end
 
+      def root_action
+        singular? ? :show : :index
+      end
+
       def readonly?
         options[:readonly]
       end
 
-      def default_breadcrumb
-        Breadcrumb.new(I18n.t("admin.breadcrumbs.#{admin_name}", default: model_name.plural.titleize), path)
+      def singular?
+        options[:singular]
+      end
+
+      def translate(key, options={})
+        super(key, options.merge({
+          model_name:            model_name.titleize,
+          lowercase_model_name:  model_name.downcase,
+          pluralized_model_name: model_name.plural.titleize
+        }))
+      end
+      alias t translate
+
+      def instance_path(instance, options={})
+        action = options.fetch(:action) { :show }
+        options = options.merge(id: to_param(instance)) unless singular?
+
+        path(action, options)
       end
 
       def routes
         admin = self
 
+        resource_method  = singular? ? :resource : :resources
+        resource_name    = admin_name
+        resource_options = {
+          controller: controller_namespace,
+          as:         route_name,
+          path:       options[:path],
+          except:     (RESOURCE_ACTIONS - actions)
+        }
+
         Proc.new do
-          resources admin.admin_name, controller: admin.controller_namespace, as: admin.route_name, path: admin.options[:path], except: (RESOURCE_ACTIONS - admin.actions) do
+          public_send(resource_method, resource_name, resource_options) do
             instance_exec(&admin.additional_routes) if admin.additional_routes
           end
         end
@@ -125,6 +154,12 @@ module Trestle
         Resource::Builder.build(self, &block)
       end
 
+      def validate!
+        if singular? && find_instance_block.nil?
+          raise NotImplementedError, "Singular resources must define an instance block."
+        end
+      end
+
     private
       def infer_model_class
         parent.const_get(admin_name.classify)

data/lib/trestle/resource/builder.rb

@@ -99,6 +99,16 @@ module Trestle
           admin.return_locations[action.to_sym] = block
         end
       end
+
+    protected
+      def normalize_table_options(name, options)
+        if name.is_a?(Hash)
+          # Default index table
+          name, options = :index, name.reverse_merge(sortable: true)
+        end
+
+        [name, options.reverse_merge(admin: admin)]
+      end
     end
   end
 end

data/lib/trestle/resource/controller.rb

@@ -1,6 +1,9 @@
 module Trestle
   class Resource
     class Controller < Admin::Controller
+      before_action :load_collection, only: [:index]
+      before_action :load_instance, only: [:show, :edit, :update, :destroy]
+
       def index
         respond_to do |format|
           format.html
@@ -10,7 +13,7 @@ module Trestle
       end
 
       def new
-        self.instance = admin.build_instance({}, params)
+        self.instance = admin.build_instance(params.key?(admin.parameter_name) ? permitted_params : {}, params)
 
         respond_to do |format|
           format.html
@@ -25,16 +28,16 @@ module Trestle
         if admin.save_instance(instance)
           respond_to do |format|
             format.html do
-              flash[:message] = flash_message("success.create", default: "The %{lowercase_model_name} was successfully created.")
-              redirect_to_return_location(:create, instance, default: admin.path(:show, id: admin.to_param(instance)))
+              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: { action: :show, id: admin.to_param(instance) } }
+            format.json { render json: instance, status: :created, location: admin.instance_path(instance) }
             format.js
           end
         else
           respond_to do |format|
             format.html do
-              flash.now[:error] = flash_message("failure.create", default: "Please correct the errors below.")
+              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 }
@@ -44,10 +47,18 @@ module Trestle
       end
 
       def show
-        respond_to do |format|
-          format.html
-          format.json { render json: instance }
-          format.js
+        if admin.singular? && instance.nil?
+          respond_to do |format|
+            format.html { redirect_to action: :new }
+            format.json { head :not_found }
+            format.js
+          end
+        else
+          respond_to do |format|
+            format.html
+            format.json { render json: instance }
+            format.js
+          end
         end
       end
 
@@ -60,8 +71,8 @@ module Trestle
         if admin.save_instance(instance)
           respond_to do |format|
             format.html do
-              flash[:message] = flash_message("success.update", default: "The %{lowercase_model_name} was successfully updated.")
-              redirect_to_return_location(:update, instance, default: admin.path(:show, id: admin.to_param(instance)))
+              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 }
             format.js
@@ -69,7 +80,7 @@ module Trestle
         else
           respond_to do |format|
             format.html do
-              flash.now[:error] = flash_message("failure.update", default: "Please correct the errors below.")
+              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 }
@@ -84,13 +95,13 @@ module Trestle
         respond_to do |format|
           format.html do
             if success
-              flash[:message] = flash_message("success.destroy", default: "The %{lowercase_model_name} was successfully deleted.")
+              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("failure.destroy", default: "Could not delete %{lowercase_model_name}.")
+              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.path(:show, id: admin.to_param(instance)))
+                redirect_to_return_location(:update, instance, default: admin.instance_path(instance))
               else
                 redirect_to_return_location(:destroy, instance, default: admin.path(:index))
               end
@@ -102,19 +113,22 @@ module Trestle
       end
 
     protected
-      def instance
-        @instance ||= admin.find_instance(params)
+      def load_instance
+        self.instance = admin.find_instance(params)
       end
 
-      def collection
-        @collection ||= admin.prepare_collection(params)
+      def load_collection
+        self.collection = admin.prepare_collection(params)
       end
 
-      attr_writer :instance, :collection
+      attr_accessor :instance, :collection
       helper_method :instance, :collection
 
-      def flash_message(type, options={})
-        t("trestle.flash.#{type}", options.merge(model_name: admin.model_name, lowercase_model_name: admin.model_name.downcase))
+      def flash_message(type, title:, message:)
+        {
+          title:   admin.t("flash.#{type}.title", default: title),
+          message: admin.t("flash.#{type}.message", default: message)
+        }
       end
 
       def permitted_params

data/lib/trestle/tab.rb

@@ -8,6 +8,10 @@ module Trestle
       @name, @options = name, options
     end
 
+    def id(tag=nil)
+      ["tab", tag, name].compact.join("-")
+    end
+
     def label
       safe_join([options[:label] || I18n.t("admin.tabs.#{name}", default: name.to_s.titleize), badge].compact, " ")
     end

data/lib/trestle/table/column.rb

@@ -32,9 +32,9 @@ module Trestle
         if options[:header]
           options[:header]
         elsif table.admin
-          table.admin.human_attribute_name(field)
+          table.admin.t("table.headers.#{field}", default: table.admin.human_attribute_name(field))
         else
-          field.to_s.humanize.titleize
+          I18n.t("admin.table.headers.#{field}", default: field.to_s.humanize.titleize)
         end
       end
 
@@ -50,9 +50,9 @@ module Trestle
         end
 
         def header
-          return if options.has_key?(:header) && options[:header].in?([nil, false])
+          return if options.key?(:header) && options[:header].in?([nil, false])
 
-          header = I18n.t("admin.table.headers.#{@column.field}", default: @column.header)
+          header = @column.header
           header = @template.sort_link(header, @column.sort_field, @column.sort_options) if @column.sortable?
           header
         end

data/lib/trestle/table/row.rb

@@ -32,7 +32,7 @@ module Trestle
         def options(instance)
           options = Trestle::Options.new
 
-          if table.admin && table.autolink?
+          if table.admin && table.autolink? && table.admin.actions.include?(:show)
             options.merge!(data: { url: admin_url_for(instance) })
             options.merge!(data: { behavior: "dialog" }) if table.admin.form.dialog?
           end

data/lib/trestle/version.rb

@@ -1,3 +1,3 @@
 module Trestle
-  VERSION = "0.8.7"
+  VERSION = "0.8.8"
 end

data/vendor/assets/javascripts/trestle/flatpickr.js.erb

@@ -1,5 +1,7 @@
 //= require trestle/flatpickr/dist/flatpickr
 
+<% flatpickr_locale_conversions = { ca: "cat", el: "gr", nb: "no", vi: "vn" } %>
 <% I18n.available_locales.each do |locale| %>
+  <% locale = flatpickr_locale_conversions[locale] if flatpickr_locale_conversions.key?(locale) %>
   <% require_asset("trestle/flatpickr/dist/l10n/#{locale}") rescue nil %>
 <% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trestle
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.8
 platform: ruby
 authors:
 - Sam Pohlenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-20 00:00:00.000000000 Z
+date: 2018-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -210,6 +210,7 @@ files:
 - app/assets/javascripts/trestle/core/_contexts.js
 - app/assets/javascripts/trestle/core/_cookies.js
 - app/assets/javascripts/trestle/core/_events.js
+- app/assets/javascripts/trestle/core/_l10n.js
 - app/assets/javascripts/trestle/core/_visit.js
 - app/assets/javascripts/trestle/custom.js
 - app/assets/stylesheets/trestle/_custom.scss
@@ -264,6 +265,7 @@ files:
 - app/helpers/trestle/grid_helper.rb
 - app/helpers/trestle/headings_helper.rb
 - app/helpers/trestle/hook_helper.rb
+- app/helpers/trestle/i18n_helper.rb
 - app/helpers/trestle/icon_helper.rb
 - app/helpers/trestle/navigation_helper.rb
 - app/helpers/trestle/pagination_helper.rb
@@ -283,14 +285,15 @@ files:
 - app/views/kaminari/trestle/_paginator.html.erb
 - app/views/layouts/trestle/admin.html.erb
 - app/views/trestle/admin/index.html.erb
-- app/views/trestle/application/_alert.html.erb
 - app/views/trestle/application/_dialog.html.erb
-- app/views/trestle/application/_flash.html.erb
 - app/views/trestle/application/_header.html.erb
 - app/views/trestle/application/_layout.html.erb
 - app/views/trestle/application/_tabs.html.erb
 - app/views/trestle/application/_utilities.html.erb
 - app/views/trestle/dashboard/index.html.erb
+- app/views/trestle/flash/_alert.html.erb
+- app/views/trestle/flash/_debug.html.erb
+- app/views/trestle/flash/_flash.html.erb
 - app/views/trestle/resource/_form.html.erb
 - app/views/trestle/resource/_scopes.html.erb
 - app/views/trestle/resource/_table.html.erb
@@ -306,6 +309,8 @@ files:
 - bin/console
 - bin/setup
 - bower.json
+- config/locales/cs.rb
+- config/locales/cs.yml
 - config/locales/en.rb
 - config/locales/en.yml
 - config/locales/fr.rb
@@ -316,10 +321,13 @@ files:
 - config/locales/pl.yml
 - config/locales/pt-BR.rb
 - config/locales/pt-BR.yml
+- config/locales/zh-CN.rb
+- config/locales/zh-CN.yml
 - config/routes.rb
 - gemfiles/rails-4.2.gemfile
 - gemfiles/rails-5.0.gemfile
 - gemfiles/rails-5.1.gemfile
+- gemfiles/rails-5.2.gemfile
 - gemfiles/rails-edge.gemfile
 - lib/generators/trestle/admin/admin_generator.rb
 - lib/generators/trestle/admin/templates/admin.rb.erb

data/app/views/trestle/application/_flash.html.erb

@@ -1,25 +0,0 @@
-<% if flash[:message] -%>
-  <%= render "alert", html_class: "alert-success",
-                      icon: icon("alert-icon ion-ios-checkmark-outline"),
-                      title: t("trestle.flash.success.title", default: "Success!"),
-                      message: flash[:message] %>
-<% elsif flash[:error] -%>
-  <%= render layout: "alert",
-             locals: {
-               html_class: "alert-danger",
-               icon: icon("alert-icon ion-ios-close-outline"),
-               title: t("trestle.flash.failure.title", default: "Warning!"),
-               message: flash[:error]
-             } do %>
-    <%- if debug_form_errors? -%>
-      <%= link_to "Debug errors", "#debug-errors", class: "toggle-debug-errors small", data: { toggle: "collapse" } %>
-      <div id="debug-errors" class="debug-errors collapse">
-        <ul>
-          <% instance.errors.each do |key, message| %>
-            <li class="small"><tt><%= key %>:</tt> <%= message %></li>
-          <% end %>
-        </ul>
-      </div>
-    <%- end -%>
-  <% end %>
-<% end -%>