active_scaffold 3.6.20 → 3.7.0

data/lib/active_scaffold/tableless.rb

@@ -4,24 +4,6 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
     def self.scope(association, connection)
       INSTANCE.scope association, connection
     end
-
-    if Rails.version < '5.0.0'
-      def column_for(table_name, column_name, alias_tracker = nil)
-        klass = alias_tracker ? alias_tracker.connection.klass : self.klass
-        if table_name == klass.table_name
-          klass.columns_hash[column_name]
-        elsif alias_tracker && (klass = alias_tracker.instance_variable_get(:@assoc_klass))
-          klass.columns_hash[column_name]
-        else # rails < 4.1
-          association.klass.columns_hash[column_name]
-        end
-      end
-
-      def add_constraints(scope, owner, assoc_klass, refl, tracker)
-        tracker.instance_variable_set(:@assoc_klass, assoc_klass)
-        super
-      end
-    end
   end
 
   class Connection < ActiveRecord::ConnectionAdapters::AbstractAdapter
@@ -43,33 +25,15 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
   end
 
   class Column < ActiveRecord::ConnectionAdapters::Column
-    if Rails.version >= '5.0.0'
-      def initialize(name, default, sql_type = nil, null = true, **)
-        metadata = ActiveRecord::Base.connection.send :fetch_type_metadata, sql_type
-        super(name, default, metadata, null)
-      end
-    else
-      def initialize(name, default, sql_type = nil, null = true)
-        cast_type = ActiveRecord::Base.connection.send :lookup_cast_type, sql_type
-        super(name, default, cast_type, sql_type, null)
-      end
+    def initialize(name, default, sql_type = nil, null = true, **)
+      metadata = ActiveRecord::Base.connection.send :fetch_type_metadata, sql_type
+      super(name, default, metadata, null)
     end
   end
 
   module Tableless
-    if Rails.version < '5.2.0'
-      def skip_statement_cache?
-        klass < ActiveScaffold::Tableless ? true : super
-      end
-
-      def association_scope
-        @association_scope ||= AssociationScope.scope(self, klass.connection) if klass < ActiveScaffold::Tableless
-        super
-      end
-    else
-      def skip_statement_cache?(scope)
-        klass < ActiveScaffold::Tableless ? true : super
-      end
+    def skip_statement_cache?(scope)
+      klass < ActiveScaffold::Tableless ? true : super
     end
 
     def target_scope
@@ -186,18 +150,11 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
     private
 
     def relation
-      args = [self]
-      if Rails.version < '5.2.0'
-        args << arel_table
-        args << predicate_builder if Rails.version >= '5.0.0'
-      end
-      ActiveScaffold::Tableless::Relation.new(*args)
+      ActiveScaffold::Tableless::Relation.new(self)
     end
 
-    if Rails.version >= '5.2'
-      def cached_find_by_statement(key, &block)
-        StatementCache.new(key, self, &block)
-      end
+    def cached_find_by_statement(key, &block)
+      StatementCache.new(key, self, &block)
     end
   end
 
@@ -207,34 +164,8 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
       @model = model
     end
 
-    if Rails.version < '5.2' # 5.0 and 5.1
-      def execute(values, model, connection)
-        model.where(@key => values)
-      end
-    else
-      def execute(values, connection)
-        @model.where(@key => values)
-      end
-    end
-  end
-  if Rails.version < '5.0' # 4.2.x
-    def self.columns_hash
-      if self < ActiveScaffold::Tableless
-        @columns_hash ||= Hash[columns.map { |c| [c.name, c] }]
-      else
-        super
-      end
-    end
-
-    def self.initialize_find_by_cache
-      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
-      @find_by_statement_cache = {
-        true => Hash.new { |h, k| h[k] = StatementCache.new(k) },
-        false => Hash.new { |h, k| h[k] = StatementCache.new(k) }
-      }
+    def execute(values, connection)
+      @model.where(@key => values)
     end
   end
 

data/lib/active_scaffold/version.rb

@@ -1,8 +1,8 @@
 module ActiveScaffold
   module Version
     MAJOR = 3
-    MINOR = 6
-    PATCH = 20
+    MINOR = 7
+    PATCH = 0
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/lib/active_scaffold.rb

@@ -5,7 +5,6 @@ module ActiveScaffold
   autoload :Configurable, 'active_scaffold/configurable'
   autoload :Constraints, 'active_scaffold/constraints'
   autoload :Core, 'active_scaffold/core'
-  autoload :DelayedSetup, 'active_scaffold/delayed_setup'
   autoload :Finder, 'active_scaffold/finder'
   autoload :MarkedModel, 'active_scaffold/marked_model'
   autoload :OrmChecks, 'active_scaffold/orm_checks'
@@ -45,7 +44,6 @@ module ActiveScaffold
   class ActionNotAllowed < RuntimeError; end
   class ReverseAssociationRequired < RuntimeError; end
 
-  mattr_accessor :delayed_setup, instance_writer: false
   mattr_accessor :stylesheets, instance_writer: false
   self.stylesheets = []
   mattr_accessor :javascripts, instance_writer: false
@@ -84,11 +82,6 @@ module ActiveScaffold
     File.dirname(__FILE__) + '/..'
   end
 
-  def self.set_defaults(&block) # rubocop:disable Naming/AccessorMethodName
-    ActiveSupport::Deprecation.warn 'use ActiveScaffold.defaults'
-    defaults(&block)
-  end
-
   def self.defaults(&block)
     ActiveScaffold::Config::Core.configure(&block)
   end

data/lib/generators/active_scaffold/install_generator.rb

@@ -37,7 +37,7 @@ module ActiveScaffold
         file = 'app/assets/stylesheets/application.css'
         return unless File.exist?(file)
         original_css = File.binread(file)
-        if original_css =~ /require active_scaffold$/
+        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
@@ -68,7 +68,7 @@ module ActiveScaffold
           say_status('create', file)
         end
         insert_into_file 'app/views/layouts/application.html.erb', after: /javascript_pack_tag 'application'.*\n/ do
-          "    <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>\n"
+          "    <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload', 'data-turbo-track': 'reload' %>\n"
         end
         append_to_file 'config/initializers/assets.rb' do
           "Rails.application.config.assets.precompile += %w( application.js )\n"

data/test/bridges/bridge_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class BridgeTest < MiniTest::Test
+class BridgeTest < Minitest::Test
   def setup
     @const_store = {}
   end

data/test/bridges/paperclip_test.rb

@@ -60,22 +60,25 @@ class PaperclipTest < ActionView::TestCase
       @record = Company.new
 
       @record.stubs(:logo).returns(stub(:file? => true, :original_filename => 'file', :url => '/system/file', :styles => Company.attachment_definitions[:logo]))
-      quote = '&#39;'
-      click_js = "jQuery(this).prev().val(#{quote}true#{quote}); jQuery(this).parent().hide().next().show(); return false;"
-      change_js = "jQuery(this).parents(#{quote}div.paperclip_controls#{quote}).find(#{quote}input.remove_file#{quote}).val(#{quote}false#{quote}); return false;"
-      template = [
-        '<div class="paperclip_controls"><div>',
-        '<a href="/system/file" target="_blank">file</a> | ',
-        '<input name="record[delete_logo]" type="hidden" class="remove_file" id="record_delete_logo" value="false" />',
-        %(<a href="#" onclick="#{click_js}">Remove or Replace file</a>),
-        '</div><div style="display: none">',
-        %(<input name="record[logo]" class="text-input" autocomplete="off" type="file" id="record_logo" onchange="#{change_js}" />),
-        '</div></div>'
-      ].join
-      assert_dom_equal template, active_scaffold_input_paperclip(config.columns[:logo], :name => 'record[logo]', :id => 'record_logo', :object => @record)
+      click_js = "jQuery(this).prev().val('true'); jQuery(this).parent().hide().next().show(); return false;"
+      change_js = "jQuery(this).parents('div.paperclip_controls').find('input.remove_file').val('false'); return false;"
+      @document = Nokogiri::HTML::Document.parse(active_scaffold_input_paperclip(config.columns[:logo], :name => 'record[logo]', :id => 'record_logo', :object => @record))
+      assert_select 'div.paperclip_controls input[type=file]' do |match|
+        assert_equal match[0]['onchange'], change_js
+      end
+      assert_select 'div.paperclip_controls a[href="#"][onclick]' do |match|
+        assert_equal match[0]['onclick'], click_js
+      end
+      assert_select 'div.paperclip_controls input.remove_file[type=hidden][value=false]'
 
       @record.stubs(:logo).returns(stub(:file? => false))
       assert_dom_equal '<input name="record[logo]" class="text-input" autocomplete="off" type="file" id="record_logo" />', active_scaffold_input_paperclip(config.columns[:logo], :name => 'record[logo]', :id => 'record_logo', :object => @record)
     end
   end
+
+  protected
+
+  def document_root_element
+    @document.root
+  end
 end

data/test/bridges/tiny_mce_test.rb

@@ -28,7 +28,7 @@ class TinyMceTest < ActionView::TestCase
   def test_includes
     ActiveScaffold::Bridges::TinyMce.expects(:install?).returns(true)
     with_js_framework :jquery do
-      assert ActiveScaffold::Bridges.all_javascripts.include?('tinymce-jquery')
+      assert ActiveScaffold::Bridges.all_javascripts.include?('tinymce')
     end
   end
 

data/test/config/base_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module Config
-  class BaseTest < MiniTest::Test
+  class BaseTest < Minitest::Test
     def setup
       @base = ActiveScaffold::Config::Base.new(ActiveScaffold::Config::Core.new(:model_stub))
     end

data/test/config/core_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module Config
-  class CoreTest < MiniTest::Test
+  class CoreTest < Minitest::Test
     class ModelStubsController < ActionController::Base
       include ActiveScaffold::Core
     end

data/test/config/create_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module Config
-  class CreateTest < MiniTest::Test
+  class CreateTest < Minitest::Test
     include ActiveScaffold::Helpers::ControllerHelpers
 
     def setup

data/test/config/delete_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module Config
-  class DeleteTest < MiniTest::Test
+  class DeleteTest < Minitest::Test
     def setup
       @config = ActiveScaffold::Config::Core.new :model_stub
       @default_link = @config.delete.link

data/test/config/field_search_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module Config
-  class FieldSearchTest < MiniTest::Test
+  class FieldSearchTest < Minitest::Test
     def setup
       @config = ActiveScaffold::Config::Core.new :model_stub
       @config.actions.swap :search, :field_search

data/test/config/list_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module Config
-  class ListTest < MiniTest::Test
+  class ListTest < Minitest::Test
     def setup
       @config = ActiveScaffold::Config::Core.new :model_stub
     end

data/test/config/nested_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module Config
-  class NestedTest < MiniTest::Test
+  class NestedTest < Minitest::Test
     class ModelStubsController < ActionController::Base
       include ActiveScaffold::Core
       active_scaffold

data/test/config/search_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module Config
-  class SearchTest < MiniTest::Test
+  class SearchTest < Minitest::Test
     def setup
       @config = ActiveScaffold::Config::Core.new :model_stub
       @default_link = @config.search.link

data/test/config/show_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module Config
-  class ShowTest < MiniTest::Test
+  class ShowTest < Minitest::Test
     def setup
       @config = ActiveScaffold::Config::Core.new :model_stub
       @default_link = @config.show.link

data/test/config/subform_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module Config
-  class SubformTest < MiniTest::Test
+  class SubformTest < Minitest::Test
     def setup
       @config = ActiveScaffold::Config::Core.new :model_stub
     end

data/test/config/update_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 module Config
-  class UpdateTest < MiniTest::Test
+  class UpdateTest < Minitest::Test
     include ActiveScaffold::Helpers::ControllerHelpers
 
     def setup

data/test/data_structures/action_columns_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 # require 'test/model_stub'
 # require File.join(File.dirname(__FILE__), '../../lib/active_scaffold/data_structures/set.rb')
 
-class ActionColumnsTest < MiniTest::Test
+class ActionColumnsTest < Minitest::Test
   def setup
     @columns = ActiveScaffold::DataStructures::ActionColumns.new(%i[a b])
     @columns.action = stub(core: stub(model_id: 'model_stub'), user_settings_key: :"model_stub_active_scaffold/config/test")

data/test/data_structures/action_link_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ActionLinkTest < MiniTest::Test
+class ActionLinkTest < Minitest::Test
   def setup
     @link = ActiveScaffold::DataStructures::ActionLink.new('foo')
   end

data/test/data_structures/action_links_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ActionLinksTest < MiniTest::Test
+class ActionLinksTest < Minitest::Test
   def setup
     @links = ActiveScaffold::DataStructures::ActionLinks.new
   end

data/test/data_structures/actions_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ActionsTest < MiniTest::Test
+class ActionsTest < Minitest::Test
   def setup
     @actions = ActiveScaffold::DataStructures::Actions.new(:a, 'b')
   end

data/test/data_structures/association_column_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 require 'model_stub'
 
-class AssociationColumnTest < MiniTest::Test
+class AssociationColumnTest < Minitest::Test
   def setup
     @association_column = ActiveScaffold::DataStructures::Column.new('other_model', ModelStub)
   end

data/test/data_structures/column_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ColumnTest < MiniTest::Test
+class ColumnTest < Minitest::Test
   def setup
     @column = ActiveScaffold::DataStructures::Column.new(:a, ModelStub)
     @association_col = ActiveScaffold::DataStructures::Column.new(:b, ModelStub)

data/test/data_structures/columns_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ColumnsTest < MiniTest::Test
+class ColumnsTest < Minitest::Test
   def setup
     @columns = ActiveScaffold::DataStructures::Columns.new(ModelStub, :a, :b)
   end

data/test/data_structures/set_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class SetTest < MiniTest::Test
+class SetTest < Minitest::Test
   def setup
     @items = ActiveScaffold::DataStructures::Set.new(:a, :b)
   end

data/test/data_structures/sorting_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class SortingTest < MiniTest::Test
+class SortingTest < Minitest::Test
   def setup
     @columns = ActiveScaffold::DataStructures::Columns.new(ModelStub, :a, :b, :c, :d, :id)
     @sorting = ActiveScaffold::DataStructures::Sorting.new(@columns, ModelStub)

data/test/data_structures/standard_column_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class StandardColumnTest < MiniTest::Test
+class StandardColumnTest < Minitest::Test
   def setup
     @standard_column = ActiveScaffold::DataStructures::Column.new(ModelStub.columns.first.name, ModelStub)
   end

data/test/data_structures/validation_reflection_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ValidationReflectionTest < MiniTest::Test
+class ValidationReflectionTest < Minitest::Test
   def test_set_required_for_validates_presence_of
     column = ActiveScaffold::DataStructures::Column.new(:name, Company)
     refute column.required?

data/test/data_structures/virtual_column_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class VirtualColumnTest < MiniTest::Test
+class VirtualColumnTest < Minitest::Test
   def setup
     @virtual_column = ActiveScaffold::DataStructures::Column.new(:fake, ModelStub)
   end

data/test/extensions/active_record_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ActiveRecordTest < MiniTest::Test
+class ActiveRecordTest < Minitest::Test
   def setup
     @record = ModelStub.new
   end

data/test/helpers/pagination_helpers_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class PaginationHelpersTest < MiniTest::Test
+class PaginationHelpersTest < Minitest::Test
   include ActiveScaffold::Helpers::PaginationHelpers
   include ActionView::Helpers::OutputSafetyHelper
 

data/test/misc/active_record_permissions_test.rb

@@ -81,7 +81,7 @@ class PermissionModel < ActiveRecord::Base
   # def c1_authorized_for_update?; end
 end
 
-class ActiveRecordPermissionsTest < MiniTest::Test
+class ActiveRecordPermissionsTest < Minitest::Test
   def setup
     @model = PermissionModel.new
   end

data/test/misc/attribute_params_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class AttributeParamsTest < MiniTest::Test
+class AttributeParamsTest < Minitest::Test
   def setup
     @controller = Controller.new
   end

data/test/misc/calculation_test.rb

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

data/test/misc/configurable_test.rb

@@ -15,7 +15,7 @@ class ExtendedClass < ConfigurableClass
   extend ActiveScaffold::Configurable
 end
 
-class ConfigurableTest < MiniTest::Test
+class ConfigurableTest < Minitest::Test
   ##
   ## constants and methods for tests to check against
   ##

data/test/misc/constraints_test.rb

@@ -121,7 +121,7 @@ class ConstraintsTestObject
   end
 end
 
-class ConstraintsTest < MiniTest::Test
+class ConstraintsTest < Minitest::Test
   def setup
     @test_object = ConstraintsTestObject.new
   end

data/test/misc/convert_numbers_format_test.rb

@@ -22,7 +22,7 @@ class NumberModel < ActiveRecord::Base
   end
 end
 
-class ConvertNumbersFormatTest < MiniTest::Test
+class ConvertNumbersFormatTest < Minitest::Test
   include ActiveScaffoldConfigMock
   include ActiveScaffold::AttributeParams
   include ActiveScaffold::Finder

data/test/misc/finder_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 require 'class_with_finder'
 
-class FinderTest < MiniTest::Test
+class FinderTest < Minitest::Test
   def setup
     @klass = ClassWithFinder.new
     @klass.active_scaffold_config.stubs(model: ModelStub)

data/test/misc/lang_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class LocalizationTest < MiniTest::Test
+class LocalizationTest < Minitest::Test
   def test_localization
     assert_equal 'Dutch', as_(:dutch)
     assert_equal 'dutch', as_('dutch')

data/test/misc/parse_datetime_test.rb

@@ -22,7 +22,7 @@ class DateTimeModel < ActiveRecord::Base
   end
 end
 
-class ParseDatetimeTest < MiniTest::Test
+class ParseDatetimeTest < Minitest::Test
   include ActiveScaffoldConfigMock
   include ActiveScaffold::AttributeParams
   include ActiveScaffold::Finder

data/test/misc/tableless_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class TablelessTest < MiniTest::Test
+class TablelessTest < Minitest::Test
   def test_find_all
     assert FileModel.all.to_a.empty?
   end

data/test/test_helper.rb

@@ -8,7 +8,7 @@ require 'mocha/minitest'
 require 'cow_proxy'
 
 require 'minitest/reporters'
-Minitest::Reporters.use!
+Minitest::Reporters.use! unless ENV['RM_INFO']
 
 def load_schema
   stdout = $stdout
@@ -32,10 +32,10 @@ I18n.backend.store_translations :en, YAML.load_file(File.expand_path('../config/
 
 # rails 4.0
 unless defined? Minitest::Test
-  class Minitest::Test < MiniTest::Unit::TestCase
+  class Minitest::Test < Minitest::Unit::TestCase
   end
 
-  class MiniTest::Unit::TestCase
+  class Minitest::Unit::TestCase
     def with_js_framework(framework)
       framework, ActiveScaffold.js_framework = ActiveScaffold.js_framework, framework
       yield
@@ -44,7 +44,7 @@ unless defined? Minitest::Test
   end
 end
 
-class MiniTest::Test
+class Minitest::Test
   protected
 
   def with_js_framework(framework)