action_args 1.5.4 → 2.0.0

data/{spec/spec_helper.rb → test/test_helper.rb}

@@ -6,10 +6,5 @@ require 'active_record'
 require 'action_controller/railtie'
 require 'action_args'
 require 'fake_app'
-require 'rspec/rails'
-
-RSpec.configure do |config|
-  config.before :all do
-    CreateAllTables.up unless ActiveRecord::Base.connection.table_exists? 'authors'
-  end
-end
+require 'test/unit/rails/test_help'
+Bundler.require

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action_args
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 2.0.0
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-19 00:00:00.000000000 Z
+date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,25 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: test-unit-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '0'
 description: Rails plugin gem that supports Merbish style controller action arguments.
 email:
 - ronnie@dio.jp
@@ -66,7 +60,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rspec"
 - ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
@@ -74,32 +67,28 @@ files:
 - README.md
 - Rakefile
 - action_args.gemspec
-- gemfiles/rails_32.gemfile
-- gemfiles/rails_40.gemfile
 - gemfiles/rails_41.gemfile
 - gemfiles/rails_42.gemfile
+- gemfiles/rails_edge.gemfile
 - 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
-- lib/generators/action_args/rspec/scaffold/templates/action_args_controller_spec.rb
 - lib/generators/rails/action_args_scaffold_controller_generator.rb
 - lib/generators/rails/templates/controller.rb
-- spec/controllers/action_args_controller_spec.rb
-- spec/controllers/hooks_spec.rb
-- spec/controllers/kwargs_controller_spec.rb
-- spec/controllers/kwargs_keyreq_controller_spec.rb
-- spec/controllers/ordinal_controller_spec.rb
-- spec/controllers/strong_parameters_spec.rb
-- spec/fake_app.rb
-- spec/kwargs_controllers.rb
-- spec/kwargs_keyreq_controllers.rb
-- spec/mailers/action_mailer_spec.rb
-- spec/params_handler/params_handler_spec.rb
-- spec/spec_helper.rb
+- test/controllers/action_args_controller_test.rb
+- test/controllers/hooks_test.rb
+- test/controllers/kwargs_controller_test.rb
+- test/controllers/kwargs_keyreq_controller_test.rb
+- test/controllers/ordinal_controller_test.rb
+- test/controllers/strong_parameters_test.rb
+- test/fake_app.rb
+- test/kwargs_controllers.rb
+- test/kwargs_keyreq_controllers.rb
+- test/mailers/action_mailer_test.rb
+- test/params_handler/params_handler_test.rb
+- test/test_helper.rb
 homepage: http://asakusa.rubyist.net/
 licenses: []
 metadata: {}
@@ -119,20 +108,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: action_args
-rubygems_version: 2.5.0
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: Controller action arguments parameterizer for Rails 3+ & Ruby 1.9+
+summary: Controller action arguments parameterizer for Rails 4+ & Ruby 2.0+
 test_files:
-- spec/controllers/action_args_controller_spec.rb
-- spec/controllers/hooks_spec.rb
-- spec/controllers/kwargs_controller_spec.rb
-- spec/controllers/kwargs_keyreq_controller_spec.rb
-- spec/controllers/ordinal_controller_spec.rb
-- spec/controllers/strong_parameters_spec.rb
-- spec/fake_app.rb
-- spec/kwargs_controllers.rb
-- spec/kwargs_keyreq_controllers.rb
-- spec/mailers/action_mailer_spec.rb
-- spec/params_handler/params_handler_spec.rb
-- spec/spec_helper.rb
+- test/controllers/action_args_controller_test.rb
+- test/controllers/hooks_test.rb
+- test/controllers/kwargs_controller_test.rb
+- test/controllers/kwargs_keyreq_controller_test.rb
+- test/controllers/ordinal_controller_test.rb
+- test/controllers/strong_parameters_test.rb
+- test/fake_app.rb
+- test/kwargs_controllers.rb
+- test/kwargs_keyreq_controllers.rb
+- test/mailers/action_mailer_test.rb
+- test/params_handler/params_handler_test.rb
+- test/test_helper.rb

data/.rspec

@@ -1,2 +0,0 @@
---color
---warnings

data/gemfiles/rails_32.gemfile

@@ -1,14 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rails', '~> 3.2.9'
-
-gemspec :path => '../'
-
-platforms :ruby do
-  gem 'sqlite3'
-end
-
-platforms :jruby do
-  gem 'activerecord-jdbcsqlite3-adapter'
-end
-gem 'test-unit'

data/gemfiles/rails_40.gemfile

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

data/lib/action_args/legacy/callbacks.rb

@@ -1,71 +0,0 @@
-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/generators/action_args/rspec/scaffold/scaffold_generator.rb

@@ -1,18 +0,0 @@
-# load original rspec scaffold generator
-require 'generators/rspec/scaffold/scaffold_generator'
-
-# override rspec genarator to switch template file
-module Rspec
-  module Generators
-    class ScaffoldGenerator < Base
-      source_paths << File.expand_path('../templates', __FILE__)
-
-      def generate_controller_spec
-        return unless options[:controller_specs]
-
-        template 'action_args_controller_spec.rb',
-                 File.join('spec/controllers', controller_class_path, "#{controller_file_name}_controller_spec.rb")
-      end
-    end
-  end
-end

data/lib/generators/action_args/rspec/scaffold/templates/action_args_controller_spec.rb

@@ -1,130 +0,0 @@
-require 'spec_helper'
-
-describe <%= controller_class_name %>Controller do
-  # This should return the minimal set of attributes required to create a valid
-  # <%= class_name %>. As you add validations to <%= class_name %>, be sure to
-  # update the return value of this method accordingly.
-  def valid_attributes
-    <%= formatted_hash(example_valid_attributes) %>
-  end
-
-<% unless options[:singleton] -%>
-  describe 'GET index' do
-    before do
-      @<%= file_name %> = <%= class_name %>.create! valid_attributes
-      controller.index
-    end
-    describe 'assigns all <%= table_name.pluralize %> as @<%= table_name.pluralize %>' do
-      subject { controller.instance_variable_get('@<%= table_name %>') }
-      it { should eq([@<%= file_name %>]) }
-    end
-  end
-
-<% end -%>
-  describe 'GET show' do
-    before do
-      @<%= file_name %> = <%= class_name %>.create! valid_attributes
-      controller.show(@<%= file_name %>.to_param)
-    end
-    describe 'assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>' do
-      subject { controller.instance_variable_get('@<%= ns_file_name %>') }
-      it { should eq(@<%= file_name %>) }
-    end
-  end
-
-  describe 'GET new' do
-    before do
-      controller.new
-    end
-    describe 'assigns a new <%= ns_file_name %> as @<%= ns_file_name %>' do
-      subject { controller.instance_variable_get('@<%= ns_file_name %>') }
-      it { should be_a_new(<%= class_name %>) }
-    end
-  end
-
-  describe 'GET edit' do
-    before do
-      @<%= file_name %> = <%= class_name %>.create! valid_attributes
-      controller.edit(@<%= file_name %>.to_param)
-    end
-    describe 'assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>' do
-      subject { controller.instance_variable_get('@<%= ns_file_name %>') }
-      it { should eq(@<%= file_name %>) }
-    end
-  end
-
-  describe 'POST create' do
-    context 'with valid params' do
-      before do
-        controller.should_receive(:redirect_to) {|u| u.should eq(<%= class_name %>.last) }
-      end
-      describe 'creates a new <%= class_name %>' do
-        it { expect {
-          controller.create(valid_attributes)
-        }.to change(<%= class_name %>, :count).by(1) }
-      end
-
-      describe 'assigns a newly created <%= ns_file_name %> as @<%= ns_file_name %> and redirects to the created <%= ns_file_name %>' do
-        before do
-          controller.create(valid_attributes)
-        end
-        subject { controller.instance_variable_get('@<%= ns_file_name %>') }
-        it { should be_a(<%= class_name %>) }
-        it { should be_persisted }
-      end
-    end
-
-    context 'with invalid params' do
-      describe "assigns a newly created but unsaved <%= ns_file_name %> as @<%= ns_file_name %>, and re-renders the 'new' template" do
-        before do
-          <%= class_name %>.any_instance.stub(:save) { false }
-          controller.should_receive(:render).with(:action => 'new')
-          controller.create(<%= formatted_hash(example_invalid_attributes) %>)
-        end
-        subject { controller.instance_variable_get('@<%= ns_file_name %>') }
-        it { should be_a_new(<%= class_name %>) }
-      end
-    end
-  end
-
-  describe 'PUT update' do
-    context 'with valid params' do
-      describe 'updates the requested <%= ns_file_name %>, assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>, and redirects to the <%= ns_file_name %>' do
-        before do
-          @<%= file_name %> = <%= class_name %>.create! valid_attributes
-          controller.should_receive(:redirect_to).with(@<%= file_name %>, anything)
-          controller.update(@<%= file_name %>.to_param, valid_attributes)
-        end
-        subject { controller.instance_variable_get('@<%= ns_file_name %>') }
-        it { should eq(@<%= file_name %>) }
-      end
-    end
-
-    context 'with invalid params' do
-      describe "assigns the <%= ns_file_name %> as @<%= ns_file_name %>, and re-renders the 'edit' template" do
-        before do
-          @<%= file_name %> = <%= class_name %>.create! valid_attributes
-          # Trigger the behavior that occurs when invalid params are submitted
-          <%= class_name %>.any_instance.stub(:save) { false }
-          controller.should_receive(:render).with(:action => 'edit')
-          controller.update(@<%= file_name %>.to_param, <%= formatted_hash(example_invalid_attributes) %>)
-        end
-        subject { controller.instance_variable_get('@<%= ns_file_name %>') }
-        it { should eq(@<%= file_name %>) }
-      end
-    end
-  end
-
-  describe 'DELETE destroy' do
-    before do
-      @<%= file_name %> = <%= class_name %>.create! valid_attributes
-      controller.stub(:<%= index_helper %>_url) { '/<%= index_helper %>' }
-      controller.should_receive(:redirect_to).with('/<%= index_helper %>')
-    end
-    it 'destroys the requested <%= ns_file_name %>, and redirects to the <%= table_name %> list' do
-      expect {
-        controller.destroy(@<%= file_name %>.to_param)
-      }.to change(<%= class_name %>, :count).by(-1)
-    end
-  end
-end

data/spec/controllers/action_args_controller_spec.rb

@@ -1,42 +0,0 @@
-require 'spec_helper'
-
-describe BooksController do
-  describe 'GET index (having an optional parameter)' do
-    before do
-      @books = []
-      Book.delete_all
-      100.times {|i| @books << Book.create!(title: 'book'+i.to_s) }
-    end
-    context 'without page parameter' do
-      before { get :index }
-      its(:response) { should be_success }
-      it { expect(assigns(:books)).to match_array(@books[0..9]) }
-    end
-
-    context 'with page parameter' do
-      before { get :index, page: 3 }
-      its(:response) { should be_success }
-      it { expect(assigns(:books)).to match_array(@books[20..29]) }
-    end
-
-    context 'first param is nil and second is not nil' do
-      let!(:rhg) { Book.create! title: 'RHG' }
-      let!(:awdwr) { Book.create! title: 'AWDwR' }
-      before { get :index, q: 'RH' }
-      subject { assigns :books }
-      it { should == [rhg] }
-    end
-  end
-
-  describe 'GET show' do
-    let(:rhg) { Book.create! title: 'RHG' }
-    before { get :show, :id => rhg.id }
-    subject { assigns :book }
-    it { should == rhg }
-  end
-
-  describe 'POST create' do
-    let(:rhg) { Book.create! title: 'RHG' }
-    it { expect { post :create, :book => {title: 'AWDwR', price: 24} }.to change(Book, :count).by(1) }
-  end
-end