action_args 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b4a8d847e94c900a71e3ce0c0bc9e5fb1f33c195a2b30222fad4ca5f4574d73
-  data.tar.gz: d557de21bbcb6eb76f88c4d4bc70fb899f58449192e9125f7c8548e2f8d17ab8
+  metadata.gz: ebaa6df1f21d52be3f527762e62810ba795dfe62a9f73c96e5e78463fbd8cf8d
+  data.tar.gz: cbfbe0fa35d12606d155744f9aeca4140f4bc7bea0ba51e09b1bdbc8915850b1
 SHA512:
-  metadata.gz: 43ee46cb44156ad2cd9a47aab03e312b00058d2173c416e6f60152c3b423ddadfa92c0ebf41c4c22b17d6c0daac3e029a3042a1d3b5272fcf18a18a5a1e03d58
-  data.tar.gz: fea23dadb984ed9d43250ead66849f38ed45d5a5ca053b1c6513e7235d0dd7d961ba9d6b7773126af104d1ed93a31d99f01b168403dded36074fcea12b273e38
+  metadata.gz: c97087901cb25a555e351c9dc805491142b7a2c21c444ab315969bc127a4b9e278f1d570c0e037b2ba0233cd78cd1ef706a14d102866ac157dbf7b0d051c95f7
+  data.tar.gz: 4e83eac63238b1d4013531d1f33e51d81d4f6d11b9ca1a05e0d95797fca90a8f657d5d5b7c5494081db1faa65091f997f940ff1c4fb136ba7f59b7e423470f80

data/.travis.yml

@@ -1,16 +1,15 @@
 script: 'bundle exec rake -t test'
 language: ruby
-sudo: false
 
 before_install:
   - "ruby -e 'exit RUBY_VERSION.to_f >= 2.3' && gem up --system || (gem i rubygems-update -v '<3' && update_rubygems)"
   - gem up bundler
 
 # rvm:
-#   - 2.6.0
-#   - 2.5.3
-#   - 2.4.5
-#   - 2.3.7
+#   - 2.6.6
+#   - 2.5.8
+#   - 2.4.10
+#   - 2.3.8
 #   - 2.2.10
 #   - 2.1.10
 #   - 2.0.0
@@ -25,17 +24,23 @@ before_install:
 
 matrix:
   include:
-    - rvm: 2.6.0
+    - rvm: 2.7.1
+      gemfile: gemfiles/rails_60.gemfile
+    - rvm: 2.6.6
+      gemfile: gemfiles/rails_60.gemfile
+    - rvm: 2.6.6
       gemfile: gemfiles/rails_52.gemfile
-    - rvm: 2.6.0
+    - rvm: 2.6.6
       gemfile: gemfiles/rails_51.gemfile
-    - rvm: 2.6.0
+    - rvm: 2.6.6
       gemfile: gemfiles/rails_50.gemfile
-    - rvm: 2.6.0
+    - rvm: 2.6.6
       gemfile: gemfiles/rails_edge.gemfile
-    - rvm: 2.5.3
+    - rvm: 2.5.8
+      gemfile: gemfiles/rails_60.gemfile
+    - rvm: 2.5.8
       gemfile: gemfiles/rails_52.gemfile
-    - rvm: 2.4.5
+    - rvm: 2.4.10
       gemfile: gemfiles/rails_52.gemfile
     - rvm: 2.3.8
       gemfile: gemfiles/rails_52.gemfile
@@ -49,16 +54,17 @@ matrix:
       gemfile: gemfiles/rails_42.gemfile
 
     - rvm: ruby-head
-      gemfile: gemfiles/rails_52.gemfile
+      gemfile: gemfiles/rails_60.gemfile
     - rvm: ruby-head
       gemfile: gemfiles/rails_edge.gemfile
 
-    - rvm: jruby-9.2.6.0
+    - rvm: jruby-9.2.11.1
       gemfile: gemfiles/rails_52.gemfile
     - rvm: rubinius-3
       gemfile: gemfiles/rails_52.gemfile
 
   allow_failures:
-    - rvm: jruby-9.2.6.0
+    - rvm: ruby-head
+    - rvm: jruby-9.2.11.1
     - rvm: rubinius-3
     - gemfile: gemfiles/rails_edge.gemfile

data/README.md

@@ -247,9 +247,9 @@ You may notice that
 
 ## Supported Versions
 
-* Ruby 2.0.0, 2.1.x, 2.2.x, 2.3.x, 2.4.x, 2.5.x, 2.6.x, 2.7.0 (trunk), JRuby, & Rubinius with 2.0+ mode
+* Ruby 2.0.0, 2.1.x, 2.2.x, 2.3.x, 2.4.x, 2.5.x, 2.6.x, 2.7.x, 2.8 (trunk), JRuby, & Rubinius with 2.0+ mode
 
-* Rails 4.1.x, 4.2.x, 5.0, 5.1, 5.2, 6.0 (edge)
+* Rails 4.1.x, 4.2.x, 5.0, 5.1, 5.2, 6.0, 6.1 (edge)
 
 For Rails 4.0.x, please use Version 1.5.4.
 

data/gemfiles/rails_50.gemfile

@@ -4,8 +4,6 @@ source 'https://rubygems.org'
 
 gem 'rails', '~> 5.0.1'
 
-gem 'rails-controller-testing'
-
 gemspec :path => '../'
 
 platforms :ruby do

data/gemfiles/rails_51.gemfile

@@ -4,8 +4,6 @@ source 'https://rubygems.org'
 
 gem 'rails', '~> 5.1.0'
 
-gem 'rails-controller-testing'
-
 gemspec :path => '../'
 
 platforms :ruby do

data/gemfiles/rails_52.gemfile

@@ -4,8 +4,6 @@ source 'https://rubygems.org'
 
 gem 'rails', '~> 5.2.0'
 
-gem 'rails-controller-testing'
-
 gemspec :path => '../'
 
 platforms :ruby do

data/gemfiles/rails_60.gemfile

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gem 'rails', '~> 6.0.0'
+gem 'selenium-webdriver'
+
+gemspec path: '../'
+
+platforms :ruby do
+  gem 'sqlite3'
+end
+
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter'
+end

data/gemfiles/rails_edge.gemfile

@@ -7,7 +7,6 @@ git_source(:github) do |repo_name|
 end
 
 gem 'rails', github: 'rails/rails'
-gem 'rails-controller-testing'
 gem 'selenium-webdriver'
 
 gemspec :path => '../'

data/lib/action_args/abstract_controller.rb

@@ -10,8 +10,12 @@ module ActionArgs
       return super if !defined?(params) || params.nil?
 
       strengthen_params! method_name
-      values = extract_method_arguments_from_params method_name
-      super method_name, *values
+      values, kwargs_values = extract_method_arguments_from_params method_name
+      if kwargs_values.any?
+        super method_name, *values, **kwargs_values
+      else
+        super method_name, *values
+      end
     end
   end
 

data/lib/action_args/callbacks.rb

@@ -16,7 +16,8 @@ module ActionArgs
 
         if (ActionController::Base === target) && (method != :instance_exec) && arguments.empty?
           target.strengthen_params! method
-          arguments = target.extract_method_arguments_from_params method
+          arguments, kwargs_arguments = target.extract_method_arguments_from_params method
+          arguments << kwargs_arguments if kwargs_arguments.any?
         end
 
         [target, block, method, *arguments]
@@ -35,7 +36,8 @@ module ActionArgs
           lambda do |target, _, &blk|
             if ActionController::Base === target
               target.strengthen_params! filter
-              values = target.extract_method_arguments_from_params filter
+              values, kwargs_values = target.extract_method_arguments_from_params filter
+              values << kwargs_values if kwargs_values.any?
               target.send filter, *values, &blk
             else
               target.send filter, &blk

data/lib/action_args/params_handler.rb

@@ -38,8 +38,7 @@ module ActionArgs
         end
 
         values = parameter_names.map {|k| params[k.to_s.sub(/_params\z/, '').to_sym]}
-        values << kwargs if kwargs.any?
-        values
+        [values, kwargs]
       end
 
       # permits declared model attributes in the params Hash

data/lib/action_args/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActionArgs
-  VERSION = '2.4.0'
+  VERSION = '2.5.0'
 end

data/test/params_handler/params_handler_test.rb

@@ -12,109 +12,109 @@ class ActionArgs::ParamsHandlerTest < ActiveSupport::TestCase
     test 'no parameters' do
       def @controller.m() end
 
-      assert_equal [], @controller.extract_method_arguments_from_params(:m)
+      assert_equal [[], {}], @controller.extract_method_arguments_from_params(:m)
     end
 
     test '1 req' do
       def @controller.m(a) end
 
-      assert_equal ['1'], @controller.extract_method_arguments_from_params(:m)
+      assert_equal [['1'], {}], @controller.extract_method_arguments_from_params(:m)
     end
 
     test '1 req with args named like strong parameters' do
       def @controller.m(a_params) end
 
-      assert_equal ['1'], @controller.extract_method_arguments_from_params(:m)
+      assert_equal [['1'], {}], @controller.extract_method_arguments_from_params(:m)
     end
 
     test '2 reqs' do
       def @controller.m(a, b) end
 
-      assert_equal ['1', '2'], @controller.extract_method_arguments_from_params(:m)
+      assert_equal [['1', '2'], {}], @controller.extract_method_arguments_from_params(:m)
     end
 
     test '2 reqs with args named like strong parameters' do
       def @controller.m(a_params, b_params) end
 
-      assert_equal ['1', '2'], @controller.extract_method_arguments_from_params(:m)
+      assert_equal [['1', '2'], {}], @controller.extract_method_arguments_from_params(:m)
     end
 
     test '1 opt with value' do
       def @controller.m(a = 'a') end
 
-      assert_equal ['1'], @controller.extract_method_arguments_from_params(:m)
+      assert_equal [['1'], {}], @controller.extract_method_arguments_from_params(:m)
     end
 
     test '1 opt with value with args named like strong parameters' do
       def @controller.m(a_params = 'a') end
 
-      assert_equal ['1'], @controller.extract_method_arguments_from_params(:m)
+      assert_equal [['1'], {}], @controller.extract_method_arguments_from_params(:m)
     end
 
     test '1 opt without value' do
       def @controller.m(x = 'x') end
 
-      assert_equal [], @controller.extract_method_arguments_from_params(:m)
+      assert_equal [[], {}], @controller.extract_method_arguments_from_params(:m)
     end
 
     test 'req, opt with value' do
       def @controller.m(a, b = 'b') end
 
-      assert_equal ['1', '2'], @controller.extract_method_arguments_from_params(:m)
+      assert_equal [['1', '2'], {}], @controller.extract_method_arguments_from_params(:m)
     end
 
     test 'req, opt without value' do
       def @controller.m(a, x = 'x') end
 
-      assert_equal ['1'], @controller.extract_method_arguments_from_params(:m)
+      assert_equal [['1'], {}], @controller.extract_method_arguments_from_params(:m)
     end
 
     test 'opt with value, opt with value' do
       def @controller.m(a = 'a', b = 'b') end
 
-      assert_equal ['1', '2'], @controller.extract_method_arguments_from_params(:m)
+      assert_equal [['1', '2'], {}], @controller.extract_method_arguments_from_params(:m)
     end
 
     test 'opt with value, opt without value' do
       def @controller.m(a = 'a', x = 'x') end
 
-      assert_equal ['1'], @controller.extract_method_arguments_from_params(:m)
+      assert_equal [['1'], {}], @controller.extract_method_arguments_from_params(:m)
     end
 
     test 'opt without value, opt with value' do
       def @controller.m(x = 'x', a = 'a') end
 
-      assert_equal [nil, '1'], @controller.extract_method_arguments_from_params(:m)
+      assert_equal [[nil, '1'], {}], @controller.extract_method_arguments_from_params(:m)
     end
 
     test 'opt without value, opt without value' do
       def @controller.m(x = 'x', y = 'y') end
 
-      assert_equal [], @controller.extract_method_arguments_from_params(:m)
+      assert_equal [[], {}], @controller.extract_method_arguments_from_params(:m)
     end
 
     test 'opt with value, req' do
       def @controller.m(a = 'a', b) end
 
-      assert_equal ['1', '2'], @controller.extract_method_arguments_from_params(:m)
+      assert_equal [['1', '2'], {}], @controller.extract_method_arguments_from_params(:m)
     end
 
     test 'opt without value, req' do
       def @controller.m(x = 'x', a) end
 
-      assert_equal ['1'], @controller.extract_method_arguments_from_params(:m)
+      assert_equal [['1'], {}], @controller.extract_method_arguments_from_params(:m)
     end
 
     test 'opt without value, opt with value, req' do
       def @controller.m(x = 'x', b = 'b', a) end
 
-      assert_equal [nil, '2', '1'], @controller.extract_method_arguments_from_params(:m)
+      assert_equal [[nil, '2', '1'], {}], @controller.extract_method_arguments_from_params(:m)
     end
 
     test 'opt with value, opt without value, req' do
       def @controller.m(b = 'b', x = 'x', a) end
 
-      assert_equal ['2', '1'], @controller.extract_method_arguments_from_params(:m)
+      assert_equal [['2', '1'], {}], @controller.extract_method_arguments_from_params(:m)
     end
 
     test 'req without a value' do
@@ -126,19 +126,19 @@ class ActionArgs::ParamsHandlerTest < ActiveSupport::TestCase
     test 'key' do
       def @controller.m(a: nil) end
 
-      assert_equal [a: '1'], @controller.extract_method_arguments_from_params(:m)
+      assert_equal [[], {a: '1'}], @controller.extract_method_arguments_from_params(:m)
     end
 
     test 'key with args named like strong parameters' do
       def @controller.m(a_params: nil) end
 
-      assert_equal [a_params: '1'], @controller.extract_method_arguments_from_params(:m)
+      assert_equal [[], {a_params: '1'}], @controller.extract_method_arguments_from_params(:m)
     end
 
     test 'key, key without value' do
       def @controller.m(a: nil, x: 'x') end
 
-      assert_equal [a: '1'], @controller.extract_method_arguments_from_params(:m)
+      assert_equal [[], {a: '1'}], @controller.extract_method_arguments_from_params(:m)
     end
 
     if RUBY_VERSION >= '2.1'
@@ -146,13 +146,13 @@ class ActionArgs::ParamsHandlerTest < ActiveSupport::TestCase
         test 'keyreq' do
           def @controller.m(a:) end
 
-          assert_equal [a: '1'], @controller.extract_method_arguments_from_params(:m)
+          assert_equal [[], {a: '1'}], @controller.extract_method_arguments_from_params(:m)
         end
 
         test 'keyreq with args named like strong parameters' do
           def @controller.m(a_params:) end
 
-          assert_equal [a_params: '1'], @controller.extract_method_arguments_from_params(:m)
+          assert_equal [[], {a_params: '1'}], @controller.extract_method_arguments_from_params(:m)
         end
 
         test 'keyreq, keyreq without value' do

data/test/test_helper.rb

@@ -6,15 +6,20 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rails'
 require 'active_record'
 require 'action_controller/railtie'
-begin
-  require 'rails-controller-testing'
-rescue LoadError
-end
 require 'action_args'
 require 'fake_app'
 require 'test/unit/rails/test_help'
 Bundler.require
 
+module ActionController::TestCase::Assigns
+  def assigns(key = nil)
+    assigns = {}.with_indifferent_access
+    @controller.view_assigns.each { |k, v| assigns.regular_writer(k, v) }
+    key.nil? ? assigns : assigns[key]
+  end
+end
+ActionController::TestCase.include ActionController::TestCase::Assigns
+
 if Rails.version < '5'
   module ActionControllerTestingMonkey
     def get(path, params: nil, session: nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action_args
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-15 00:00:00.000000000 Z
+date: 2020-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,6 +72,7 @@ files:
 - gemfiles/rails_50.gemfile
 - gemfiles/rails_51.gemfile
 - gemfiles/rails_52.gemfile
+- gemfiles/rails_60.gemfile
 - gemfiles/rails_edge.gemfile
 - lib/action_args.rb
 - lib/action_args/abstract_controller.rb
@@ -111,8 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.2.0.pre1
 signing_key: 
 specification_version: 4
 summary: Controller action arguments parameterizer for Rails 4+ & Ruby 2.0+