active_scaffold 3.6.0.rc1 → 3.6.2

data/lib/active_scaffold/helpers/search_column_helpers.rb

@@ -245,16 +245,23 @@ module ActiveScaffold
         options = column.options.merge(options)
         type = "#{'date' unless options[:discard_date]}#{'time' unless options[:discard_time]}"
         use_select = options.delete(:use_select)
-        helper = use_select ? "select_#{type}" : "#{type}#{'_local' if type == 'datetime'}_field"
+        from_name = "#{options[:name]}[from]"
+        to_name = "#{options[:name]}[to]"
         if use_select
-          default_from_options = {include_blank: true, prefix: "#{options[:name]}[from]"}
-          default_to_options = {include_blank: true, prefix: "#{options[:name]}[to]"}
+          helper = "select_#{type}"
+          fields = [
+            send(helper, field_search_datetime_value(from_value), options.reverse_merge(include_blank: true, prefix: from_name)),
+            send(helper, field_search_datetime_value(to_value), options.reverse_merge(include_blank: true, prefix: to_name))
+          ]
+        else
+          helper = "#{type}#{'_local' if type == 'datetime'}_field_tag"
+          fields = [
+            send(helper, from_name, field_search_datetime_value(from_value), options.except(:name, :object).merge(id: "#{options[:id]}_from")),
+            send(helper, to_name, field_search_datetime_value(to_value), options.except(:name, :object).merge(id: "#{options[:id]}_to"))
+          ]
         end
 
-        safe_join [
-          send(helper, field_search_datetime_value(from_value), options.reverse_merge(default_from_options || {})),
-          send(helper, field_search_datetime_value(to_value), options.reverse_merge(default_to_options || {}))
-        ], ' - '
+        safe_join fields, ' - '
       end
 
       def active_scaffold_search_date(column, options)

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -41,7 +41,7 @@ module ActiveScaffold
           restore_view_paths = lookup_context.view_paths
           lookup_context.view_paths = @_view_paths
         end
-        lookup_context.exists?(template_name, '', partial).tap do
+        (@_lookup_context || lookup_context).exists?(template_name, '', partial).tap do
           lookup_context.view_paths = restore_view_paths if @_view_paths
         end
       end

data/lib/active_scaffold/tableless.rb

@@ -34,11 +34,17 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
     def columns(table_name)
       klass.columns
     end
+
+    if Rails.version >= '6.0.0'
+      def data_sources
+        klass ? [klass.table_name] : []
+      end
+    end
   end
 
   class Column < ActiveRecord::ConnectionAdapters::Column
     if Rails.version >= '5.0.0'
-      def initialize(name, default, sql_type = nil, null = true)
+      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
@@ -149,9 +155,17 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
     def execute_simple_calculation(operation, column_name, distinct)
       @klass.execute_simple_calculation(self, operation, column_name, distinct)
     end
+
+    def implicit_order_column
+      @klass.implicit_order_column
+    end
+
+    def exists?
+      limit(1).to_a.present?
+    end
   end
 
-  class Relation < ActiveRecord::Relation
+  class Relation < ::ActiveRecord::Relation
     include RelationExtension
   end
   class << self

data/lib/active_scaffold/version.rb

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

data/lib/generators/active_scaffold/install_generator.rb

@@ -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/test/data_structures/action_columns_test.rb

@@ -5,7 +5,7 @@ require 'test_helper'
 class ActionColumnsTest < MiniTest::Test
   def setup
     @columns = ActiveScaffold::DataStructures::ActionColumns.new(%i[a b])
-    @columns.action = stub(:core => stub(:model_id => 'model_stub'))
+    @columns.action = stub(core: stub(model_id: 'model_stub'), user_settings_key: :"model_stub_active_scaffold/config/test")
   end
 
   def test_label

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

data/test/misc/tableless_test.rb

@@ -25,6 +25,10 @@ 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
@@ -35,6 +39,10 @@ class TablelessTest < MiniTest::Test
 
   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/app/controllers/people_controller.rb

@@ -1,6 +1,8 @@
 class PeopleController < ApplicationController
   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/test_helper.rb

@@ -1,10 +1,10 @@
-require 'simplecov' if RUBY_ENGINE == 'ruby'
+require 'simplecov' if ENV['COVERAGE']
 
 ENV['RAILS_ENV'] = 'test'
 require 'mock_app/config/environment'
 require 'rails/test_help'
 require 'minitest/autorun'
-require 'mocha/setup'
+require 'mocha/minitest'
 require 'cow_proxy'
 
 require 'minitest/reporters'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.6.0.rc1
+  version: 3.6.2
 platform: ruby
 authors:
 - Many, see README
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-09 00:00:00.000000000 Z
+date: 2021-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: cow_proxy
   requirement: !ruby/object:Gem::Requirement
@@ -224,6 +230,7 @@ files:
 - lib/active_scaffold/bridges/ancestry/ancestry_bridge.rb
 - lib/active_scaffold/bridges/bitfields.rb
 - lib/active_scaffold/bridges/bitfields/bitfields_bridge.rb
+- lib/active_scaffold/bridges/bitfields/list_ui.rb
 - lib/active_scaffold/bridges/calendar_date_select.rb
 - lib/active_scaffold/bridges/calendar_date_select/as_cds_bridge.rb
 - lib/active_scaffold/bridges/cancan.rb
@@ -377,6 +384,7 @@ files:
 - test/data_structures/standard_column_test.rb
 - test/data_structures/validation_reflection_test.rb
 - test/data_structures/virtual_column_test.rb
+- test/extensions/action_view_rendering_test.rb
 - test/extensions/active_record_test.rb
 - test/extensions/routing_mapper_test.rb
 - test/helpers/form_column_helpers_test.rb
@@ -404,6 +412,7 @@ files:
 - test/mock_app/app/controllers/contacts_controller.rb
 - test/mock_app/app/controllers/floors_controller.rb
 - test/mock_app/app/controllers/people_controller.rb
+- test/mock_app/app/controllers/roles_controller.rb
 - test/mock_app/app/helpers/application_helper.rb
 - test/mock_app/app/models/address.rb
 - test/mock_app/app/models/building.rb
@@ -413,6 +422,11 @@ files:
 - test/mock_app/app/models/floor.rb
 - test/mock_app/app/models/person.rb
 - test/mock_app/app/models/role.rb
+- test/mock_app/app/views/active_scaffold_overrides/_form.html.erb
+- test/mock_app/app/views/active_scaffold_overrides/list.html.erb
+- test/mock_app/app/views/people/_first_name_form_column.html.erb
+- test/mock_app/app/views/people/_form.html.erb
+- test/mock_app/app/views/people/list.html.erb
 - test/mock_app/config.ru
 - test/mock_app/config/application.rb
 - test/mock_app/config/boot.rb
@@ -457,9 +471,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.8
 signing_key:
@@ -498,6 +512,7 @@ test_files:
 - test/data_structures/standard_column_test.rb
 - test/data_structures/validation_reflection_test.rb
 - test/data_structures/virtual_column_test.rb
+- test/extensions/action_view_rendering_test.rb
 - test/extensions/active_record_test.rb
 - test/extensions/routing_mapper_test.rb
 - test/helpers/form_column_helpers_test.rb
@@ -525,6 +540,7 @@ test_files:
 - test/mock_app/app/controllers/contacts_controller.rb
 - test/mock_app/app/controllers/floors_controller.rb
 - test/mock_app/app/controllers/people_controller.rb
+- test/mock_app/app/controllers/roles_controller.rb
 - test/mock_app/app/helpers/application_helper.rb
 - test/mock_app/app/models/address.rb
 - test/mock_app/app/models/building.rb
@@ -534,6 +550,11 @@ test_files:
 - test/mock_app/app/models/floor.rb
 - test/mock_app/app/models/person.rb
 - test/mock_app/app/models/role.rb
+- test/mock_app/app/views/active_scaffold_overrides/_form.html.erb
+- test/mock_app/app/views/active_scaffold_overrides/list.html.erb
+- test/mock_app/app/views/people/_first_name_form_column.html.erb
+- test/mock_app/app/views/people/_form.html.erb
+- test/mock_app/app/views/people/list.html.erb
 - test/mock_app/config.ru
 - test/mock_app/config/application.rb
 - test/mock_app/config/boot.rb