action_args 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc3c3e13a176e31e7bd8cd5fef3f81ad07ec90e1
-  data.tar.gz: 2a9c273f4ff29a1648f5c7668480d9d89a38edce
+  metadata.gz: 1807030ec2fd680d15c088b5c5be6832d1418095
+  data.tar.gz: ee7b83c11cc9c38368a0c33205aa15bbf8aa7d5a
 SHA512:
-  metadata.gz: 66054d421bd9685f970bbe57aeb2337013e2e46dbb062ac46aa2a702b5f20ecb910a0a26294f7f07ca502c1c82974ce045fcf9fa61bb00aa528fd21171b42752
-  data.tar.gz: 4c124ceb79d14182f86fad1fc6fb4b3cda4c3ef2dc75dab8f4d3ad8b974a253d097524eddaae879139f78defa0514d89c5e3eed0c58a5fef90d503d92b563245
+  metadata.gz: b8897628771fe3b47a501c72a488d537e32dc817a0798cf7196158037cc4233f8c57e2ab49cdbe8e1a77cbb357664d1c44a7cddca76533515839a476630a68f0
+  data.tar.gz: 6fa4f61b8d08f9eefd92ed02ebdf485fd4b5156633dd308917b97e54d60bae98ac2dd0fd13a274e3f9d7223a0a10b7cec91b857a9f3b71e41c585ad8a31cdeb0

data/README.md

@@ -155,8 +155,6 @@ Thus, by hitting the scaffold generator command like this:
 The following elegant controller code will be generated:
 
 ```ruby
-# coding: utf-8
-
 class UsersController < ApplicationController
   before_action :set_user, only: [:show, :edit, :update, :destroy]
   permits :name, :age, :email

data/Rakefile

@@ -11,7 +11,7 @@ end
 task :default => 'spec:all'
 
 namespace :spec do
-  %w(rails_32 rails_40 rails_41).each do |gemfile|
+  %w(rails_32 rails_40 rails_41 rails_42).each do |gemfile|
     desc "Run Tests against #{gemfile}"
     task gemfile do
       sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle --quiet"
@@ -21,7 +21,7 @@ namespace :spec do
 
   desc 'Run Tests against all Rails versions'
   task :all do
-    %w(rails_32 rails_40 rails_41).each do |gemfile|
+    %w(rails_32 rails_40 rails_41 rails_42).each do |gemfile|
       sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle --quiet"
       sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle exec rake spec"
     end

data/lib/action_args.rb

@@ -4,7 +4,11 @@ rescue LoadError
 end
 require 'action_args/params_handler'
 require 'action_args/abstract_controller'
-require 'action_args/callbacks'
+if ActionArgs.respond_to? :prepend
+  require 'action_args/callbacks'
+else
+  require 'action_args/legacy/callbacks'
+end
 
 module ActionArgs
   class Railtie < ::Rails::Railtie

data/lib/action_args/callbacks.rb

@@ -1,13 +1,13 @@
-module ActiveSupport
-  module Callbacks
-    class Callback
+module ActionArgs
+  module ActiveSupport
+    module CallbackParameterizer
       if Rails.version > '4.1'
         # 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_with_method_parameters(filter)
+        def make_lambda(filter)
           if Symbol === filter
             lambda do |target, _, &blk|
               if ActionController::Base === target
@@ -21,13 +21,12 @@ module ActiveSupport
               end
             end
           else
-            make_lambda_without_method_parameters filter
+            super
           end
         end
-        alias_method_chain :make_lambda, :method_parameters
 
       elsif Rails.version > '4.0'
-        def apply_with_method_parameters(code)
+        def apply(code)
           if (Symbol === @filter) && (@klass < ActionController::Base)
             method_body = <<-FILTER
               meth = method :#{@filter}
@@ -42,12 +41,11 @@ module ActiveSupport
               @filter = method_body.chomp
             end
           end
-          apply_without_method_parameters code
+          super
         end
-        alias_method_chain :apply, :method_parameters
 
       else  # Rails 3.2
-        def start_with_method_parameters(key=nil, object=nil)
+        def start(key=nil, object=nil)
           if (Symbol === @filter) && (@klass < ActionController::Base)
             method_body = <<-FILTER
               meth = method :#{@filter}
@@ -62,10 +60,17 @@ module ActiveSupport
               @filter = method_body.chomp
             end
           end
-          start_without_method_parameters key, object
+          super
         end
-        alias_method_chain :start, :method_parameters
       end
     end
   end
 end
+
+module ActiveSupport
+  module Callbacks
+    class Callback
+      prepend ActionArgs::ActiveSupport::CallbackParameterizer
+    end
+  end
+end

data/lib/action_args/legacy/callbacks.rb

@@ -0,0 +1,71 @@
+module ActiveSupport
+  module Callbacks
+    class Callback
+      if Rails.version > '4.1'
+        # 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_with_method_parameters(filter)
+          if Symbol === filter
+            lambda do |target, _, &blk|
+              if ActionController::Base === target
+                meth = target.method filter
+                method_parameters = meth.parameters
+                ActionArgs::ParamsHandler.strengthen_params!(target.class, method_parameters, target.params)
+                values = ActionArgs::ParamsHandler.extract_method_arguments_from_params method_parameters, target.params
+                target.send filter, *values, &blk
+              else
+                target.send filter, &blk
+              end
+            end
+          else
+            make_lambda_without_method_parameters filter
+          end
+        end
+        alias_method_chain :make_lambda, :method_parameters
+
+      elsif Rails.version > '4.0'
+        def apply_with_method_parameters(code)
+          if (Symbol === @filter) && (@klass < ActionController::Base)
+            method_body = <<-FILTER
+              meth = method :#{@filter}
+              method_parameters = meth.parameters
+              ActionArgs::ParamsHandler.strengthen_params!(self.class, method_parameters, params)
+              values = ActionArgs::ParamsHandler.extract_method_arguments_from_params method_parameters, params
+              send :#{@filter}, *values
+            FILTER
+            if @kind == :before
+              @filter = "begin\n#{method_body}\nend"
+            else
+              @filter = method_body.chomp
+            end
+          end
+          apply_without_method_parameters code
+        end
+        alias_method_chain :apply, :method_parameters
+
+      else  # Rails 3.2
+        def start_with_method_parameters(key=nil, object=nil)
+          if (Symbol === @filter) && (@klass < ActionController::Base)
+            method_body = <<-FILTER
+              meth = method :#{@filter}
+              method_parameters = meth.parameters
+              ActionArgs::ParamsHandler.strengthen_params!(self.class, method_parameters, params)
+              values = ActionArgs::ParamsHandler.extract_method_arguments_from_params method_parameters, params
+              send :#{@filter}, *values
+            FILTER
+            if @kind == :before
+              @filter = "begin\n#{method_body}\nend"
+            else
+              @filter = method_body.chomp
+            end
+          end
+          start_without_method_parameters key, object
+        end
+        alias_method_chain :start, :method_parameters
+      end
+    end
+  end
+end

data/lib/action_args/version.rb

@@ -1,3 +1,3 @@
 module ActionArgs
-  VERSION = '1.5.2'.freeze
+  VERSION = '1.5.3'
 end

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

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 class <%= controller_class_name %>Controller < ApplicationController
   before_action :set_<%= singular_table_name %>, only: [:show, :edit, :update, :destroy]
 <% if defined? ActionController::StrongParameters -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action_args
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-24 00:00:00.000000000 Z
+date: 2015-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,7 @@ files:
 - lib/action_args.rb
 - lib/action_args/abstract_controller.rb
 - lib/action_args/callbacks.rb
+- lib/action_args/legacy/callbacks.rb
 - lib/action_args/params_handler.rb
 - lib/action_args/version.rb
 - lib/generators/action_args/rspec/scaffold/scaffold_generator.rb