active_scaffold 3.5.5 → 3.6.1

data/lib/active_scaffold/version.rb

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

data/lib/generators/active_scaffold/controller_generator.rb

@@ -2,10 +2,10 @@
 
 module ActiveScaffold
   module Generators
-    class ControllerGenerator < Rails::Generators::NamedBase # metagenerator
+    class ControllerGenerator < Rails::Generators::NamedBase
       include Rails::Generators::ResourceHelpers
 
-      source_root File.expand_path('../../templates', __FILE__)
+      source_root File.expand_path('../templates', __dir__)
 
       check_class_collision :suffix => 'Controller'
 

data/lib/generators/active_scaffold/install_generator.rb

@@ -3,7 +3,7 @@ require 'rails/generators/base'
 
 module ActiveScaffold
   module Generators
-    class InstallGenerator < Rails::Generators::Base # metagenerator
+    class InstallGenerator < Rails::Generators::Base
       desc 'Add concerns to routes and require lines to assets manifest files'
 
       def add_concern_routes
@@ -14,18 +14,23 @@ module ActiveScaffold
       def add_to_javascript_manifest
         file = 'app/assets/javascripts/application.js'
         unless File.exist?(file)
+          if Rails.version >= '6.0'
+            create_javascript_manifest file
+            return
+          end
           say_status :missing, file, :red
           return if options[:pretend]
           raise Thor::Error, "JS file #{file} is required for ActiveScaffold"
         end
         original_js = File.binread(file)
         if original_js.include?('require active_scaffold')
-          say_status('skipped', 'insert into app/assets/javascripts/application.js', :yellow)
+          say_status('skipped', "insert into #{file}", :yellow)
         else
-          insert_into_file 'app/assets/javascripts/application.js', :after => %r{//= require +.*ujs['"]?\n} do
+          insert_into_file file, after: %r{//= require +.*ujs['"]?\n} do
             "//= require active_scaffold\n"
           end
         end
+        setup_jquery file, original_js
       end
 
       def add_to_stylesheet_manifest
@@ -35,11 +40,54 @@ module ActiveScaffold
         if original_css =~ /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
       end
+
+      protected
+
+      def create_javascript_manifest(file)
+        FileUtils.mkdir_p File.dirname(file)
+        File.open(file, 'w') do |f|
+          f << "// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, or any plugin's
+// vendor/assets/javascripts directory can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// compiled file. JavaScript code in this file should be added after the last require_* statement.
+//
+// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
+// about supported directives.
+//
+//= require active_scaffold
+"
+          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"
+        end
+        append_to_file 'config/initializers/assets.rb' do
+          "Rails.application.config.assets.precompile += %w( application.js )\n"
+        end
+        setup_jquery file, where: 'active_scaffold'
+      end
+
+      def setup_jquery(file, original_js = nil, where: 'ujs')
+        original_js ||= File.binread(file)
+        if ActiveScaffold.js_framework == :jquery
+          unless original_js.include?('require jquery')
+            insert_into_file file, before: %r{//= require +.*#{where}['"]?\n} do
+              "//= require jquery\n"
+            end
+          end
+        else
+          say_status('missing', 'no jquery-rails gem, load jquery in your layout, or add jquery-rails to Gemfile and add //= require jquery to application.js', :red)
+        end
+      end
     end
   end
 end

data/lib/generators/active_scaffold/resource_generator.rb

@@ -3,7 +3,7 @@ require 'rails/generators/rails/resource/resource_generator'
 
 module ActiveScaffold
   module Generators
-    class ResourceGenerator < Rails::Generators::ResourceGenerator # metagenerator
+    class ResourceGenerator < Rails::Generators::ResourceGenerator
       remove_hook_for :resource_controller
       remove_hook_for :resource_route
       remove_class_option :actions
@@ -46,7 +46,7 @@ module ActiveScaffold
         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}
+          inject_into_file 'config/routes.rb', "  #{routing_code}\n", after: /^[ ]*concern :active_scaffold,.*\n/, verbose: false, force: true
         end
       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/date_picker_test.rb

@@ -1,7 +1,6 @@
 require 'test_helper'
 require 'active_scaffold_config_mock'
-require File.join(File.dirname(__FILE__), '../../lib/active_scaffold/bridges/date_picker/ext')
-# require File.join(File.dirname(__FILE__), '../../lib/active_scaffold/bridges/date_picker/helper')
+require File.expand_path('../../lib/active_scaffold/bridges/date_picker/ext', __dir__)
 
 class DatePickerTest < ActionView::TestCase
   include ActiveScaffold::Helpers::ViewHelpers

data/test/bridges/paperclip_test.rb

@@ -1,8 +1,8 @@
 require 'test_helper'
-require File.expand_path('../../../lib/active_scaffold/bridges/paperclip/paperclip_bridge', __FILE__)
-require File.expand_path('../../../lib/active_scaffold/bridges/paperclip/paperclip_bridge_helpers', __FILE__)
-require File.expand_path('../../../lib/active_scaffold/bridges/paperclip/form_ui', __FILE__)
-require File.expand_path('../../../lib/active_scaffold/bridges/paperclip/list_ui', __FILE__)
+require File.expand_path('../../lib/active_scaffold/bridges/paperclip/paperclip_bridge', __dir__)
+require File.expand_path('../../lib/active_scaffold/bridges/paperclip/paperclip_bridge_helpers', __dir__)
+require File.expand_path('../../lib/active_scaffold/bridges/paperclip/form_ui', __dir__)
+require File.expand_path('../../lib/active_scaffold/bridges/paperclip/list_ui', __dir__)
 
 class PaperclipCore < ActiveScaffold::Config::Core
   include ActiveScaffold::Bridges::Paperclip::PaperclipBridge
@@ -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
@@ -51,7 +51,7 @@ class PaperclipTest < ActionView::TestCase
     assert_dom_equal '<a href="/system/file" target="_blank">file</a>', active_scaffold_column_paperclip(company, config.columns[:logo])
 
     company.stubs(:logo).returns(stub(:file? => true, :original_filename => 'file', :url => '/system/file', :styles => {:thumbnail => '40x40'}))
-    assert_dom_equal '<a href="/system/file" target="_blank"><img src="/system/file" border="0" alt="File"/></a>', active_scaffold_column_paperclip(company, config.columns[:logo])
+    assert_dom_equal '<a href="/system/file" target="_blank"><img src="/system/file" border="0"/></a>', active_scaffold_column_paperclip(company, config.columns[:logo])
   end
 
   def test_form_ui

data/test/class_with_finder.rb

@@ -18,8 +18,8 @@ class ClassWithFinder
     {}
   end
 
-  def params_hash(v)
-    v
+  def params_hash(value)
+    value
   end
 
   def joins_for_collection; end

data/test/company.rb

@@ -37,8 +37,8 @@ class Company < ActiveRecord::Base
   end
 
   # not the real signature of the method, but forgive me
-  def self.before_destroy(s = nil)
-    @@before = s
+  def self.before_destroy(string = nil)
+    @@before = string
   end
 
   if respond_to?(:create_reflection)
@@ -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/config/create_test.rb

@@ -2,6 +2,8 @@ require 'test_helper'
 
 module Config
   class CreateTest < MiniTest::Test
+    include ActiveScaffold::Helpers::ControllerHelpers
+
     def setup
       @config = ActiveScaffold::Config::Core.new :model_stub
       @default_link = @config.create.link
@@ -12,7 +14,7 @@ module Config
     end
 
     def test_default_columns
-      assert_equal %i[a d other_model other_models], @config.create.columns.names
+      assert_equal %i[a d other_model other_models], @config.create.columns.visible_columns_names
     end
 
     def test_default_options
@@ -52,7 +54,7 @@ module Config
       label = 'create new monkeys'
       @config.create.label = label
       assert_equal label, @config.create.label
-      I18n.backend.store_translations :en, :active_scaffold => {:create_new_model => 'Create new %{model}'}
+      I18n.backend.store_translations :en, :active_scaffold => {:create_new_model => 'Create new %<model>s'}
       @config.create.label = :create_new_model
       assert_equal 'Create new Model stub', @config.create.label
     end

data/test/config/nested_test.rb

@@ -20,7 +20,7 @@ module Config
       label = 'nested monkeys'
       @config.nested.label = label
       assert_equal label, @config.nested.label
-      I18n.backend.store_translations :en, :active_scaffold => {:test_create_model => 'Add new %{model}'}
+      I18n.backend.store_translations :en, :active_scaffold => {:test_create_model => 'Add new %<model>s'}
       @config.nested.label = :test_create_model
       assert_equal 'Add new Model stub', @config.nested.label
     end

data/test/config/show_test.rb

@@ -36,7 +36,7 @@ module Config
       label = 'show monkeys'
       @config.show.label = label
       assert_equal label, @config.show.label
-      I18n.backend.store_translations :en, :active_scaffold => {:view_model => 'View %{model}'}
+      I18n.backend.store_translations :en, :active_scaffold => {:view_model => 'View %<model>s'}
       @config.show.label = :view_model
       assert_equal 'View Model stub', @config.show.label
       assert_equal 'View record', @config.show.label('record')

data/test/config/update_test.rb

@@ -2,20 +2,20 @@ require 'test_helper'
 
 module Config
   class UpdateTest < MiniTest::Test
+    include ActiveScaffold::Helpers::ControllerHelpers
+
     def setup
       @config = ActiveScaffold::Config::Core.new :model_stub
     end
 
     def test_copy_columns_from_create
       @config.create.columns = %i[a c d]
-      assert_equal %i[a d], @config.create.columns.names
+      assert_equal %i[a d], @config.create.columns.visible_columns_names
       @config.update.columns = @config.create.columns
-      @config._load_action_columns
-      assert_equal %i[a c d], @config.update.columns.names
+      assert_equal %i[a c d], @config.update.columns.visible_columns_names
     end
 
     def test__params_for_columns__returns_all_params
-      @config._load_action_columns
       @config.columns[:a].params.add :keep_a, :a_temp
       assert @config.columns[:a].params.include?(:keep_a)
       assert @config.columns[:a].params.include?(:a_temp)
@@ -33,7 +33,8 @@ module Config
     end
 
     def test_nested_links
-      old, @config.update.nested_links = @config.update.nested_links, true
+      old = @config.update.nested_links
+      @config.update.nested_links = true
       assert @config.update.nested_links
       @config.update.nested_links = old
     end
@@ -42,7 +43,7 @@ module Config
       label = 'update new monkeys'
       @config.update.label = label
       assert_equal label, @config.update.label
-      I18n.backend.store_translations :en, :active_scaffold => {:change_model => 'Change %{model}'}
+      I18n.backend.store_translations :en, :active_scaffold => {:change_model => 'Change %<model>s'}
       @config.update.label = :change_model
       assert_equal 'Change Model stub', @config.update.label
       assert_equal 'Change record', @config.update.label('record')

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

@@ -70,7 +70,7 @@ class ActionLinksTest < MiniTest::Test
     begin
       @links.delete :foo
       @links.delete 'foo'
-    rescue
+    rescue StandardError
       assert false, "deleting from action links when item doesn't exist should not throw an error"
     end
     refute @links['bar'].nil?

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/data_structures/sorting_test.rb

@@ -64,6 +64,13 @@ class SortingTest < MiniTest::Test
     assert @sorting.sorts_on?(:b)
     assert_equal 'ASC', @sorting.direction_of(:b)
 
+    @sorting.set({a: 'DESC'}, {b: 'ASC'})
+    assert @sorting.instance_variable_get('@clauses').size == 2
+    assert @sorting.sorts_on?(:a)
+    assert_equal 'DESC', @sorting.direction_of(:a)
+    assert @sorting.sorts_on?(:b)
+    assert_equal 'ASC', @sorting.direction_of(:b)
+
     @sorting.set [:a, 'DESC'], [:b, 'ASC']
     assert @sorting.instance_variable_get('@clauses').size == 2
     assert @sorting.sorts_on?(:a)

data/test/extensions/action_view_rendering_test.rb

@@ -0,0 +1,20 @@
+require 'test_helper'
+
+class ActionViewRenderingTest < ActionController::TestCase
+  setup do
+    @controller = PeopleController.new
+  end
+
+  test 'render :super twice' do
+    get :index
+    assert_select '#controller', 1
+    assert_select '#app', 1
+  end
+
+  test 'render partial override with render :super twice' do
+    get :new
+    assert_select '#first_name_field', 1
+    assert_select '#controller_form', 1
+    assert_select '#app_form', 1
+  end
+end

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