active_scaffold 3.7.12 → 4.0.0.rc1

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -10,6 +10,7 @@ module ActiveScaffold
       include ActiveScaffold::Helpers::ListColumnHelpers
       include ActiveScaffold::Helpers::ShowColumnHelpers
       include ActiveScaffold::Helpers::FormColumnHelpers
+      include ActiveScaffold::Helpers::TabsHelpers
       include ActiveScaffold::Helpers::SearchColumnHelpers
       include ActiveScaffold::Helpers::HumanConditionHelpers
 
@@ -61,24 +62,23 @@ module ActiveScaffold
         # it's call many times and we can cache same result
         @_loading_indicator_path ||= image_path('active_scaffold/indicator.gif')
         # it's call many times in long lists, image_tag is a bit slower
-        tag :img, src: @_loading_indicator_path, style: 'visibility:hidden;', id: loading_indicator_id(options), alt: 'loading indicator', class: 'loading-indicator'
+        tag.img(src: @_loading_indicator_path, style: 'visibility:hidden;', id: loading_indicator_id(options), alt: 'loading indicator', class: 'loading-indicator')
       end
 
       # Creates a javascript-based link that toggles the visibility of some element on the page.
       # By default, it toggles the visibility of the sibling after the one it's nested in.
-      # You may pass custom javascript logic in options[:of] to change that, though. For example, you could say :of => '$("my_div_id")'.
       # You may also flag whether the other element is visible by default or not, and the initial text will adjust accordingly.
       def link_to_visibility_toggle(id, options = {})
         options[:hide_label] ||= as_(:hide)
         options[:show_label] ||= as_(:show_block)
         label = options[:default_visible].nil? || options[:default_visible] ? options[:hide_label] : options[:show_label]
-        data = {:show => options[:show_label], :hide => options[:hide_label], :toggable => id}
-        link_to label, '#', :data => data, :style => 'display: none;', :class => 'as-js-button visibility-toggle'
+        data = {show: options[:show_label], hide: options[:hide_label], toggable: id}
+        link_to label, '#', data: data, style: 'display: none;', class: 'as-js-button visibility-toggle'
       end
 
       def list_row_class(record)
         class_override_helper = override_helper_per_model(:list_row_class, record.class)
-        class_override_helper != :list_row_class ? send(class_override_helper, record) : ''
+        class_override_helper == :list_row_class ? '' : send(class_override_helper, record)
       end
 
       def list_row_attributes(tr_class, tr_id, data_refresh)
@@ -88,6 +88,7 @@ module ActiveScaffold
       def column_attributes(column, record)
         method = override_helper column, 'column_attributes'
         return send(method, record) if method
+
         {}
       end
 
@@ -138,6 +139,7 @@ module ActiveScaffold
 
       def empty_field_text
         return @_empty_field_text if defined? @_empty_field_text
+
         @_empty_field_text = (active_scaffold_config.list.empty_field_text if active_scaffold_config.actions.include?(:list))
       end
 
@@ -188,7 +190,7 @@ module ActiveScaffold
       end
 
       def display_message(message)
-        message = safe_join message, tag(:br) if message.is_a?(Array)
+        message = safe_join message, tag.br if message.is_a?(Array)
         if (highlights = active_scaffold_config.user.highlight_messages)
           message = highlights.inject(message) do |msg, (phrases, highlighter)|
             highlight(msg, phrases, highlighter || {})
@@ -196,8 +198,8 @@ module ActiveScaffold
         end
         if (format = active_scaffold_config.user.timestamped_messages)
           format = :short if format == true
-          messages = [content_tag(:div, l(Time.current, :format => format), :class => 'timestamp')]
-          messages << content_tag(:div, message, :class => 'message-content')
+          messages = [content_tag(:div, l(Time.current, format: format), class: 'timestamp')]
+          messages << content_tag(:div, message, class: 'message-content')
           message = safe_join messages, ' '
         end
         message
@@ -205,10 +207,10 @@ module ActiveScaffold
 
       def active_scaffold_error_messages_for(*params)
         options = params.extract_options!.symbolize_keys
-        options.reverse_merge!(:container_tag => :div, :list_type => :ul)
+        options.reverse_merge!(container_tag: :div, list_type: :ul)
 
         objects = Array.wrap(options.delete(:object) || params).map do |object|
-          object = instance_variable_get("@#{object}") unless object.respond_to?(:to_model)
+          object = instance_variable_get(:"@#{object}") unless object.respond_to?(:to_model)
           object = convert_to_model(object)
 
           options[:object_name] ||= object.class.model_name.human.downcase if object.class.respond_to?(:model_name)
@@ -237,19 +239,19 @@ module ActiveScaffold
             if options.include?(:header_message)
               options[:header_message]
             else
-              as_('errors.template.header', :count => count, :model => options[:object_name].to_s.tr('_', ' '))
+              as_('errors.template.header', count: count, model: options[:object_name].to_s.tr('_', ' '))
             end
 
           message = options.include?(:message) ? options[:message] : as_('errors.template.body')
 
           error_messages = objects.sum([]) do |object|
             object.errors.full_messages.map do |msg|
-              options[:list_type] != :br ? content_tag(:li, msg) : msg
+              options[:list_type] == :br ? msg : content_tag(:li, msg)
             end
           end
           error_messages =
             if options[:list_type] == :br
-              safe_join error_messages, tag(:br)
+              safe_join error_messages, tag.br
             else
               content_tag options[:list_type], safe_join(error_messages)
             end

data/lib/active_scaffold/marked_model.rb

@@ -14,8 +14,7 @@ module ActiveScaffold
     end
 
     def as_marked=(value)
-      value = [true, 'true', 1, '1', 'T', 't'].include?(value.class == String ? value.downcase : value)
-      if value == true
+      if [true, 'true', 1, '1', 'T', 't'].include?(value.respond_to?(:downcase) ? value.downcase : value)
         marked_records[id.to_s] = true unless as_marked
       else
         marked_records.delete(id.to_s)

data/lib/active_scaffold/orm_checks.rb

@@ -2,12 +2,14 @@ module ActiveScaffold
   module OrmChecks
     class << self
       def active_record?(klass)
-        return unless defined? ActiveRecord
+        return false unless defined? ActiveRecord
+
         klass < ActiveRecord::Base
       end
 
       def mongoid?(klass)
-        return unless defined? Mongoid
+        return false unless defined? Mongoid
+
         klass < Mongoid::Document
       end
 
@@ -61,7 +63,7 @@ module ActiveScaffold
         if active_record? klass
           klass.content_columns
         elsif mongoid? klass
-          klass.fields.reject { |field, _| field == '_id' }.values
+          klass.fields.except('_id').values
         else
           []
         end
@@ -108,7 +110,7 @@ module ActiveScaffold
 
     %i[_table_name _quoted_table_name _columns _columns_hash _reflect_on_all_associations _content_columns].each do |method|
       define_method method do
-        ActiveScaffold::OrmChecks.send method.to_s[1..-1], active_record_class
+        ActiveScaffold::OrmChecks.send method.to_s[1..], active_record_class
       end
     end
 

data/lib/active_scaffold/paginator.rb

@@ -22,6 +22,7 @@ class Paginator
     @count = count
     @per_page = per_page
     raise MissingSelectError, 'Must provide block to select data for each page' unless select
+
     @select = select
   end
 
@@ -78,7 +79,7 @@ class Paginator
 
     attr_reader :number, :pager
 
-    def initialize(pager, number, &select) #:nodoc:
+    def initialize(pager, number, &select) # :nodoc:
       @pager = pager
       @number = number
       @offset = (number - 1) * pager.per_page
@@ -125,7 +126,7 @@ class Paginator
       end
     end
 
-    def ==(other) #:nodoc:
+    def ==(other) # :nodoc:
       @pager == other.pager && number == other.number
     end
   end

data/lib/active_scaffold/registry.rb

@@ -14,6 +14,10 @@ module ActiveScaffold
       RequestStore.store[:attr_Registry_unauthorized_columns] ||= Hash.new { |h, k| h[k] = [] }
     end
 
+    def self.column_links
+      RequestStore.store[:column_links] ||= {}
+    end
+
     def self.cache(kind, key = nil, &block)
       unless key
         key = kind
@@ -22,6 +26,7 @@ module ActiveScaffold
       RequestStore.store[:attr_Registry_cache] ||= {}
       cache = RequestStore.store[:attr_Registry_cache][kind] ||= {}
       return cache[key] if cache.include? key
+
       cache[key] ||= yield
     end
   end

data/lib/active_scaffold/tableless.rb

@@ -8,6 +8,7 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
 
   class Connection < ActiveRecord::ConnectionAdapters::AbstractAdapter
     attr_reader :klass
+
     def initialize(klass, *args)
       super(nil, *args)
       @klass = klass
@@ -17,15 +18,13 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
       klass.columns
     end
 
-    if Rails.version >= '6.0.0'
-      def data_sources
-        klass ? [klass.table_name] : []
-      end
+    def data_sources
+      klass ? [klass.table_name] : []
     end
   end
 
   class Column < ActiveRecord::ConnectionAdapters::Column
-    def initialize(name, default, sql_type = nil, null = true, **)
+    def initialize(name, default, sql_type = nil, null = true, **) # rubocop:disable Style/OptionalBooleanParameter
       metadata = ActiveRecord::Base.connection.send :fetch_type_metadata, sql_type
       super(name, default, metadata, null)
     end
@@ -41,7 +40,7 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
         if klass < ActiveScaffold::Tableless
           class << scope; include RelationExtension; end
           assoc_conditions = scope.proxy_association&.send(:association_scope)&.conditions
-          if assoc_conditions&.present?
+          if assoc_conditions.present?
             scope.conditions.concat(assoc_conditions.map { |c| c.is_a?(Hash) ? c[klass.table_name] || c : c })
           end
         end
@@ -59,6 +58,14 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
     def get_records # rubocop:disable Naming/AccessorMethodName
       klass < ActiveScaffold::Tableless ? scope.to_a : super
     end
+
+    def reader
+      super.tap do |proxy|
+        if klass < ActiveScaffold::Tableless
+          def proxy.exists?(...) = scope.exists?(...)
+        end
+      end
+    end
   end
 
   module CollectionAssociation
@@ -111,9 +118,7 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
 
     def except(*skips)
       super.tap do |new_relation|
-        unless new_relation.is_a?(RelationExtension)
-          class << new_relation; include RelationExtension; end
-        end
+        class << new_relation; include RelationExtension; end unless new_relation.is_a?(RelationExtension)
         new_relation.conditions.concat conditions unless skips.include? :where
       end
     end
@@ -147,6 +152,10 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
     include RelationExtension
   end
   class << self
+    def find(*ids)
+      ids.length == 1 ? all.find(*ids[0]) : super # rubocop:disable Rails/RedundantActiveRecordAllMethod
+    end
+
     private
 
     def relation
@@ -170,7 +179,7 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
   end
 
   def self.columns
-    @tableless_columns ||= []
+    @tableless_columns ||= [] # rubocop:disable Naming/MemoizedInstanceVariableName
   end
 
   def self.table_name
@@ -203,6 +212,7 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
     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
 
@@ -210,11 +220,11 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
     raise 'destroy must be implemented in a Tableless model'
   end
 
-  def _create_record #:nodoc:
-    run_callbacks(:create) {}
+  def _create_record # :nodoc:
+    run_callbacks(:create) {} # run callbacks but do nothing
   end
 
-  def _update_record(*) #:nodoc:
-    run_callbacks(:update) {}
+  def _update_record(*) # :nodoc:
+    run_callbacks(:update) {} # run callbacks but do nothing
   end
 end

data/lib/active_scaffold/version.rb

@@ -1,9 +1,9 @@
 module ActiveScaffold
   module Version
-    MAJOR = 3
-    MINOR = 7
-    PATCH = 12
-    FIX = nil
+    MAJOR = 4
+    MINOR = 0
+    PATCH = 0
+    FIX = 'rc1'
 
     STRING = [MAJOR, MINOR, PATCH, FIX].compact.join('.')
   end

data/lib/active_scaffold.rb

@@ -51,45 +51,20 @@ module ActiveScaffold
   mattr_accessor :javascripts, instance_writer: false
   self.javascripts = []
 
-  mattr_reader :threadsafe
   def self.threadsafe!
-    @@threadsafe = true
-  end
-
-  def self.js_framework=(framework)
-    warning = 'js_framework is deprecated as prototype support will be removed in 4.0'
-    case framework
-    when :jquery then
-      warning +=
-        if defined? Jquery
-          ', it can be removed as it defaults to :jquery'
-        else
-          ", it's still needed in this version, as you are not using jquery-rails gem"
-        end
-    when :prototype then warning += ', convert your app to jQuery, and remove this call'
-    end
-    deprecator.warn warning
-    @@js_framework = framework
-  end
-
-  def self.js_framework
-    @@js_framework ||=
-      if defined? Jquery
-        :jquery
-      elsif defined? PrototypeRails
-        :prototype
-      end
+    ActiveSupport::Deprecation.warn 'Threadsafe is enabled always, no need to require it anymore'
   end
 
   mattr_writer :jquery_ui_loaded, instance_writer: false
   def self.jquery_ui_included?
     return true if @@jquery_ui_loaded
-    Jquery::Rails.const_defined?('JQUERY_UI_VERSION') || Jquery.const_defined?('Ui') if Object.const_defined?('Jquery')
+
+    Jquery::Rails.const_defined?(:JQUERY_UI_VERSION) || Jquery.const_defined?(:Ui) if Object.const_defined?(:Jquery)
   end
 
   mattr_writer :js_config, instance_writer: false
   def self.js_config
-    @@js_config ||= {:scroll_on_close => :checkInViewport}
+    @@js_config ||= {scroll_on_close: :checkInViewport}
   end
 
   # exclude bridges you do not need, add to an initializer
@@ -102,18 +77,17 @@ module ActiveScaffold
   end
 
   mattr_accessor :nested_subforms, instance_writer: false
+  def nested_subforms=(*)
+    ActiveSupport::Deprecation.warn 'Nested subforms are enabled by default already'
+  end
 
   def self.root
-    File.dirname(__FILE__) + '/..'
+    "#{File.dirname(__FILE__)}/.."
   end
 
   def self.defaults(&block)
     ActiveScaffold::Config::Core.configure(&block)
   end
-
-  def self.deprecator
-    @deprecator ||= ActiveSupport::Deprecation.new('4.0', 'ActiveScaffold')
-  end
 end
 require 'active_scaffold/engine'
 require 'ice_nine'

data/lib/generators/active_scaffold/controller_generator.rb

@@ -7,31 +7,31 @@ module ActiveScaffold
 
       source_root File.expand_path('../templates', __dir__)
 
-      check_class_collision :suffix => 'Controller'
+      check_class_collision suffix: 'Controller'
 
-      class_option :orm, :banner => 'NAME', :type => :string, :required => true,
-                         :desc => 'ORM to generate the controller for'
+      class_option :orm, banner: 'NAME', type: :string, required: true,
+                         desc: 'ORM to generate the controller for'
 
-      desc <<-DESC.strip_heredoc
-      Description:
-          Stubs out a active_scaffolded controller. Pass the model name,
-          either CamelCased or under_scored.
-          The controller name is retrieved as a pluralized version of the model
-          name.
+      desc <<~DESC
+        Description:
+            Stubs out a active_scaffolded controller. Pass the model name,
+            either CamelCased or under_scored.
+            The controller name is retrieved as a pluralized version of the model
+            name.
 
-          To create a controller within a module, specify the model name as a
-          path like 'parent_module/controller_name'.
+            To create a controller within a module, specify the model name as a
+            path like 'parent_module/controller_name'.
 
-          This generates a controller class in app/controllers and invokes helper,
-          template engine and test framework generators.
+            This generates a controller class in app/controllers and invokes helper,
+            template engine and test framework generators.
 
-      Example:
-          `rails generate active_scaffold:controller CreditCard`
+        Example:
+            `rails generate active_scaffold:controller CreditCard`
 
-          Credit card controller with URLs like /credit_card/debit.
-              Controller:      app/controllers/credit_cards_controller.rb
-              Functional Test: test/functional/credit_cards_controller_test.rb
-              Helper:          app/helpers/credit_cards_helper.rb
+            Credit card controller with URLs like /credit_card/debit.
+                Controller:      app/controllers/credit_cards_controller.rb
+                Functional Test: test/functional/credit_cards_controller_test.rb
+                Helper:          app/helpers/credit_cards_helper.rb
       DESC
 
       def create_controller_files
@@ -39,7 +39,7 @@ module ActiveScaffold
         template 'helper.rb', File.join('app/helpers', class_path, "#{controller_file_name}_helper.rb")
       end
 
-      hook_for :test_framework, :as => :scaffold
+      hook_for :test_framework, as: :scaffold
 
       def create_view_root_folder
         empty_directory File.join('app/views', controller_file_path)

data/lib/generators/active_scaffold/install_generator.rb

@@ -14,13 +14,8 @@ 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"
+          create_javascript_manifest file
+          return
         end
         original_js = File.binread(file)
         if original_js.include?('require active_scaffold')
@@ -36,6 +31,7 @@ module ActiveScaffold
       def add_to_stylesheet_manifest
         file = 'app/assets/stylesheets/application.css'
         return unless File.exist?(file)
+
         original_css = File.binread(file)
         if original_css.match?(/require active_scaffold$/)
           say_status('skipped', 'insert into app/assets/stylesheets/application.css', :yellow)
@@ -78,7 +74,7 @@ module ActiveScaffold
 
       def setup_jquery(file, original_js = nil, where: 'ujs')
         original_js ||= File.binread(file)
-        if ActiveScaffold.js_framework == :jquery
+        if defined? Jquery
           unless original_js.include?('require jquery')
             insert_into_file file, before: %r{//= require +.*#{where}['"]?\n} do
               "//= require jquery\n"

data/lib/generators/active_scaffold/resource_generator.rb

@@ -8,42 +8,42 @@ module ActiveScaffold
       remove_hook_for :resource_route
       remove_class_option :actions
 
-      desc <<-DESC.strip_heredoc
-      Description:
-          Scaffolds an entire resource, from model and migration to controller,
-              along with a full test suite and configured to use active_scaffold.
-          The resource is ready to use as a starting point for your RESTful,
-              resource-oriented application.
-
-          Pass the name of the model (in singular form), either CamelCased or
-              under_scored, as the first argument, and an optional list of attribute
-          pairs.
-
-          Attribute pairs are field:type arguments specifying the
-          model's attributes. Timestamps are added by default, so you don't have to
-          specify them by hand as 'created_at:datetime updated_at:datetime'.
-
-          You don't have to think up every attribute up front, but it helps to
-          sketch out a few so you can start working with the resource immediately.
-
-          For example, 'active_scaffold post title:string body:text published:boolean'
-          gives you a model with those three attributes, a controller configured to use active_scaffold,
-          as well as a resources :posts with additional active_scaffold routes
-          declaration in config/routes.rb.
-
-          If you want to remove all the generated files, run
-          'rails destroy active_scaffold ModelName'.
-
-      Examples:
-          `rails generate active_scaffold:resource post`
-          `rails generate active_scaffold:resource post title:string body:text published:boolean`
-          `rails generate active_scaffold:resource purchase order_id:integer amount:decimal`
+      desc <<~DESC
+        Description:
+            Scaffolds an entire resource, from model and migration to controller,
+                along with a full test suite and configured to use active_scaffold.
+            The resource is ready to use as a starting point for your RESTful,
+                resource-oriented application.
+
+            Pass the name of the model (in singular form), either CamelCased or
+                under_scored, as the first argument, and an optional list of attribute
+            pairs.
+
+            Attribute pairs are field:type arguments specifying the
+            model's attributes. Timestamps are added by default, so you don't have to
+            specify them by hand as 'created_at:datetime updated_at:datetime'.
+
+            You don't have to think up every attribute up front, but it helps to
+            sketch out a few so you can start working with the resource immediately.
+
+            For example, 'active_scaffold post title:string body:text published:boolean'
+            gives you a model with those three attributes, a controller configured to use active_scaffold,
+            as well as a resources :posts with additional active_scaffold routes
+            declaration in config/routes.rb.
+
+            If you want to remove all the generated files, run
+            'rails destroy active_scaffold ModelName'.
+
+        Examples:
+            `rails generate active_scaffold:resource post`
+            `rails generate active_scaffold:resource post title:string body:text published:boolean`
+            `rails generate active_scaffold:resource purchase order_id:integer amount:decimal`
       DESC
 
       def add_resource_route
         routing_code =  class_path.collect { |namespace| "namespace :#{namespace} do " }.join(' ')
         routing_code << "resources :#{file_name.pluralize}, concerns: :active_scaffold"
-        routing_code << ' end' * class_path.size
+        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

data/lib/tasks/brakeman.rake

@@ -3,7 +3,7 @@ namespace :brakeman do
   task :run, :output_files do |_t, args|
     require 'brakeman'
 
-    files = args[:output_files].split(' ') if args[:output_files]
+    files = args[:output_files].split if args[:output_files]
     Brakeman.run app_path: '.', output_files: files, print_report: true
   end