action_args 2.3.2 → 2.7.0

data/lib/action_args/params_handler.rb

@@ -9,20 +9,21 @@ module ActionArgs
         kwargs, missing_required_params = {}, []
         parameter_names = method_parameters.map(&:last)
         method_parameters.reverse_each do |type, key|
+          trimmed_key = key.to_s.sub(/_params\z/, '').to_sym
           case type
           when :req
-            missing_required_params << key unless params.key? key
+            missing_required_params << key unless params.key? trimmed_key
             next
           when :keyreq
-            if params.key? key
-              kwargs[key] = params[key]
+            if params.key? trimmed_key
+              kwargs[key] = params[trimmed_key]
             else
               missing_required_params << key
             end
           when :key
-            kwargs[key] = params[key] if params.key? key
+            kwargs[key] = params[trimmed_key] if params.key? trimmed_key
           when :opt
-            break if params.key? key
+            break if params.key? trimmed_key
           end
           # omitting parameters that are :block, :rest, :opt without a param, and :key without a param
           parameter_names.delete key
@@ -36,9 +37,8 @@ module ActionArgs
           end
         end
 
-        values = parameter_names.map {|k| params[k]}
-        values << kwargs if kwargs.any?
-        values
+        values = parameter_names.map {|k| params[k.to_s.sub(/_params\z/, '').to_sym]}
+        [values, kwargs]
       end
 
       # permits declared model attributes in the params Hash
@@ -50,9 +50,10 @@ module ActionArgs
 
         method_parameters = method(method_name).parameters
         method_parameters.each do |type, key|
-          if (key == target_model_name) && permitted_attributes
-            params.require(key) if %i[req keyreq].include?(type)
-            params[key] = params[key].try :permit, *permitted_attributes if params.key? key
+          trimmed_key = key.to_s.sub(/_params\z/, '').to_sym
+          if (trimmed_key == target_model_name) && permitted_attributes
+            params.require(trimmed_key) if %i[req keyreq].include?(type)
+            params[trimmed_key] = params[trimmed_key].try :permit, *permitted_attributes if params.key? trimmed_key
           end
         end
       end

data/lib/action_args/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action_args
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.7.0
 platform: ruby
 authors:
 - Akira Matsuda
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-22 00:00:00.000000000 Z
+date: 2021-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,8 +59,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
-- ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
 - MIT-LICENSE
@@ -72,6 +72,9 @@ files:
 - gemfiles/rails_50.gemfile
 - gemfiles/rails_51.gemfile
 - gemfiles/rails_52.gemfile
+- gemfiles/rails_60.gemfile
+- gemfiles/rails_61.gemfile
+- gemfiles/rails_70.gemfile
 - gemfiles/rails_edge.gemfile
 - lib/action_args.rb
 - lib/action_args/abstract_controller.rb
@@ -80,23 +83,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
@@ -111,20 +103,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.3.0.dev
+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/.travis.yml

@@ -1,64 +0,0 @@
-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.2.10
-#   - 2.1.10
-#   - 2.0.0
-#   - ruby-head
-# gemfile:
-#   - gemfiles/rails_52.gemfile
-#   - gemfiles/rails_51.gemfile
-#   - gemfiles/rails_50.gemfile
-#   - gemfiles/rails_42.gemfile
-#   - gemfiles/rails_41.gemfile
-#   - gemfiles/rails_edge.gemfile
-
-matrix:
-  include:
-    - rvm: 2.6.0
-      gemfile: gemfiles/rails_52.gemfile
-    - rvm: 2.6.0
-      gemfile: gemfiles/rails_51.gemfile
-    - rvm: 2.6.0
-      gemfile: gemfiles/rails_50.gemfile
-    - rvm: 2.6.0
-      gemfile: gemfiles/rails_edge.gemfile
-    - rvm: 2.5.3
-      gemfile: gemfiles/rails_52.gemfile
-    - rvm: 2.4.5
-      gemfile: gemfiles/rails_52.gemfile
-    - rvm: 2.3.8
-      gemfile: gemfiles/rails_52.gemfile
-    - rvm: 2.2.10
-      gemfile: gemfiles/rails_42.gemfile
-    - rvm: 2.2.10
-      gemfile: gemfiles/rails_41.gemfile
-    - rvm: 2.1.10
-      gemfile: gemfiles/rails_42.gemfile
-    - rvm: 2.0.0
-      gemfile: gemfiles/rails_42.gemfile
-
-    - rvm: ruby-head
-      gemfile: gemfiles/rails_52.gemfile
-    - rvm: ruby-head
-      gemfile: gemfiles/rails_edge.gemfile
-
-    - rvm: jruby-9.2.0.0
-      gemfile: gemfiles/rails_52.gemfile
-    - rvm: rubinius-3
-      gemfile: gemfiles/rails_52.gemfile
-
-  allow_failures:
-    - rvm: jruby-9.2.0.0
-    - rvm: rubinius-3
-    - gemfile: gemfiles/rails_edge.gemfile

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