trestle 0.9.6 → 0.9.9

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/column.rb

@@ -108,7 +108,7 @@ module Trestle
 
         def column_value(instance)
           if @column.block
-            if defined?(Haml) && Haml::Helpers.block_is_haml?(@column.block)
+            if block_is_legacy_haml?
               # In order for table column blocks to work properly within Haml templates,
               # the _hamlout local variable needs to be defined in the scope of the block,
               # so that the Haml version of the capture method is used. Because we
@@ -131,6 +131,10 @@ module Trestle
             instance.send(@column.field)
           end
         end
+
+        def block_is_legacy_haml?
+          defined?(Haml) && Haml::Helpers.respond_to?(:block_is_haml?) && Haml::Helpers.block_is_haml?(@column.block)
+        end
       end
     end
   end

data/lib/trestle/version.rb

@@ -1,3 +1,3 @@
 module Trestle
-  VERSION = "0.9.6"
+  VERSION = "0.9.9"
 end

data/lib/trestle.rb

@@ -11,6 +11,8 @@ 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"
   require_relative "trestle/display"
@@ -83,6 +85,10 @@ module Trestle
       [locale]
     end
   end
+
+  def self.deprecator
+    @deprecator ||= ActiveSupport::Deprecation.new
+  end
 end
 
 require_relative "trestle/engine" if defined?(Rails)

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trestle",
-  "version": "0.9.6",
+  "version": "0.9.7",
   "description": "A modern, responsive admin framework for Ruby on Rails",
   "homepage": "https://trestle.io",
   "repository": "https://github.com/TrestleAdmin/trestle.git",
@@ -22,9 +22,9 @@
     "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": "^1.76.0",
     "sass-loader": "^12.1.0",
     "webpack": "^5.42.0",
     "webpack-cli": "^4.7.2"

data/trestle.gemspec

@@ -20,18 +20,18 @@ 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 "railties",        ">= 5.2.0"
+  spec.add_dependency "activemodel",     ">= 5.2.0"
   spec.add_dependency "sprockets-rails", ">= 2.0.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 "bundler"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "sqlite3", "~> 1.3.6"
+  spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "turbolinks"
 end

data/webpack.config.js

@@ -54,7 +54,14 @@ module.exports = {
               }
             }
           },
-          { loader: 'sass-loader' }
+          {
+            loader: 'sass-loader',
+            options: {
+              sassOptions: {
+                quietDeps: true
+              }
+            }
+          }
         ]
       },
       {