action_args 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8f99c507ba7d9a77264851459c344095c6b3368
-  data.tar.gz: 8ae5a3690c88d10ff55270705ad37558b66a1efc
+  metadata.gz: f9cb11e1b130b2399db5822b438360194f84367e
+  data.tar.gz: 9206b615c8d47577a55fc1e30e5ee4958842546f
 SHA512:
-  metadata.gz: b7b0b63137e252a121d71d202891841548bb43b40daae9289112811b42b4cc1afe4477c3fe73ca81d572e8bd7f4bdfd41d95fcb1aa78219af3feabc407918437
-  data.tar.gz: 16ad6ad19f3530e1773bc9f567d80a8c0c5b6366a9ba8e1c69bf6e3611d4817eaa58ba888d50c05766079fd1ca46fd131914007ae0c4838af0654c4ba2c43bcf
+  metadata.gz: 1c0e862e70f26c6fd50866fc95021c418f749e03b6b4ff9ae01a20d537e1744f29f73c7f8a79913cb99beeffdeaf9123ea9cb0148149ad9b9f7ccb606abcec83
+  data.tar.gz: e47c8285b8a7aae7e568cc91745607c03a6c43ff456955b7d8d608c374e41f9c999ba62e11861973a80864009b157d2a2b5d6d324c51f18ebd98027632382464

data/.travis.yml

@@ -5,30 +5,40 @@ sudo: false
 rvm:
   - 2.0.0
   - 2.1.10
-  - 2.2.5
-  - 2.3.1
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
   - ruby-head
-  - jruby-9.1.0.0
-  - rbx-3
+  - jruby-9.1.8.0
+  - rubinius-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_51.gemfile
+    - rvm: 2.1.10
+      gemfile: gemfiles/rails_51.gemfile
     - rvm: 2.0.0
       gemfile: gemfiles/rails_edge.gemfile
     - rvm: 2.1.10
       gemfile: gemfiles/rails_edge.gemfile
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails_41.gemfile
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails_42.gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/rails_41.gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/rails_42.gemfile
   allow_failures:
-    - rvm: jruby-9.1.0.0
-    - rvm: rbx-3
+    - rvm: jruby-9.1.8.0
+    - rvm: rubinius-3
 gemfile:
   - gemfiles/rails_41.gemfile
   - gemfiles/rails_42.gemfile
   - gemfiles/rails_50.gemfile
+  - gemfiles/rails_51.gemfile
   - gemfiles/rails_edge.gemfile

data/Gemfile

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

data/README.md

@@ -213,14 +213,14 @@ end
 ```
 
 You may notice that
-* There are no globalish `params` referrence
+* There are no globalish `params` reference
 * It's quite easy to comprehend what's the actual input value for each action
 * You may write the unit test code as if the actions are just normal Ruby methods
 
 
 ## Supported versions
 
-* Ruby 2.0.0, 2.1.x, 2.2.x, 2.3.x, 2.4.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.0 (trunk), JRuby, & Rubinius with 2.0+ mode
 
 * Rails 4.1.x, 4.2.x, 5.0, 5.1 (edge)
 

data/action_args.gemspec

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

data/gemfiles/rails_41.gemfile

@@ -1,6 +1,8 @@
+# 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 => '../'
 

data/gemfiles/rails_42.gemfile

@@ -1,6 +1,8 @@
+# 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 => '../'
 

data/gemfiles/rails_50.gemfile

@@ -1,8 +1,14 @@
+# 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.0'
+gem 'rails', '~> 5.0.1'
 
-gem 'rails-controller-testing'
+# FIXME: bundle from GH master until > 1.0.1 release
+gem 'rails-controller-testing', github: 'rails/rails-controller-testing'
 
 gemspec :path => '../'
 

data/gemfiles/rails_51.gemfile

@@ -0,0 +1,21 @@
+# 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.beta1'
+
+# FIXME: bundle from GH master until > 1.0.1 release
+gem 'rails-controller-testing', github: 'rails/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,9 @@
+# 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 'rack', github: 'rack/rack'
@@ -6,7 +11,8 @@ gem 'arel', github: 'rails/arel'
 gem 'sprockets', github: 'rails/sprockets'
 gem 'sprockets-rails', github: 'rails/sprockets-rails'
 gem 'sass-rails', github: 'rails/sass-rails'
-gem 'rails-controller-testing'
+# FIXME: bundle from GH master until > 1.0.1 release
+gem 'rails-controller-testing', github: 'rails/rails-controller-testing'
 
 gemspec :path => '../'
 

data/lib/action_args.rb

@@ -1,3 +1,4 @@
+# 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,3 +1,4 @@
+# frozen_string_literal: true
 require_relative 'params_handler'
 using ActionArgs::ParamsHandler
 
@@ -26,12 +27,8 @@ module ActionArgs
     #     end
     #   end
     #
-    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
-      @permitted_attributes = attributes
+    def permits(*attributes, model_name: nil)
+      @permitted_attributes, @permitting_model_name = attributes, model_name
     end
   end
 end

data/lib/action_args/callbacks.rb

@@ -1,36 +1,67 @@
+# frozen_string_literal: true
 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 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 = target.extract_method_arguments_from_params filter
-                target.send filter, *values, &blk
-              else
-                target.send filter, &blk
-              end
+      # Extending AS::Callbacks::Callback's `expand` 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
+
+        if (ActionController::Base === target) && (method != :instance_exec) && arguments.empty?
+          target.strengthen_params! method
+          arguments = target.extract_method_arguments_from_params method
+        end
+
+        [target, block, method, *arguments]
+      end
+    end
+
+    # 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 = target.extract_method_arguments_from_params filter
+              target.send filter, *values, &blk
+            else
+              target.send filter, &blk
             end
-          else
-            super
           end
+        else
+          super
         end
+      end
     end
   end
 end
 
-module ActiveSupport
-  module Callbacks
-    class Callback
-      prepend ActionArgs::ActiveSupport::CallbackParameterizer
+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
+      end
     end
   end
 end

data/lib/action_args/params_handler.rb

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

data/lib/action_args/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ActionArgs
-  VERSION = '2.1.0'
+  VERSION = '2.2.0'
 end

data/lib/generators/rails/action_args_scaffold_controller_generator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # load original rails scaffold_controller generator
 require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator'
 

data/test/controllers/action_args_controller_test.rb

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

data/test/controllers/hooks_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 class BooksControllerTest < ActionController::TestCase
@@ -12,8 +13,10 @@ class BooksControllerTest < ActionController::TestCase
       assert_equal @book, assigns(:book)
     end
 
-    test 'via String' do
-      assert assigns(:string_filter_executed)
+    if Rails.version < '5.1'
+      test 'via String' do
+        assert assigns(:string_filter_executed)
+      end
     end
 
     test 'via Proc' do

data/test/controllers/kwargs_controller_test.rb

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

data/test/controllers/kwargs_keyreq_controller_test.rb

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

data/test/controllers/ordinal_controller_test.rb

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

data/test/controllers/strong_parameters_test.rb

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

data/test/fake_app.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 # config
 ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
@@ -68,7 +69,9 @@ end
 class BooksController < ApplicationController
   before_action :set_book, only: :show
   before_action -> { @proc_filter_executed = true }, only: :show
-  before_action '@string_filter_executed = true', only: :show
+  if Rails.version < '5.1'
+    before_action '@string_filter_executed = true', only: :show
+  end
   around_action :benchmark_action
   before_action :omg
   skip_before_action :omg
@@ -147,7 +150,7 @@ require_relative 'kwargs_controllers'
 require_relative 'kwargs_keyreq_controllers' if RUBY_VERSION >= '2.1'
 
 # migrations
-class CreateAllTables < ActiveRecord::Migration
+class CreateAllTables < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
   def self.up
     create_table(:authors) {|t| t.string :name}
     create_table(:books) {|t| t.string :title; t.integer :price}

data/test/kwargs_controllers.rb

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

data/test/kwargs_keyreq_controllers.rb

@@ -1,3 +1,4 @@
+# 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,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 class UserMailerTest < ActionMailer::TestCase

data/test/params_handler/params_handler_test.rb

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

data/test/test_helper.rb

@@ -1,9 +1,14 @@
+# frozen_string_literal: true
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 # load Rails first
 require 'rails'
 require 'active_record'
 require 'action_controller/railtie'
+begin
+  require 'rails-controller-testing'
+rescue LoadError
+end
 require 'action_args'
 require 'fake_app'
 require 'test/unit/rails/test_help'

metadata

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