action_args 2.3.0 → 2.6.0

data/gemfiles/rails_41.gemfile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gem 'rails', '~> 4.1.0'
@@ -7,7 +8,7 @@ gem 'nokogiri', RUBY_VERSION < '2.1' ? '~> 1.6.0' : '>= 1.7'
 gemspec :path => '../'
 
 platforms :ruby do
-  gem 'sqlite3'
+  gem 'sqlite3', '~> 1.3.6'
 end
 
 platforms :jruby do

data/gemfiles/rails_42.gemfile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gem 'rails', '~> 4.2.0'
@@ -7,7 +8,7 @@ gem 'nokogiri', RUBY_VERSION < '2.1' ? '~> 1.6.0' : '>= 1.7'
 gemspec :path => '../'
 
 platforms :ruby do
-  gem 'sqlite3'
+  gem 'sqlite3', '~> 1.3.6'
 end
 
 platforms :jruby do

data/gemfiles/rails_50.gemfile

@@ -1,18 +1,13 @@
 # frozen_string_literal: true
+
 source 'https://rubygems.org'
-git_source(:github) do |repo_name|
-  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
-  "https://github.com/#{repo_name}.git"
-end
 
 gem 'rails', '~> 5.0.1'
 
-gem 'rails-controller-testing'
-
 gemspec :path => '../'
 
 platforms :ruby do
-  gem 'sqlite3'
+  gem 'sqlite3', '~> 1.3.6'
 end
 
 platforms :jruby do

data/gemfiles/rails_51.gemfile

@@ -1,18 +1,13 @@
 # frozen_string_literal: true
+
 source 'https://rubygems.org'
-git_source(:github) do |repo_name|
-  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
-  "https://github.com/#{repo_name}.git"
-end
 
 gem 'rails', '~> 5.1.0'
 
-gem 'rails-controller-testing'
-
 gemspec :path => '../'
 
 platforms :ruby do
-  gem 'sqlite3'
+  gem 'sqlite3', '~> 1.3.6'
 end
 
 platforms :jruby do

data/gemfiles/rails_52.gemfile

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

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_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/gemfiles/rails_edge.gemfile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 source 'https://rubygems.org'
 git_source(:github) do |repo_name|
   repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
@@ -6,11 +7,7 @@ git_source(:github) do |repo_name|
 end
 
 gem 'rails', github: 'rails/rails'
-gem 'rack', github: 'rack/rack'
-gem 'arel', github: 'rails/arel'
-gem 'sprockets', github: 'rails/sprockets'
-gem 'sprockets-rails', github: 'rails/sprockets-rails'
-gem 'rails-controller-testing'
+gem 'selenium-webdriver'
 
 gemspec :path => '../'
 

data/lib/action_args.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'action_args/params_handler'
 require 'action_args/abstract_controller'
 require 'action_args/callbacks'

data/lib/action_args/abstract_controller.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative 'params_handler'
 using ActionArgs::ParamsHandler
 
@@ -6,11 +7,15 @@ module ActionArgs
   module AbstractControllerMethods
     def send_action(method_name, *args)
       return super unless args.empty?
-      return super unless defined?(params)
+      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

@@ -1,24 +1,32 @@
 # frozen_string_literal: true
+
 using ActionArgs::ParamsHandler
 
 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 = target.extract_method_arguments_from_params method
+          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
 
@@ -34,7 +42,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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module ActionArgs
   module ParamsHandler
     refine AbstractController::Base do
@@ -8,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
@@ -35,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
@@ -49,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,4 +1,5 @@
 # frozen_string_literal: true
+
 module ActionArgs
-  VERSION = '2.3.0'
+  VERSION = '2.6.0'
 end

data/lib/generators/rails/action_args_scaffold_controller_generator.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # load original rails scaffold_controller generator
 require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator'
 
@@ -6,7 +7,7 @@ require 'rails/generators/rails/scaffold_controller/scaffold_controller_generato
 module Rails
   module Generators
     class ActionArgsScaffoldControllerGenerator < ::Rails::Generators::ScaffoldControllerGenerator
-      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+      argument :attributes, type: :array, default: [], banner: 'field:type field:type'
       source_root File.expand_path('../templates', __FILE__)
     end
   end

data/lib/generators/rails/templates/controller.rb

@@ -1,5 +1,4 @@
 class <%= controller_class_name %>Controller < ApplicationController
-  before_action :set_<%= singular_table_name %>, only: [:show, :edit, :update, :destroy]
 <% if defined? ActionController::StrongParameters -%>
   permits <%= attributes.map {|a| ":#{a.name}" }.join(', ') %>
 
@@ -10,7 +9,8 @@ class <%= controller_class_name %>Controller < ApplicationController
   end
 
   # GET <%= route_url %>/1
-  def show
+  def show(id)
+    @<%= singular_table_name %> = <%= orm_class.find(class_name, 'id') %>
   end
 
   # GET <%= route_url %>/new
@@ -19,7 +19,8 @@ class <%= controller_class_name %>Controller < ApplicationController
   end
 
   # GET <%= route_url %>/1/edit
-  def edit
+  def edit(id)
+    @<%= singular_table_name %> = <%= orm_class.find(class_name, 'id') %>
   end
 
   # POST <%= route_url %>
@@ -34,7 +35,9 @@ class <%= controller_class_name %>Controller < ApplicationController
   end
 
   # PUT <%= route_url %>/1
-  def update(<%= singular_table_name %>)
+  def update(id, <%= singular_table_name %>)
+    @<%= singular_table_name %> = <%= orm_class.find(class_name, 'id') %>
+
 <% if orm_instance.respond_to? :update -%>
     if @<%= orm_instance.update(singular_table_name) %>
 <% else -%>
@@ -47,15 +50,10 @@ class <%= controller_class_name %>Controller < ApplicationController
   end
 
   # DELETE <%= route_url %>/1
-  def destroy
+  def destroy(id)
+    @<%= singular_table_name %> = <%= orm_class.find(class_name, 'id') %>
     @<%= orm_instance.destroy %>
 
     redirect_to <%= index_helper %>_url, notice: <%= "'#{human_name} was successfully destroyed.'" %>
   end
-
-  private
-    # Use callbacks to share common setup or constraints between actions.
-    def set_<%= singular_table_name %>(id)
-      @<%= singular_table_name %> = <%= orm_class.find(class_name, 'id') %>
-    end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action_args
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Akira Matsuda
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-09-06 00:00:00.000000000 Z
+date: 2021-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,6 +71,9 @@ files:
 - gemfiles/rails_42.gemfile
 - gemfiles/rails_50.gemfile
 - 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
@@ -79,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
@@ -110,21 +102,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-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: []