action_args 2.6.0 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8be56bb5bd7e6183a1f68f1cfeb7baa5da32287d11a50dddc53248561755ee1c
-  data.tar.gz: 14b0d9da9608f4d0cdc465039d202eb35eabb2abe7471f12cdf28af205d0bd01
+  metadata.gz: 0f39ce97090f0a421ac97075c9282d1dd644bd6bf3b065ac79ae5ad3c6900793
+  data.tar.gz: 6ae6f79d371088a28d87e06ccf3ee5ef8c77e75e87f4ba81953f1c9c9f381d27
 SHA512:
-  metadata.gz: 4a112b0b811700d98a8f5c65958d1f9566b0401bcb885bcd160f2d6d7fdcbbc47b55b72e8b3258f9f3c6a461e3256e5d4c97409fe2ccc3373fbdb2deb5db55d4
-  data.tar.gz: d10fdf287ee66df67eee06cfd9c515bbaab7567cac69a84dbbdf11732ca86609ecafc7d437e3e2c89dff9b4001f9757edc4887061cc5d0c3d606d68629850ed6
+  metadata.gz: 2e6b7373af88aea4dd76f04e97fdae2b84761d46a212f3738499beac00ccd1e24a1bf639a370c28381fa52ebf7d21d926088e2726a0ecb65ede0bb9d5823e512
+  data.tar.gz: b310e7647093de316c5eeeee0464d29306531f1211eb14d79709b84a51da79ea953f02d234b2af8422026ce923868a54c710db5f4c618c553fd5e983c6b3fd58

data/.github/workflows/main.yml

@@ -0,0 +1,58 @@
+name: build
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        ruby_version: [ruby-head, '3.1', '3.0', '2.7', 'jruby']
+        rails_version: [edge, '7.0', '6.1', '6.0']
+
+        include:
+          - ruby_version: '2.6'
+            rails_version: '6.1'
+          - ruby_version: '2.6'
+            rails_version: '6.0'
+          - ruby_version: '2.6'
+            rails_version: '5.2'
+          - ruby_version: '2.6'
+            rails_version: '5.1'
+          - ruby_version: '2.6'
+            rails_version: '5.0'
+
+          - ruby_version: '2.5'
+            rails_version: '6.1'
+          - ruby_version: '2.5'
+            rails_version: '5.2'
+
+          - ruby_version: '2.4'
+            rails_version: '5.2'
+
+          - ruby_version: '2.3'
+            rails_version: '5.2'
+
+          - ruby_version: '2.2'
+            rails_version: '4.2'
+          - ruby_version: '2.2'
+            rails_version: '4.1'
+
+          - ruby_version: '2.1'
+            rails_version: '4.2'
+
+    runs-on: ubuntu-latest
+
+    env:
+      RAILS_VERSION: ${{ matrix.rails_version }}
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby_version }}
+          bundler-cache: true
+        continue-on-error: ${{ (matrix.ruby_version == 'ruby-head') || (matrix.ruby_version == 'jruby') || (matrix.rails_version == 'edge') }}
+
+      - run: bundle exec rake
+        continue-on-error: ${{ (matrix.ruby_version == 'ruby-head') || (matrix.ruby_version == 'jruby') || (matrix.rails_version == 'edge') }}

data/Gemfile

@@ -4,3 +4,26 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in action_args.gemspec
 gemspec
+
+if ENV['RAILS_VERSION'] == 'edge'
+  gem 'rails', git: 'https://github.com/rails/rails.git'
+elsif ENV['RAILS_VERSION']
+  gem 'rails', "~> #{ENV['RAILS_VERSION']}.0"
+else
+  gem 'rails'
+end
+
+rails_version = ENV['RAILS_VERSION'] || '∞'
+
+platforms :ruby do
+  gem 'sqlite3', rails_version >= '5.1' ? '>= 1.4' : '< 1.4'
+end
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter'
+end
+
+gem 'nokogiri', RUBY_VERSION < '2.1' ? '~> 1.6.0' : '>= 1.7'
+
+gem 'selenium-webdriver' if rails_version >= '6.1'
+
+gem 'net-smtp' if RUBY_VERSION >= '3.1'

data/README.md

@@ -1,5 +1,5 @@
 # action_args
-[![Build Status](https://travis-ci.org/asakusarb/action_args.svg?branch=master)](https://travis-ci.org/asakusarb/action_args)
+[![Build Status](https://github.com/asakusarb/action_args/actions/workflows/main.yml/badge.svg)](https://github.com/asakusarb/action_args/actions)
 
 Controller action arguments parameterizer for Rails
 
@@ -249,7 +249,7 @@ You may notice that
 
 * 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, 7.0 (edge)
+* Rails 4.1.x, 4.2.x, 5.0, 5.1, 5.2, 6.0, 6.1, 7.0, 7.1 (edge)
 
 For Rails 4.0.x, please use Version 1.5.4.
 

data/Rakefile

@@ -10,22 +10,4 @@ Rake::TestTask.new do |t|
   t.verbose = true
 end
 
-task :default => 'test:all'
-
-namespace :test do
-  %w(rails_41 rails_42 rails_edge).each do |gemfile|
-    desc "Run Tests against #{gemfile}"
-    task gemfile do
-      sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle --quiet"
-      sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle exec rake -t test"
-    end
-  end
-
-  desc 'Run Tests against all Rails versions'
-  task :all do
-    %w(rails_41 rails_42 rails_edge).each do |gemfile|
-      sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle --quiet"
-      sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle exec rake -t test"
-    end
-  end
-end
+task default: :test

data/lib/action_args/callbacks.rb

@@ -4,73 +4,79 @@ using ActionArgs::ParamsHandler
 
 module ActionArgs
   module ActiveSupport
-    # For Rails >= 5.1
-    module CallbackParameterizer
-      # 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 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, 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)
+    if Rails::VERSION::MAJOR >= 7
+      module CallTemplate
+        module MethodCallParameterizer
+          def make_lambda
+            lambda do |target, value, &block|
+              if ActionController::Base === target
+                target.strengthen_params! @method_name
+                arguments, keyword_arguments = target.extract_method_arguments_from_params @method_name
+                if keyword_arguments.any?
+                  target.send(@method_name, *arguments, **keyword_arguments, &block)
+                else
+                  target.send(@method_name, *arguments, &block)
+                end
+              else
+                target.send(@method_name, &block)
+              end
             end
-          else
-            target.send(method, *arguments, &block)
           end
         end
       end
-    end
+      ::ActiveSupport::Callbacks::CallTemplate::MethodCall.prepend ActionArgs::ActiveSupport::CallTemplate::MethodCallParameterizer
+    elsif Rails.version >= '5.1'
+      module CallbackParameterizer
+        # 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 make_lambda
+          lambda do |target, value, &block|
+            target, block, method, *arguments = expand(target, value, block)
 
-    # For Rails 4 & 5.0
-    module CallbackParameterizerLegacy
-      # 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 filter was defined in Symbol form
-      # * the target object is_a ActionController object
-      def make_lambda(filter)
-        if Symbol === filter
-          lambda do |target, _, &blk|
-            if ActionController::Base === target
-              target.strengthen_params! filter
-              values, kwargs_values = target.extract_method_arguments_from_params filter
-              values << kwargs_values if kwargs_values.any?
-              target.send filter, *values, &blk
+            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 filter, &blk
+              target.send(method, *arguments, &block)
             end
           end
-        else
-          super
         end
       end
-    end
-  end
-end
-
-if Rails.version >= '5.1'
-  module ActiveSupport
-    module Callbacks
-      class CallTemplate
-        prepend ActionArgs::ActiveSupport::CallbackParameterizer
-      end
-    end
-  end
-else
-  module ActiveSupport
-    module Callbacks
-      class Callback
-        prepend ActionArgs::ActiveSupport::CallbackParameterizerLegacy
+      ::ActiveSupport::Callbacks::CallTemplate.prepend ActionArgs::ActiveSupport::CallbackParameterizer
+    else
+      # For Rails 4 & 5.0
+      module CallbackParameterizerLegacy
+        # 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 filter was defined in Symbol form
+        # * the target object is_a ActionController object
+        def make_lambda(filter)
+          if Symbol === filter
+            lambda do |target, _, &blk|
+              if ActionController::Base === target
+                target.strengthen_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
+              end
+            end
+          else
+            super
+          end
+        end
       end
+      ::ActiveSupport::Callbacks::Callback.prepend ActionArgs::ActiveSupport::CallbackParameterizerLegacy
     end
   end
 end

data/lib/action_args/version.rb

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

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

@@ -0,0 +1,51 @@
+class <%= controller_class_name %>Controller < ApplicationController
+<% if defined? ActionController::StrongParameters -%>
+  permits <%= attributes.map {|a| ":#{a.name}" }.join(', ') %>
+
+<% end -%>
+  # GET <%= route_url %>
+  def index
+    @<%= plural_table_name %> = <%= orm_class.all(class_name) %>
+
+    render json: <%= "@#{plural_table_name}" %>
+  end
+
+  # GET <%= route_url %>/1
+  def show(id)
+    @<%= singular_table_name %> = <%= orm_class.find(class_name, 'id') %>
+
+    render json: <%= "@#{singular_table_name}" %>
+  end
+
+  # POST <%= route_url %>
+  def create(<%= singular_table_name %>)
+    @<%= singular_table_name %> = <%= orm_class.build(class_name, singular_table_name) %>
+
+    if @<%= orm_instance.save %>
+      render json: <%= "@#{singular_table_name}" %>, status: :created, location: <%= "@#{singular_table_name}" %>
+    else
+      render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity
+    end
+  end
+
+  # PATCH/PUT <%= route_url %>/1
+  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 -%>
+    if @<%= orm_instance.update_attributes(singular_table_name) %>
+<% end -%>
+      render json: <%= "@#{singular_table_name}" %>
+    else
+      render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity
+    end
+  end
+
+  # DELETE <%= route_url %>/1
+  def destroy(id)
+    @<%= singular_table_name %> = <%= orm_class.find(class_name, 'id') %>
+    @<%= orm_instance.destroy %>
+  end
+end

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

@@ -30,11 +30,11 @@ class <%= controller_class_name %>Controller < ApplicationController
     if @<%= orm_instance.save %>
       redirect_to @<%= singular_table_name %>, notice: '<%= human_name %> was successfully created.'
     else
-      render :new
+      render :new, status: :unprocessable_entity
     end
   end
 
-  # PUT <%= route_url %>/1
+  # PATCH/PUT <%= route_url %>/1
   def update(id, <%= singular_table_name %>)
     @<%= singular_table_name %> = <%= orm_class.find(class_name, 'id') %>
 
@@ -45,7 +45,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 <% end -%>
       redirect_to @<%= singular_table_name %>, notice: '<%= human_name %> was successfully updated.'
     else
-      render :edit
+      render :edit, status: :unprocessable_entity
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action_args
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.2
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-05 00:00:00.000000000 Z
+date: 2022-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,28 +59,21 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/main.yml"
 - ".gitignore"
-- ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
 - MIT-LICENSE
 - README.md
 - Rakefile
 - action_args.gemspec
-- gemfiles/rails_41.gemfile
-- 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
 - lib/action_args/callbacks.rb
 - lib/action_args/params_handler.rb
 - lib/action_args/version.rb
 - lib/generators/rails/action_args_scaffold_controller_generator.rb
+- lib/generators/rails/templates/api_controller.rb
 - lib/generators/rails/templates/controller.rb
 homepage: http://asakusa.rubyist.net/
 licenses:
@@ -102,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.4.0.dev
 signing_key:
 specification_version: 4
 summary: Controller action arguments parameterizer for Rails 4+ & Ruby 2.0+

data/.travis.yml

@@ -1,78 +0,0 @@
-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.7
-#   - 2.5.9
-#   - 2.4.10
-#   - 2.3.8
-#   - 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: 3.0.1
-      gemfile: gemfiles/rails_61.gemfile
-    - rvm: 3.0.1
-      gemfile: gemfiles/rails_60.gemfile
-    - 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.7
-      gemfile: gemfiles/rails_51.gemfile
-    - rvm: 2.6.7
-      gemfile: gemfiles/rails_50.gemfile
-    - 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
-    - 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_61.gemfile
-    - rvm: ruby-head
-      gemfile: gemfiles/rails_edge.gemfile
-
-    - 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.17.0
-    - rvm: rubinius-3
-    - gemfile: gemfiles/rails_edge.gemfile

data/gemfiles/rails_41.gemfile

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

data/gemfiles/rails_42.gemfile

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

data/gemfiles/rails_50.gemfile

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

data/gemfiles/rails_51.gemfile

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

data/gemfiles/rails_52.gemfile

@@ -1,15 +0,0 @@
-# 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

@@ -1,16 +0,0 @@
-# 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

@@ -1,16 +0,0 @@
-# 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,20 +0,0 @@
-# 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', github: 'rails/rails'
-gem 'selenium-webdriver'
-
-gemspec :path => '../'
-
-platforms :ruby do
-  gem 'sqlite3'
-end
-
-platforms :jruby do
-  gem 'activerecord-jdbcsqlite3-adapter'
-end