active_scaffold 3.5.5 → 3.6.0.pre

data/lib/active_scaffold/registry.rb

@@ -0,0 +1,22 @@
+module ActiveScaffold
+  class Registry
+    extend ActiveSupport::PerThreadRegistry
+    attr_accessor :current_user_proc, :current_ability_proc, :marked_records
+
+    def user_settings
+      @user_settings ||= {}
+    end
+
+    def constraint_columns
+      @constraint_columns ||= Hash.new { |h, k| h[k] = [] }
+    end
+
+    def unauthorized_columns
+      @unauthorized_columns ||= Hash.new { |h, k| h[k] = [] }
+    end
+
+    def self.instance
+      RequestStore.store[@per_thread_registry_key] ||= new
+    end
+  end
+end

data/lib/active_scaffold/responds_to_parent.rb

@@ -34,12 +34,8 @@ module ActiveScaffold
         instance_variable_set(:@_response_body, nil)
       end
 
-      # We're returning HTML instead of JS now
-      if Rails.version < '4.1'
-        render text: script, content_type: 'text/html' # remove when rails 4.0 is not supported
-      else
-        render html: script.html_safe, content_type: 'text/html' # rubocop:disable Rails/OutputSafety
-      end
+      # We're returning HTML instead of JS now, content_type needed if not inside respond_to block
+      render html: script.html_safe, content_type: 'text/html' # rubocop:disable Rails/OutputSafety
     end
     alias respond_to_parent responds_to_parent
   end

data/lib/active_scaffold/tableless.rb

@@ -1,10 +1,8 @@
 class ActiveScaffold::Tableless < ActiveRecord::Base
   class AssociationScope < ActiveRecord::Associations::AssociationScope
-    if defined?(ActiveRecord::Associations::AssociationScope::INSTANCE) # rails >= 4.1
-      INSTANCE = respond_to?(:create) ? create : new # create for rails >= 4.2
-      def self.scope(association, connection)
-        INSTANCE.scope association, connection
-      end
+    INSTANCE = create
+    def self.scope(association, connection)
+      INSTANCE.scope association, connection
     end
 
     if Rails.version < '5.0.0'
@@ -19,11 +17,9 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
         end
       end
 
-      if Rails.version >= '4.1'
-        def add_constraints(scope, owner, assoc_klass, refl, tracker)
-          tracker.instance_variable_set(:@assoc_klass, assoc_klass)
-          super
-        end
+      def add_constraints(scope, owner, assoc_klass, refl, tracker)
+        tracker.instance_variable_set(:@assoc_klass, assoc_klass)
+        super
       end
     end
   end
@@ -46,7 +42,7 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
         metadata = ActiveRecord::Base.connection.send :fetch_type_metadata, sql_type
         super(name, default, metadata, null)
       end
-    elsif Rails.version >= '4.2.0'
+    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)
@@ -55,16 +51,18 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
   end
 
   module Tableless
-    def association_scope
-      @association_scope ||= overrided_association_scope if klass < ActiveScaffold::Tableless
-      super
-    end
+    if Rails.version < '5.2.0'
+      def skip_statement_cache?
+        klass < ActiveScaffold::Tableless ? true : super
+      end
 
-    def overrided_association_scope
-      if AssociationScope.respond_to?(:scope) # rails >= 4.1
-        AssociationScope.scope(self, klass.connection)
-      else # rails < 4.1
-        AssociationScope.new(self).scope
+      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
     end
 
@@ -91,7 +89,7 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
 
   module CollectionAssociation
     def self.included(base)
-      base.prepend TablelessCollectionAssociation if Rails.version >= '4.2'
+      base.prepend TablelessCollectionAssociation
     end
   end
 
@@ -110,20 +108,13 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
   module RelationExtension
     attr_reader :conditions
 
-    if Rails.version >= '5.0'
-      def initialize(klass, table, predicate_builder, values = {})
-        super
-        @conditions ||= []
-      end
-    else
-      def initialize(klass, table)
-        super
-        @conditions ||= []
-      end
+    def initialize(klass, *)
+      super
+      @conditions ||= []
     end
 
     def initialize_copy(other)
-      @conditions = @conditions.try(:dup) || []
+      @conditions = @conditions&.dup || []
       super
     end
 
@@ -135,9 +126,9 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
       self
     end
 
-    def merge(r)
+    def merge(rel)
       super.tap do |merged|
-        merged.conditions.concat r.conditions unless r.nil? || r.is_a?(Array)
+        merged.conditions.concat rel.conditions unless rel.nil? || rel.is_a?(Array)
       end
     end
 
@@ -167,41 +158,56 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
     private
 
     def relation
-      args = [self, arel_table]
-      args << predicate_builder if Rails.version >= '5.0.0'
+      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)
     end
+
+    if Rails.version >= '5.2'
+      def cached_find_by_statement(key, &block)
+        StatementCache.new(key, self, &block)
+      end
+    end
   end
 
   class StatementCache
-    def initialize(key)
+    def initialize(key, model = nil)
       @key = key
+      @model = model
     end
 
-    def execute(values, model, connection)
-      model.where(@key => values)
+    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
 
-  unless Rails.version < '4.2'
-    def self.columns_hash
-      if self < ActiveScaffold::Tableless
-        @columns_hash ||= Hash[columns.map { |c| [c.name, c] }]
-      else
-        super
-      end
-    end
-    if Rails.version >= '5.0'
-      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) }
-        }
-      end
+  def self.columns_hash
+    if self < ActiveScaffold::Tableless
+      @columns_hash ||= Hash[columns.map { |c| [c.name, c] }]
     else
-      def self.initialize_find_by_cache
-        self.find_by_statement_cache = Hash.new { |h, k| h[k] = StatementCache.new(k) }
-      end
+      super
+    end
+  end
+  if Rails.version < '5.0' # 4.2.x
+    def self.initialize_find_by_cache
+      # rubocop:disable Rails/DynamicFindBy
+      self.find_by_statement_cache = Hash.new { |h, k| h[k] = StatementCache.new(k) }
+    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) }
+      }
     end
   end
 
@@ -250,10 +256,8 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
   def _create_record #:nodoc:
     run_callbacks(:create) {}
   end
-  alias create_record _create_record # for rails4 < 4.0.6, < 4.1.2
 
   def _update_record(*) #:nodoc:
     run_callbacks(:update) {}
   end
-  alias update_record _update_record # for rails4 < 4.0.6, < 4.1.2
 end

data/lib/active_scaffold/version.rb

@@ -1,8 +1,8 @@
 module ActiveScaffold
   module Version
     MAJOR = 3
-    MINOR = 5
-    PATCH = 5
+    MINOR = 6
+    PATCH = '0.pre'.freeze
 
     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

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

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