action_args 2.7.1 → 2.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 375a2da95a1f6a2d7b141a4e17cd057b534e03069211772ea803f5eb8a47f603
-  data.tar.gz: 50bfa937f5ea30b756de264837b8d63aaae5031a4018f09a2a521b5739be9c29
+  metadata.gz: 64423c6ed81fa656828710aa765b9e434226bad08103bbdb6359f5dc94a7039d
+  data.tar.gz: f5d0630db055169bb86a1cff64640e225440f516bdce1082912675b7cd8f6b6b
 SHA512:
-  metadata.gz: 8a0178f695e91ac00887b006201023d1cbdc11777bce68485f6b7b118cba8900763031112762f57660a2407efbb808b839edda36f03a3a2ba7ffeb81c4d5f90a
-  data.tar.gz: 6ab9fde7062e2160611e2b7860ad6f308fdbf3944900ef324d41257592316146c0a1766eff95a1686837708fc4239038e2bc53d6324ae4553509ef3f55ccc24a
+  metadata.gz: 96def3bb5f6cb866492f61377fec76df9ba1a0cbad0f2836107672083a036d0f99a360f277353f916e39318104d9c5fad7a0a7ea16d8b10102a79cc56609ab24
+  data.tar.gz: a18c64b3d4321cd5fcd96ded285ef80cdced877a55a4302881a96f71081690b2b5fd5a396f3baaf0d39a630c0569c1f0c6c135e982c771b82578f606805d4eab

data/.github/workflows/main.yml

@@ -1,88 +1,63 @@
 name: build
 
-on: [push, pull_request]
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: '22 22 * * *'
 
 jobs:
   build:
     strategy:
       matrix:
-        include:
-          - ruby_version: ruby-head
-            gemfile: gemfiles/rails_edge.gemfile
-            allow_failures: 'true'
-          - ruby_version: '3.0'
-            gemfile: gemfiles/rails_70.gemfile
-            allow_failures: 'true'
-          - ruby_version: '3.0'
-            gemfile: gemfiles/rails_61.gemfile
-            allow_failures: 'true'
-
-          - ruby_version: '3.0'
-            gemfile: gemfiles/rails_edge.gemfile
-            allow_failures: 'true'
-          - ruby_version: '3.0'
-            gemfile: gemfiles/rails_70.gemfile
-          - ruby_version: '3.0'
-            gemfile: gemfiles/rails_61.gemfile
-          - ruby_version: '3.0'
-            gemfile: gemfiles/rails_60.gemfile
-
-          - ruby_version: jruby
-            gemfile: gemfiles/rails_61.gemfile
-            allow_failures: 'true'
-          - ruby_version: jruby
-            gemfile: gemfiles/rails_70.gemfile
-            allow_failures: 'true'
-
-          - ruby_version: '2.7'
-            gemfile: gemfiles/rails_edge.gemfile
-            allow_failures: 'true'
-          - ruby_version: '2.7'
-            gemfile: gemfiles/rails_70.gemfile
-          - ruby_version: '2.7'
-            gemfile: gemfiles/rails_61.gemfile
+        ruby_version: [ruby-head, '3.2', '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'
-            gemfile: gemfiles/rails_61.gemfile
+            rails_version: '6.0'
           - ruby_version: '2.6'
-            gemfile: gemfiles/rails_52.gemfile
+            rails_version: '5.2'
           - ruby_version: '2.6'
-            gemfile: gemfiles/rails_51.gemfile
+            rails_version: '5.1'
           - ruby_version: '2.6'
-            gemfile: gemfiles/rails_50.gemfile
+            rails_version: '5.0'
 
           - ruby_version: '2.5'
-            gemfile: gemfiles/rails_61.gemfile
+            rails_version: '6.1'
           - ruby_version: '2.5'
-            gemfile: gemfiles/rails_52.gemfile
+            rails_version: '5.2'
 
           - ruby_version: '2.4'
-            gemfile: gemfiles/rails_52.gemfile
+            rails_version: '5.2'
 
           - ruby_version: '2.3'
-            gemfile: gemfiles/rails_52.gemfile
+            rails_version: '5.2'
 
           - ruby_version: '2.2'
-            gemfile: gemfiles/rails_42.gemfile
+            rails_version: '4.2'
           - ruby_version: '2.2'
-            gemfile: gemfiles/rails_41.gemfile
+            rails_version: '4.1'
 
           - ruby_version: '2.1'
-            gemfile: gemfiles/rails_42.gemfile
+            rails_version: '4.2'
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     env:
-      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+      RAILS_VERSION: ${{ matrix.rails_version }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby_version }}
+          rubygems: ${{ matrix.ruby_version < '2.6' && 'default' || 'latest' }}
           bundler-cache: true
-        continue-on-error: ${{ matrix.allow_failures == '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.allow_failures == 'true' }}
+        continue-on-error: ${{ (matrix.ruby_version == 'ruby-head') || (matrix.ruby_version == 'jruby') || (matrix.rails_version == 'edge') }}

data/Gemfile

@@ -4,3 +4,27 @@ 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 'loofah', RUBY_VERSION < '2.5' ? '~> 2.20.0' : '>= 2.20'
+
+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://github.com/asakusarb/action_args/actions/workflows/main.yml/badge.svg)](https://github.com/asakusarb/action_args/actions/actions)
+[![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
 
@@ -247,7 +247,7 @@ 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, 3.0.x, 3.1 (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.x, 3.2.x, 3.3 (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, 7.1 (edge)
 

data/lib/action_args/abstract_controller.rb

@@ -6,7 +6,15 @@ using ActionArgs::ParamsHandler
 module ActionArgs
   module AbstractControllerMethods
     def send_action(method_name, *args)
-      return super unless args.empty?
+      unless args.empty?
+        kwargs = args.extract_options!
+        if kwargs.any?
+          return super(method_name, *args, **kwargs)
+        else
+          return super
+        end
+      end
+
       return super if !defined?(params) || params.nil?
 
       strengthen_params! method_name

data/lib/action_args/params_handler.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'abstract_controller'
+
 module ActionArgs
   module ParamsHandler
     refine AbstractController::Base do

data/lib/action_args/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActionArgs
-  VERSION = '2.7.1'
+  VERSION = '2.7.3'
 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.7.1
+  version: 2.7.3
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-25 00:00:00.000000000 Z
+date: 2023-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,21 +67,13 @@ files:
 - 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_70.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:
@@ -103,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.0.dev
+rubygems_version: 3.5.0.dev
 signing_key:
 specification_version: 4
 summary: Controller action arguments parameterizer for Rails 4+ & Ruby 2.0+

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_70.gemfile

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-gem 'rails', '~> 7.0.0'
-gem 'net-smtp'
-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,21 +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 'net-smtp'
-gem 'selenium-webdriver'
-
-gemspec :path => '../'
-
-platforms :ruby do
-  gem 'sqlite3'
-end
-
-platforms :jruby do
-  gem 'activerecord-jdbcsqlite3-adapter'
-end