active_scaffold 3.5.5 → 3.6.1

data/test/extensions/routing_mapper_test.rb

@@ -54,8 +54,8 @@ class RoutingMapperTest < ActionController::TestCase
     assert_routing 'cars/1/edit', controller: 'cars', action: 'edit', id: '1'
     assert_routing({method: :patch, path: 'cars/1'}, {controller: 'cars', action: 'update', id: '1'})
 
-    assert_raises(ActionController::RoutingError) { @routes.recognize_path '/cars' }
-    assert_raises(ActionController::RoutingError) { @routes.recognize_path '/cars/1/list' }
+    assert_raises(ActionController::RoutingError) { @routes.recognize_path '/cars', method: :post }
+    assert_raises(ActionController::RoutingError) { @routes.recognize_path '/cars/1' }
     assert_raises(ActionController::RoutingError) { @routes.recognize_path '/cars/1/destroy', method: :delete }
   end
 

data/test/helpers/list_column_helpers_test.rb

@@ -34,8 +34,10 @@ class ListColumnHelpersTest < ActionView::TestCase
     value.each { |v| v.stubs(:to_label).returns(v) }
     assert_equal '1, 2, 3, … (4)', format_association_value(value, @association_column, value.size)
     @config.list.stubs(:association_join_text => ',<br/>')
+    remove_instance_variable :@_association_join_text
     assert_equal '1,&lt;br/&gt;2,&lt;br/&gt;3,&lt;br/&gt;… (4)', format_association_value(value, @association_column, value.size)
-    @config.list.stubs(:association_join_text => ',<br/>'.html_safe)
+    @config.list.stubs(:association_join_text => ',<br/>'.html_safe) # rubocop:disable Rails/OutputSafety
+    remove_instance_variable :@_association_join_text
     assert_equal '1,<br/>2,<br/>3,<br/>… (4)', format_association_value(value, @association_column, value.size)
   end
 

data/test/misc/active_record_permissions_test.rb

@@ -91,7 +91,7 @@ class ActiveRecordPermissionsTest < MiniTest::Test
   #   symbols are: is (a)bsent, returns (f)alse, returns (t)rue, or n/a (_)
   def test_method_combinations_with_default_true
     old_permission = nil
-    ActiveScaffold.set_defaults do |config|
+    ActiveScaffold.defaults do |config|
       old_permission = config.security.default_permission
       config.security.default_permission = true
     end
@@ -134,17 +134,13 @@ class ActiveRecordPermissionsTest < MiniTest::Test
     miss(@model.authorized_for?(:crud_type => :read, :column => :b1), 'ttf')
     pass(@model.authorized_for?(:crud_type => :read, :column => :a1), 'ttt')
 
-    ActiveScaffold.set_defaults do |config|
+    ActiveScaffold.defaults do |config|
       config.security.default_permission = old_permission
     end
   end
 
   def test_method_combinations_with_default_false
-    old_permission = nil
-    ActiveScaffold.set_defaults do |config|
-      old_permission = config.security.default_permission
-      config.security.default_permission = false
-    end
+    ActiveScaffold::Config::Core.security.stubs(default_permission: false)
 
     miss(@model.authorized_for?(:column => :a3), '_a_')
     miss(@model.authorized_for?(:column => :a2), '_f_')
@@ -183,10 +179,6 @@ class ActiveRecordPermissionsTest < MiniTest::Test
     pass(@model.authorized_for?(:crud_type => :read, :column => :c1), 'tta')
     miss(@model.authorized_for?(:crud_type => :read, :column => :b1), 'ttf')
     pass(@model.authorized_for?(:crud_type => :read, :column => :a1), 'ttt')
-
-    ActiveScaffold.set_defaults do |config|
-      config.security.default_permission = old_permission
-    end
   end
 
   private

data/test/misc/attribute_params_test.rb

@@ -46,6 +46,7 @@ class AttributeParamsTest < MiniTest::Test
     assert_nil model.last_name
     assert_equal buildings.map(&:id), model.building_ids
     assert_equal buildings.map(&:id), model.buildings.map(&:id)
+    assert_equal model, model.buildings[0].owner
     assert model.save
     assert_equal 2, model.reload.buildings_count
 
@@ -134,6 +135,7 @@ class AttributeParamsTest < MiniTest::Test
     assert_equal 'Name', model.first_name
     assert model.floor.present?
     assert_equal floor.id, model.floor.id
+    assert_equal model, model.floor.tenant
     assert_nil floor.reload.tenant_id, 'tenant_id should not be saved yet'
     assert model.save
     assert_equal model.id, floor.reload.tenant_id, 'tenant_id should be saved'
@@ -224,6 +226,7 @@ class AttributeParamsTest < MiniTest::Test
     assert_equal 3, model.floors.size
     assert_equal floor.id, model.floors.first.id
     assert_equal [nil, *people.map(&:id)], model.floors.map(&:tenant_id)
+    assert_equal model, model.floors[0].building
     assert model.save
     assert_equal [1, 1], people.map(&:reload).map(&:floors_count)
     assert_equal 3, model.reload.floors_count
@@ -299,6 +302,7 @@ class AttributeParamsTest < MiniTest::Test
     assert_equal 'First', model.first_name
     assert model.car.present?
     assert model.car.new_record?
+    assert_equal model, model.car.person
     assert model.save
     assert model.car.persisted?
 
@@ -417,15 +421,15 @@ class AttributeParamsTest < MiniTest::Test
       record = record.class.find(record.id) if record.persisted?
       new_record = @controller.update_record_from_params(record, build_action_columns(record, action, columns), params)
       yield if block_given?
-      Thread.current[:constraint_columns] = nil
+      ActiveScaffold::Registry.constraint_columns.clear
     end
     new_record
   end
 
   def build_action_columns(record, action, *columns)
-    controller = ActiveScaffold::Core.active_scaffold_controller_for record.class
-    controller.active_scaffold_config.send(action).columns = columns
-    controller.active_scaffold_config.send(action).columns
+    config = @controller.active_scaffold_config_for record.class
+    config.send(action).columns = columns
+    config.send(action).columns
   end
 end
 
@@ -447,11 +451,11 @@ class Controller
     @flash ||= ActionDispatch::Flash::FlashHash.new
   end
 
-  def params_hash?(v)
-    v.is_a? Hash
+  def params_hash?(value)
+    value.is_a? Hash
   end
 
-  def params_hash(v)
-    v
+  def params_hash(value)
+    value
   end
 end

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

@@ -3,7 +3,7 @@ require 'test_helper'
 module ModelStubs
   class ModelStub < ActiveRecord::Base
     self.abstract_class = true
-    def self.columns; @columns ||= [ColumnMock.new('foo', '')] end
+    def self.columns; @columns ||= [ColumnMock.new('foo', '', 'string')] end
 
     def self.columns_hash; @hash ||= Hash[@columns.map { |c| [c.name, c] }] end
 
@@ -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

@@ -25,10 +25,24 @@ class TablelessTest < MiniTest::Test
 
   def test_find_with_association
     assert Person.new.files.empty?
+    @person = Person.new
+    @person.save(validate: false)
+    assert @person.files.empty?
+    assert_equal [], @person.files.to_a
+  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?
+    @building = Building.new
+    @building.save(validate: false)
+    assert @building.files.empty?
+    assert_equal [], @building.files.to_a
   end
 
   def test_new

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,8 @@
 class PeopleController < ApplicationController
-  active_scaffold do
+  active_scaffold do |conf|
+    conf.columns.exclude :files
+    conf.columns[:buildings].includes = nil
+    conf.columns[:buildings].associated_limit = 0
+    conf.create.columns.exclude :address
   end
 end

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

@@ -0,0 +1,4 @@
+class RolesController < ApplicationController
+  active_scaffold do
+  end
+end

data/test/mock_app/app/views/active_scaffold_overrides/_form.html.erb

@@ -0,0 +1,2 @@
+<div id="app_form"></div>
+<%= render :super %>

data/test/mock_app/app/views/active_scaffold_overrides/list.html.erb

@@ -0,0 +1,2 @@
+<div id="app"></div>
+<%= render :super %>

data/test/mock_app/app/views/people/_first_name_form_column.html.erb

@@ -0,0 +1,2 @@
+<span id="first_name_field"></span>
+<%= form_attribute(column, record, scope, only_value, col_class) %>

data/test/mock_app/app/views/people/_form.html.erb

@@ -0,0 +1,2 @@
+<div id="controller_form"></div>
+<%= render :super %>

data/test/mock_app/app/views/people/list.html.erb

@@ -0,0 +1,2 @@
+<div id="controller"></div>
+<%= render :super %>

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