active_scaffold 3.5.5 → 3.6.0.pre

data/lib/active_scaffold/extensions/ice_nine.rb

@@ -0,0 +1,36 @@
+module IceNine
+  class Freezer
+    def self.find(name)
+      freezer = name.split('::').reduce(self) do |mod, const|
+        mod.const_lookup(const) or break mod # rubocop:disable Style/AndOr
+      end
+      freezer if freezer < self # only return a descendant freezer
+    end
+
+    class ObjectWithExclussion < Object
+      class_attribute :excluded_vars
+      self.excluded_vars = []
+      def self.freeze_instance_variables(object, recursion_guard)
+        object.instance_variables.each do |ivar_name|
+          next if excluded_vars.include? ivar_name
+          Freezer.guarded_deep_freeze(
+            object.instance_variable_get(ivar_name),
+            recursion_guard
+          )
+        end
+      end
+      private_class_method :freeze_instance_variables
+    end
+
+    class ActiveScaffold < ::IceNine::Freezer::Object
+      class DataStructures < ::IceNine::Freezer::Object
+        class Column < ::IceNine::Freezer::ObjectWithExclussion
+          self.excluded_vars = %i[@active_record_class @column]
+        end
+
+        class Association < ::IceNine::Freezer::NoFreeze
+        end
+      end
+    end
+  end
+end

data/lib/active_scaffold/extensions/left_outer_joins.rb

@@ -18,11 +18,6 @@ if Rails.version < '5.0.0'
       end
       alias left_joins left_outer_joins
 
-      def outer_joins(*args)
-        ActiveSupport::Deprecation.warn 'use left_outer_joins or left_joins which is added to Rails 5.0.0'
-        left_outer_joins(*args)
-      end
-
       def left_outer_joins!(*args)
         self.joins_values += [''] # HACK: for using left_outer_joins in update_all/delete_all
         self.left_outer_joins_values += args
@@ -30,39 +25,19 @@ if Rails.version < '5.0.0'
       end
       alias left_joins! left_outer_joins!
 
-      def outer_joins!(*args)
-        ActiveSupport::Deprecation.warn 'use left_outer_joins! or left_joins! which is added to Rails 5.0.0'
-        left_outer_joins!(*args)
-      end
-
-      if Rails.version < '4.1'
-        def build_arel
-          if left_outer_joins_values.empty?
-            super
-          else
-            relation = except(:left_outer_joins)
-            join_dependency = ActiveRecord::Associations::JoinDependency.new(@klass, left_outer_joins_values, [])
-            join_dependency.join_associations.each do |association|
-              relation = association.join_relation(relation)
-            end
-            relation.build_arel
-          end
-        end
-      else
-        def build_arel
-          if left_outer_joins_values.empty?
-            super
-          else
-            relation = except(:left_outer_joins)
-            relation.joins! ActiveRecord::Associations::JoinDependency.new(@klass, left_outer_joins_values, [])
-            relation.build_arel
-          end
+      def build_arel
+        if left_outer_joins_values.empty?
+          super
+        else
+          relation = except(:left_outer_joins)
+          relation.joins! ActiveRecord::Associations::JoinDependency.new(@klass, left_outer_joins_values, [])
+          relation.build_arel
         end
       end
     end
   end
   ActiveRecord::Relation.send :include, ActiveScaffold::OuterJoins
   module ActiveRecord::Querying
-    delegate :left_outer_joins, :left_joins, :outer_joins, :to => :all
+    delegate :left_outer_joins, :left_joins, :to => :all
   end
 end

data/lib/active_scaffold/extensions/routing_mapper.rb

@@ -29,13 +29,13 @@ module ActiveScaffold
         actions = get_actions(ACTIVE_SCAFFOLD_ASSOCIATION_ROUTING, options)
 
         mapper.collection do
-          ActionDispatch::Routing::ACTIVE_SCAFFOLD_ASSOCIATION_ROUTING[:collection].each do |name, type|
+          ActiveScaffold::Routing::ACTIVE_SCAFFOLD_ASSOCIATION_ROUTING[:collection].each do |name, type|
             mapper.match(name, via: type) if actions.include? name
           end
         end
 
         mapper.member do
-          ActionDispatch::Routing::ACTIVE_SCAFFOLD_ASSOCIATION_ROUTING[:member].each do |name, type|
+          ActiveScaffold::Routing::ACTIVE_SCAFFOLD_ASSOCIATION_ROUTING[:member].each do |name, type|
             mapper.match(name, via: type) if actions.include? name
           end
         end
@@ -52,13 +52,13 @@ module ActiveScaffold
         actions = get_actions(ACTIVE_SCAFFOLD_CORE_ROUTING, options)
 
         mapper.collection do
-          ActionDispatch::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:collection].each do |name, type|
+          ActiveScaffold::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:collection].each do |name, type|
             mapper.match(name, via: type) if actions.include? name
           end
         end
 
         mapper.member do
-          ActionDispatch::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:member].each do |name, type|
+          ActiveScaffold::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:member].each do |name, type|
             mapper.match(name, via: type) if actions.include? name
           end
           mapper.get 'list', action: :index if mapper.send(:parent_resource).actions.include? :index
@@ -72,47 +72,8 @@ end
 
 module ActionDispatch
   module Routing
-    ACTIVE_SCAFFOLD_CORE_ROUTING = ActiveScaffold::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING
-    ACTIVE_SCAFFOLD_ASSOCIATION_ROUTING = ActiveScaffold::Routing::ACTIVE_SCAFFOLD_ASSOCIATION_ROUTING
-
     class Mapper
       module Resources
-        def parent_options
-          opts = parent_resource.instance_variable_get(:@options)
-          if Rails.version >= '5.0.0'
-            opts.merge(
-              only: parent_resource.instance_variable_get(:@only),
-              except: parent_resource.instance_variable_get(:@except)
-            )
-          end
-          opts
-        end
-
-        def define_active_scaffold_concern
-          ActiveSupport::Deprecation.warn 'Add concern :active_scaffold, ActiveScaffold::Routing::Basic.new(association: true) to your routes file.'
-          concern :active_scaffold, ActiveScaffold::Routing::Basic.new(association: true)
-        end
-
-        def define_active_scaffold_association_concern
-          ActiveSupport::Deprecation.warn 'Add concern :active_scaffold_association, ActiveScaffold::Routing::Association.new to your routes file.'
-          concern :active_scaffold_association, ActiveScaffold::Routing::Association.new
-        end
-
-        def as_routes(opts = {association: true})
-          define_active_scaffold_concern unless @concerns[:active_scaffold]
-          if opts[:association] && !@concerns[:active_scaffold_association]
-            define_active_scaffold_association_concern
-          end
-          ActiveSupport::Deprecation.warn 'Use concerns: :active_scaffold in resources instead of as_routes, or concerns :active_scaffold in resources block if want to disable association routes or restrict routes with only or except options.'
-          concerns :active_scaffold, parent_options.merge(association: opts[:association])
-        end
-
-        def as_association_routes
-          define_active_scaffold_association_concern unless @concerns[:active_scaffold_association]
-          ActiveSupport::Deprecation.warn 'Use concerns: :active_scaffold_association in resources instead of as_association_routes, or concerns :active_scaffold_association in resources block if want to restrict routes with only or except options.'
-          concerns :active_scaffold_association, parent_options
-        end
-
         def as_nested_resources(*resources)
           options = resources.extract_options!
           nested_options = options.merge(parent_scaffold: parent_scaffold)

data/lib/active_scaffold/extensions/unsaved_record.rb

@@ -18,10 +18,8 @@ module ActiveScaffold::UnsavedRecord
   def keeping_errors
     old_errors = errors.dup if errors.present?
     result = yield
-    if old_errors
-      old_errors.each do |attr|
-        old_errors[attr].each { |msg| errors.add(attr, msg) unless errors.added?(attr, msg) }
-      end
+    old_errors&.each do |attr|
+      old_errors[attr].each { |msg| errors.add(attr, msg) unless errors.added?(attr, msg) }
     end
     result && old_errors.blank?
   end

data/lib/active_scaffold/finder.rb

@@ -95,7 +95,7 @@ module ActiveScaffold
         if respond_to?("condition_for_#{column.name}_column")
           return send("condition_for_#{column.name}_column", column, value, like_pattern)
         end
-        return unless column && column.search_sql && value.present?
+        return unless column&.search_sql && value.present?
         search_ui = column.search_ui || column.column_type
         begin
           sql, *values =
@@ -122,7 +122,7 @@ module ActiveScaffold
       def condition_for_search_ui(column, value, like_pattern, search_ui)
         case search_ui
         when :boolean, :checkbox
-          ['%{search_sql} = ?', column.column ? ActiveScaffold::Core.column_type_cast(value, column.column) : value]
+          ['%<search_sql>s = ?', column.column ? ActiveScaffold::Core.column_type_cast(value, column.column) : value]
         when :integer, :decimal, :float
           condition_for_numeric(column, value)
         when :string, :range
@@ -131,47 +131,47 @@ module ActiveScaffold
           condition_for_datetime(column, value)
         when :select, :multi_select, :country, :usa_state, :chosen, :multi_chosen
           values = Array(value).select(&:present?)
-          ['%{search_sql} in (?)', values] if values.present?
+          ['%<search_sql>s in (?)', values] if values.present?
         else
           if column.text?
-            ["%{search_sql} #{ActiveScaffold::Finder.like_operator} ?", like_pattern.sub('?', value)]
+            ["%<search_sql>s #{ActiveScaffold::Finder.like_operator} ?", like_pattern.sub('?', value)]
           else
-            ['%{search_sql} = ?', ActiveScaffold::Core.column_type_cast(value, column.column)]
+            ['%<search_sql>s = ?', ActiveScaffold::Core.column_type_cast(value, column.column)]
           end
         end
       end
 
       def condition_for_numeric(column, value)
         if !value.is_a?(Hash)
-          ['%{search_sql} = ?', condition_value_for_numeric(column, value)]
+          ['%<search_sql>s = ?', condition_value_for_numeric(column, value)]
         elsif ActiveScaffold::Finder::NULL_COMPARATORS.include?(value[:opt])
           condition_for_null_type(column, value[:opt])
         elsif value[:from].blank? || !ActiveScaffold::Finder::NUMERIC_COMPARATORS.include?(value[:opt])
           nil
         elsif value[:opt] == 'BETWEEN'
-          ['(%{search_sql} BETWEEN ? AND ?)', condition_value_for_numeric(column, value[:from]), condition_value_for_numeric(column, value[:to])]
+          ['(%<search_sql>s BETWEEN ? AND ?)', condition_value_for_numeric(column, value[:from]), condition_value_for_numeric(column, value[:to])]
         else
-          ["%{search_sql} #{value[:opt]} ?", condition_value_for_numeric(column, value[:from])]
+          ["%<search_sql>s #{value[:opt]} ?", condition_value_for_numeric(column, value[:from])]
         end
       end
 
       def condition_for_range(column, value, like_pattern = nil)
         if !value.is_a?(Hash)
           if column.text?
-            ["%{search_sql} #{ActiveScaffold::Finder.like_operator} ?", like_pattern.sub('?', value)]
+            ["%<search_sql>s #{ActiveScaffold::Finder.like_operator} ?", like_pattern.sub('?', value)]
           else
-            ['%{search_sql} = ?', ActiveScaffold::Core.column_type_cast(value, column.column)]
+            ['%<search_sql>s = ?', ActiveScaffold::Core.column_type_cast(value, column.column)]
           end
         elsif ActiveScaffold::Finder::NULL_COMPARATORS.include?(value[:opt])
           condition_for_null_type(column, value[:opt], like_pattern)
         elsif value[:from].blank?
           nil
         elsif ActiveScaffold::Finder::STRING_COMPARATORS.values.include?(value[:opt])
-          ["%{search_sql} #{ActiveScaffold::Finder.like_operator} ?", value[:opt].sub('?', value[:from])]
+          ["%<search_sql>s #{ActiveScaffold::Finder.like_operator} ?", value[:opt].sub('?', value[:from])]
         elsif value[:opt] == 'BETWEEN'
-          ['(%{search_sql} BETWEEN ? AND ?)', value[:from], value[:to]]
+          ['(%<search_sql>s BETWEEN ? AND ?)', value[:from], value[:to]]
         elsif ActiveScaffold::Finder::NUMERIC_COMPARATORS.include?(value[:opt])
-          ["%{search_sql} #{value[:opt]} ?", value[:from]]
+          ["%<search_sql>s #{value[:opt]} ?", value[:from]]
         end
       end
 
@@ -230,7 +230,7 @@ module ActiveScaffold
         unless value.nil? || value.blank?
           if value.is_a? Hash
             time = Time.zone.local(*%i[year month day hour minute second].collect { |part| value[part].to_i }) rescue nil
-            time.send(conversion) if time
+            time&.send(conversion)
           elsif value.respond_to?(:strftime)
             if conversion == :to_time
               # Explicitly get the current zone, because TimeWithZone#to_time in rails 3.2.3 returns UTC.
@@ -250,7 +250,7 @@ module ActiveScaffold
             format, offset = format_for_datetime(column, value)
             format.gsub!(/%-d|%-m|%_m/) { |s| s.gsub(/[-_]/, '') } # strptime fails with %-d, %-m, %_m
             value = translate_days_and_months(value, format) if I18n.locale != :en
-            time = DateTime.strptime(value, format) rescue nil
+            time = Time.strptime(value, format) rescue nil
             if time
               time = Time.zone.local_to_utc(time).in_time_zone unless offset
               time = time.send(conversion) unless conversion == :to_time
@@ -267,11 +267,7 @@ module ActiveScaffold
         when :integer   then value.to_i rescue value ? 1 : 0
         when :float     then value.to_f
         when :decimal
-          if Rails.version >= '4.2.0'
-            ::ActiveRecord::Type::Decimal.new.type_cast_from_user(value)
-          else
-            ::ActiveRecord::ConnectionAdapters::Column.value_to_decimal(value)
-          end
+          ::ActiveRecord::Type::Decimal.new.type_cast_from_user(value)
         else
           value
         end
@@ -293,28 +289,28 @@ module ActiveScaffold
         if from_value.nil? && to_value.nil?
           nil
         elsif !from_value
-          ['%{search_sql} <= ?', to_value.to_s(:db)]
+          ['%<search_sql>s <= ?', to_value.to_s(:db)]
         elsif !to_value
-          ['%{search_sql} >= ?', from_value.to_s(:db)]
+          ['%<search_sql>s >= ?', from_value.to_s(:db)]
         else
-          ['%{search_sql} BETWEEN ? AND ?', from_value.to_s(:db), to_value.to_s(:db)]
+          ['%<search_sql>s BETWEEN ? AND ?', from_value.to_s(:db), to_value.to_s(:db)]
         end
       end
 
       def condition_for_record_select_type(column, value, like_pattern = nil)
         if value.is_a?(Array)
-          ['%{search_sql} IN (?)', value]
+          ['%<search_sql>s IN (?)', value]
         else
-          ['%{search_sql} = ?', value]
+          ['%<search_sql>s = ?', value]
         end
       end
 
       def condition_for_null_type(column, value, like_pattern = nil)
         case value.to_s
         when 'null'
-          ['%{search_sql} is null', []]
+          ['%<search_sql>s is null', []]
         when 'not_null'
-          ['%{search_sql} is not null', []]
+          ['%<search_sql>s is not null', []]
         end
       end
     end
@@ -415,7 +411,7 @@ module ActiveScaffold
 
       # create a general-use options array that's compatible with Rails finders
       finder_options = {
-        :reorder => options[:sorting].try(:clause, (grouped_columns_calculations if grouped_search?)),
+        :reorder => options[:sorting]&.clause((grouped_columns_calculations if grouped_search?)),
         :conditions => search_conditions
       }
       if active_scaffold_config.mongoid?
@@ -466,7 +462,7 @@ module ActiveScaffold
 
       query = append_to_query(query, find_options)
       # we build the paginator differently for method- and sql-based sorting
-      pager = if options[:sorting] && options[:sorting].sorts_by_method?
+      pager = if options[:sorting]&.sorts_by_method?
                 ::Paginator.new(count, options[:per_page]) do |offset, per_page|
                   calculate_last_modified(query)
                   sorted_collection = sort_collection_by_column(query.to_a, *options[:sorting].first)
@@ -536,7 +532,7 @@ module ActiveScaffold
     def sort_collection_by_column(collection, column, order)
       sorter = column.sort[:method]
       collection = collection.sort_by do |record|
-        value = (sorter.is_a? Proc) ? record.instance_eval(&sorter) : record.instance_eval(sorter.to_s)
+        value = sorter.is_a?(Proc) ? record.instance_eval(&sorter) : record.instance_eval(sorter.to_s)
         value = '' if value.nil?
         value
       end

data/lib/active_scaffold/helpers/action_link_helpers.rb

@@ -79,8 +79,8 @@ module ActiveScaffold
       end
 
       def render_action_link(link, record = nil, options = {})
-        if link.action.nil? || link.column.try(:association).try(:polymorphic?)
-          link = action_link_to_inline_form(link, record) if link.column.try(:association)
+        if link.action.nil? || link.column&.association&.polymorphic?
+          link = action_link_to_inline_form(link, record) if link.column&.association
           options[:authorized] = false if link.action.nil? || link.controller.nil?
           options.delete :link if link.crud_type == :create
         end
@@ -95,9 +95,9 @@ module ActiveScaffold
 
       # setup the action link to inline form
       def action_link_to_inline_form(link, record)
-        link = link.clone
+        link = link.dup
         associated = record.send(link.column.association.name)
-        if link.column.association.try(:polymorphic?)
+        if link.column.association&.polymorphic?
           link.controller = controller_path_for_activerecord(associated.class)
           return link if link.controller.nil?
         end
@@ -160,7 +160,7 @@ module ActiveScaffold
       end
 
       def cache_action_link_url?(link, record)
-        active_scaffold_config.cache_action_link_urls && link.type == :member && !link.dynamic_parameters.is_a?(Proc) && !sti_record?(record)
+        active_scaffold_config.user.cache_action_link_urls && link.type == :member && !link.dynamic_parameters.is_a?(Proc) && !sti_record?(record)
       end
 
       def cached_action_link_url(link, record)
@@ -178,8 +178,8 @@ module ActiveScaffold
 
       def replace_id_params_in_action_link_url(link, record, url)
         url = record ? url.sub('--ID--', record.to_param.to_s) : url.clone
-        if link.column.try(:association).try(:singular?)
-          child_id = record.send(link.column.association.name).try(:to_param)
+        if link.column&.association&.singular?
+          child_id = record.send(link.column.association.name)&.to_param
           if child_id.present?
             url.sub!('--CHILD_ID--', child_id)
           else
@@ -243,7 +243,7 @@ module ActiveScaffold
       end
 
       def cache_action_link_url_options?(link, record)
-        active_scaffold_config.cache_action_link_urls && (link.type == :collection || !link.dynamic_parameters.is_a?(Proc)) && !sti_record?(record)
+        active_scaffold_config.user.cache_action_link_urls && (link.type == :collection || !link.dynamic_parameters.is_a?(Proc)) && !sti_record?(record)
       end
 
       def cached_action_link_url_options(link, record)
@@ -290,8 +290,8 @@ module ActiveScaffold
         missing_options, url_options = url.partition { |_, v| v.nil? }
         replacements = {}
         replacements['--ID--'] = record.id.to_s if record
-        if link.column.try(:association).try(:singular?)
-          replacements['--CHILD_ID--'] = record.send(link.column.association.name).try(:id).to_s
+        if link.column&.association&.singular?
+          replacements['--CHILD_ID--'] = record.send(link.column.association.name)&.id.to_s
         elsif nested?
           replacements['--CHILD_ID--'] = params[nested.param_name].to_s
         end
@@ -303,7 +303,7 @@ module ActiveScaffold
 
       def action_link_selected?(link, record)
         missing_options, url_options = replaced_action_link_url_options(link, record)
-        safe_params = (Rails.version < '4.2' ? params.to_h : params.to_unsafe_h)
+        safe_params = params.to_unsafe_h
         (url_options - safe_params.to_a).blank? && missing_options.all? { |k, _| params[k].nil? }
       end
 
@@ -316,7 +316,7 @@ module ActiveScaffold
         html_options[:method] = link.method if link.method != :get
 
         html_options[:data] ||= {}
-        html_options[:data][:confirm] = link.confirm(h(record.try(:to_label))) if link.confirm?
+        html_options[:data][:confirm] = link.confirm(h(record&.to_label)) if link.confirm?
         if !options[:page] && !options[:popup] && (options[:inline] || link.inline?)
           html_options[:class] << ' as_action'
           html_options[:data][:position] = link.position if link.position
@@ -346,7 +346,7 @@ module ActiveScaffold
 
       def get_action_link_id(link, record = nil, column = nil)
         column ||= link.column
-        if column.try(:association) && record
+        if column&.association && record
           id = if column.association.collection?
                  "#{column.association.name}-#{record.id}"
                elsif record.send(column.association.name).present?
@@ -355,7 +355,7 @@ module ActiveScaffold
                  "#{column.association.name}-#{record.id}"
                end
         end
-        id ||= record.try(:id) || (nested? ? nested_parent_id : '')
+        id ||= record&.id || (nested? ? nested_parent_id : '')
         action_id = "#{id_from_controller("#{link.controller}-") if params[:parent_controller] || (link.controller && link.controller != controller.controller_path)}#{link.action}"
         action_link_id(action_id, id)
       end
@@ -371,13 +371,13 @@ module ActiveScaffold
       end
 
       def url_options_for_nested_link(column, record, link, url_options)
-        if column.try(:association)
+        if column&.association
           url_options[:parent_scaffold] = controller_path
           url_options[column.model.name.foreign_key.to_sym] = url_options.delete(:id)
           url_options[:id] = if column.association.singular? && url_options[:action].to_sym != :index
                                '--CHILD_ID--'
                              end
-        elsif link.parameters && link.parameters[:named_scope]
+        elsif link.parameters&.dig(:named_scope)
           url_options[:parent_scaffold] = controller_path
           url_options[active_scaffold_config.model.name.foreign_key.to_sym] = url_options.delete(:id)
         end