active_scaffold 3.5.3 → 3.6.0.rc2

data/test/misc/calculation_test.rb

@@ -4,7 +4,7 @@ require 'class_with_finder'
 class CalculationTest < MiniTest::Test
   def setup
     @buildings = []
-    @buildings << Building.create { |b| b.create_owner(:first_name => 'foo') }
+    @buildings << Building.create { |b| b.build_owner(:first_name => 'foo') }
     @buildings << Building.create(:name => 'foo bar')
     @buildings << Building.create
 

data/test/misc/configurable_test.rb

@@ -41,17 +41,17 @@ class ConfigurableTest < MiniTest::Test
     ## test normal block behaviors
     ##
     # functions
-    assert_equal hello, configurable_class.configure { hello }
+    assert_equal hello, (configurable_class.configure { hello })
     # variables
-    assert_equal configurable_class, configurable_class.configure { configurable_class }
+    assert_equal configurable_class, (configurable_class.configure { configurable_class })
     # constants
-    assert_equal ConfigurableTest::HELLO, configurable_class.configure { ConfigurableTest::HELLO }
+    assert_equal ConfigurableTest::HELLO, (configurable_class.configure { ConfigurableTest::HELLO })
 
     ##
     ## test extra "localized" block behavior
     ##
     # functions
-    assert_equal configurable_class.foo, configurable_class.configure { foo }
+    assert_equal configurable_class.foo, (configurable_class.configure { foo })
     # constants - not working
     #    assert_equal configurable_class.FOO, configurable_class.configure {FOO}
   end
@@ -73,25 +73,25 @@ class ConfigurableTest < MiniTest::Test
     ## test normal block behaviors
     ##
     # functions
-    assert_equal hello, ExtendedClass.configure { hello }
+    assert_equal hello, (ExtendedClass.configure { hello })
     # variables
-    assert_equal ExtendedClass, ExtendedClass.configure { ExtendedClass }
+    assert_equal ExtendedClass, (ExtendedClass.configure { ExtendedClass })
     # constants
-    assert_equal ConfigurableTest::HELLO, ExtendedClass.configure { ConfigurableTest::HELLO }
+    assert_equal ConfigurableTest::HELLO, (ExtendedClass.configure { ConfigurableTest::HELLO })
 
     ##
     ## test extra "localized" block behavior
     ##
     # functions
-    assert_equal ExtendedClass.foo, ExtendedClass.configure { foo }
+    assert_equal ExtendedClass.foo, (ExtendedClass.configure { foo })
     # constants - not working
     #    assert_equal ExtendedClass.FOO, ExtendedClass.configure {FOO}
   end
 
   def test_arity
     # this is the main style
-    assert_equal 'foo', ExtendedClass.configure { 'foo' }
+    assert_equal 'foo', (ExtendedClass.configure { 'foo' })
     # but we want to let people accept the configurable class as the first argument, too
-    assert_equal 'bar', ExtendedClass.configure { |a| a.foo } # rubocop:disable Style/SymbolProc
+    assert_equal 'bar', (ExtendedClass.configure { |a| a.foo }) # rubocop:disable Style/SymbolProc
   end
 end

data/test/misc/constraints_test.rb

@@ -116,8 +116,8 @@ class ConstraintsTestObject
     @params = {}
   end
 
-  def params_hash?(v)
-    v.is_a? Hash
+  def params_hash?(value)
+    value.is_a? Hash
   end
 end
 

data/test/misc/convert_numbers_format_test.rb

@@ -26,6 +26,7 @@ class ConvertNumbersFormatTest < MiniTest::Test
   include ActiveScaffoldConfigMock
   include ActiveScaffold::AttributeParams
   include ActiveScaffold::Finder
+  include ActiveScaffold::Helpers::ControllerHelpers
 
   def setup
     NumberModel.load_schema! if Rails.version >= '5.0'
@@ -46,7 +47,6 @@ class ConvertNumbersFormatTest < MiniTest::Test
 
     @config = config_for('number_model')
     @config.columns[:number].form_ui = nil
-    @config.create.columns.set_columns @config.columns
   end
 
   def teardown
@@ -161,7 +161,11 @@ class ConvertNumbersFormatTest < MiniTest::Test
     record.number
   end
 
-  def params_hash?(v)
-    v.is_a? Hash
+  def params_hash?(value)
+    value.is_a? Hash
+  end
+
+  def params_hash(value)
+    value
   end
 end

data/test/misc/lang_test.rb

@@ -4,7 +4,7 @@ class LocalizationTest < MiniTest::Test
   def test_localization
     assert_equal 'Dutch', as_(:dutch)
     assert_equal 'dutch', as_('dutch')
-    I18n.backend.store_translations :en, :active_scaffold => {:create_model => 'Create %{model}'}
+    I18n.backend.store_translations :en, :active_scaffold => {:create_model => 'Create %<model>s'}
     assert_equal 'Create Test', as_(:create_model, :model => 'Test')
   end
 end

data/test/misc/parse_datetime_test.rb

@@ -44,7 +44,6 @@ class ParseDatetimeTest < MiniTest::Test
     I18n.backend.store_translations :es, spanish
 
     @config = config_for('date_time_model')
-    @config.create.columns.set_columns @config.columns
   end
 
   def teardown
@@ -125,7 +124,7 @@ class ParseDatetimeTest < MiniTest::Test
   end
 
   def test_condition_for_datetime_with_zone
-    assert_equal DateTime.new(2017, 4, 8, 16, 30, 0, '+0300'), condition_value('2017-04-08 16:30 +0300')
+    assert_equal ActiveSupport::TimeZone[3].local(2017, 4, 8, 16, 30, 0), condition_value('2017-04-08 16:30 +0300')
   end
 
   def test_condition_for_spanish_date
@@ -154,7 +153,7 @@ class ParseDatetimeTest < MiniTest::Test
     self.class.condition_value_for_datetime(@config.columns[:run_at], value, conversion || :to_time)
   end
 
-  def params_hash?(v)
-    v.is_a? Hash
+  def params_hash?(value)
+    value.is_a? Hash
   end
 end

data/test/misc/tableless_test.rb

@@ -27,6 +27,12 @@ class TablelessTest < MiniTest::Test
     assert Person.new.files.empty?
   end
 
+  def test_tableless_assoc_with_dependent
+    @person = Person.new
+    @person.save(validate: false)
+    assert @person.destroy
+  end
+
   def test_find_with_through_association
     assert Building.new.files.empty?
   end

data/test/mock_app/Rakefile

@@ -1,7 +1,7 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
+require File.expand_path('config/application', __dir__)
 require 'rake'
 
 RailsApp::Application.load_tasks

data/test/mock_app/app/controllers/cars_controller.rb

@@ -1,4 +1,5 @@
 class CarsController < ApplicationController
   active_scaffold do
+    columns[:model].inplace_edit = true
   end
 end

data/test/mock_app/app/controllers/people_controller.rb

@@ -1,4 +1,6 @@
 class PeopleController < ApplicationController
-  active_scaffold do
+  active_scaffold do |conf|
+    conf.columns[:buildings].includes = nil
+    conf.columns[:buildings].associated_limit = 0
   end
 end

data/test/mock_app/config/application.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../boot', __FILE__)
+require File.expand_path('boot', __dir__)
 
 require 'rails/all'
 require 'rails/test_unit/railtie'
@@ -9,5 +9,6 @@ module RailsApp
     config.filter_parameters << :password
     config.action_mailer.default_url_options = {:host => 'localhost:3000'}
     config.i18n.enforce_available_locales = false if config.i18n.respond_to? :enforce_available_locales
+    config.active_record.sqlite3.represent_boolean_as_integer = true if config.active_record.sqlite3.respond_to? :represent_boolean_as_integer
   end
 end

data/test/mock_app/config/boot.rb

@@ -1,5 +1,5 @@
 begin
-  require File.expand_path('../../../../.bundle/environment', __FILE__)
+  require File.expand_path('../../../.bundle/environment', __dir__)
 rescue LoadError
   require 'rubygems'
   require 'bundler'

data/test/mock_app/config/environment.rb

@@ -1,6 +1,6 @@
 # Load the rails application
-require File.expand_path('../application', __FILE__)
+require File.expand_path('application', __dir__)
 
 # Initialize the rails application
-RailsApp::Application.config.root = File.expand_path('../..', __FILE__)
+RailsApp::Application.config.root = File.expand_path('..', __dir__)
 RailsApp::Application.initialize!

data/test/mock_app/config/routes.rb

@@ -6,9 +6,12 @@ Rails.application.routes.draw do
   resources :buildings, except: :index do
     concerns :active_scaffold, except: %i[mark add_existing new_existing destroy_existing]
   end
-  resources :cars, only: %i[edit update] do
+  resources :cars, only: %i[index edit update] do
     concerns :active_scaffold, association: false, except: [:mark]
   end
+  resources :people do
+    concerns :active_scaffold, except: %i[mark]
+  end
 
   match ':controller(/:action(/:id))', :via => :any
 end

data/test/mock_app/db/schema.rb

@@ -1,3 +1,4 @@
+# rubocop:disable Metrics/BlockLength
 ActiveRecord::Schema.define do
   create_table 'addresses' do |t|
     t.integer 'addressable_id'
@@ -64,3 +65,4 @@ ActiveRecord::Schema.define do
     t.integer 'role_id'
   end
 end
+# rubocop:enable Metrics/BlockLength

data/test/performance/list_cars_performance_test.rb

@@ -0,0 +1,34 @@
+require 'test_helper'
+require 'performance_test_help'
+
+class ListCarsPerformanceTest < ActionDispatch::PerformanceTest
+  self.profile_options =
+    if ENV['BENCHMARK_TESTS']
+      {metrics: [:wall_time]}
+    else
+      {metrics: %i[process_time], formats: %i[flat graph_html call_stack]}
+    end
+  def setup
+    owners = Array.new(4) { |i| Person.create first_name: "Name#{i}" } << nil
+    500.times { |i| Car.create(brand: 'Skoda', model: 'Fabia', person: owners[i % 5]) }
+    CarsController.class_eval do
+      before_action :setup
+
+      def setup
+        active_scaffold_config.list.pagination = false
+      end
+    end
+  end
+
+  def test_list
+    get '/cars'
+  end
+
+  # def test_list2
+  #   get '/cars?t=2'
+  # end
+  #
+  # def test_list3
+  #   get '/cars?t=3'
+  # end
+end

data/test/performance/list_people_performance_test.rb

@@ -0,0 +1,31 @@
+require 'test_helper'
+require 'performance_test_help'
+
+class ListPeoplePerformanceTest < ActionDispatch::PerformanceTest
+  self.profile_options =
+    if ENV['BENCHMARK_TESTS']
+      {metrics: [:wall_time]}
+    else
+      {metrics: %i[process_time], formats: %i[flat graph_html call_stack]}
+    end
+  def setup
+    200.times do |i|
+      p = Person.create(first_name: "Name#{i}", last_name: 'Last')
+      p.buildings = Array.new(4) { |j| Building.create name: "B#{j} of #{p.first_name}" } unless (i % 4).zero?
+    end
+    PeopleController.class_eval do
+      before_action :setup
+      def list_columns
+        active_scaffold_config.columns.select { |col| %i[first_name last_name buildings].include?(col.name) }
+      end
+
+      def setup
+        active_scaffold_config.list.pagination = false
+      end
+    end
+  end
+
+  def test_list
+    get '/people'
+  end
+end

data/test/performance_test_help.rb

@@ -0,0 +1,3 @@
+require 'rails/performance_test_help'
+require 'rails/perftest/action_dispatch'
+require 'rails/perftest/action_controller'

data/test/test_helper.rb

@@ -5,6 +5,7 @@ require 'mock_app/config/environment'
 require 'rails/test_help'
 require 'minitest/autorun'
 require 'mocha/setup'
+require 'cow_proxy'
 
 require 'minitest/reporters'
 Minitest::Reporters.use!
@@ -17,11 +18,17 @@ def load_schema
 end
 load_schema
 
+ActiveScaffold.threadsafe!
+# avoid freezing defaults so we can stubs in tests for testing with different defaults
+class << ActiveScaffold::Config::Core
+  def freeze; end
+end
+
 %w[model_stub const_mocker company].each do |file|
   require File.join(File.dirname(__FILE__), file)
 end
 
-I18n.backend.store_translations :en, YAML.load_file(File.expand_path('../../config/locales/en.yml', __FILE__))['en']
+I18n.backend.store_translations :en, YAML.load_file(File.expand_path('../config/locales/en.yml', __dir__))['en']
 
 # rails 4.0
 unless defined? Minitest::Test
@@ -53,4 +60,5 @@ end
 
 Config = RbConfig # HACK: needed some comments
 
-class ColumnMock < ActiveScaffold::Tableless::Column; end
+class ColumnMock < ActiveScaffold::Tableless::Column
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.5.3
+  version: 3.6.0.rc2
 platform: ruby
 authors:
 - Many, see README
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-10-19 00:00:00.000000000 Z
+date: 2020-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,20 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.5
-    - - "<"
+        version: 4.2.0
+- !ruby/object:Gem::Dependency
+  name: cow_proxy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: ice_nine
   requirement: !ruby/object:Gem::Requirement
@@ -44,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
+- !ruby/object:Gem::Dependency
+  name: request_store
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 description: Save time and headaches, and create a more easily maintainable set of
   pages, with ActiveScaffold. ActiveScaffold handles all your CRUD (create, read,
   update, delete) user interface needs, leaving you more time to focus on more challenging
@@ -54,7 +76,7 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- CHANGELOG
+- CHANGELOG.rdoc
 - LICENSE.md
 - README.md
 - app/assets/images/active_scaffold/add.png
@@ -94,7 +116,6 @@ files:
 - app/assets/javascripts/prototype/active_scaffold_chosen.js
 - app/assets/javascripts/prototype/dhtml_history.js
 - app/assets/javascripts/prototype/form_enhancements.js
-- app/assets/javascripts/prototype/rico_corner.js
 - app/assets/javascripts/prototype/tiny_mce_bridge.js
 - app/assets/stylesheets/active_scaffold-ie.scss
 - app/assets/stylesheets/active_scaffold.scss
@@ -194,6 +215,11 @@ files:
 - lib/active_scaffold/active_record_permissions.rb
 - lib/active_scaffold/attribute_params.rb
 - lib/active_scaffold/bridges.rb
+- lib/active_scaffold/bridges/active_storage.rb
+- lib/active_scaffold/bridges/active_storage/active_storage_bridge.rb
+- lib/active_scaffold/bridges/active_storage/active_storage_helpers.rb
+- lib/active_scaffold/bridges/active_storage/form_ui.rb
+- lib/active_scaffold/bridges/active_storage/list_ui.rb
 - lib/active_scaffold/bridges/ancestry.rb
 - lib/active_scaffold/bridges/ancestry/ancestry_bridge.rb
 - lib/active_scaffold/bridges/bitfields.rb
@@ -226,7 +252,6 @@ 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/file_column/test/test_helper.rb
 - lib/active_scaffold/bridges/paper_trail.rb
 - lib/active_scaffold/bridges/paper_trail/actions.rb
 - lib/active_scaffold/bridges/paper_trail/config.rb
@@ -283,6 +308,8 @@ files:
 - lib/active_scaffold/extensions/action_controller_rescueing.rb
 - lib/active_scaffold/extensions/action_view_rendering.rb
 - lib/active_scaffold/extensions/connection_adapter.rb
+- lib/active_scaffold/extensions/cow_proxy.rb
+- lib/active_scaffold/extensions/ice_nine.rb
 - lib/active_scaffold/extensions/left_outer_joins.rb
 - lib/active_scaffold/extensions/localize.rb
 - lib/active_scaffold/extensions/name_option_for_datetime.rb
@@ -306,6 +333,7 @@ files:
 - lib/active_scaffold/marked_model.rb
 - lib/active_scaffold/orm_checks.rb
 - lib/active_scaffold/paginator.rb
+- lib/active_scaffold/registry.rb
 - lib/active_scaffold/responds_to_parent.rb
 - lib/active_scaffold/tableless.rb
 - lib/active_scaffold/version.rb
@@ -368,6 +396,7 @@ files:
 - test/misc/tableless_test.rb
 - test/mock_app/.gitignore
 - test/mock_app/Rakefile
+- test/mock_app/app/assets/config/manifest.js
 - test/mock_app/app/controllers/addresses_controller.rb
 - test/mock_app/app/controllers/application_controller.rb
 - test/mock_app/app/controllers/buildings_controller.rb
@@ -403,6 +432,9 @@ files:
 - test/mock_app/db/schema.rb
 - test/mock_app/db/test.sqlite3
 - test/model_stub.rb
+- test/performance/list_cars_performance_test.rb
+- test/performance/list_people_performance_test.rb
+- test/performance_test_help.rb
 - test/run_all.rb
 - test/test_helper.rb
 - vendor/assets/javascripts/getprototypeof.js
@@ -414,7 +446,7 @@ homepage: https://github.com/activescaffold/active_scaffold
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -422,16 +454,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Rails 4.x and 5.x versions of ActiveScaffold supporting prototype and jquery
 test_files:
@@ -486,6 +517,7 @@ test_files:
 - test/misc/tableless_test.rb
 - test/mock_app/.gitignore
 - test/mock_app/Rakefile
+- test/mock_app/app/assets/config/manifest.js
 - test/mock_app/app/controllers/addresses_controller.rb
 - test/mock_app/app/controllers/application_controller.rb
 - test/mock_app/app/controllers/buildings_controller.rb
@@ -521,5 +553,8 @@ test_files:
 - test/mock_app/db/schema.rb
 - test/mock_app/db/test.sqlite3
 - test/model_stub.rb
+- test/performance/list_cars_performance_test.rb
+- test/performance/list_people_performance_test.rb
+- test/performance_test_help.rb
 - test/run_all.rb
 - test/test_helper.rb