trestle 0.9.7 → 0.9.8

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

@@ -2,6 +2,6 @@
   <%= render "trestle/flash/alert", html_class: "alert-success", icon: icon("alert-icon far fa-check-circle"), alert: normalize_flash_alert(flash[:message]) %>
 <% elsif flash[:error] -%>
   <%= render layout: "trestle/flash/alert", locals: { html_class: "alert-danger", icon: icon("alert-icon far fa-times-circle"), alert: normalize_flash_alert(flash[:error]) } do %>
-    <%= render "trestle/flash/debug", errors: instance.errors if debug_form_errors? %>
+    <%= render "trestle/flash/debug", errors: Trestle::DebugErrors.new(instance.errors) if debug_form_errors? %>
   <% end %>
 <% end -%>

data/frontend/css/components/_fields.scss

@@ -14,6 +14,7 @@
 
 ul.invalid-feedback {
   list-style: none;
+  margin-bottom: 0;
   padding-left: 0;
 }
 

data/frontend/js/components/tabs.js

@@ -6,7 +6,7 @@ import { init } from '../core/events'
 
 const TAB_SELECTOR = 'a[data-toggle="tab"]'
 const TAB_PANE_SELECTOR = '.tab-pane'
-const ERROR_SELECTOR = '.is-invalid:not([type="hidden"])'
+const ERROR_SELECTOR = '.has-error'
 
 // Save active tab to URL hash
 init(function (root) {

data/lib/generators/trestle/install/install_generator.rb

@@ -10,8 +10,12 @@ module Trestle
       end
 
       def create_assets
-        template "_theme.scss",  "app/assets/stylesheets/trestle/_theme.scss"
-        template "_custom.scss", "app/assets/stylesheets/trestle/_custom.scss"
+        if defined?(Sass) || defined?(SassC)
+          template "_custom.scss", "app/assets/stylesheets/trestle/_custom.scss"
+          template "_theme.scss",  "app/assets/stylesheets/trestle/_theme.scss"
+        else
+          template "_custom.css", "app/assets/stylesheets/trestle/_custom.css"
+        end
 
         template "custom.js",    "app/assets/javascripts/trestle/custom.js"
       end

data/lib/generators/trestle/install/templates/_custom.css

@@ -0,0 +1,8 @@
+/* This file may be used for providing additional customizations to the Trestle
+ * admin. It will be automatically included within all admin pages.
+ *
+ * For organizational purposes, you may wish to define your customizations
+ * within individual partials in this folder and they'll be required below.
+ *
+ *= require_tree .
+*/

data/lib/trestle/debug_errors.rb

@@ -0,0 +1,24 @@
+module Trestle
+  class DebugErrors
+    def initialize(errors)
+      @errors = errors
+    end
+
+    def any?
+      @errors.any?
+    end
+
+    def each
+      if defined?(ActiveModel::Error)
+        # Rails 6.1 introduces a unified Error class
+        @errors.each do |error|
+          yield error.attribute, error.message
+        end
+      else
+        @errors.each do |error, message|
+          yield error, message
+        end
+      end
+    end
+  end
+end

data/lib/trestle/navigation/group.rb

@@ -4,8 +4,7 @@ module Trestle
       attr_reader :name, :options
 
       def initialize(name, options={})
-        @name = name
-        @options = options
+        @name, @options = name.to_s, options
       end
 
       def ==(other)

data/lib/trestle/navigation/item.rb

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

data/lib/trestle/version.rb

@@ -1,3 +1,3 @@
 module Trestle
-  VERSION = "0.9.7"
+  VERSION = "0.9.8"
 end

data/lib/trestle.rb

@@ -11,6 +11,7 @@ module Trestle
   require_relative "trestle/adapters"
   require_relative "trestle/attribute"
   require_relative "trestle/breadcrumb"
+  require_relative "trestle/debug_errors"
   require_relative "trestle/lazy"
   require_relative "trestle/configurable"
   require_relative "trestle/configuration"