active_scaffold 3.6.0.pre → 3.6.0.rc1

data/lib/active_scaffold/orm_checks.rb

@@ -43,7 +43,7 @@ module ActiveScaffold
         elsif mongoid? klass
           klass.fields
         else
-          []
+          {}
         end
       end
 
@@ -71,7 +71,7 @@ module ActiveScaffold
         if active_record? klass
           klass.type_for_attribute column_name.to_s
         elsif mongoid? klass
-          klass.fields[column_name.to_s].type
+          klass.fields[column_name.to_s]&.type
         end
       end
 

data/lib/active_scaffold/paginator.rb

@@ -21,9 +21,7 @@ class Paginator
   def initialize(count, per_page, &select)
     @count = count
     @per_page = per_page
-    unless select
-      raise MissingSelectError, 'Must provide block to select data for each page'
-    end
+    raise MissingSelectError, 'Must provide block to select data for each page' unless select
     @select = select
   end
 

data/lib/active_scaffold/registry.rb

@@ -15,6 +15,17 @@ module ActiveScaffold
       @unauthorized_columns ||= Hash.new { |h, k| h[k] = [] }
     end
 
+    def cache(kind, key = nil, &block)
+      unless key
+        key = kind
+        kind = :cache
+      end
+      @cache ||= {}
+      cache = @cache[kind] ||= {}
+      return cache[key] if cache.include? key
+      cache[key] ||= yield
+    end
+
     def self.instance
       RequestStore.store[@per_thread_registry_key] ||= new
     end

data/lib/active_scaffold/responds_to_parent.rb

@@ -9,11 +9,12 @@ module ActiveScaffold
       return unless performed?
 
       # Either pull out a redirect or the request body
-      script = if response.headers['Location']
-                 "document.location.href = '#{self.class.helpers.escape_javascript response.headers.delete('Location').to_s}'"
-               else
-                 response.body || ''
-                end
+      script =
+        if response.headers['Location']
+          "document.location.href = '#{self.class.helpers.escape_javascript response.headers.delete('Location').to_s}'"
+        else
+          response.body || ''
+        end
       response.status = 200 if (300...400).cover? response.status
 
       # Eval in parent scope and replace document location of this frame

data/lib/active_scaffold/tableless.rb

@@ -1,4 +1,4 @@
-class ActiveScaffold::Tableless < ActiveRecord::Base
+class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/ApplicationRecord
   class AssociationScope < ActiveRecord::Associations::AssociationScope
     INSTANCE = create
     def self.scope(association, connection)
@@ -82,7 +82,7 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
   end
 
   module TablelessCollectionAssociation
-    def get_records
+    def get_records # rubocop:disable Naming/AccessorMethodName
       klass < ActiveScaffold::Tableless ? scope.to_a : super
     end
   end
@@ -94,7 +94,7 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
   end
 
   module TablelessSingularAssociation
-    def get_records
+    def get_records # rubocop:disable Naming/AccessorMethodName
       klass < ActiveScaffold::Tableless ? scope.limit(1).to_a : super
     end
   end
@@ -199,8 +199,7 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
   end
   if Rails.version < '5.0' # 4.2.x
     def self.initialize_find_by_cache
-      # rubocop:disable Rails/DynamicFindBy
-      self.find_by_statement_cache = Hash.new { |h, k| h[k] = StatementCache.new(k) }
+      self.find_by_statement_cache = Hash.new { |h, k| h[k] = StatementCache.new(k) } # rubocop:disable Rails/DynamicFindBy
     end
   elsif Rails.version < '5.2' # 5.0 and 5.1
     def self.initialize_find_by_cache
@@ -242,11 +241,10 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
   end
 
   def self.execute_simple_calculation(relation, operation, column_name, distinct)
-    if operation == 'count' && [relation.klass.primary_key, :all].include?(column_name)
-      find_all(relation).size
-    else
+    unless operation == 'count' && [relation.klass.primary_key, :all].include?(column_name)
       raise "self.execute_simple_calculation must be implemented in a Tableless model to support #{operation} #{column_name}#{' distinct' if distinct} columns"
     end
+    find_all(relation).size
   end
 
   def destroy

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 6
-    PATCH = '0.pre'.freeze
+    PATCH = '0.rc1'.freeze
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/shoulda_macros/macros.rb

@@ -127,7 +127,9 @@ class ActiveSupport::TestCase
       script = script.gsub('\n', '\\\\\\n')
                      .gsub(/['"]/, '\\\\\\\\\&')
                      .gsub('</script>', '</scr"+"ipt>')
-      assert_select 'script[type=text/javascript]', Regexp.new('.*' + Regexp.quote("with(window.parent) { setTimeout(function() { window.eval('") + script + Regexp.quote("'); if (typeof(loc) !== 'undefined') loc.replace('about:blank'); }, 1) };") + '.*')
+      pre_regex = Regexp.quote("with(window.parent) { setTimeout(function() { window.eval('")
+      post_regex = Regexp.quote("'); if (typeof(loc) !== 'undefined') loc.replace('about:blank'); }, 1) };")
+      assert_select 'script[type=text/javascript]', Regexp.new('.*' + pre_regex + script + post_regex + '.*')
     end
   end
 

data/test/bridges/paperclip_test.rb

@@ -16,7 +16,7 @@ class PaperclipTest < ActionView::TestCase
     config = PaperclipCore.new(:company)
     refute config.create.multipart?
     refute config.update.multipart?
-    refute config.columns.any? { |column| column.form_ui == :paperclip }
+    refute(config.columns.any? { |column| column.form_ui == :paperclip })
   end
 
   def test_initialization

data/test/company.rb

@@ -53,11 +53,11 @@ class Company < ActiveRecord::Base
     end
   end
 
-  def self.has_many(association_id, options = {})
+  def self.has_many(association_id, options = {}) # rubocop:disable Naming/PredicateName
     create_reflection(:has_many, association_id, nil, options, self)
   end
 
-  def self.has_one(association_id, options = {})
+  def self.has_one(association_id, options = {}) # rubocop:disable Naming/PredicateName
     create_reflection(:has_one, association_id, nil, options, self)
   end
 

data/test/data_structures/action_columns_test.rb

@@ -71,12 +71,12 @@ class ActionColumnsTest < MiniTest::Test
     # first, use @columns.add directly
     @c2 = ActiveScaffold::DataStructures::ActionColumns.new
     @columns.add @c2
-    assert @columns.any? { |c| c == @c2 }
+    assert(@columns.any? { |c| c == @c2 })
 
     # then use the shortcut
     @columns.add_subgroup 'foo' do
     end
-    assert @columns.any? { |c| c.respond_to?(:label) && c.label == 'foo' }
+    assert(@columns.any? { |c| c.respond_to?(:label) && c.label == 'foo' })
   end
 
   def test_block_config

data/test/data_structures/column_test.rb

@@ -16,9 +16,6 @@ class ColumnTest < MiniTest::Test
   def test_basic_properties
     # test that it was set during initialization
     assert_equal @column.name, :a
-    # test that we can change it
-    @column.name = :b
-    assert_equal @column.name, :b
 
     # label
     @column.label = 'foo'
@@ -74,7 +71,7 @@ class ColumnTest < MiniTest::Test
     # comparison with different object of same type
     column2 = ActiveScaffold::DataStructures::Column.new(:fake, ModelStub)
     refute_equal @column, column2
-    column2.name = 'a'
+    column2 = ActiveScaffold::DataStructures::Column.new(:a, ModelStub)
     assert_equal @column, column2
 
     # special comparisons
@@ -152,12 +149,12 @@ class ColumnTest < MiniTest::Test
   def test_config_block
     @column.configure do |config|
       # we can use the config object
-      config.name = 'foo'
+      config.form_ui = :select
       # or not
       self.label = 'hello'
     end
 
-    assert_equal 'foo', @column.name
+    assert_equal :select, @column.form_ui
     assert_equal 'hello', @column.label
   end
 

data/test/data_structures/columns_test.rb

@@ -41,8 +41,8 @@ class ColumnsTest < MiniTest::Test
 
     # test the collection finders
     found = @columns.find_by_names(:a, :b)
-    assert found.any? { |c| c.name == :a }
-    assert found.any? { |c| c.name == :b }
+    assert(found.any? { |c| c.name == :a })
+    assert(found.any? { |c| c.name == :b })
   end
 
   def test_each

data/test/extensions/active_record_test.rb

@@ -14,7 +14,7 @@ class ActiveRecordTest < MiniTest::Test
         'to_s'
       end
     end
-
+    RequestStore.clear!
     assert_equal 'to_s', @record.to_label
 
     class << @record
@@ -22,7 +22,7 @@ class ActiveRecordTest < MiniTest::Test
         'title'
       end
     end
-
+    RequestStore.clear!
     assert_equal 'title', @record.to_label
 
     class << @record
@@ -30,7 +30,7 @@ class ActiveRecordTest < MiniTest::Test
         'label'
       end
     end
-
+    RequestStore.clear!
     assert_equal 'label', @record.to_label
 
     class << @record
@@ -38,7 +38,7 @@ class ActiveRecordTest < MiniTest::Test
         'name'
       end
     end
-
+    RequestStore.clear!
     assert_equal 'name', @record.to_label
   end
 end

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,7 +134,7 @@ 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

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?
 

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

@@ -164,4 +164,8 @@ class ConvertNumbersFormatTest < MiniTest::Test
   def params_hash?(value)
     value.is_a? Hash
   end
+
+  def params_hash(value)
+    value
+  end
 end

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

@@ -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/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