action_args 2.5.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebaa6df1f21d52be3f527762e62810ba795dfe62a9f73c96e5e78463fbd8cf8d
-  data.tar.gz: cbfbe0fa35d12606d155744f9aeca4140f4bc7bea0ba51e09b1bdbc8915850b1
+  metadata.gz: 8be56bb5bd7e6183a1f68f1cfeb7baa5da32287d11a50dddc53248561755ee1c
+  data.tar.gz: 14b0d9da9608f4d0cdc465039d202eb35eabb2abe7471f12cdf28af205d0bd01
 SHA512:
-  metadata.gz: c97087901cb25a555e351c9dc805491142b7a2c21c444ab315969bc127a4b9e278f1d570c0e037b2ba0233cd78cd1ef706a14d102866ac157dbf7b0d051c95f7
-  data.tar.gz: 4e83eac63238b1d4013531d1f33e51d81d4f6d11b9ca1a05e0d95797fca90a8f657d5d5b7c5494081db1faa65091f997f940ff1c4fb136ba7f59b7e423470f80
+  metadata.gz: 4a112b0b811700d98a8f5c65958d1f9566b0401bcb885bcd160f2d6d7fdcbbc47b55b72e8b3258f9f3c6a461e3256e5d4c97409fe2ccc3373fbdb2deb5db55d4
+  data.tar.gz: d10fdf287ee66df67eee06cfd9c515bbaab7567cac69a84dbbdf11732ca86609ecafc7d437e3e2c89dff9b4001f9757edc4887061cc5d0c3d606d68629850ed6

data/.travis.yml

@@ -1,13 +1,15 @@
 script: 'bundle exec rake -t test'
 language: ruby
 
+cache: bundler
+
 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.6
-#   - 2.5.8
+#   - 2.6.7
+#   - 2.5.9
 #   - 2.4.10
 #   - 2.3.8
 #   - 2.2.10
@@ -24,21 +26,27 @@ before_install:
 
 matrix:
   include:
-    - rvm: 2.7.1
-      gemfile: gemfiles/rails_60.gemfile
-    - rvm: 2.6.6
+    - rvm: 3.0.1
+      gemfile: gemfiles/rails_61.gemfile
+    - rvm: 3.0.1
       gemfile: gemfiles/rails_60.gemfile
-    - rvm: 2.6.6
+    - rvm: 3.0.1
+      gemfile: gemfiles/rails_edge.gemfile
+    - rvm: 2.7.3
+      gemfile: gemfiles/rails_61.gemfile
+    - rvm: 2.7.3
+      gemfile: gemfiles/rails_edge.gemfile
+    - rvm: 2.6.7
+      gemfile: gemfiles/rails_61.gemfile
+    - rvm: 2.6.7
       gemfile: gemfiles/rails_52.gemfile
-    - rvm: 2.6.6
+    - rvm: 2.6.7
       gemfile: gemfiles/rails_51.gemfile
-    - rvm: 2.6.6
+    - rvm: 2.6.7
       gemfile: gemfiles/rails_50.gemfile
-    - rvm: 2.6.6
-      gemfile: gemfiles/rails_edge.gemfile
-    - rvm: 2.5.8
-      gemfile: gemfiles/rails_60.gemfile
-    - rvm: 2.5.8
+    - rvm: 2.5.9
+      gemfile: gemfiles/rails_61.gemfile
+    - rvm: 2.5.9
       gemfile: gemfiles/rails_52.gemfile
     - rvm: 2.4.10
       gemfile: gemfiles/rails_52.gemfile
@@ -54,17 +62,17 @@ matrix:
       gemfile: gemfiles/rails_42.gemfile
 
     - rvm: ruby-head
-      gemfile: gemfiles/rails_60.gemfile
+      gemfile: gemfiles/rails_61.gemfile
     - rvm: ruby-head
       gemfile: gemfiles/rails_edge.gemfile
 
-    - rvm: jruby-9.2.11.1
+    - rvm: jruby-9.2.17.0
       gemfile: gemfiles/rails_52.gemfile
     - rvm: rubinius-3
       gemfile: gemfiles/rails_52.gemfile
 
   allow_failures:
     - rvm: ruby-head
-    - rvm: jruby-9.2.11.1
+    - rvm: jruby-9.2.17.0
     - 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.x, 2.8 (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, 3.0.x, 3.1 (trunk), JRuby, & Rubinius with 2.0+ mode
 
-* Rails 4.1.x, 4.2.x, 5.0, 5.1, 5.2, 6.0, 6.1 (edge)
+* Rails 4.1.x, 4.2.x, 5.0, 5.1, 5.2, 6.0, 6.1, 7.0 (edge)
 
 For Rails 4.0.x, please use Version 1.5.4.
 

data/action_args.gemspec

@@ -12,12 +12,15 @@ Gem::Specification.new do |s|
   s.email       = ['ronnie@dio.jp']
   s.homepage    = 'http://asakusa.rubyist.net/'
   s.license     = 'MIT'
+  s.metadata = {
+    'source_code_uri' => 'https://github.com/asakusarb/action_args'
+  }
   s.summary     = 'Controller action arguments parameterizer for Rails 4+ & Ruby 2.0+'
   s.description = 'Rails plugin gem that supports Merbish style controller action arguments.'
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
   s.require_paths = ["lib"]
 
   s.add_development_dependency 'bundler'

data/gemfiles/rails_61.gemfile

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

data/lib/action_args/callbacks.rb

@@ -6,21 +6,27 @@ module ActionArgs
   module ActiveSupport
     # For Rails >= 5.1
     module CallbackParameterizer
-      # Extending AS::Callbacks::Callback's `expand` not just to call specified
+      # Extending AS::Callbacks::Callback's `make_lambda` not just to call specified
       # method but to call the method with method parameters taken from `params`.
       # This would happen only when
       # * the target object is_a ActionController object
       # * the filter was not defined via lambda
-      def expand(*)
-        target, block, method, *arguments = super
+      def make_lambda
+        lambda do |target, value, &block|
+          target, block, method, *arguments = expand(target, value, block)
 
-        if (ActionController::Base === target) && (method != :instance_exec) && arguments.empty?
-          target.strengthen_params! method
-          arguments, kwargs_arguments = target.extract_method_arguments_from_params method
-          arguments << kwargs_arguments if kwargs_arguments.any?
+          if (ActionController::Base === target) && (method != :instance_exec) && arguments.empty?
+            target.strengthen_params! method
+            arguments, keyword_arguments = target.extract_method_arguments_from_params method
+            if keyword_arguments.any?
+              target.send(method, *arguments, **keyword_arguments, &block)
+            else
+              target.send(method, *arguments, &block)
+            end
+          else
+            target.send(method, *arguments, &block)
+          end
         end
-
-        [target, block, method, *arguments]
       end
     end
 

data/lib/action_args/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action_args
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Akira Matsuda
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-25 00:00:00.000000000 Z
+date: 2021-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,6 +73,7 @@ files:
 - gemfiles/rails_51.gemfile
 - gemfiles/rails_52.gemfile
 - gemfiles/rails_60.gemfile
+- gemfiles/rails_61.gemfile
 - gemfiles/rails_edge.gemfile
 - lib/action_args.rb
 - lib/action_args/abstract_controller.rb
@@ -81,23 +82,12 @@ files:
 - lib/action_args/version.rb
 - lib/generators/rails/action_args_scaffold_controller_generator.rb
 - lib/generators/rails/templates/controller.rb
-- test/controllers/action_args_controller_test.rb
-- test/controllers/hooks_test.rb
-- test/controllers/kwargs_controller_test.rb
-- test/controllers/kwargs_keyreq_controller_test.rb
-- test/controllers/ordinal_controller_test.rb
-- test/controllers/strong_parameters_test.rb
-- test/fake_app.rb
-- test/kwargs_controllers.rb
-- test/kwargs_keyreq_controllers.rb
-- test/mailers/action_mailer_test.rb
-- test/params_handler/params_handler_test.rb
-- test/test_helper.rb
 homepage: http://asakusa.rubyist.net/
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  source_code_uri: https://github.com/asakusarb/action_args
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -112,20 +102,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.0.pre1
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Controller action arguments parameterizer for Rails 4+ & Ruby 2.0+
-test_files:
-- test/controllers/action_args_controller_test.rb
-- test/controllers/hooks_test.rb
-- test/controllers/kwargs_controller_test.rb
-- test/controllers/kwargs_keyreq_controller_test.rb
-- test/controllers/ordinal_controller_test.rb
-- test/controllers/strong_parameters_test.rb
-- test/fake_app.rb
-- test/kwargs_controllers.rb
-- test/kwargs_keyreq_controllers.rb
-- test/mailers/action_mailer_test.rb
-- test/params_handler/params_handler_test.rb
-- test/test_helper.rb
+test_files: []

data/test/controllers/action_args_controller_test.rb

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-require 'test_helper'
-
-class BooksControllerTest < ActionController::TestCase
-  sub_test_case 'GET index (having an optional parameter)' do
-    setup do
-      @books = []
-      Book.delete_all
-      100.times {|i| @books << Book.create!(title: 'book'+i.to_s) }
-    end
-
-    test 'without page parameter' do
-      get :index
-      assert 200, response.code
-      assert_equal @books[0..9], assigns(:books)
-    end
-
-    test 'with page parameter' do
-      get :index, params: {page: 3}
-      assert 200, response.code
-      assert_equal @books[20..29], assigns(:books)
-    end
-
-    test 'first param is nil and second is not nil' do
-      rhg = Book.create! title: 'RHG'
-      Book.create! title: 'AWDwR'
-      get :index, params: {q: 'RH'}
-      assert_equal [rhg], assigns(:books)
-    end
-  end
-
-  test 'GET show' do
-    rhg = Book.create! title: 'RHG'
-    get :show, params: {id: rhg.id}
-    assert_equal rhg, assigns(:book)
-  end
-
-  test 'POST create' do
-    Book.create! title: 'RHG'
-    books_count_was = Book.count
-    post :create, params: {book: {title: 'AWDwR', price: 24}}
-    assert_equal 1, Book.count - books_count_was
-  end
-end

data/test/controllers/hooks_test.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-require 'test_helper'
-
-class BooksControllerTest < ActionController::TestCase
-  setup do
-    Book.delete_all
-    @book = Book.create! title: 'Head First ActionArgs'
-    get :show, params: {id: @book.id}
-  end
-
-  sub_test_case 'before_action' do
-    test 'via Symbol' do
-      assert_equal @book, assigns(:book)
-    end
-
-    if Rails.version < '5.1'
-      test 'via String' do
-        assert assigns(:string_filter_executed)
-      end
-    end
-
-    test 'via Proc' do
-      assert assigns(:proc_filter_executed)
-    end
-  end
-
-  test 'around_action' do
-    assert_not_nil assigns(:elapsed_time)
-  end
-end

data/test/controllers/kwargs_controller_test.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-require 'test_helper'
-
-class KwBooksControllerTest < ActionController::TestCase
-  sub_test_case 'GET index (having an optional parameter)' do
-    test 'without giving any kw parameter (not even giving :required one)' do
-      assert_raises(ActionController::BadRequest) { get :index }
-    end
-
-    test 'without giving any optional kw parameter' do
-      get :index, params: {author_name: 'nari'}
-      assert 200, response.code
-    end
-
-    test 'with kw parameter defaults to non-nil value' do
-      get :index, params: {author_name: 'nari', page: 3}
-      body = eval response.body
-      assert_equal 'nari', body[:author_name]
-      assert_equal '3', body[:page]
-      assert_nil body[:q]
-    end
-
-    test 'with kw parameter defaults to nil' do
-      get :index, params: {author_name: 'nari', q: 'Rails'}
-      body = eval response.body
-      assert_equal 'nari', body[:author_name]
-      assert_equal '1', body[:page]
-      assert_equal 'Rails', body[:q]
-    end
-  end
-end

data/test/controllers/kwargs_keyreq_controller_test.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-require 'test_helper'
-
-class KwKeyreqBooksControllerTest < ActionController::TestCase
-  sub_test_case 'GET index (having an optional parameter)' do
-    test 'without giving any kw parameter (not even giving :required one)' do
-      assert_raises(ActionController::BadRequest) { get :index }
-    end
-
-    test 'without giving any kw parameter' do
-      get :index, params: {author_name: 'nari'}
-      assert 200, response.code
-    end
-
-    test 'with kw parameter defaults to non-nil value' do
-      get :index, params: {author_name: 'nari', page: 3}
-      body = eval response.body
-      assert_equal 'nari', body[:author_name]
-      assert_equal '3', body[:page]
-      assert_nil body[:q]
-    end
-
-    test 'with kw parameter defaults to nil' do
-      get :index, params: {author_name: 'nari', q: 'Rails'}
-      body = eval response.body
-      assert_equal 'nari', body[:author_name]
-      assert_equal '1', body[:page]
-      assert_equal 'Rails', body[:q]
-    end
-  end
-end if RUBY_VERSION >= '2.1'

data/test/controllers/ordinal_controller_test.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require 'test_helper'
-
-class AuthorsControllerTest < ActionController::TestCase
-  test 'GET show' do
-    matz = Author.create! name: 'Matz'
-    get :show, params: {id: matz.id}
-    assert_equal matz, assigns(:author)
-  end
-end

data/test/controllers/strong_parameters_test.rb

@@ -1,59 +0,0 @@
-# frozen_string_literal: true
-
-require 'test_helper'
-
-class StoresControllerTest < ActionController::TestCase
-  test 'GET show' do
-    tatsu_zine = Store.create! name: 'Tatsu-zine'
-    get :show, params: {id: tatsu_zine.id}
-
-    assert_equal tatsu_zine, assigns(:store)
-  end
-
-  sub_test_case 'GET new' do
-    test 'without store parameter' do
-      get :new
-      assert 200, response.code
-      assert_equal 'PragProg', assigns(:store).name
-    end
-    test 'with store parameter' do
-      get :new, params: {store: {name: 'Tatsu-zine'}}
-      assert 200, response.code
-      assert_equal 'Tatsu-zine', assigns(:store).name
-    end
-  end
-
-  test 'POST create' do
-    store_count_was = Store.count
-    post :create, params: {store: {name: 'Tatsu-zine', url: 'http://tatsu-zine.com'}}
-
-    assert_equal 1, Store.count - store_count_was
-  end
-end
-
-class MoviesControllerTest < ActionController::TestCase
-  test 'POST create' do
-    movie_count_was = Movie.count
-    post :create, params: {movie: {title: 'Dr. No', actors_attributes: [{name: 'Bernard Lee'}]}}
-
-    assert_equal 1, Movie.count - movie_count_was
-  end
-end
-
-# this controller doesn't permit price of new book do
-class Admin::BooksControllerTest < ActionController::TestCase
-  test 'POST create' do
-    post :create, params: {book: {title: 'naruhoUnix', price: 30}}
-
-    assert_nil Book.last.price
-  end
-end
-
-class Admin::AccountsControllerTest < ActionController::TestCase
-  test 'POST create' do
-    admin_account_count_was = Admin::Account.count
-    post :create, params: {admin_account: {name: 'amatsuda'}}
-
-    assert_equal 1, Admin::Account.count - admin_account_count_was
-  end
-end

data/test/fake_app.rb

@@ -1,193 +0,0 @@
-# coding: utf-8
-# frozen_string_literal: true
-
-# config
-ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
-
-module ActionArgsTestApp
-  class Application < Rails::Application
-    config.secret_key_base = config.secret_token = [*'A'..'z'].join
-    config.session_store :cookie_store, :key => '_myapp_session'
-    config.active_support.deprecation = :log
-    config.eager_load = false
-  end
-end
-ActionArgsTestApp::Application.initialize!
-
-# routes
-ActionArgsTestApp::Application.routes.draw do
-  resources :authors
-  resources :books
-  resources :kw_books  # 2.0+ only
-  resources :kw_keyreq_books  # 2.1+ only
-  resources :stores
-  resources :movies
-
-  namespace :admin do
-    resources :accounts
-    resources :books
-  end
-end
-
-# models
-class Author < ActiveRecord::Base
-end
-class Book < ActiveRecord::Base
-end
-class Store < ActiveRecord::Base
-end
-class Movie < ActiveRecord::Base
-  has_many :actors
-  accepts_nested_attributes_for :actors
-end
-class Actor < ActiveRecord::Base
-  belongs_to :movie
-end
-module Admin
-  def self.table_name_prefix() 'admin_' end
-  class Account < ActiveRecord::Base
-  end
-end
-
-# mailers
-require "action_mailer/railtie"
-class UserMailer < ActionMailer::Base
-  def send_email_without_args
-    mail(
-      to:      'to@example.com',
-      from:    'from@example.com',
-      subject: 'Action Args!!!',
-      body:    'test'
-    )
-  end
-
-  def send_email_with_optional_args(subject = 'Action Args!!!')
-    mail(
-      to:      'to@example.com',
-      from:    'from@example.com',
-      subject: subject,
-      body:    'test'
-    )
-  end
-end
-
-# helpers
-module ApplicationHelper; end
-
-# controllers
-class ApplicationController < ActionController::Base
-end
-class AuthorsController < ApplicationController
-  def show
-    @author = Author.find params[:id]
-    render plain: @author.name
-  end
-end
-class BooksController < ApplicationController
-  before_action :set_book, only: :show
-  before_action -> { @proc_filter_executed = true }, only: :show
-  if Rails.version < '5.1'
-    before_action '@string_filter_executed = true', only: :show
-  end
-  around_action :benchmark_action
-  before_action :omg
-  skip_before_action :omg
-
-  # optional parameter
-  def index(page = 1, q = nil, limit = 10)
-    @books = Book.limit(limit.to_i).offset(([page.to_i - 1, 0].max) * 10)
-    @books = @books.where('title like ?', "%#{q}%") unless q.blank?
-    render plain: 'index', books: @books
-  end
-
-  def show(id)
-    render plain: @book.title
-  end
-
-  def create(book)
-    book = book.permit :title, :price
-    @book = Book.create! book
-    render plain: @book.title
-  end
-
-  private
-    def set_book(id)
-      @book = Book.find(id)
-    end
-
-    def benchmark_action
-      start  = Time.now
-      yield
-      @elapsed_time = Time.now - start
-    end
-
-    def omg
-      raise '💣'
-    end
-end
-class MoviesController < ApplicationController
-  permits :title, actors_attributes: [:name]
-
-  def create(movie)
-    @movie = Movie.create! movie
-    render plain: @movie.title
-  end
-end
-class StoresController < ApplicationController
-  permits :name, :url
-
-  def show(id)
-    @store = Store.find(id)
-    render plain: @store.name
-  end
-
-  def new(store = {name: 'PragProg'})
-    @store = Store.new store
-    render plain: @store.name
-  end
-
-  def create(store)
-    @store = Store.create! store
-    render plain: @store.name
-  end
-end
-module Admin
-  class AccountsController < ::ApplicationController
-    permits :name, model_name: 'Admin::Account'
-
-    def create(admin_account)
-      @admin_account = Admin::Account.create! admin_account
-      render plain: @admin_account.name
-    end
-  end
-
-  class BooksController < ::ApplicationController
-    permits :title
-
-    def create(book)
-      @book = Book.create! book
-      render plain: @book.title
-    end
-  end
-end
-
-require_relative 'kwargs_controllers'
-require_relative 'kwargs_keyreq_controllers' if RUBY_VERSION >= '2.1'
-
-# migrations
-class CreateAllTables < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
-  def self.up
-    create_table(:authors) {|t| t.string :name}
-    create_table(:books) {|t| t.string :title; t.integer :price}
-    create_table(:stores) {|t| t.string :name; t.string :url}
-    create_table(:admin_accounts) {|t| t.string :name}
-    create_table(:movies) {|t| t.string :title}
-    create_table(:actors) {|t| t.string :name; t.references :movie}
-  end
-end
-
-if ActiveRecord::Base.connection.respond_to? :data_source_exists?
-  CreateAllTables.up unless ActiveRecord::Base.connection.data_source_exists? 'authors'
-else
-  CreateAllTables.up unless ActiveRecord::Base.connection.table_exists? 'authors'
-end

data/test/kwargs_controllers.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-# this file should not be loaded from Ruby <2.0
-
-class KwBooksController < ApplicationController
-  # keyword arguments
-  def index(author_name, page: '1', q: nil)
-    render plain: {author_name: author_name, page: page, q: q}.inspect
-  end
-end

data/test/kwargs_keyreq_controllers.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-# this file should not be loaded from Ruby <2.1
-
-class KwKeyreqBooksController < ApplicationController
-  # keyword arguments
-  def index(author_name:, page: '1', q: nil)
-    render plain: {author_name: author_name, page: page, q: q}.inspect
-  end
-end

data/test/mailers/action_mailer_test.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-require 'test_helper'
-
-class UserMailerTest < ActionMailer::TestCase
-  test '#send_email_without_args' do
-    #it should not raise NameError: undefined local variable or method `params' for ...
-    assert UserMailer.send_email_without_args
-  end
-
-  test '#send_email_with_optional_args' do
-    #it should not raise NoMethodError: undefined method for nil:NilClass
-    assert UserMailer.send_email_with_optional_args
-  end
-end

data/test/params_handler/params_handler_test.rb

@@ -1,256 +0,0 @@
-# frozen_string_literal: true
-
-require 'test_helper'
-using ActionArgs::ParamsHandler
-
-class ActionArgs::ParamsHandlerTest < ActiveSupport::TestCase
-  sub_test_case 'extract_method_arguments_from_params' do
-    setup do
-      params = {a: '1', b: '2'}
-      @controller = Class.new(ApplicationController).new.tap {|c| c.params = params }
-    end
-    test 'no parameters' do
-      def @controller.m() end
-
-      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)
-    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)
-    end
-
-    test '2 reqs' do
-      def @controller.m(a, b) end
-
-      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)
-    end
-
-    test '1 opt with value' do
-      def @controller.m(a = 'a') end
-
-      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)
-    end
-
-    test '1 opt without value' do
-      def @controller.m(x = 'x') end
-
-      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)
-    end
-
-    test 'req, opt without value' do
-      def @controller.m(a, x = 'x') end
-
-      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)
-    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)
-    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)
-    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)
-    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)
-    end
-
-    test 'opt without value, req' do
-      def @controller.m(x = 'x', a) end
-
-      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)
-    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)
-    end
-
-    test 'req without a value' do
-      def @controller.m(x) end
-
-      assert_raises(ActionController::BadRequest) { @controller.extract_method_arguments_from_params(:m) }
-    end
-
-    test 'key' do
-      def @controller.m(a: nil) end
-
-      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)
-    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)
-    end
-
-    if RUBY_VERSION >= '2.1'
-      eval <<-KWARGS_KEYREQ_TEST
-        test 'keyreq' do
-          def @controller.m(a:) end
-
-          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)
-        end
-
-        test 'keyreq, keyreq without value' do
-          def @controller.m(a:, x:) end
-
-          assert_raises(ActionController::BadRequest) { @controller.extract_method_arguments_from_params(:m) }
-        end
-      KWARGS_KEYREQ_TEST
-    end
-  end
-
-  sub_test_case 'strengthen_params!' do
-    setup do
-      @params = ActionController::Parameters.new(x: '1', y: '2', foo: {a: 'a', b: 'b'}, bar: {a: 'a', b: 'b'}, baz: {a: 'a', b: 'b'}, hoge: {a: 'a', b: 'b'}, fuga: {a: 'a', b: 'b'}, foo_foo: {a: 'a', b: 'b'}, hoge_hoge: {a: 'a', b: 'b'}, fuga_fuga: {a: 'a', b: 'b'})
-    end
-
-    def execute_strengthen_params!(controller)
-      c = controller.new
-      c.instance_variable_set :@_params, @params
-      c.strengthen_params! :a
-    end
-
-    test 'requiring via :req, permitting all scalars' do
-      execute_strengthen_params! FooController ||= Class.new(ApplicationController) { permits :a, :b; def a(foo) end }
-
-      assert @params[:foo].permitted?
-      assert_not_nil @params[:foo][:a]
-      assert_not_nil @params[:foo][:b]
-    end
-
-    test 'requiring via :req, permitting all scalars with args named like strong parameters' do
-      execute_strengthen_params! FooFooController ||= Class.new(ApplicationController) { permits :a, :b; def a(foo_foo_params) end }
-
-      assert @params[:foo_foo].permitted?
-      assert_not_nil @params[:foo_foo][:a]
-      assert_not_nil @params[:foo_foo][:b]
-    end
-
-    test 'requiring via :req, not permitting all scalars' do
-      execute_strengthen_params! BarController ||= Class.new(ApplicationController) { permits :a; def a(bar, x = 'x') end }
-
-      assert @params[:bar].permitted?
-      assert_not_nil @params[:bar][:a]
-      assert_nil @params[:bar][:b]
-    end
-
-    test 'requiring via :req, not permitting any scalars' do
-      execute_strengthen_params! BazController ||= Class.new(ApplicationController) { def a(baz, aho = 'omg') end }
-
-      refute @params[:baz].permitted?
-    end
-
-    test 'requiring via :opt, permitting all scalars' do
-      execute_strengthen_params! HogeController ||= Class.new(ApplicationController) { permits :a, :b; def a(hoge = {}) end }
-
-      assert @params[:hoge].permitted?
-      assert_not_nil @params[:hoge][:a]
-      assert_not_nil @params[:hoge][:b]
-    end
-
-    test 'requiring via :opt, permitting all scalars with args named like strong parameters' do
-      execute_strengthen_params! HogeHogeController ||= Class.new(ApplicationController) { permits :a, :b; def a(hoge_hoge_params = {}) end }
-
-      assert @params[:hoge_hoge].permitted?
-      assert_not_nil @params[:hoge_hoge][:a]
-      assert_not_nil @params[:hoge_hoge][:b]
-    end
-
-    test 'requiring via :key, permitting all scalars' do
-      execute_strengthen_params! FugaController ||= Class.new(ApplicationController) { permits :a, :b; def a(fuga: {}) end }
-
-      assert @params[:fuga].permitted?
-      assert_not_nil @params[:fuga][:a]
-      assert_not_nil @params[:fuga][:b]
-    end
-
-    test 'requiring via :key, permitting all scalars with args named like strong parameters' do
-      execute_strengthen_params! FugaFugaController ||= Class.new(ApplicationController) { permits :a, :b; def a(fuga_fuga_params: {}) end }
-
-      assert @params[:fuga_fuga].permitted?
-      assert_not_nil @params[:fuga_fuga][:a]
-      assert_not_nil @params[:fuga_fuga][:b]
-    end
-
-    test '"model_name" option' do
-      execute_strengthen_params! PiyoController ||= Class.new(ApplicationController) { permits :a, :b, model_name: 'Foo'; def a(foo) end }
-
-      assert @params[:foo].permitted?
-      assert_not_nil @params[:foo][:a]
-      assert_not_nil @params[:foo][:b]
-    end
-
-    test '"model_name" option with args named like strong parameters' do
-      execute_strengthen_params! PiyoPiyoController = Class.new(ApplicationController) { permits :a, :b, model_name: 'Foo'; def a(foo_params) end }
-
-      assert @params[:foo].permitted?
-      assert_not_nil @params[:foo][:a]
-      assert_not_nil @params[:foo][:b]
-    end
-  end
-end

data/test/test_helper.rb

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-# load Rails first
-require 'rails'
-require 'active_record'
-require 'action_controller/railtie'
-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)
-      super path, params, session
-    end
-
-    def post(path, params: nil, session: nil)
-      super path, params, session
-    end
-  end
-
-  ActionController::TestCase.send :prepend, ActionControllerTestingMonkey
-end