action_args 1.5.4 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7062ef48bdc9ea5251edabde8741bd59a94a053
-  data.tar.gz: 99a982870ef9d599448c17e00457a5663d847e16
+  metadata.gz: e5f4f25a659c405f12ede335715b003888d85750
+  data.tar.gz: 86b00b4457c7da799ce4d12d2baadf9a4c76761e
 SHA512:
-  metadata.gz: 3844a31080e5f9dd72f720ce3f747999773b50265dbc44892ca6e32e35cd8116e05b37d7a3bac0a267a5e9cb3821a1d33f8bd4815a29b7d4cc8d25663a89974b
-  data.tar.gz: 61d4f1c96d1a9da789452113e9fc32c900daeaa891e4aeb6f7e07f1e78027de6b1ed5ae191a6567e2cc6cc4ea1cdf4f88e9308d3d5f83807d901af29214074b2
+  metadata.gz: 4b253edeedc59dfd20bfde649b17af128570eef09214947cb961db481aaddf5fcd1ab43cc9d7236016c60a7ca832c3c0f7392c682f081515846181da7a9bf016
+  data.tar.gz: 9737e77da93a77c23b191ef085eb9ab40cb00a1249554da7723d51798b9cd6acc70ec24f5e00a8c530792b174ad8912b0092d43a491fd090ece7893459f73821

data/.travis.yml

@@ -1,20 +1,24 @@
-script: "bundle exec rake spec"
+script: 'bundle exec rake -t test'
 language: ruby
+sudo: false
+
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1
-  - 2.2
+  - 2.2.3
   - ruby-head
-  - jruby
+  - jruby-9.0.0.0
   - rbx
 matrix:
+  exclude:
+    - rvm: 2.0.0
+      gemfile: gemfiles/rails_edge.gemfile
+    - rvm: 2.1
+      gemfile: gemfiles/rails_edge.gemfile
   allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby
+    - rvm: jruby-9.0.0.0
     - rvm: rbx
 gemfile:
-  - gemfiles/rails_32.gemfile
-  - gemfiles/rails_40.gemfile
   - gemfiles/rails_41.gemfile
   - gemfiles/rails_42.gemfile
+  - gemfiles/rails_edge.gemfile

data/CONTRIBUTING.md

@@ -1,16 +1,17 @@
 # Contributing
 
-## Running specs
+## Running tests
 
 ActionArgs has several Bundler Gemfiles, each of which bundles different version of Rails.
 
     % ls gemfiles/*.gemfile
-    gemfiles/rails_32.gemfile gemfiles/rails_40.gemfile gemfiles/rails_41.gemfile
+    gemfiles/rails_41.gemfile gemfiles/rails_42.gemfile rails_edge.gemfile
+
 
 Via BUNDLE_GEMFILE ENV variable, you can tell Bundler which version of Rails to bundle.
 
-    $ BUNDLE_GEMFILE=gemfiles/rails_40.gemfile bundle ex rake spec
+    $ BUNDLE_GEMFILE=gemfiles/rails_42.gemfile bundle ex rake test
 
 Simply executing this command would probably run all tests against each version of Rails:
 
-    % rake spec:all
+    % rake test:all

data/README.md

@@ -1,6 +1,6 @@
 # ActionArgs
 
-Controller action arguments parameterizer for Rails 3 and 4
+Controller action arguments parameterizer for Rails 4.1+
 
 
 ## What is this?
@@ -28,7 +28,7 @@ This allows you to explicitly state which members of the `params` Hash are used
 
 ### Required Parameters (:req)
 Method parameters that you specify are required. If a key of the same name does not exist in the params Hash,
-ActionContrller::BadRequest (or ArgumentError in Rails 3) is raised.
+ActionContrller::BadRequest is raised.
 
 In this `show` action, ActionArgs will require that `id` parameter is provided.
 ```ruby
@@ -220,9 +220,11 @@ You may notice that
 
 ## Supported versions
 
-* Ruby 1.9.2, 1.9.3, 2.0.0, 2.1.x, 2.2.x, 2.3.0 (trunk), JRuby, & Rubinius with 1.9+ mode
+* Ruby 2.0.0, 2.1.x, 2.2.x, 2.3.0 (trunk), JRuby, & Rubinius with 2.0+ mode
 
-* Rails 3.0.x, 3.1.x, 3.2.x, 4.0.x, 4.1.x, 4.2.x, 5.0 (edge)
+* Rails 4.1.x, 4.2.x, 5.0 (edge)
+
+Please use Version 1.5.4 for Rails 4.0.x.
 
 
 ## Installation

data/Rakefile

@@ -1,29 +1,31 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-require 'rspec/core'
-require 'rspec/core/rake_task'
+require 'rake/testtask'
 
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.pattern = 'test/**/*_test.rb'
+  t.warning = true
+  t.verbose = true
 end
 
-task :default => 'spec:all'
+task :default => 'test:all'
 
-namespace :spec do
-  %w(rails_32 rails_40 rails_41 rails_42).each do |gemfile|
+namespace :test do
+  %w(rails_41 rails_42 rails_edge).each do |gemfile|
     desc "Run Tests against #{gemfile}"
     task gemfile do
       sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle --quiet"
-      sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle exec rake -t spec"
+      sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle exec rake -t test"
     end
   end
 
   desc 'Run Tests against all Rails versions'
   task :all do
-    %w(rails_32 rails_40 rails_41 rails_42).each do |gemfile|
+    %w(rails_41 rails_42 rails_edge).each do |gemfile|
       sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle --quiet"
-      sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle exec rake spec"
+      sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle exec rake -t test"
     end
   end
 end

data/action_args.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.authors     = ['Akira Matsuda']
   s.email       = ['ronnie@dio.jp']
   s.homepage    = 'http://asakusa.rubyist.net/'
-  s.summary     = 'Controller action arguments parameterizer for Rails 3+ & Ruby 1.9+'
+  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'
@@ -21,5 +21,5 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec-rails', ['~> 2.0', '< 2.99']
+  s.add_development_dependency 'test-unit-rails'
 end

data/gemfiles/rails_edge.gemfile

@@ -0,0 +1,19 @@
+source 'https://rubygems.org'
+
+gem 'rails', github: 'rails/rails'
+gem 'rack', github: 'rack/rack'
+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'
+
+gemspec :path => '../'
+
+platforms :ruby do
+  gem 'sqlite3'
+end
+
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter'
+end

data/lib/action_args.rb

@@ -1,21 +1,9 @@
-begin
-  require 'strong_parameters'
-rescue LoadError
-end
 require 'action_args/params_handler'
 require 'action_args/abstract_controller'
-if ActionArgs.respond_to? :prepend
-  require 'action_args/callbacks'
-else
-  require 'action_args/legacy/callbacks'
-end
+require 'action_args/callbacks'
 
 module ActionArgs
   class Railtie < ::Rails::Railtie
-    if config.respond_to? :app_generators
-      config.app_generators.scaffold_controller = :action_args_scaffold_controller
-    else
-      config.generators.scaffold_controller = :action_args_scaffold_controller
-    end
+    config.app_generators.scaffold_controller = :action_args_scaffold_controller
   end
 end

data/lib/action_args/abstract_controller.rb

@@ -1,44 +1,33 @@
+require_relative 'params_handler'
+using ActionArgs::ParamsHandler
+
 module AbstractController
   class Base
-    if defined? ActionController::StrongParameters
-      def send_action(method_name, *args)
-        return send method_name, *args unless args.empty?
-        return send method_name, *args unless defined?(params)
-
-        method_parameters = method(method_name).parameters
-        ActionArgs::ParamsHandler.strengthen_params!(self.class, method_parameters, params)
-        values = ActionArgs::ParamsHandler.extract_method_arguments_from_params method_parameters, params
-        send method_name, *values
-      end
+    def send_action(method_name, *args)
+      return send method_name, *args unless args.empty?
+      return send method_name, *args unless defined?(params)
 
-      # 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.
-      #
-      #   class UsersController < ApplicationController
-      #     permits :name, :age
-      #
-      #     def create(user)
-      #       @user = User.new(user)
-      #     end
-      #   end
-      #
-      def self.permits(*attributes)
-        if attributes.last.is_a?(Hash) && attributes.last.extractable_options? && attributes.last.has_key?(:model_name)
-          options = attributes.pop
-          @permitting_model_name = options[:model_name]
-        end
-        @permitted_attributes = attributes
-      end
-    # no StrongParameters
-    else
-      def send_action(method_name, *args)
-        return send method_name, *args unless args.empty?
-        return send method_name, *args unless defined?(params)
+      send_with_method_parameters_from_params method_name
+    end
 
-        values = ActionArgs::ParamsHandler.extract_method_arguments_from_params method(method_name).parameters, params
-        send method_name, *values
+    # 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.
+    #
+    #   class UsersController < ApplicationController
+    #     permits :name, :age
+    #
+    #     def create(user)
+    #       @user = User.new(user)
+    #     end
+    #   end
+    #
+    def self.permits(*attributes)
+      if attributes.last.is_a?(Hash) && attributes.last.extractable_options? && attributes.last.has_key?(:model_name)
+        options = attributes.pop
+        @permitting_model_name = options[:model_name]
       end
+      @permitted_attributes = attributes
     end
   end
 end

data/lib/action_args/callbacks.rb

@@ -1,7 +1,8 @@
+using ActionArgs::ParamsHandler
+
 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
@@ -11,11 +12,7 @@ module ActionArgs
           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
+                target.send_with_method_parameters_from_params filter, &blk
               else
                 target.send filter, &blk
               end
@@ -24,45 +21,6 @@ module ActionArgs
             super
           end
         end
-
-      elsif Rails.version > '4.0'
-        def apply(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
-          super
-        end
-
-      else  # Rails 3.2
-        def start(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
-          super
-        end
-      end
     end
   end
 end

data/lib/action_args/params_handler.rb

@@ -1,51 +1,57 @@
 module ActionArgs
   module ParamsHandler
-    # converts the request params Hash into an Array to be passed into the target Method
-    def self.extract_method_arguments_from_params(method_parameters, params)
-      kwargs, missing_required_params = {}, []
-      parameter_names = method_parameters.map(&:last)
-      method_parameters.reverse_each do |type, key|
-        case type
-        when :req
-          missing_required_params << key unless params.has_key? key
-          next
-        when :keyreq
-          if params.has_key? key
-            kwargs[key] = params[key]
-          else
-            missing_required_params << key
+    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
+        kwargs, missing_required_params = {}, []
+        parameter_names = method_parameters.map(&:last)
+        method_parameters.reverse_each do |type, key|
+          case type
+          when :req
+            missing_required_params << key unless params.has_key? key
+            next
+          when :keyreq
+            if params.has_key? key
+              kwargs[key] = params[key]
+            else
+              missing_required_params << key
+            end
+          when :key
+            kwargs[key] = params[key] if params.has_key? key
+          when :opt
+            break if params.has_key? key
           end
-        when :key
-          kwargs[key] = params[key] if params.has_key? key
-        when :opt
-          break if params.has_key? key
+          # omitting parameters that are :block, :rest, :opt without a param, and :key without a param
+          parameter_names.delete 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?
-        if defined? ActionController::BadRequest
-          raise ActionController::BadRequest.new(:required, ArgumentError.new("Missing required parameters: #{missing_required_params.join(', ')}"))
-        else
-          raise ArgumentError, "Missing required parameters: #{missing_required_params.join(', ')}"
+        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(', ')}"))
         end
-      end
 
-      values = parameter_names.map {|k| params[k]}
-      values << kwargs if kwargs.any?
-      values
-    end
+        values = parameter_names.map {|k| params[k]}
+        values << kwargs if kwargs.any?
+        values
+      end
 
-    # permits declared model attributes in the params Hash
-    # note that this method mutates the given params Hash
-    def self.strengthen_params!(controller_class, method_parameters, params)
-      permitting_model_name = controller_class.instance_variable_defined?(:@permitting_model_name) && controller_class.instance_variable_get(:@permitting_model_name)
-      target_model_name = (permitting_model_name || controller_class.name.sub(/.+::/, '').sub(/Controller$/, '')).singularize.underscore.tr('/', '_').to_sym
-      permitted_attributes = controller_class.instance_variable_defined?(:@permitted_attributes) && controller_class.instance_variable_get(:@permitted_attributes)
+      # permits declared model attributes in the params Hash
+      # note that this method mutates the given params Hash
+      def strengthen_params!(method_name)
+        permitting_model_name = self.class.instance_variable_defined?(:@permitting_model_name) && self.class.instance_variable_get(:@permitting_model_name)
+        target_model_name = (permitting_model_name || self.class.name.sub(/.+::/, '').sub(/Controller$/, '')).singularize.underscore.tr('/', '_').to_sym
+        permitted_attributes = self.class.instance_variable_defined?(:@permitted_attributes) && self.class.instance_variable_get(:@permitted_attributes)
 
-      method_parameters.each do |type, key|
-        if (key == target_model_name) && permitted_attributes
-          params[key] = params.require(key).try :permit, *permitted_attributes
+        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
+          end
         end
       end
     end

data/lib/action_args/version.rb

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

data/lib/generators/rails/action_args_scaffold_controller_generator.rb

@@ -10,6 +10,3 @@ module Rails
     end
   end
 end
-
-# load custom rspec generator
-require 'generators/action_args/rspec/scaffold/scaffold_generator' if defined? ::RSpec::Rails