active_scaffold 3.5.5 → 3.6.0.pre

data/test/misc/active_record_permissions_test.rb

@@ -140,11 +140,7 @@ class ActiveRecordPermissionsTest < MiniTest::Test
   end
 
   def test_method_combinations_with_default_false
-    old_permission = nil
-    ActiveScaffold.set_defaults do |config|
-      old_permission = config.security.default_permission
-      config.security.default_permission = false
-    end
+    ActiveScaffold::Config::Core.security.stubs(default_permission: false)
 
     miss(@model.authorized_for?(:column => :a3), '_a_')
     miss(@model.authorized_for?(:column => :a2), '_f_')
@@ -183,10 +179,6 @@ class ActiveRecordPermissionsTest < MiniTest::Test
     pass(@model.authorized_for?(:crud_type => :read, :column => :c1), 'tta')
     miss(@model.authorized_for?(:crud_type => :read, :column => :b1), 'ttf')
     pass(@model.authorized_for?(:crud_type => :read, :column => :a1), 'ttt')
-
-    ActiveScaffold.set_defaults do |config|
-      config.security.default_permission = old_permission
-    end
   end
 
   private

data/test/misc/attribute_params_test.rb

@@ -417,15 +417,15 @@ class AttributeParamsTest < MiniTest::Test
       record = record.class.find(record.id) if record.persisted?
       new_record = @controller.update_record_from_params(record, build_action_columns(record, action, columns), params)
       yield if block_given?
-      Thread.current[:constraint_columns] = nil
+      ActiveScaffold::Registry.constraint_columns.clear
     end
     new_record
   end
 
   def build_action_columns(record, action, *columns)
-    controller = ActiveScaffold::Core.active_scaffold_controller_for record.class
-    controller.active_scaffold_config.send(action).columns = columns
-    controller.active_scaffold_config.send(action).columns
+    config = @controller.active_scaffold_config_for record.class
+    config.send(action).columns = columns
+    config.send(action).columns
   end
 end
 
@@ -447,11 +447,11 @@ class Controller
     @flash ||= ActionDispatch::Flash::FlashHash.new
   end
 
-  def params_hash?(v)
-    v.is_a? Hash
+  def params_hash?(value)
+    value.is_a? Hash
   end
 
-  def params_hash(v)
-    v
+  def params_hash(value)
+    value
   end
 end

data/test/misc/calculation_test.rb

@@ -4,7 +4,7 @@ require 'class_with_finder'
 class CalculationTest < MiniTest::Test
   def setup
     @buildings = []
-    @buildings << Building.create { |b| b.create_owner(:first_name => 'foo') }
+    @buildings << Building.create { |b| b.build_owner(:first_name => 'foo') }
     @buildings << Building.create(:name => 'foo bar')
     @buildings << Building.create
 

data/test/misc/constraints_test.rb

@@ -116,8 +116,8 @@ class ConstraintsTestObject
     @params = {}
   end
 
-  def params_hash?(v)
-    v.is_a? Hash
+  def params_hash?(value)
+    value.is_a? Hash
   end
 end
 

data/test/misc/convert_numbers_format_test.rb

@@ -26,6 +26,7 @@ class ConvertNumbersFormatTest < MiniTest::Test
   include ActiveScaffoldConfigMock
   include ActiveScaffold::AttributeParams
   include ActiveScaffold::Finder
+  include ActiveScaffold::Helpers::ControllerHelpers
 
   def setup
     NumberModel.load_schema! if Rails.version >= '5.0'
@@ -46,7 +47,6 @@ class ConvertNumbersFormatTest < MiniTest::Test
 
     @config = config_for('number_model')
     @config.columns[:number].form_ui = nil
-    @config.create.columns.set_columns @config.columns
   end
 
   def teardown
@@ -161,7 +161,7 @@ class ConvertNumbersFormatTest < MiniTest::Test
     record.number
   end
 
-  def params_hash?(v)
-    v.is_a? Hash
+  def params_hash?(value)
+    value.is_a? Hash
   end
 end

data/test/misc/lang_test.rb

@@ -4,7 +4,7 @@ class LocalizationTest < MiniTest::Test
   def test_localization
     assert_equal 'Dutch', as_(:dutch)
     assert_equal 'dutch', as_('dutch')
-    I18n.backend.store_translations :en, :active_scaffold => {:create_model => 'Create %{model}'}
+    I18n.backend.store_translations :en, :active_scaffold => {:create_model => 'Create %<model>s'}
     assert_equal 'Create Test', as_(:create_model, :model => 'Test')
   end
 end

data/test/misc/parse_datetime_test.rb

@@ -44,7 +44,6 @@ class ParseDatetimeTest < MiniTest::Test
     I18n.backend.store_translations :es, spanish
 
     @config = config_for('date_time_model')
-    @config.create.columns.set_columns @config.columns
   end
 
   def teardown
@@ -125,7 +124,7 @@ class ParseDatetimeTest < MiniTest::Test
   end
 
   def test_condition_for_datetime_with_zone
-    assert_equal DateTime.new(2017, 4, 8, 16, 30, 0, '+0300'), condition_value('2017-04-08 16:30 +0300')
+    assert_equal ActiveSupport::TimeZone[3].local(2017, 4, 8, 16, 30, 0), condition_value('2017-04-08 16:30 +0300')
   end
 
   def test_condition_for_spanish_date
@@ -154,7 +153,7 @@ class ParseDatetimeTest < MiniTest::Test
     self.class.condition_value_for_datetime(@config.columns[:run_at], value, conversion || :to_time)
   end
 
-  def params_hash?(v)
-    v.is_a? Hash
+  def params_hash?(value)
+    value.is_a? Hash
   end
 end

data/test/misc/tableless_test.rb

@@ -27,6 +27,12 @@ class TablelessTest < MiniTest::Test
     assert Person.new.files.empty?
   end
 
+  def test_tableless_assoc_with_dependent
+    @person = Person.new
+    @person.save(validate: false)
+    assert @person.destroy
+  end
+
   def test_find_with_through_association
     assert Building.new.files.empty?
   end

data/test/mock_app/Rakefile

@@ -1,7 +1,7 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
+require File.expand_path('config/application', __dir__)
 require 'rake'
 
 RailsApp::Application.load_tasks

data/test/mock_app/config/application.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../boot', __FILE__)
+require File.expand_path('boot', __dir__)
 
 require 'rails/all'
 require 'rails/test_unit/railtie'

data/test/mock_app/config/boot.rb

@@ -1,5 +1,5 @@
 begin
-  require File.expand_path('../../../../.bundle/environment', __FILE__)
+  require File.expand_path('../../../.bundle/environment', __dir__)
 rescue LoadError
   require 'rubygems'
   require 'bundler'

data/test/mock_app/config/environment.rb

@@ -1,6 +1,6 @@
 # Load the rails application
-require File.expand_path('../application', __FILE__)
+require File.expand_path('application', __dir__)
 
 # Initialize the rails application
-RailsApp::Application.config.root = File.expand_path('../..', __FILE__)
+RailsApp::Application.config.root = File.expand_path('..', __dir__)
 RailsApp::Application.initialize!

data/test/test_helper.rb

@@ -5,6 +5,7 @@ require 'mock_app/config/environment'
 require 'rails/test_help'
 require 'minitest/autorun'
 require 'mocha/setup'
+require 'cow_proxy'
 
 require 'minitest/reporters'
 Minitest::Reporters.use!
@@ -17,11 +18,17 @@ def load_schema
 end
 load_schema
 
+ActiveScaffold.threadsafe!
+# avoid freezing defaults so we can stubs in tests for testing with different defaults
+class << ActiveScaffold::Config::Core
+  def freeze; end
+end
+
 %w[model_stub const_mocker company].each do |file|
   require File.join(File.dirname(__FILE__), file)
 end
 
-I18n.backend.store_translations :en, YAML.load_file(File.expand_path('../../config/locales/en.yml', __FILE__))['en']
+I18n.backend.store_translations :en, YAML.load_file(File.expand_path('../config/locales/en.yml', __dir__))['en']
 
 # rails 4.0
 unless defined? Minitest::Test

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.5.5
+  version: 3.6.0.pre
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-10 00:00:00.000000000 Z
+date: 2019-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,20 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.5
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.5
-    - - "<"
+        version: 4.2.0
+- !ruby/object:Gem::Dependency
+  name: cow_proxy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: ice_nine
   requirement: !ruby/object:Gem::Requirement
@@ -44,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
+- !ruby/object:Gem::Dependency
+  name: request_store
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 description: Save time and headaches, and create a more easily maintainable set of
   pages, with ActiveScaffold. ActiveScaffold handles all your CRUD (create, read,
   update, delete) user interface needs, leaving you more time to focus on more challenging
@@ -283,6 +305,8 @@ files:
 - lib/active_scaffold/extensions/action_controller_rescueing.rb
 - lib/active_scaffold/extensions/action_view_rendering.rb
 - lib/active_scaffold/extensions/connection_adapter.rb
+- lib/active_scaffold/extensions/cow_proxy.rb
+- lib/active_scaffold/extensions/ice_nine.rb
 - lib/active_scaffold/extensions/left_outer_joins.rb
 - lib/active_scaffold/extensions/localize.rb
 - lib/active_scaffold/extensions/name_option_for_datetime.rb
@@ -306,6 +330,7 @@ files:
 - lib/active_scaffold/marked_model.rb
 - lib/active_scaffold/orm_checks.rb
 - lib/active_scaffold/paginator.rb
+- lib/active_scaffold/registry.rb
 - lib/active_scaffold/responds_to_parent.rb
 - lib/active_scaffold/tableless.rb
 - lib/active_scaffold/version.rb
@@ -422,15 +447,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.9
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Rails 4.x and 5.x versions of ActiveScaffold supporting prototype and jquery