trestle 0.9.8 → 0.10.0.pre

data/lib/trestle/resource/toolbar.rb

@@ -14,11 +14,11 @@ module Trestle
         end
 
         def delete
-          link(t("buttons.delete", default: "Delete %{model_name}"), instance, action: :destroy, method: :delete, style: :danger, icon: "fa fa-trash", data: { toggle: "confirm-delete", placement: "bottom" }) if action?(:destroy)
+          link(t("buttons.delete", default: "Delete %{model_name}"), instance, action: :destroy, style: :danger, icon: "fa fa-trash", data: { turbo_method: "delete", controller: "confirm-delete", confirm_delete_placement_value: "bottom" }) if action?(:destroy)
         end
 
         def dismiss
-          button(t("buttons.ok", default: "OK"), style: :light, data: { dismiss: "modal" }) if @template.dialog_request?
+          button(t("buttons.ok", default: "OK"), style: :light, data: { bs_dismiss: "modal" }) if @template.modal_request?
         end
         alias ok dismiss
 

data/lib/trestle/resource.rb

@@ -88,8 +88,8 @@ module Trestle
         model_name.plural
       end
 
-      def actions
-        @actions ||= (readonly? ? READONLY_ACTIONS : RESOURCE_ACTIONS).dup
+      def default_actions
+        readonly? ? READONLY_ACTIONS : RESOURCE_ACTIONS
       end
 
       def root_action

data/lib/trestle/scopes/block.rb

@@ -1,16 +1,16 @@
 module Trestle
   class Scopes
     class Block
-      attr_reader :block
+      attr_reader :block, :options
 
-      def initialize(&block)
-        @block = block
+      def initialize(options={}, &block)
+        @options, @block = options, block
       end
 
       # Evaluates the scope block within the given admin context
       # and returns an array of the scopes that were defined.
       def scopes(context)
-        context = Evaluator.new(context)
+        context = Evaluator.new(context, options)
         context.instance_exec(context, &block)
         context.scopes
       end
@@ -20,8 +20,8 @@ module Trestle
 
         attr_reader :scopes
 
-        def initialize(context=nil)
-          @context = context
+        def initialize(context=nil, defaults={})
+          @context, @defaults = context, defaults
           @scopes = []
         end
 
@@ -31,7 +31,7 @@ module Trestle
             scope = nil
           end
 
-          scopes << Scope.new(@context, name, options, &(scope || block))
+          scopes << Scope.new(@context, name, @defaults.merge(options), &(scope || block))
         end
       end
     end

data/lib/trestle/scopes/definition.rb

@@ -8,8 +8,8 @@ module Trestle
         @options = {}
       end
 
-      def append(&block)
-        @blocks << Block.new(&block)
+      def append(options={}, &block)
+        @blocks << Block.new(options, &block)
       end
 
       # Evaluates each of the scope blocks within the given admin context

data/lib/trestle/scopes/scope.rb

@@ -23,6 +23,10 @@ module Trestle
         @options[:default] == true
       end
 
+      def count?
+        @options[:count] != false
+      end
+
       def apply(collection)
         if @block
           if @block.arity == 1

data/lib/trestle/table/actions_column.rb

@@ -42,7 +42,7 @@ module Trestle
         end
 
         def delete
-          link(t("buttons.delete", default: "Delete"), instance, admin: admin, action: :destroy, method: :delete, icon: "fa fa-trash", style: :danger, data: { toggle: "confirm-delete", placement: "left" })
+          link(t("buttons.delete", default: "Delete"), instance, admin: admin, action: :destroy, icon: "fa fa-trash", style: :danger, data: { turbo_method: "delete", controller: "confirm-delete", confirm_delete_placement_value: "left" })
         end
 
         builder_method :show, :edit, :delete
@@ -67,7 +67,7 @@ module Trestle
         end
 
         def classes
-          super + ["actions"]
+          super + ["table-actions"]
         end
 
         def content(instance)

data/lib/trestle/table/row.rb

@@ -33,8 +33,9 @@ module Trestle
           options = Trestle::Options.new
 
           if @table.admin && @table.autolink? && @table.admin.actions.include?(:show)
+            options.merge!(data: { controller: "follow-url", action: "click->follow-url#follow" })
             options.merge!(data: { url: admin_url_for(instance) })
-            options.merge!(data: { behavior: "dialog" }) if @table.admin.form.dialog?
+            options.merge!(data: { modal: true }) if @table.admin.form.modal?
           end
 
           options.merge!(@row.options)

data/lib/trestle/table/select_column.rb

@@ -13,11 +13,11 @@ module Trestle
 
       class Renderer < Column::Renderer
         def header
-          checkbox "", nil, id: checkbox_id("all")
+          checkbox "", nil, id: checkbox_id("all"), data: { checkbox_select_target: "selectAll", action: "change->checkbox-select#toggleAll" }
         end
 
         def content(instance)
-          checkbox "selected[]", instance.to_param, id: checkbox_id(instance.to_param)
+          checkbox "selected[]", instance.to_param, id: checkbox_id(instance.to_param), data: { checkbox_select_target: "checkbox", action: "change->checkbox-select#toggle" }
         end
 
         def classes
@@ -34,10 +34,7 @@ module Trestle
         end
 
         def checkbox(name, value="1", options={})
-          @template.content_tag(:div, class: "custom-control custom-checkbox") do
-            @template.check_box_tag(name, value, false, options.merge(class: "custom-control-input")) +
-              @template.tag(:label, for: options.fetch(:id), class: "custom-control-label")
-          end
+          @template.check_box_tag(name, value, false, options.merge(class: "form-check-input"))
         end
       end
     end

data/lib/trestle/table.rb

@@ -70,7 +70,12 @@ module Trestle
       end
 
       def data
-        options[:data]
+        data = options[:data] || {}
+
+        controllers = Array(data[:controller])
+        controllers << "checkbox-select"
+
+        data.merge(controller: controllers.join(" "))
       end
     end
   end

data/lib/trestle/toolbar/item.rb

@@ -97,7 +97,7 @@ module Trestle
 
     class Dropdown < Button
       def options
-        super.merge(type: "button", data: { toggle: "dropdown" })
+        super.merge(type: "button", data: { bs_toggle: "dropdown" })
       end
 
       def label

data/lib/trestle/toolbar/menu.rb

@@ -18,16 +18,13 @@ module Trestle
       end
 
       def render_toggle(options={})
-        content_tag(:button, type: "button", class: Array(options[:class]) + ["dropdown-toggle"], data: { toggle: "dropdown" }) do
-          safe_join([
-            content_tag(:span, "", class: "caret"),
-            content_tag(:span, I18n.t("trestle.ui.toggle_dropdown", default: "Toggle dropdown"), class: "sr-only")
-          ])
+        content_tag(:button, type: "button", class: Array(options[:class]) + ["dropdown-toggle dropdown-toggle-split"], data: { bs_toggle: "dropdown" }, aria: { expanded: false }) do
+          content_tag(:span, I18n.t("trestle.ui.toggle_dropdown", default: "Toggle dropdown"), class: "visually-hidden")
         end
       end
 
       def render_items
-        content_tag(:ul, safe_join(items, "\n"), class: "dropdown-menu dropdown-menu-right", role: "menu")
+        content_tag(:ul, safe_join(items, "\n"), class: "dropdown-menu dropdown-menu-end", role: "menu")
       end
 
       class Builder

data/lib/trestle/version.rb

@@ -1,3 +1,3 @@
 module Trestle
-  VERSION = "0.9.8"
+  VERSION = "0.10.0.pre"
 end

data/lib/trestle.rb

@@ -6,6 +6,7 @@ require "kaminari"
 module Trestle
   require_relative "trestle/evaluation_context"
   require_relative "trestle/builder"
+  require_relative "trestle/color"
   require_relative "trestle/hook"
   require_relative "trestle/toolbar"
   require_relative "trestle/adapters"
@@ -64,26 +65,8 @@ module Trestle
     Navigation.build(blocks, context)
   end
 
-  # Returns the I18n fallbacks for the given locale.
-  #
-  # This is used from within a Sprockets asset (JavaScript)
-  # to determine which locale files to include.
-  #
-  # Examples
-  #
-  #   Trestle.i18n_fallbacks("pt-BR") => ["pt-BR", "pt"]
-  #   Trestle.i18n_fallbacks("ca") => ["ca", "es-ES", "es"] %>
-  #
-  # Returns an array of locale Strings.
-  def self.i18n_fallbacks(locale=I18n.locale)
-    if I18n.respond_to?(:fallbacks)
-      I18n.fallbacks[locale].map(&:to_s)
-    elsif locale.to_s.include?("-")
-      fallback = locale.to_s.split("-").first
-      [locale, fallback]
-    else
-      [locale]
-    end
+  def self.deprecator
+    @deprecator ||= ActiveSupport::Deprecation.new('1.0', 'Trestle')
   end
 end
 

data/package.json

@@ -1,11 +1,11 @@
 {
   "name": "trestle",
-  "version": "0.9.7",
+  "version": "0.10.0.pre",
   "description": "A modern, responsive admin framework for Ruby on Rails",
   "homepage": "https://trestle.io",
   "repository": "https://github.com/TrestleAdmin/trestle.git",
   "author": "Sam Pohlenz <sam@sampohlenz.com>",
-  "license": "LGPL-3.0",
+  "license": "LGPL-3.0-only",
   "private": true,
   "scripts": {
     "dev": "webpack --mode development",
@@ -13,33 +13,37 @@
     "watch": "webpack --mode development --watch"
   },
   "devDependencies": {
-    "@babel/core": "^7.14.6",
-    "@babel/preset-env": "^7.14.7",
-    "autoprefixer": "^10.2.6",
-    "babel-loader": "^8.0.6",
-    "copy-webpack-plugin": "^9.0.1",
-    "css-loader": "^5.2.6",
-    "css-minimizer-webpack-plugin": "^3.0.2",
-    "expose-loader": "^3.0.0",
-    "mini-css-extract-plugin": "^2.0.0",
-    "node-sass": "^7.0.1",
-    "postcss": "^8.3.5",
-    "postcss-loader": "^6.1.1",
-    "sass-loader": "^12.1.0",
-    "webpack": "^5.42.0",
-    "webpack-cli": "^4.7.2"
+    "@babel/core": "^7.20.12",
+    "@babel/helper-explode-assignable-expression": "^7.18.6",
+    "@babel/preset-env": "^7.20.2",
+    "autoprefixer": "^10.4.13",
+    "babel-loader": "^9.1.2",
+    "copy-webpack-plugin": "^11.0.0",
+    "css-loader": "^6.7.3",
+    "css-minimizer-webpack-plugin": "^5.0.0",
+    "expose-loader": "^4.0.0",
+    "mini-css-extract-plugin": "^2.7.2",
+    "postcss": "^8.4.21",
+    "postcss-loader": "^7.0.2",
+    "sass": "^1.57.1",
+    "sass-loader": "^13.2.0",
+    "webpack": "^5.75.0",
+    "webpack-bundle-analyzer": "^4.7.0",
+    "webpack-cli": "^5.0.1"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-free": "^5.15.3",
-    "@rails/ujs": "^6.1.3-1",
-    "bootstrap": "^4.5.0",
-    "bootstrap-confirmation2": "^4.2.1",
-    "bs-custom-file-input": "^1.3.2",
-    "flatpickr": "^4.6.2",
+    "@fortawesome/fontawesome-free": "^6.2.1",
+    "@hotwired/stimulus": "^3.2.2",
+    "@hotwired/stimulus-webpack-helpers": "^1.0.1",
+    "@hotwired/turbo": "^8.0.2",
+    "@popperjs/core": "^2.11.8",
+    "bootstrap": "~5.3.1",
+    "flatpickr": "^4.6.13",
+    "get-video-id": "^4.1.7",
+    "i18n-js": "^4.4.3",
     "jquery": "^3.6.0",
-    "magnific-popup": "^1.1.0",
-    "popper.js": "^1.15.0",
-    "select2": "^4.0.10",
-    "select2-theme-bootstrap4": "^1.0.0"
+    "photoswipe": "^5.4.4",
+    "select2": "^4.0.13",
+    "select2-bootstrap-5-theme": "~1.3.0"
   }
 }

data/trestle.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.summary       = "A modern, responsive admin framework for Ruby on Rails"
   spec.description   = "Trestle is a modern, responsive admin framework for Ruby on Rails."
   spec.homepage      = "https://www.trestle.io"
-  spec.license       = "LGPL-3.0"
+  spec.license       = "LGPL-3.0-only"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(bin|coverage|gemfiles|node_modules|spec|sandbox)/}) }
 
@@ -20,18 +20,17 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.2.2"
 
-  spec.add_dependency "railties",        ">= 4.2.0"
-  spec.add_dependency "activemodel",     ">= 4.2.0"
-  spec.add_dependency "sprockets-rails", ">= 2.0.0"
+  spec.add_dependency "railties",        ">= 5.2.0"
+  spec.add_dependency "activemodel",     ">= 5.2.0"
   spec.add_dependency "kaminari",        ">= 1.1.0"
 
-  spec.add_development_dependency "rspec-rails",         "~> 3.5"
-  spec.add_development_dependency "rspec-html-matchers", "~> 0.9.2"
-  spec.add_development_dependency "database_cleaner",    "~> 1.8.3"
-  spec.add_development_dependency "ammeter",             "~> 1.1.4"
+  spec.add_development_dependency "rspec-rails",         ">= 5.1.2"
+  spec.add_development_dependency "rspec-html-matchers", "~> 0.10.0"
+  spec.add_development_dependency "database_cleaner",    "~> 2.0.2"
+  spec.add_development_dependency "ammeter",             "~> 1.1.5"
+  spec.add_development_dependency "i18n-js",             "~> 4.2.3"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "sqlite3", "~> 1.3.6"
-  spec.add_development_dependency "turbolinks"
+  spec.add_development_dependency "sqlite3"
 end

data/webpack.config.js

@@ -4,6 +4,7 @@ const CopyWebpackPlugin = require('copy-webpack-plugin');
 const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const TerserPlugin = require('terser-webpack-plugin');
+// const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 
 module.exports = {
   mode: 'production',
@@ -11,8 +12,10 @@ module.exports = {
   output: {
     library: 'Trestle',
     libraryExport: 'Trestle',
-    filename: 'bundle.js',
-    path: path.resolve(__dirname, 'app/assets/bundle/trestle')
+    filename: 'admin.js',
+    path: path.resolve(__dirname, 'app/assets/bundle/trestle'),
+    chunkFilename: '[name]-[contenthash].digested.js',
+    assetModuleFilename: '[name][ext]'
   },
   optimization: {
     minimizer: [
@@ -32,7 +35,7 @@ module.exports = {
         ]
       },
       {
-        test: /\.(ttf|eot|svg|woff2?)(\?[\s\S]+)?$/,
+        test: /\.(ttf|woff2?)(\?[\s\S]+)?$/,
         type: 'asset/resource'
       },
       {
@@ -54,7 +57,14 @@ module.exports = {
               }
             }
           },
-          { loader: 'sass-loader' }
+          {
+            loader: 'sass-loader',
+            options: {
+              sassOptions: {
+                quietDeps: true
+              }
+            }
+          }
         ]
       },
       {
@@ -71,13 +81,9 @@ module.exports = {
   plugins: [
     new CopyWebpackPlugin({
       patterns: [
-        {
-          from: 'node_modules/@fortawesome/fontawesome-free/webfonts/*',
-          to: '[name][ext]'
-        },
         {
           from: 'node_modules/flatpickr/dist/l10n/*.js',
-          to: 'flatpickr/[name][ext]',
+          to: 'locale/flatpickr/[name][ext]',
           globOptions: {
             ignore: ['**/index.js']
           }
@@ -85,8 +91,9 @@ module.exports = {
       ]
     }),
     new MiniCssExtractPlugin({
-      filename: 'bundle.css'
-    })
+      filename: 'admin.css'
+    }),
+    // new BundleAnalyzerPlugin()
   ],
   resolve: {
     mainFields: ['main']