action_args 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c2ac1aabe42af754f64ecd83e1df164647214e3d
-  data.tar.gz: 5e6642e829771673ab64b390905108067cd844fb
+SHA256:
+  metadata.gz: 234e515eeed335a94bc99891422b4e0374227c9d18b0cd5dcab10dc5c86a8ee2
+  data.tar.gz: bab6cf038df32ccc98d4921bda15b4815f039660219c8430fbf5a5f293be1cd9
 SHA512:
-  metadata.gz: 6115f465b8836119907bdad9e57120a818304d9ba4f9fbf13f63af8f4d17a14b380beebc9f84d038f6e65d7ff094e41be45d7c4df4b34b1af70028134e867b21
-  data.tar.gz: 25cf667565cde9b800560d9492c244b8d17df5d58894a9f4b298df7a97bcd5098f7ae33ccbd17608df640c9e664599026172baa680456dd1c8524030b5ccdc26
+  metadata.gz: 143f8be57fe2a24ff9ad59abc21433a3248cc64536fbdd4b2b72dbf3fcb7df4f86be0655f543e696db4b909a789e189ed7b3377b27ac5c8a9082d9d4c3546558
+  data.tar.gz: 8627eb5561b52f110be725779eea1382fdd9453755d7cae01ba2f7fb4b87bcd77e0207466acc15b62c9ac4f323d6688dabce8a646dfe050924f75ae43d1709df

data/.travis.yml

@@ -3,52 +3,62 @@ language: ruby
 sudo: false
 
 before_install:
-  - gem update --system
-  - gem install bundler
+  - "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
 
-rvm:
-  - 2.5.0
-  - 2.4.3
-  - 2.3.6
-  - 2.2.9
-  - 2.1.10
-  - 2.0.0
-  - ruby-head
-  - jruby-9.1.15.0
-  - rubinius-3
 matrix:
-  exclude:
-    - rvm: 2.5.0
-      gemfile: gemfiles/rails_42.gemfile
-    - rvm: 2.5.0
-      gemfile: gemfiles/rails_41.gemfile
-    - rvm: 2.4.3
-      gemfile: gemfiles/rails_42.gemfile
-    - rvm: 2.4.3
-      gemfile: gemfiles/rails_41.gemfile
-    - rvm: 2.1.10
+  include:
+    - rvm: 2.6.0
+      gemfile: gemfiles/rails_52.gemfile
+    - rvm: 2.6.0
       gemfile: gemfiles/rails_51.gemfile
-    - rvm: 2.0.0
-      gemfile: gemfiles/rails_51.gemfile
-    - rvm: 2.1.10
-      gemfile: gemfiles/rails_50.gemfile
-    - rvm: 2.0.0
+    - rvm: 2.6.0
       gemfile: gemfiles/rails_50.gemfile
-    - rvm: 2.1.10
+    - 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_edge.gemfile
-    - rvm: ruby-head
       gemfile: gemfiles/rails_42.gemfile
+
     - rvm: ruby-head
-      gemfile: gemfiles/rails_41.gemfile
+      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.1.15.0
+    - rvm: jruby-9.2.0.0
     - rvm: rubinius-3
     - gemfile: gemfiles/rails_edge.gemfile
-gemfile:
-  - gemfiles/rails_51.gemfile
-  - gemfiles/rails_50.gemfile
-  - gemfiles/rails_42.gemfile
-  - gemfiles/rails_41.gemfile
-  - gemfiles/rails_edge.gemfile

data/Gemfile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in action_args.gemspec

data/README.md

@@ -157,7 +157,6 @@ The following elegant controller code will be generated:
 
 ```ruby
 class UsersController < ApplicationController
-  before_action :set_user, only: [:show, :edit, :update, :destroy]
   permits :name, :age, :email
 
   # GET /users
@@ -166,7 +165,8 @@ class UsersController < ApplicationController
   end
 
   # GET /users/1
-  def show
+  def show(id)
+    @user = User.find(id)
   end
 
   # GET /users/new
@@ -175,7 +175,8 @@ class UsersController < ApplicationController
   end
 
   # GET /users/1/edit
-  def edit
+  def edit(id)
+    @user = User.find(id)
   end
 
   # POST /users
@@ -185,31 +186,28 @@ class UsersController < ApplicationController
     if @user.save
       redirect_to @user, notice: 'User was successfully created.'
     else
-      render action: 'new'
+      render :new
     end
   end
 
   # PUT /users/1
-  def update(user)
-    if @user.update_attributes(user)
+  def update(id, user)
+    @user = User.find(id)
+
+    if @user.update(user)
       redirect_to @user, notice: 'User was successfully updated.'
     else
-      render action: 'edit'
+      render :edit
     end
   end
 
   # DELETE /users/1
-  def destroy
+  def destroy(id)
+    @user = User.find(id)
     @user.destroy
 
-    redirect_to users_url
+    redirect_to users_url, notice: 'User was successfully destroyed.'
   end
-
-  private
-    # Use callbacks to share common setup or constraints between actions.
-    def set_user(id)
-      @user = User.find(id)
-    end
 end
 ```
 
@@ -221,9 +219,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.0 (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.0 (trunk), JRuby, & Rubinius with 2.0+ mode
 
-* Rails 4.1.x, 4.2.x, 5.0, 5.1 (edge)
+* Rails 4.1.x, 4.2.x, 5.0, 5.1, 5.2, 6.0 (edge)
 
 Please use Version 1.5.4 for Rails 4.0.x.
 

data/action_args.gemspec

@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*-
 # frozen_string_literal: true
+
 $:.push File.expand_path("../lib", __FILE__)
 require 'action_args/version'
 

data/gemfiles/rails_41.gemfile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gem 'rails', '~> 4.1.0'

data/gemfiles/rails_42.gemfile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gem 'rails', '~> 4.2.0'

data/gemfiles/rails_50.gemfile

@@ -1,9 +1,6 @@
 # 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'
 

data/gemfiles/rails_51.gemfile

@@ -1,9 +1,6 @@
 # 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'
 

data/gemfiles/rails_52.gemfile

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+source 'https://rubygems.org'
+
+gem 'rails', '~> 5.2.0'
+
+gem 'rails-controller-testing'
+
+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?("/")

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
 

data/lib/action_args/callbacks.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 using ActionArgs::ParamsHandler
 
 module ActionArgs

data/lib/action_args/params_handler.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module ActionArgs
   module ParamsHandler
     refine AbstractController::Base do

data/lib/action_args/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module ActionArgs
-  VERSION = '2.3.1'
+  VERSION = '2.3.2'
 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

data/test/controllers/action_args_controller_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 class BooksControllerTest < ActionController::TestCase

data/test/controllers/hooks_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 class BooksControllerTest < ActionController::TestCase

data/test/controllers/kwargs_controller_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 class KwBooksControllerTest < ActionController::TestCase

data/test/controllers/kwargs_keyreq_controller_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 class KwKeyreqBooksControllerTest < ActionController::TestCase

data/test/controllers/ordinal_controller_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 class AuthorsControllerTest < ActionController::TestCase

data/test/controllers/strong_parameters_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 class StoresControllerTest < ActionController::TestCase

data/test/kwargs_controllers.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # this file should not be loaded from Ruby <2.0
 
 class KwBooksController < ApplicationController

data/test/kwargs_keyreq_controllers.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # this file should not be loaded from Ruby <2.1
 
 class KwKeyreqBooksController < ApplicationController

data/test/mailers/action_mailer_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 class UserMailerTest < ActionMailer::TestCase

data/test/params_handler/params_handler_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 using ActionArgs::ParamsHandler
 

data/test/test_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 # load Rails first

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action_args
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-27 00:00:00.000000000 Z
+date: 2019-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,6 +71,7 @@ files:
 - gemfiles/rails_42.gemfile
 - gemfiles/rails_50.gemfile
 - gemfiles/rails_51.gemfile
+- gemfiles/rails_52.gemfile
 - gemfiles/rails_edge.gemfile
 - lib/action_args.rb
 - lib/action_args/abstract_controller.rb
@@ -110,8 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.2
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Controller action arguments parameterizer for Rails 4+ & Ruby 2.0+