active_scaffold 4.1.6 → 4.2.1

data/lib/active_scaffold/paginator.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require 'forwardable'
 
 class Paginator
-  VERSION = '1.0.9'.freeze
+  VERSION = '1.0.9'
 
   class ArgumentError < ::ArgumentError; end
   class MissingCountError < ArgumentError; end
@@ -72,6 +74,7 @@ class Paginator
   # of the page in the paginator
   class Page
     extend Forwardable
+
     def_delegator :@pager, :first, :first
     def_delegator :@pager, :last, :last
     def_delegator :items, :each

data/lib/active_scaffold/registry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold
   class Registry
     thread_mattr_accessor :current_user_proc, :current_ability_proc, :marked_records

data/lib/active_scaffold/responds_to_parent.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold
   # Module containing the methods useful for child IFRAME to parent window communication
   module RespondsToParent

data/lib/active_scaffold/tableless.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/ApplicationRecord
   class Connection < ActiveRecord::ConnectionAdapters::AbstractAdapter
     attr_reader :klass
 
-    def initialize(klass, *args)
-      super(nil, *args)
+    def initialize(klass, *)
+      super(nil, *)
       @klass = klass
     end
 
@@ -21,9 +23,19 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
   end
 
   class Column < ActiveRecord::ConnectionAdapters::Column
-    def initialize(name, default, sql_type = nil, null = true, **) # rubocop:disable Style/OptionalBooleanParameter
-      metadata = ActiveRecord::Base.connection.send :fetch_type_metadata, sql_type
-      super(name, default, metadata, null)
+    def initialize(name, default, type, null = true, *, **) # rubocop:disable Style/OptionalBooleanParameter,Metrics/ParameterLists
+      if Rails.version >= '8.1'
+        if type.is_a?(Symbol)
+          cast_type = ActiveRecord::Type.lookup(type)
+        else
+          metadata = ActiveRecord::Base.connection.send :fetch_type_metadata, type
+          cast_type = ActiveRecord::Type.lookup(metadata.type)
+        end
+        super(name, cast_type, default, metadata, null, *, **)
+      else
+        metadata = ActiveRecord::Base.connection.send :fetch_type_metadata, type.to_s
+        super(name, default, metadata, null, *, **)
+      end
     end
   end
 
@@ -121,16 +133,14 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
     end
 
     def find_one(id)
-      @klass.find_one(id, self) || raise(ActiveRecord::RecordNotFound)
+      model.find_one(id, self) || raise(ActiveRecord::RecordNotFound)
     end
 
     def execute_simple_calculation(operation, column_name, distinct)
-      @klass.execute_simple_calculation(self, operation, column_name, distinct)
+      model.execute_simple_calculation(self, operation, column_name, distinct)
     end
 
-    def implicit_order_column
-      @klass.implicit_order_column
-    end
+    delegate :implicit_order_column, to: :model
 
     def exists?
       size.positive?
@@ -139,7 +149,7 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
     private
 
     def exec_queries
-      @records = @klass.find_all(self)
+      @records = model.find_all(self)
       @loaded = true
       @records
     end
@@ -195,8 +205,8 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
     @connection ||= Connection.new(self)
   end
 
-  def self.column(name, sql_type = nil, options = {})
-    column = Column.new(name.to_s, options[:default], sql_type.to_s, options.key?(:null) ? options[:null] : true)
+  def self.column(name, sql_type, options = {})
+    column = Column.new(name.to_s, options[:default], sql_type, options.key?(:null) ? options[:null] : true)
     column.tap { columns << column }
   end
 

data/lib/active_scaffold/version.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module ActiveScaffold
   module Version
     MAJOR = 4
-    MINOR = 1
-    PATCH = 6
+    MINOR = 2
+    PATCH = 1
     FIX = nil
 
     STRING = [MAJOR, MINOR, PATCH, FIX].compact.join('.')

data/lib/active_scaffold.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveScaffold
   autoload :ActiveRecordPermissions, 'active_scaffold/active_record_permissions'
   autoload :AttributeParams, 'active_scaffold/attribute_params'
@@ -77,7 +79,7 @@ module ActiveScaffold
   mattr_accessor :nested_subforms, instance_writer: false
 
   def self.root
-    "#{File.dirname(__FILE__)}/.."
+    File.expand_path '..', __dir__
   end
 
   def self.defaults(&)
@@ -85,7 +87,13 @@ module ActiveScaffold
   end
 
   def self.deprecator
-    @deprecator ||= ActiveSupport::Deprecation.new('4.2', 'ActiveScaffold')
+    @deprecator ||= ActiveSupport::Deprecation.new('4.3', 'ActiveScaffold')
+  end
+
+  def self.log_exception(exception, message)
+    line = exception.backtrace.find { |l| l.start_with? Rails.root.to_s }
+    line ||= exception.backtrace.find { |l| l.start_with? ActiveScaffold.root }
+    Rails.logger.error "#{exception.class.name}: #{exception.message} -- #{message}\n#{Rails.backtrace_cleaner.clean_frame(line) || line}"
   end
 end
 require 'active_scaffold/engine'

data/lib/generators/active_scaffold/controller/USAGE

@@ -0,0 +1,19 @@
+Description:
+    Stubs out a active_scaffolded controller. Pass the model name,
+    either CamelCased or under_scored.
+    The controller name is retrieved as a pluralized version of the model
+    name.
+
+    To create a controller within a module, specify the model name as a
+    path like 'parent_module/controller_name'.
+
+    This generates a controller class in app/controllers and invokes helper,
+    template engine and test framework generators.
+
+Example:
+    `rails generate active_scaffold:controller CreditCard`
+
+    Credit card controller with URLs like /credit_card/debit.
+        Controller:      app/controllers/credit_cards_controller.rb
+        Functional Test: test/functional/credit_cards_controller_test.rb
+        Helper:          app/helpers/credit_cards_helper.rb

data/lib/generators/active_scaffold/controller/controller_generator.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+# require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator'
+
+module ActiveScaffold
+  module Generators
+    class ControllerGenerator < Rails::Generators::NamedBase
+      include Rails::Generators::ResourceHelpers
+
+      source_root File.expand_path('templates', __dir__)
+
+      check_class_collision suffix: 'Controller'
+
+      class_option :orm, banner: 'NAME', type: :string, required: true,
+                         desc: 'ORM to generate the controller for'
+
+      def create_controller_files
+        template 'controller.rb', File.join('app/controllers', class_path, "#{controller_file_name}_controller.rb")
+        template 'helper.rb', File.join('app/helpers', class_path, "#{controller_file_name}_helper.rb")
+      end
+
+      hook_for :test_framework, as: :scaffold
+
+      def create_view_root_folder
+        empty_directory File.join('app/views', controller_file_path)
+      end
+    end
+  end
+end

data/lib/generators/active_scaffold/install/USAGE

@@ -0,0 +1,2 @@
+Description:
+    Add concerns to routes and require lines to assets manifest files

data/lib/generators/active_scaffold/{install_generator.rb → install/install_generator.rb}

@@ -1,20 +1,24 @@
+# frozen_string_literal: true
+
 require 'rails/generators/base'
 # require 'generators/active_scaffold_controller/active_scaffold_controller_generator'
 
 module ActiveScaffold
   module Generators
     class InstallGenerator < Rails::Generators::Base
-      desc 'Add concerns to routes and require lines to assets manifest files'
+      def self.base_root
+        File.expand_path '../..', __dir__
+      end
 
       def add_concern_routes
         route 'concern :active_scaffold, ActiveScaffold::Routing::Basic.new(association: true)'
         route 'concern :active_scaffold_association, ActiveScaffold::Routing::Association.new'
       end
 
-      IMPORTMAP = 'config/importmap.rb'.freeze
-      JS_ASSET = 'app/assets/javascripts/application.js'.freeze
-      JS_APP = 'app/javascript/application.js'.freeze
-      MANIFEST = 'app/assets/config/manifest.js'.freeze
+      IMPORTMAP = 'config/importmap.rb'
+      JS_ASSET = 'app/assets/javascripts/application.js'
+      JS_APP = 'app/javascript/application.js'
+      MANIFEST = 'app/assets/config/manifest.js'
 
       def add_javascript
         if File.exist?(IMPORTMAP)
@@ -44,7 +48,7 @@ module ActiveScaffold
         if original_css.match?(/require active_scaffold$/)
           say_status('skipped', 'insert into app/assets/stylesheets/application.css', :yellow)
         else
-          insert_into_file 'app/assets/stylesheets/application.css', before: %r{[ ]*\*/} do
+          insert_into_file 'app/assets/stylesheets/application.css', before: %r{ *\*/} do
             " *= require active_scaffold\n"
           end
         end

data/lib/generators/active_scaffold/resource/USAGE

@@ -0,0 +1,29 @@
+Description:
+    Scaffolds an entire resource, from model and migration to controller,
+        along with a full test suite and configured to use active_scaffold.
+    The resource is ready to use as a starting point for your RESTful,
+        resource-oriented application.
+
+    Pass the name of the model (in singular form), either CamelCased or
+        under_scored, as the first argument, and an optional list of attribute
+    pairs.
+
+    Attribute pairs are field:type arguments specifying the
+    model's attributes. Timestamps are added by default, so you don't have to
+    specify them by hand as 'created_at:datetime updated_at:datetime'.
+
+    You don't have to think up every attribute up front, but it helps to
+    sketch out a few so you can start working with the resource immediately.
+
+    For example, 'active_scaffold post title:string body:text published:boolean'
+    gives you a model with those three attributes, a controller configured to use active_scaffold,
+    as well as a resources :posts with additional active_scaffold routes
+    declaration in config/routes.rb.
+
+    If you want to remove all the generated files, run
+    'rails destroy active_scaffold ModelName'.
+
+Examples:
+    `rails generate active_scaffold:resource post`
+    `rails generate active_scaffold:resource post title:string body:text published:boolean`
+    `rails generate active_scaffold:resource purchase order_id:integer amount:decimal`

data/lib/generators/active_scaffold/resource/resource_generator.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'rails/generators/rails/resource/resource_generator'
+# require 'generators/active_scaffold_controller/active_scaffold_controller_generator'
+
+module ActiveScaffold
+  module Generators
+    class ResourceGenerator < Rails::Generators::ResourceGenerator
+      def self.base_root
+        File.expand_path '../..', __dir__
+      end
+
+      remove_hook_for :resource_controller
+      remove_hook_for :resource_route
+      remove_class_option :actions
+
+      def add_resource_route
+        routing_code =  class_path.collect { |namespace| "namespace :#{namespace} do " }.join(' ')
+        routing_code << "resources :#{file_name.pluralize}, concerns: :active_scaffold"
+        routing_code << (' end' * class_path.size)
+        log :route, routing_code
+        in_root do
+          inject_into_file 'config/routes.rb', "  #{routing_code}\n", after: /^ *concern :active_scaffold,.*\n/, verbose: false, force: true
+        end
+      end
+
+      invoke 'active_scaffold:controller'
+    end
+  end
+end

data/lib/tasks/brakeman.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 namespace :brakeman do
   desc 'Run Brakeman'
   task :run, :output_files do |_t, args|

data/shoulda_macros/macros.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ActiveSupport::TestCase
   def self.should_have_columns_in(action, *columns)
     should "have #{columns.to_sentence} columns in #{action}" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 4.1.6
+  version: 4.2.1
 platform: ruby
 authors:
 - Many, see README
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-02 00:00:00.000000000 Z
+date: 2026-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dartsass-sprockets
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 7.2.0
 - !ruby/object:Gem::Dependency
   name: request_store
   requirement: !ruby/object:Gem::Requirement
@@ -106,8 +106,9 @@ files:
 - app/assets/stylesheets/active_scaffold_extensions.css.erb
 - app/assets/stylesheets/active_scaffold_images.scss
 - app/assets/stylesheets/active_scaffold_jquery_ui.css.erb
-- app/assets/stylesheets/active_scaffold_layout.css
+- app/assets/stylesheets/active_scaffold_layout.scss
 - app/assets/stylesheets/blue-theme.css
+- app/assets/stylesheets/tiny_mce_bridge.scss
 - app/views/active_scaffold_overrides/_add_existing_form.html.erb
 - app/views/active_scaffold_overrides/_base_form.html.erb
 - app/views/active_scaffold_overrides/_create_form.html.erb
@@ -158,6 +159,7 @@ files:
 - app/views/active_scaffold_overrides/_update_messages.js.erb
 - app/views/active_scaffold_overrides/_vertical_subform.html.erb
 - app/views/active_scaffold_overrides/action_confirmation.html.erb
+- app/views/active_scaffold_overrides/action_links_menu.js.erb
 - app/views/active_scaffold_overrides/add_existing.js.erb
 - app/views/active_scaffold_overrides/add_existing_form.html.erb
 - app/views/active_scaffold_overrides/add_tab.js.erb
@@ -239,6 +241,9 @@ files:
 - lib/active_scaffold/bridges/file_column/list_ui.rb
 - lib/active_scaffold/bridges/file_column/test/functional/file_column_keep_test.rb
 - lib/active_scaffold/bridges/file_column/test/mock_model.rb
+- lib/active_scaffold/bridges/logical_query_parser.rb
+- lib/active_scaffold/bridges/logical_query_parser/tokens_grammar.rb
+- lib/active_scaffold/bridges/logical_query_parser/tokens_grammar.treetop
 - lib/active_scaffold/bridges/paper_trail.rb
 - lib/active_scaffold/bridges/paper_trail/actions.rb
 - lib/active_scaffold/bridges/paper_trail/config.rb
@@ -327,11 +332,14 @@ files:
 - lib/active_scaffold/responds_to_parent.rb
 - lib/active_scaffold/tableless.rb
 - lib/active_scaffold/version.rb
-- lib/generators/active_scaffold/controller_generator.rb
-- lib/generators/active_scaffold/install_generator.rb
-- lib/generators/active_scaffold/resource_generator.rb
-- lib/generators/templates/controller.rb
-- lib/generators/templates/helper.rb
+- lib/generators/active_scaffold/controller/USAGE
+- lib/generators/active_scaffold/controller/controller_generator.rb
+- lib/generators/active_scaffold/controller/templates/controller.rb
+- lib/generators/active_scaffold/controller/templates/helper.rb
+- lib/generators/active_scaffold/install/USAGE
+- lib/generators/active_scaffold/install/install_generator.rb
+- lib/generators/active_scaffold/resource/USAGE
+- lib/generators/active_scaffold/resource/resource_generator.rb
 - lib/tasks/brakeman.rake
 - public/blank.html
 - shoulda_macros/macros.rb
@@ -368,7 +376,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/generators/active_scaffold/controller_generator.rb

@@ -1,49 +0,0 @@
-# require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator'
-
-module ActiveScaffold
-  module Generators
-    class ControllerGenerator < Rails::Generators::NamedBase
-      include Rails::Generators::ResourceHelpers
-
-      source_root File.expand_path('../templates', __dir__)
-
-      check_class_collision suffix: 'Controller'
-
-      class_option :orm, banner: 'NAME', type: :string, required: true,
-                         desc: 'ORM to generate the controller for'
-
-      desc <<~DESC
-        Description:
-            Stubs out a active_scaffolded controller. Pass the model name,
-            either CamelCased or under_scored.
-            The controller name is retrieved as a pluralized version of the model
-            name.
-
-            To create a controller within a module, specify the model name as a
-            path like 'parent_module/controller_name'.
-
-            This generates a controller class in app/controllers and invokes helper,
-            template engine and test framework generators.
-
-        Example:
-            `rails generate active_scaffold:controller CreditCard`
-
-            Credit card controller with URLs like /credit_card/debit.
-                Controller:      app/controllers/credit_cards_controller.rb
-                Functional Test: test/functional/credit_cards_controller_test.rb
-                Helper:          app/helpers/credit_cards_helper.rb
-      DESC
-
-      def create_controller_files
-        template 'controller.rb', File.join('app/controllers', class_path, "#{controller_file_name}_controller.rb")
-        template 'helper.rb', File.join('app/helpers', class_path, "#{controller_file_name}_helper.rb")
-      end
-
-      hook_for :test_framework, as: :scaffold
-
-      def create_view_root_folder
-        empty_directory File.join('app/views', controller_file_path)
-      end
-    end
-  end
-end

data/lib/generators/active_scaffold/resource_generator.rb

@@ -1,56 +0,0 @@
-require 'rails/generators/rails/resource/resource_generator'
-# require 'generators/active_scaffold_controller/active_scaffold_controller_generator'
-
-module ActiveScaffold
-  module Generators
-    class ResourceGenerator < Rails::Generators::ResourceGenerator
-      remove_hook_for :resource_controller
-      remove_hook_for :resource_route
-      remove_class_option :actions
-
-      desc <<~DESC
-        Description:
-            Scaffolds an entire resource, from model and migration to controller,
-                along with a full test suite and configured to use active_scaffold.
-            The resource is ready to use as a starting point for your RESTful,
-                resource-oriented application.
-
-            Pass the name of the model (in singular form), either CamelCased or
-                under_scored, as the first argument, and an optional list of attribute
-            pairs.
-
-            Attribute pairs are field:type arguments specifying the
-            model's attributes. Timestamps are added by default, so you don't have to
-            specify them by hand as 'created_at:datetime updated_at:datetime'.
-
-            You don't have to think up every attribute up front, but it helps to
-            sketch out a few so you can start working with the resource immediately.
-
-            For example, 'active_scaffold post title:string body:text published:boolean'
-            gives you a model with those three attributes, a controller configured to use active_scaffold,
-            as well as a resources :posts with additional active_scaffold routes
-            declaration in config/routes.rb.
-
-            If you want to remove all the generated files, run
-            'rails destroy active_scaffold ModelName'.
-
-        Examples:
-            `rails generate active_scaffold:resource post`
-            `rails generate active_scaffold:resource post title:string body:text published:boolean`
-            `rails generate active_scaffold:resource purchase order_id:integer amount:decimal`
-      DESC
-
-      def add_resource_route
-        routing_code =  class_path.collect { |namespace| "namespace :#{namespace} do " }.join(' ')
-        routing_code << "resources :#{file_name.pluralize}, concerns: :active_scaffold"
-        routing_code << (' end' * class_path.size)
-        log :route, routing_code
-        in_root do
-          inject_into_file 'config/routes.rb', "  #{routing_code}\n", after: /^[ ]*concern :active_scaffold,.*\n/, verbose: false, force: true
-        end
-      end
-
-      invoke 'active_scaffold:controller'
-    end
-  end
-end