trestle 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ec0dcceb14b2184fb07724245272ba57926c91058ed554cb19653149aa5a61d
-  data.tar.gz: ec4b694ff3649bb301dffad74fba26fce2dc222c52ffeb48ff205fcda95c1e98
+  metadata.gz: 1a0e145542ea21344ab56ce456f98a2eab365820c9cb65da1a2c64e57b7041e1
+  data.tar.gz: 9957f9704925389b5adf30d148dee1f41843fd450bd1d5442b40a296b6daf21f
 SHA512:
-  metadata.gz: e07e61553b61a4f0ed93efc32178290de7623a37fb58e8caf4ce170e8b09cf1d15b1765b7cd28544e99c841fa5de25bd78d02220308da2ce98cc02fb2af36938
-  data.tar.gz: 58eb9ad54d778ace1d86fc8e7f39b069604d15049af4f3bd05b6cef8c629b9eec0b11589e44e5f63a371632d1f45396873eb3ac9c395c4ae002108c47f77e2b5
+  metadata.gz: c43a3a0a73533519d3fcaac45788fb1bb41c1bf746d5d0b2c4516c172f90f73cf51a1cc88560f0e546e76b3b0d269550ee91e39a5176ec63ba9933fc1f33e6c5
+  data.tar.gz: c415ad3ce71f604c39af7dd052556b1b53da73b5c4214ae60802f7024edc38cb761548ee78373f780987a95c8fdb9b753fc7dbfff1b270c400515f6454151f9d

data/.travis.yml

@@ -1,14 +1,15 @@
 language: ruby
 
+cache: bundler
+
 before_install:
   - gem update --system
   - gem install bundler
 
 rvm:
-  - 2.6.3
+  - 2.6.5
 
 gemfile:
-  - gemfiles/rails-4.2.gemfile
   - gemfiles/rails-5.0.gemfile
   - gemfiles/rails-5.1.gemfile
   - gemfiles/rails-5.2.gemfile
@@ -17,10 +18,7 @@ gemfile:
 addons:
   chrome: stable
 
-matrix:
-  exclude:
-    gemfile: gemfiles/rails-4.2.gemfile
-
+jobs:
   include:
     gemfile: gemfiles/rails-4.2.gemfile
     before_install:

data/Gemfile

@@ -5,7 +5,6 @@ gemspec
 
 group :test do
   gem 'coveralls',   require: false
-  gem 'simplecov',   require: false
   gem 'guard-rspec', require: false
 
   gem 'capybara'

data/README.md

@@ -28,7 +28,7 @@ Run `bundle install`, and then run the install generator to create the initial c
 
     $ rails generate trestle:install
 
-Then create your first admin resource:
+Then create your first admin resource (assuming you have an existing `Article` model):
 
     $ rails generate trestle:resource Article
 
@@ -104,6 +104,8 @@ The following plugins are currently available:
 | *trestle-sidekiq* | [Sidekiq](http://sidekiq.org/) integration | [GitHub](https://github.com/TrestleAdmin/trestle-sidekiq) \| [RubyGems](https://rubygems.org/gems/trestle-sidekiq) |
 | *trestle-active_storage* | [Active Storage](https://guides.rubyonrails.org/active_storage_overview.html) integration | [GitHub](https://github.com/richardvenneman/trestle-active_storage) \| [RubyGems](https://rubygems.org/gems/trestle-active_storage) |
 | *trestle-mobility* | [Mobility](https://github.com/shioyama/mobility) integration | [GitHub](https://github.com/richardvenneman/trestle-mobility) \| [RubyGems](https://rubygems.org/gems/trestle-mobility) |
+| *trestle-omniauth* | OmniAuth authentication plugin | [GitHub](https://github.com/airhorns/trestle-omniauth) \| [RubyGems](https://rubygems.org/gems/trestle-omniauth) |
+| *trestle-auth-otp* | 2FA/OTP user authentication | [GitHub](https://github.com/McRipper/trestle-auth-otp) \| [RubyGems](https://rubygems.org/gems/trestle-auth-otp) |
 
 
 ## License

data/{lib → app/controllers/concerns}/trestle/resource/controller/actions.rb

@@ -1,6 +1,6 @@
 module Trestle
   class Resource
-    class Controller
+    module Controller
       module Actions
         def index
           respond_to do |format|

data/{lib → app/controllers/concerns}/trestle/resource/controller/data_methods.rb

@@ -1,6 +1,6 @@
 module Trestle
   class Resource
-    class Controller
+    module Controller
       module DataMethods
         extend ActiveSupport::Concern
 

data/{lib → app/controllers/concerns}/trestle/resource/controller/redirection.rb

@@ -1,6 +1,6 @@
 module Trestle
   class Resource
-    class Controller
+    module Controller
       module Redirection
       protected
         def redirect_to_return_location(action, instance, default:)

data/{lib → app/controllers/concerns}/trestle/resource/controller/toolbar.rb

@@ -1,6 +1,6 @@
 module Trestle
   class Resource
-    class Controller
+    module Controller
       module Toolbar
         def default_toolbar_builder
           Resource::Toolbar::Builder

data/app/controllers/trestle/admin_controller.rb

@@ -0,0 +1,33 @@
+module Trestle
+  class AdminController < ApplicationController
+    def index
+    end
+
+    class << self
+      attr_reader :admin
+
+    private
+      def local_prefixes
+        return admin.view_path_prefixes if admin
+        [controller_path.sub(/\/$/, "")]
+      end
+    end
+
+    def admin
+      @_admin ||= self.class.admin.new(self)
+    end
+    helper_method :admin
+
+  protected
+    def breadcrumbs
+      @_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/app/controllers/trestle/dashboard_controller.rb

@@ -1,15 +1,17 @@
-class Trestle::DashboardController < Trestle::ApplicationController
-  def index
-    admin = primary_admin
-    redirect_to admin.path if admin
-  end
+module Trestle
+  class DashboardController < ApplicationController
+    def index
+      admin = primary_admin
+      redirect_to admin.path if admin
+    end
 
-private
-  def primary_admin
-    if navigation = Trestle.navigation(self).first
-      navigation.admin
-    elsif Trestle.admins.values.any?
-      Trestle.admins.values.first
+  private
+    def primary_admin
+      if navigation = Trestle.navigation(self).first
+        navigation.admin
+      elsif Trestle.admins.values.any?
+        Trestle.admins.values.first
+      end
     end
   end
 end

data/app/controllers/trestle/resource_controller.rb

@@ -0,0 +1,8 @@
+module Trestle
+  class ResourceController < AdminController
+    include Resource::Controller::Actions
+    include Resource::Controller::DataMethods
+    include Resource::Controller::Redirection
+    include Resource::Controller::Toolbar
+  end
+end

data/app/helpers/trestle/grid_helper.rb

@@ -45,9 +45,13 @@ module Trestle
         columns = breakpoints.delete("xs") || breakpoints.delete(:xs)
       end
 
-      classes = []
-      classes << (columns ? "col-#{columns}" : "col")
-      classes += breakpoints.map { |breakpoint, span| "col-#{breakpoint}-#{span}" }
+      if columns.nil? && breakpoints.empty?
+        classes = "col"
+      else
+        classes = []
+        classes << "col-#{columns}" if columns
+        classes += breakpoints.map { |breakpoint, span| "col-#{breakpoint}-#{span}" }
+      end
 
       content_tag(:div, class: classes) { yield }
     end

data/app/helpers/trestle/hook_helper.rb

@@ -1,17 +1,19 @@
 module Trestle
   module HookHelper
-    def hook(name)
-      if hook?(name)
-        safe_join(hooks(name).map { |hook|
-          hook.evaluate(self)
+    def hook(name, *args)
+      hooks = hooks(name)
+
+      if hooks.any?
+        safe_join(hooks.map { |hook|
+          hook.evaluate(self, *args)
         }, "\n")
       elsif block_given?
-        capture(&Proc.new)
+        capture(*args, &Proc.new)
       end
     end
 
     def hook?(name)
-      hook_sets.any? { |set| set.any?(name) }
+      hooks(name).any?
     end
 
   protected

data/app/views/trestle/resource/edit.html.erb

@@ -4,11 +4,11 @@
 <% breadcrumb(title) %>
 
 <% toolbar(:primary) do |t| %>
-  <%= t.save if admin.actions.include?(:update) %>
+  <%= t.save_or_dismiss(:update) %>
 <% end %>
 
 <% toolbar(:secondary) do |t| %>
-  <%= t.delete if admin.actions.include?(:destroy) %>
+  <%= t.delete %>
 <% end %>
 
 <%= trestle_form_for instance, url: admin.actions.include?(:update) ? admin.instance_path(instance, action: :update) : "#", method: :patch do |f| %>

data/app/views/trestle/resource/index.html.erb

@@ -1,7 +1,7 @@
 <% content_for(:title, admin.t("titles.index", default: "Listing %{pluralized_model_name}")) %>
 
 <% toolbar(:primary) do |t| %>
-  <%= t.new if admin.actions.include?(:new) %>
+  <%= t.new %>
 <% end %>
 
 <% content_for(:utilities) do %>

data/app/views/trestle/resource/new.html.erb

@@ -4,7 +4,7 @@
 <% breadcrumb(title) %>
 
 <% toolbar(:primary) do |t| %>
-  <%= t.save if admin.actions.include?(:create) %>
+  <%= t.save_or_dismiss(:create) %>
 <% end %>
 
 <%= trestle_form_for instance, url: admin.path(:create), method: :post do |f| %>

data/app/views/trestle/resource/show.html.erb

@@ -4,11 +4,11 @@
 <% breadcrumb(title) unless admin.singular? %>
 
 <% toolbar(:primary) do |t| %>
-  <%= t.save if admin.actions.include?(:update) %>
+  <%= t.save_or_dismiss(:update) %>
 <% end %>
 
 <% toolbar(:secondary) do |t| %>
-  <%= t.delete if admin.actions.include?(:destroy) %>
+  <%= t.delete %>
 <% end %>
 
 <%= trestle_form_for instance, url: admin.actions.include?(:update) ? admin.instance_path(instance, action: :update) : "#", method: :patch do |f| %>

data/frontend/css/components/_table.scss

@@ -64,6 +64,22 @@
   .select-row {
     width: 2.5em;
     text-align: center;
+
+    .custom-control {
+      padding-left: 1.5rem;
+    }
+
+    .custom-control-input {
+      width: 1.5rem;
+      height: 1.5rem;
+    }
+
+    .custom-control-label {
+      &::before,
+      &::after {
+        left: -1.325rem;
+      }
+    }
   }
 
   .actions {

data/frontend/css/layout/_sidebar.scss

@@ -20,7 +20,9 @@
 
   .navbar-toggler {
     outline: none;
+
     margin-left: $grid-gutter-width / 2;
+    margin-right: $grid-gutter-width / 2;
 
     background: $sidebar-mobile-toggle-bg;
     border: $sidebar-mobile-toggle-border;
@@ -155,8 +157,11 @@
 
   .app-sidebar-title {
     justify-content: center;
-    margin-right: 65px;
     padding: 10px 5px;
+
+    // Match right margin with navbar toggler width:
+    // (margin + border + font-size * icon-width + padding)
+    margin-right: calc(#{$grid-gutter-width} + #{$border-width} + #{$navbar-toggler-font-size} * 1.5 + #{$navbar-toggler-padding-x} * 2);
   }
 
   .toggle-sidebar {

data/frontend/js/components/confirmation.js

@@ -15,11 +15,13 @@ init(function (root) {
     copyAttributes: 'href target data-remote data-method data-url data-params data-type'
   }
 
-  const CONFIRM = { ...DEFAULTS,
+  const CONFIRM = {
+    ...DEFAULTS,
     rootSelector: '[data-toggle="confirm"]'
   }
 
-  const DELETE = { ...DEFAULTS,
+  const DELETE = {
+    ...DEFAULTS,
     rootSelector: '[data-toggle="confirm-delete"]',
     btnOkClass: 'btn btn-sm btn-danger',
     btnOkLabel: i18n['trestle.confirmation.delete'] || 'Delete'

data/frontend/js/components/dialog.js

@@ -128,6 +128,9 @@ export default class Dialog {
   }
 }
 
+// Expose showError as Trestle.Dialog.showError
+Dialog.showError = showError
+
 $(document).on('click', '[data-behavior="dialog"]', function (e) {
   e.preventDefault()
 

data/frontend/js/components/form.js

@@ -22,6 +22,9 @@ init(function (root) {
 
   $form
     .on('ajax:send', function (e) {
+      // Only run when triggered directly on form
+      if (e.target !== this) return
+
       // Disable submit buttons
       $(this).find(':submit').prop('disabled', true)
 
@@ -30,6 +33,9 @@ init(function (root) {
       if (button) { $(button).addClass('loading') }
     })
     .on('ajax:complete', function (e) {
+      // Only run when triggered directly on form
+      if (e.target !== this) return
+
       const xhr = e.detail[0]
 
       // Reset submit buttons
@@ -64,6 +70,9 @@ init(function (root) {
       }
     })
     .on('ajax:success', function (e) {
+      // Only run when triggered directly on form
+      if (e.target !== this) return
+
       const xhr = e.detail[2]
 
       const $context = $(this).closest('[data-context]')

data/frontend/js/components/sidebar.js

@@ -24,10 +24,10 @@ ready(function () {
   // Interacting outside of the sidebar closes the navigation
 
   $wrapper.on('click touchstart', function (e) {
-    let navExpanded = $('body').hasClass('mobile-nav-expanded')
+    const navExpanded = $('body').hasClass('mobile-nav-expanded')
 
-    let clickInHeader = $(e.target).closest('.app-header').length
-    let clickInSidebar = $(e.target).closest('.app-sidebar').length
+    const clickInHeader = $(e.target).closest('.app-header').length
+    const clickInSidebar = $(e.target).closest('.app-sidebar').length
 
     if (navExpanded && !clickInHeader && !clickInSidebar) {
       e.stopPropagation()
@@ -62,7 +62,7 @@ ready(function () {
 
     $(this).closest('ul').toggleClass('collapsed')
 
-    let collapsed = $sidebar.find('.collapsed .nav-header a').map(function () {
+    const collapsed = $sidebar.find('.collapsed .nav-header a').map(function () {
       return $(this).attr('href').replace(/^#/, '')
     }).toArray()
 
@@ -71,7 +71,7 @@ ready(function () {
 
   // Scroll sidebar to active item
 
-  let $active = $sidebar.find('.active')
+  const $active = $sidebar.find('.active')
   if ($active.length) {
     $sidebar.find('.app-sidebar-inner').scrollTop($active.offset().top - 100)
   }