action_args 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5f4f25a659c405f12ede335715b003888d85750
-  data.tar.gz: 86b00b4457c7da799ce4d12d2baadf9a4c76761e
+  metadata.gz: e8f99c507ba7d9a77264851459c344095c6b3368
+  data.tar.gz: 8ae5a3690c88d10ff55270705ad37558b66a1efc
 SHA512:
-  metadata.gz: 4b253edeedc59dfd20bfde649b17af128570eef09214947cb961db481aaddf5fcd1ab43cc9d7236016c60a7ca832c3c0f7392c682f081515846181da7a9bf016
-  data.tar.gz: 9737e77da93a77c23b191ef085eb9ab40cb00a1249554da7723d51798b9cd6acc70ec24f5e00a8c530792b174ad8912b0092d43a491fd090ece7893459f73821
+  metadata.gz: b7b0b63137e252a121d71d202891841548bb43b40daae9289112811b42b4cc1afe4477c3fe73ca81d572e8bd7f4bdfd41d95fcb1aa78219af3feabc407918437
+  data.tar.gz: 16ad6ad19f3530e1773bc9f567d80a8c0c5b6366a9ba8e1c69bf6e3611d4817eaa58ba888d50c05766079fd1ca46fd131914007ae0c4838af0654c4ba2c43bcf

data/.travis.yml

@@ -4,21 +4,31 @@ sudo: false
 
 rvm:
   - 2.0.0
-  - 2.1
-  - 2.2.3
+  - 2.1.10
+  - 2.2.5
+  - 2.3.1
   - ruby-head
-  - jruby-9.0.0.0
-  - rbx
+  - jruby-9.1.0.0
+  - rbx-3
 matrix:
   exclude:
+    - rvm: ruby-head
+      gemfile: gemfiles/rails_41.gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/rails_42.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/rails_50.gemfile
+    - rvm: 2.1.10
+      gemfile: gemfiles/rails_50.gemfile
     - rvm: 2.0.0
       gemfile: gemfiles/rails_edge.gemfile
-    - rvm: 2.1
+    - rvm: 2.1.10
       gemfile: gemfiles/rails_edge.gemfile
   allow_failures:
-    - rvm: jruby-9.0.0.0
-    - rvm: rbx
+    - rvm: jruby-9.1.0.0
+    - rvm: rbx-3
 gemfile:
   - gemfiles/rails_41.gemfile
   - gemfiles/rails_42.gemfile
+  - gemfiles/rails_50.gemfile
   - gemfiles/rails_edge.gemfile

data/README.md

@@ -220,9 +220,9 @@ You may notice that
 
 ## Supported versions
 
-* Ruby 2.0.0, 2.1.x, 2.2.x, 2.3.0 (trunk), JRuby, & Rubinius with 2.0+ mode
+* Ruby 2.0.0, 2.1.x, 2.2.x, 2.3.x, 2.4.0 (trunk), JRuby, & Rubinius with 2.0+ mode
 
-* Rails 4.1.x, 4.2.x, 5.0 (edge)
+* Rails 4.1.x, 4.2.x, 5.0, 5.1 (edge)
 
 Please use Version 1.5.4 for Rails 4.0.x.
 

data/action_args.gemspec

@@ -12,8 +12,6 @@ Gem::Specification.new do |s|
   s.summary     = 'Controller action arguments parameterizer for Rails 4+ & Ruby 2.0+'
   s.description = 'Rails plugin gem that supports Merbish style controller action arguments.'
 
-  s.rubyforge_project = 'action_args'
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/gemfiles/rails_50.gemfile

@@ -0,0 +1,15 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 5.0.0'
+
+gem 'rails-controller-testing'
+
+gemspec :path => '../'
+
+platforms :ruby do
+  gem 'sqlite3'
+end
+
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter'
+end

data/lib/action_args/abstract_controller.rb

@@ -1,15 +1,19 @@
 require_relative 'params_handler'
 using ActionArgs::ParamsHandler
 
-module AbstractController
-  class Base
+module ActionArgs
+  module AbstractControllerMethods
     def send_action(method_name, *args)
-      return send method_name, *args unless args.empty?
-      return send method_name, *args unless defined?(params)
+      return super unless args.empty?
+      return super unless defined?(params)
 
-      send_with_method_parameters_from_params method_name
+      strengthen_params! method_name
+      values = extract_method_arguments_from_params method_name
+      super method_name, *values
     end
+  end
 
+  module AbstractControllerClassMethods
     # You can configure StrongParameters' `permit` attributes using this DSL method.
     # The `permit` call will be invoked only against parameters having the resource
     # model name inferred from the controller class name.
@@ -22,8 +26,8 @@ module AbstractController
     #     end
     #   end
     #
-    def self.permits(*attributes)
-      if attributes.last.is_a?(Hash) && attributes.last.extractable_options? && attributes.last.has_key?(:model_name)
+    def permits(*attributes)
+      if attributes.last.is_a?(Hash) && attributes.last.extractable_options? && attributes.last.key?(:model_name)
         options = attributes.pop
         @permitting_model_name = options[:model_name]
       end
@@ -31,3 +35,6 @@ module AbstractController
     end
   end
 end
+
+AbstractController::Base.send :prepend, ActionArgs::AbstractControllerMethods
+AbstractController::Base.singleton_class.send :include, ActionArgs::AbstractControllerClassMethods

data/lib/action_args/callbacks.rb

@@ -12,7 +12,9 @@ module ActionArgs
           if Symbol === filter
             lambda do |target, _, &blk|
               if ActionController::Base === target
-                target.send_with_method_parameters_from_params filter, &blk
+                target.strengthen_params! filter
+                values = target.extract_method_arguments_from_params filter
+                target.send filter, *values, &blk
               else
                 target.send filter, &blk
               end

data/lib/action_args/params_handler.rb

@@ -1,12 +1,6 @@
 module ActionArgs
   module ParamsHandler
     refine AbstractController::Base do
-      def send_with_method_parameters_from_params(method_name, &blk)
-        strengthen_params! method_name
-        values = extract_method_arguments_from_params method_name
-        send method_name, *values, &blk
-      end
-
       # converts the request params Hash into an Array to be passed into the target Method
       def extract_method_arguments_from_params(method_name)
         method_parameters = method(method_name).parameters
@@ -15,24 +9,29 @@ module ActionArgs
         method_parameters.reverse_each do |type, key|
           case type
           when :req
-            missing_required_params << key unless params.has_key? key
+            missing_required_params << key unless params.key? key
             next
           when :keyreq
-            if params.has_key? key
+            if params.key? key
               kwargs[key] = params[key]
             else
               missing_required_params << key
             end
           when :key
-            kwargs[key] = params[key] if params.has_key? key
+            kwargs[key] = params[key] if params.key? key
           when :opt
-            break if params.has_key? key
+            break if params.key? key
           end
           # omitting parameters that are :block, :rest, :opt without a param, and :key without a param
           parameter_names.delete key
         end
         if missing_required_params.any?
-          raise ActionController::BadRequest.new(:required, ArgumentError.new("Missing required parameters at #{self.class.name}##{method_name}: #{missing_required_params.join(', ')}"))
+          message = "Missing required parameters at #{self.class.name}##{method_name}: #{missing_required_params.join(', ')}"
+          if Rails.version > '5'
+            raise ActionController::BadRequest.new message
+          else
+            raise ActionController::BadRequest.new :required, ArgumentError.new(message)
+          end
         end
 
         values = parameter_names.map {|k| params[k]}
@@ -50,7 +49,8 @@ module ActionArgs
         method_parameters = method(method_name).parameters
         method_parameters.each do |type, key|
           if (key == target_model_name) && permitted_attributes
-            params[key] = params.require(key).try :permit, *permitted_attributes
+            params.require(key) if %i[req keyreq].include?(type)
+            params[key] = params[key].try :permit, *permitted_attributes
           end
         end
       end

data/lib/action_args/version.rb

@@ -1,3 +1,3 @@
 module ActionArgs
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

data/test/controllers/action_args_controller_test.rb

@@ -15,7 +15,7 @@ class BooksControllerTest < ActionController::TestCase
     end
 
     test 'with page parameter' do
-      get :index, page: 3
+      get :index, params: {page: 3}
       assert 200, response.code
       assert_equal @books[20..29], assigns(:books)
     end
@@ -23,21 +23,21 @@ class BooksControllerTest < ActionController::TestCase
     test 'first param is nil and second is not nil' do
       rhg = Book.create! title: 'RHG'
       Book.create! title: 'AWDwR'
-      get :index, q: 'RH'
+      get :index, params: {q: 'RH'}
       assert_equal [rhg], assigns(:books)
     end
   end
 
   test 'GET show' do
     rhg = Book.create! title: 'RHG'
-    get :show, :id => rhg.id
+    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, :book => {title: 'AWDwR', price: 24}
+    post :create, params: {book: {title: 'AWDwR', price: 24}}
     assert_equal 1, Book.count - books_count_was
   end
 end

data/test/controllers/hooks_test.rb

@@ -4,7 +4,7 @@ class BooksControllerTest < ActionController::TestCase
   setup do
     Book.delete_all
     @book = Book.create! title: 'Head First ActionArgs'
-    get :show, id: @book.id
+    get :show, params: {id: @book.id}
   end
 
   sub_test_case 'before_action' do

data/test/controllers/kwargs_controller_test.rb

@@ -7,12 +7,12 @@ class KwBooksControllerTest < ActionController::TestCase
     end
 
     test 'without giving any optional kw parameter' do
-      get :index, author_name: 'nari'
+      get :index, params: {author_name: 'nari'}
       assert 200, response.code
     end
 
     test 'with kw parameter defaults to non-nil value' do
-      get :index, author_name: 'nari', page: 3
+      get :index, params: {author_name: 'nari', page: 3}
       body = eval response.body
       assert_equal 'nari', body[:author_name]
       assert_equal '3', body[:page]
@@ -20,7 +20,7 @@ class KwBooksControllerTest < ActionController::TestCase
     end
 
     test 'with kw parameter defaults to nil' do
-      get :index, author_name: 'nari', q: 'Rails'
+      get :index, params: {author_name: 'nari', q: 'Rails'}
       body = eval response.body
       assert_equal 'nari', body[:author_name]
       assert_equal '1', body[:page]

data/test/controllers/kwargs_keyreq_controller_test.rb

@@ -7,12 +7,12 @@ class KwKeyreqBooksControllerTest < ActionController::TestCase
     end
 
     test 'without giving any kw parameter' do
-      get :index, author_name: 'nari'
+      get :index, params: {author_name: 'nari'}
       assert 200, response.code
     end
 
     test 'with kw parameter defaults to non-nil value' do
-      get :index, author_name: 'nari', page: 3
+      get :index, params: {author_name: 'nari', page: 3}
       body = eval response.body
       assert_equal 'nari', body[:author_name]
       assert_equal '3', body[:page]
@@ -20,7 +20,7 @@ class KwKeyreqBooksControllerTest < ActionController::TestCase
     end
 
     test 'with kw parameter defaults to nil' do
-      get :index, author_name: 'nari', q: 'Rails'
+      get :index, params: {author_name: 'nari', q: 'Rails'}
       body = eval response.body
       assert_equal 'nari', body[:author_name]
       assert_equal '1', body[:page]

data/test/controllers/ordinal_controller_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class AuthorsControllerTest < ActionController::TestCase
   test 'GET show' do
     matz = Author.create! name: 'Matz'
-    get :show, :id => matz.id
+    get :show, params: {id: matz.id}
     assert_equal matz, assigns(:author)
   end
 end

data/test/controllers/strong_parameters_test.rb

@@ -3,14 +3,26 @@ require 'test_helper'
 class StoresControllerTest < ActionController::TestCase
   test 'GET show' do
     tatsu_zine = Store.create! name: 'Tatsu-zine'
-    get :show, :id => tatsu_zine.id
+    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
+    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, :store => {name: 'Tatsu-zine', url: 'http://tatsu-zine.com'}
+    post :create, params: {store: {name: 'Tatsu-zine', url: 'http://tatsu-zine.com'}}
 
     assert_equal 1, Store.count - store_count_was
   end
@@ -19,7 +31,7 @@ end
 # this controller doesn't permit price of new book do
 class Admin::BooksControllerTest < ActionController::TestCase
   test 'POST create' do
-    post :create, :book => {title: 'naruhoUnix', price: 30}
+    post :create, params: {book: {title: 'naruhoUnix', price: 30}}
 
     assert_nil Book.last.price
   end
@@ -28,7 +40,7 @@ end
 class Admin::AccountsControllerTest < ActionController::TestCase
   test 'POST create' do
     admin_account_count_was = Admin::Account.count
-    post :create, :admin_account => {name: 'amatsuda'}
+    post :create, params: {admin_account: {name: 'amatsuda'}}
 
     assert_equal 1, Admin::Account.count - admin_account_count_was
   end

data/test/fake_app.rb

@@ -5,7 +5,7 @@ ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':me
 
 module ActionArgsTestApp
   class Application < Rails::Application
-    config.secret_token = [*'A'..'z'].join
+    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
@@ -62,7 +62,7 @@ end
 class AuthorsController < ApplicationController
   def show
     @author = Author.find params[:id]
-    render text: @author.name
+    render plain: @author.name
   end
 end
 class BooksController < ApplicationController
@@ -77,17 +77,17 @@ class BooksController < ApplicationController
   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 text: 'index', books: @books
+    render plain: 'index', books: @books
   end
 
   def show(id)
-    render text: @book.title
+    render plain: @book.title
   end
 
   def create(book)
     book = book.permit :title, :price
     @book = Book.create! book
-    render text: @book.title
+    render plain: @book.title
   end
 
   private
@@ -110,12 +110,17 @@ class StoresController < ApplicationController
 
   def show(id)
     @store = Store.find(id)
-    render text: @store.name
+    render plain: @store.name
+  end
+
+  def new(store = nil)
+    @store = Store.new store
+    render plain: @store.name
   end
 
   def create(store)
     @store = Store.create! store
-    render text: @store.name
+    render plain: @store.name
   end
 end
 module Admin
@@ -124,7 +129,7 @@ module Admin
 
     def create(admin_account)
       @admin_account = Admin::Account.create! admin_account
-      render text: @admin_account.name
+      render plain: @admin_account.name
     end
   end
 
@@ -133,7 +138,7 @@ module Admin
 
     def create(book)
       @book = Book.create! book
-      render text: @book.title
+      render plain: @book.title
     end
   end
 end
@@ -151,4 +156,8 @@ class CreateAllTables < ActiveRecord::Migration
   end
 end
 
-CreateAllTables.up unless ActiveRecord::Base.connection.table_exists? 'authors'
+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

@@ -3,6 +3,6 @@
 class KwBooksController < ApplicationController
   # keyword arguments
   def index(author_name, page: '1', q: nil)
-    render text: {author_name: author_name, page: page, q: q}.inspect
+    render plain: {author_name: author_name, page: page, q: q}.inspect
   end
 end

data/test/kwargs_keyreq_controllers.rb

@@ -3,6 +3,6 @@
 class KwKeyreqBooksController < ApplicationController
   # keyword arguments
   def index(author_name:, page: '1', q: nil)
-    render text: {author_name: author_name, page: page, q: q}.inspect
+    render plain: {author_name: author_name, page: page, q: q}.inspect
   end
 end

data/test/test_helper.rb

@@ -8,3 +8,17 @@ require 'action_args'
 require 'fake_app'
 require 'test/unit/rails/test_help'
 Bundler.require
+
+if Rails.version < '5'
+  module ActionControllerTestingMonkey
+    def get(path, params: nil, session: nil)
+      super path, params, session
+    end
+
+    def post(path, params: nil, session: nil)
+      super path, params, session
+    end
+  end
+
+  ActionController::TestCase.send :prepend, ActionControllerTestingMonkey
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action_args
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2016-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -69,6 +69,7 @@ files:
 - action_args.gemspec
 - gemfiles/rails_41.gemfile
 - gemfiles/rails_42.gemfile
+- gemfiles/rails_50.gemfile
 - gemfiles/rails_edge.gemfile
 - lib/action_args.rb
 - lib/action_args/abstract_controller.rb
@@ -107,8 +108,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: action_args
-rubygems_version: 2.4.8
+rubyforge_project: 
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Controller action arguments parameterizer for Rails 4+ & Ruby 2.0+