rename_params 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab818ecdac22088f8e4c0fc471f1b14493f3087e
-  data.tar.gz: d316571c82a95e8697da6e30c2813ab23e049d21
+  metadata.gz: b90214f110951409c498a774e7a3e4b59fab5c36
+  data.tar.gz: a9eac70722c932f4d4c6d233340575ff2afe5108
 SHA512:
-  metadata.gz: fe1cb6c108e84637a6dadba79c4059c49cc0d36c9de3b4229f1c70c6ae90e3e335cbcd4c39174429d2ab8049ead791316f970488c28c31487cf95382d8fb70b3
-  data.tar.gz: ce58245c80d31fdeac5a6a84d64763ac8a113309c2c9dbec93173a6e18b3db5580648b73490b749df68a225f1651ffcc66a70f6dcbed3bb729bd316d02f17856
+  metadata.gz: 6dd0a4c6daf1cd74783714857ff26a7cbafbf84924896682373b6c6a848017223d6158cc584d6ea825465438ee0459a393d542d987d1e2db7a9c2ce2a1bb9eb8
+  data.tar.gz: 749be24287ffa76428ebab7a9f46175015d6b10b827b8af25a25a2142214a7f181ebd86d408c9dbca4c723bf97adfe47a66463da3718bed7e9ce4ffe1ba0f1b2

data/lib/rename_params.rb

@@ -1,6 +1,9 @@
 require 'active_support'
 require 'active_support/core_ext'
 require 'action_controller'
+require 'rename_params/macros/base'
+require 'rename_params/macros/rename'
+require 'rename_params/macros/move'
 require 'rename_params/macros'
 require 'rename_params/params'
 require 'rename_params/converters/hash_converter'

data/lib/rename_params/macros.rb

@@ -4,40 +4,15 @@ module RenameParams
 
     module ClassMethods
       def rename(*args)
-        current_param = args.shift
-        options = build_options(*args)
-
-        before_filter options[:filters] do
-          new_params = RenameParams::Params.new(params, self)
-          new_params.convert(current_param, options[:convert], options[:namespace])
-          new_params.rename(current_param, options[:to], options[:namespace])
-        end
-      end
-
-      private
-
-      def build_options(args = {})
-        {
-          to: args[:to],
-          convert: args[:convert],
-          namespace: namespace_options(args),
-          filters: filter_options(args)
-        }
-      end
-
-      def namespace_options(args = {})
-        args[:namespace].is_a?(Array) ? args[:namespace] : [args[:namespace]].compact
+        RenameParams::Macros::Rename.def_rename(self, *args)
       end
 
-      def filter_options(args = {})
-        {
-          only: args.delete(:only),
-          except: args.delete(:except)
-        }.reject { |_, v| v.nil? }
+      def move(*args)
+        RenameParams::Macros::Move.def_move(self, *args)
       end
     end
   end
 end
 
 ActionController::API.send(:include, RenameParams::Macros) if defined?(ActionController::API)
-ActionController::Base.send(:include, RenameParams::Macros) if defined?(ActionController::Base)
+ActionController::Base.send(:include, RenameParams::Macros) if defined?(ActionController::Base)

data/lib/rename_params/macros/base.rb

@@ -0,0 +1,26 @@
+module RenameParams
+  module Macros
+    class Base
+      class << self
+
+        def namespace_options(args = {})
+          args[:namespace] = [] if args[:namespace] == :root
+          args[:namespace].is_a?(Array) ? args[:namespace] : [args[:namespace]].compact
+        end
+
+        def move_to_options(key, args = {})
+          return unless args[key]
+          args[key] = [] if args[key] == :root
+          args[key].is_a?(Array) ? args[key] : [args[key]]
+        end
+
+        def filter_options(args = {})
+          {
+            only: args.delete(:only),
+            except: args.delete(:except)
+          }.reject { |_, v| v.nil? }
+        end
+      end
+    end
+  end
+end

data/lib/rename_params/macros/move.rb

@@ -0,0 +1,28 @@
+module RenameParams
+  module Macros
+    class Move < Base
+      class << self
+
+        def def_move(klass, *args)
+          move_param = args.shift
+          options = build_options(*args)
+
+          klass.before_filter(options[:filters]) do |controller|
+            params = RenameParams::Params.new(controller.params, controller)
+            params.move(move_param, options[:to], options[:namespace]) if options[:to]
+          end
+        end
+
+        private
+
+        def build_options(args = {})
+          {
+            to: move_to_options(:to, args),
+            namespace: namespace_options(args),
+            filters: filter_options(args)
+          }
+        end
+      end
+    end
+  end
+end

data/lib/rename_params/macros/rename.rb

@@ -0,0 +1,32 @@
+module RenameParams
+  module Macros
+    class Rename < Base
+      class << self
+
+        def def_rename(klass, *args)
+          rename_param = args.shift
+          options = build_options(*args)
+
+          klass.before_filter options[:filters] do |controller|
+            params = RenameParams::Params.new(controller.params, controller)
+            params.convert(rename_param, options[:convert], options[:namespace])
+            params.rename(rename_param, options[:to], options[:namespace])
+            params.move(options[:to], options[:move_to], options[:namespace]) if options[:move_to]
+          end
+        end
+
+        private
+
+        def build_options(args = {})
+          {
+            to: args[:to],
+            convert: args[:convert],
+            move_to: move_to_options(:move_to, args),
+            namespace: namespace_options(args),
+            filters: filter_options(args)
+          }
+        end
+      end
+    end
+  end
+end

data/lib/rename_params/params.rb

@@ -22,9 +22,14 @@ module RenameParams
       set(new_key, delete(key, namespace), namespace) if has_key?(key, namespace)
     end
 
+    def move(key, target = [], namespace = [])
+      set(key, delete(key, namespace), target)
+    end
+
     private
 
     def set(key, value, namespace = [])
+      create_namespace(namespace)
       namespaced(namespace)[key] = value
     end
 
@@ -47,6 +52,14 @@ module RenameParams
       params
     end
 
+    def create_namespace(namespace)
+      params = @params
+      namespace.each do |ns|
+        params[ns] ||= {}
+        params = params[ns]
+      end
+    end
+
     def converter_class(converter)
       if converter.is_a?(Hash)
         RenameParams::Converters::HashConverter.new(converter)

data/lib/rename_params/version.rb

@@ -1,3 +1,3 @@
 module RenameParams
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/spec/macros/move_spec.rb

@@ -0,0 +1,77 @@
+describe RenameParams::Macros::Move, type: :controller do
+  context 'with :root' do
+    controller(ActionController::Base) do
+      move :name, to: :root, namespace: :billing_contact
+
+      def update
+        head :ok
+      end
+    end
+
+    describe 'move' do
+      before { routes.draw { get 'update' => 'anonymous#update' } }
+
+      it 'moves billing_contact[:name] to root' do
+        put :update, { 'billing_contact' => { 'name' => 'Marcelo' } }
+        expect(controller.params).to eq('controller' => 'anonymous', 'action' => 'update', 'billing_contact' => {}, 'name' => 'Marcelo' )
+      end
+    end
+  end
+
+  context 'with existent nested key' do
+    controller(ActionController::Base) do
+      move :street, to: :billing_contact, namespace: [:billing_contact, :address]
+
+      def update
+        head :ok
+      end
+    end
+
+    describe 'move' do
+      before { routes.draw { get 'update' => 'anonymous#update' } }
+
+      it 'moves billing_contact[:address][:street] to billing_contact[:street]' do
+        put :update, { 'billing_contact' => { 'address' => { 'street' => '123 St' } } }
+        expect(controller.params).to eq('controller' => 'anonymous', 'action' => 'update', 'billing_contact' => { 'address' => {}, 'street' => '123 St' } )
+      end
+    end
+  end
+
+  context 'with non existent nested key' do
+    controller(ActionController::Base) do
+      move :name, to: :contact, namespace: :billing_contact
+
+      def update
+        head :ok
+      end
+    end
+
+    describe 'move' do
+      before { routes.draw { get 'update' => 'anonymous#update' } }
+
+      it 'moves billing_contact[:name] to contact[:name]' do
+        put :update, { 'billing_contact' => { 'name' => 'Marcelo' } }
+        expect(controller.params).to eq('controller' => 'anonymous', 'action' => 'update', 'billing_contact' => {}, 'contact' => { 'name' =>'Marcelo' })
+      end
+    end
+  end
+
+  context 'with non existent deep nested key' do
+    controller(ActionController::Base) do
+      move :name, to: [:contact, :info], namespace: :billing_contact
+
+      def update
+        head :ok
+      end
+    end
+
+    describe 'move' do
+      before { routes.draw { get 'update' => 'anonymous#update' } }
+
+      it 'moves billing_contact[:name] to contact[:info][:name]' do
+        put :update, { 'billing_contact' => { 'name' => 'Marcelo' } }
+        expect(controller.params).to eq('controller' => 'anonymous', 'action' => 'update', 'billing_contact' => {}, 'contact' => { 'info' => { 'name' =>'Marcelo' } })
+      end
+    end
+  end
+end

data/spec/macros/rename_spec.rb

@@ -0,0 +1,299 @@
+describe RenameParams::Macros::Rename, type: :controller do
+  context 'when not filtering' do
+    let(:default_params) { { 'controller' => 'anonymous', 'action' => 'index' } }
+    before { routes.draw { get 'index' => 'anonymous#index' } }
+
+    describe 'when just renaming params' do
+      controller(ActionController::Base) do
+        rename :username, to: :login
+
+        def index
+          head :ok
+        end
+      end
+
+      it 'renames username to login' do
+        get :index, { username: 'aperson' }
+        expect(controller.params).to eq default_params.merge('login' => 'aperson')
+      end
+
+      context 'if param is not sent' do
+        it 'leaves params as they were' do
+          get :index
+          expect(controller.params).to eq default_params
+        end
+      end
+    end
+
+    describe 'when converting values' do
+      context 'and using enum converter' do
+        controller(ActionController::Base) do
+          rename :admin, to: :role, convert: { true: ['admin'], false: [] }
+
+          def index
+            head :ok
+          end
+        end
+
+        it 'renames admin to role and converts value' do
+          get :index, { admin: 'true' }
+          expect(controller.params).to eq default_params.merge('role' => ['admin'])
+        end
+
+        context 'if param is not sent' do
+          it 'leaves params as they were' do
+            get :index
+            expect(controller.params).to eq default_params
+          end
+        end
+      end
+
+      context 'and using a Proc converter' do
+        controller(ActionController::Base) do
+          rename :amount_due, to: :amount_due_in_cents, convert: ->(value) { value.to_i * 100 }
+
+          def index
+            head :ok
+          end
+        end
+
+        it 'renames amount_due to amount_due_in_cents and converts value' do
+          get :index, { amount_due: 100 }
+          expect(controller.params).to eq default_params.merge('amount_due_in_cents' => 10000)
+        end
+
+        context 'if param is not sent' do
+          it 'leaves params as they were' do
+            get :index
+            expect(controller.params).to eq default_params
+          end
+        end
+      end
+
+      context 'and using a method converter' do
+        controller(ActionController::Base) do
+          rename :amount_due, to: :amount_due_in_cents, convert: :to_cents
+
+          def index
+            head :ok
+          end
+
+          private
+
+          def to_cents(value)
+            value.to_f * 100
+          end
+        end
+
+        it 'renames amount_due to amount_due_in_cents and converts value' do
+          get :index, { amount_due: 100 }
+          expect(controller.params).to eq default_params.merge('amount_due_in_cents' => 10000)
+        end
+
+        context 'if param is not sent' do
+          it 'leaves params as they were' do
+            get :index
+            expect(controller.params).to eq default_params
+          end
+        end
+      end
+    end
+
+    describe 'when nested params' do
+      context 'using only one namespace' do
+        controller(ActionController::Base) do
+          rename :username, to: :login, namespace: :session
+
+          def index
+            head :ok
+          end
+        end
+
+        it 'renames username to login' do
+          get :index, { 'session' => { 'username' => 'aperson' } }
+          expect(controller.params).to eq default_params.merge('session' => { 'login' => 'aperson' })
+        end
+
+        context 'if param is not sent' do
+          it 'leaves params as they were' do
+            get :index, { 'session' => '' }
+            expect(controller.params).to eq default_params.merge('session' => '')
+          end
+        end
+      end
+
+      context 'using more than one nest levels' do
+        controller(ActionController::Base) do
+          rename :username, to: :login, namespace: [:session, :credentials]
+
+          def index
+            head :ok
+          end
+        end
+
+        it 'renames username to login' do
+          get :index, { 'session' => { 'credentials' => { 'username' => 'aperson' } } }
+          expect(controller.params).to eq default_params.merge('session' => { 'credentials' => { 'login' => 'aperson' } })
+        end
+
+        context 'if param is not sent' do
+          it 'leaves params as they were' do
+            get :index, { 'session' => { 'credentials' => '' } }
+            expect(controller.params).to eq default_params.merge('session' => { 'credentials' => '' })
+          end
+        end
+
+        context 'if namespace is not sent' do
+          it 'leaves params as they were' do
+            get :index, { 'session' => '' }
+            expect(controller.params).to eq default_params.merge('session' => '')
+          end
+        end
+      end
+    end
+  end
+
+  context 'when filtering' do
+    context 'using only' do
+      controller(ActionController::Base) do
+        rename :username, to: :login, only: :show
+
+        def index
+          head :ok
+        end
+
+        def show
+          head :ok
+        end
+      end
+
+      describe 'show' do
+        before { routes.draw { get 'show' => 'anonymous#show' } }
+
+        it 'renames username to login' do
+          get :show, { 'username' => 'aperson' }
+          expect(controller.params).to eq('controller' => 'anonymous', 'action' => 'show', 'login' => 'aperson')
+        end
+      end
+
+      describe 'index' do
+        before { routes.draw { get 'index' => 'anonymous#index' } }
+
+        it 'keeps username param' do
+          get :index, { 'username' => 'aperson' }
+          expect(controller.params).to eq('controller' => 'anonymous', 'action' => 'index', 'username' => 'aperson')
+        end
+      end
+    end
+
+    context 'using except' do
+      controller(ActionController::Base) do
+        rename :username, to: :login, except: :show
+
+        def index
+          head :ok
+        end
+
+        def show
+          head :ok
+        end
+      end
+
+      describe 'show' do
+        before { routes.draw { get 'show' => 'anonymous#show' } }
+
+        it 'keeps username param' do
+          get :show, { 'username' => 'aperson' }
+          expect(controller.params).to eq('controller' => 'anonymous', 'action' => 'show', 'username' => 'aperson')
+        end
+      end
+
+      describe 'index' do
+        before { routes.draw { get 'index' => 'anonymous#index' } }
+
+        it 'renames username to login' do
+          get :index, { 'username' => 'aperson' }
+          expect(controller.params).to eq('controller' => 'anonymous', 'action' => 'index', 'login' => 'aperson')
+        end
+      end
+    end
+  end
+
+  context 'when using move_to' do
+    context 'with :root' do
+      controller(ActionController::Base) do
+        rename :name, to: :billing_contact_name, namespace: :billing_contact, move_to: :root
+
+        def update
+          head :ok
+        end
+      end
+
+      describe 'move_to' do
+        before { routes.draw { get 'update' => 'anonymous#update' } }
+
+        it 'renames billing_contact[:name] to billing_contact_name' do
+          put :update, { 'billing_contact' => { 'name' => 'Marcelo' } }
+          expect(controller.params).to eq('controller' => 'anonymous', 'action' => 'update', 'billing_contact' => {}, 'billing_contact_name' => 'Marcelo' )
+        end
+      end
+    end
+
+    context 'with existent nested key' do
+      controller(ActionController::Base) do
+        rename :street, to: :address_street, namespace: [:billing_contact, :address], move_to: :billing_contact
+
+        def update
+          head :ok
+        end
+      end
+
+      describe 'move_to' do
+        before { routes.draw { get 'update' => 'anonymous#update' } }
+
+        it 'renames billing_contact[:address][:street] to billing_contact[:street_address]' do
+          put :update, { 'billing_contact' => { 'address' => { 'street' => '123 St' } } }
+          expect(controller.params).to eq('controller' => 'anonymous', 'action' => 'update', 'billing_contact' => { 'address' => {}, 'address_street' => '123 St' } )
+        end
+      end
+    end
+
+    context 'with non existent nested key' do
+      controller(ActionController::Base) do
+        rename :name, to: :name, namespace: :billing_contact, move_to: :contact
+
+        def update
+          head :ok
+        end
+      end
+
+      describe 'move_to' do
+        before { routes.draw { get 'update' => 'anonymous#update' } }
+
+        it 'renames billing_contact[:name] to contact[:name]' do
+          put :update, { 'billing_contact' => { 'name' => 'Marcelo' } }
+          expect(controller.params).to eq('controller' => 'anonymous', 'action' => 'update', 'billing_contact' => {}, 'contact' => { 'name' =>'Marcelo' })
+        end
+      end
+    end
+
+    context 'with non existent deep nested key' do
+      controller(ActionController::Base) do
+        rename :name, to: :name, namespace: :billing_contact, move_to: [:contact, :info]
+
+        def update
+          head :ok
+        end
+      end
+
+      describe 'move_to' do
+        before { routes.draw { get 'update' => 'anonymous#update' } }
+
+        it 'renames billing_contact[:name] to contact[:info][:name]' do
+          put :update, { 'billing_contact' => { 'name' => 'Marcelo' } }
+          expect(controller.params).to eq('controller' => 'anonymous', 'action' => 'update', 'billing_contact' => {}, 'contact' => { 'info' => { 'name' =>'Marcelo' } })
+        end
+      end
+    end
+  end
+end

data/spec/params_spec.rb

@@ -35,4 +35,22 @@ describe RenameParams::Params do
       it { expect(params[:b]).to eq 'BB' }
     end
   end
+
+  describe '#move' do
+    let(:params) { RenameParams::Params.new(a: 'A', b: 'B', c: { d: 'D' }) }
+
+    context 'when moving to nested key' do
+      before { params.move(:b, [:c]) }
+
+      it { expect(params[:b]).to be_nil }
+      it { expect(params[:c][:b]).to eq 'B' }
+    end
+
+    context 'when moving to root' do
+      before { params.move(:d, [], [:c]) }
+
+      it { expect(params[:d]).to eq 'D' }
+      it { expect(params[:c][:d]).to be_nil }
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rename_params
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Marcelo Casiraghi
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -133,11 +133,15 @@ files:
 - lib/rename_params/converters/method_converter.rb
 - lib/rename_params/converters/proc_converter.rb
 - lib/rename_params/macros.rb
+- lib/rename_params/macros/base.rb
+- lib/rename_params/macros/move.rb
+- lib/rename_params/macros/rename.rb
 - lib/rename_params/params.rb
 - lib/rename_params/version.rb
 - spec/converters/hash_converter_spec.rb
 - spec/converters/proc_converter_spec.rb
-- spec/macros_spec.rb
+- spec/macros/move_spec.rb
+- spec/macros/rename_spec.rb
 - spec/params_spec.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb
@@ -171,7 +175,8 @@ summary: Simple params renaming for Rails applications
 test_files:
 - spec/converters/hash_converter_spec.rb
 - spec/converters/proc_converter_spec.rb
-- spec/macros_spec.rb
+- spec/macros/move_spec.rb
+- spec/macros/rename_spec.rb
 - spec/params_spec.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb

data/spec/macros_spec.rb

@@ -1,224 +0,0 @@
-describe RenameParams::Macros, type: :controller do
-  describe '.rename' do
-
-    context 'when not filtering' do
-      let(:default_params) { { 'controller' => 'anonymous', 'action' => 'index' } }
-      before { routes.draw { get 'index' => 'anonymous#index' } }
-
-      describe 'when just renaming params' do
-        controller(ActionController::Base) do
-          rename :username, to: :login
-
-          def index
-            head :ok
-          end
-        end
-
-        it 'renames username to login' do
-          get :index, { username: 'aperson' }
-          expect(controller.params).to eq default_params.merge('login' => 'aperson')
-        end
-
-        context 'if param is not sent' do
-          it 'leaves params as they were' do
-            get :index
-            expect(controller.params).to eq default_params
-          end
-        end
-      end
-
-      describe 'when converting values' do
-        context 'and using enum converter' do
-          controller(ActionController::Base) do
-            rename :admin, to: :role, convert: { true: ['admin'], false: [] }
-
-            def index
-              head :ok
-            end
-          end
-
-          it 'renames admin to role and converts value' do
-            get :index, { admin: 'true' }
-            expect(controller.params).to eq default_params.merge('role' => ['admin'])
-          end
-
-          context 'if param is not sent' do
-            it 'leaves params as they were' do
-              get :index
-              expect(controller.params).to eq default_params
-            end
-          end
-        end
-
-        context 'and using a Proc converter' do
-          controller(ActionController::Base) do
-            rename :amount_due, to: :amount_due_in_cents, convert: ->(value) { value.to_i * 100 }
-
-            def index
-              head :ok
-            end
-          end
-
-          it 'renames amount_due to amount_due_in_cents and converts value' do
-            get :index, { amount_due: 100 }
-            expect(controller.params).to eq default_params.merge('amount_due_in_cents' => 10000)
-          end
-
-          context 'if param is not sent' do
-            it 'leaves params as they were' do
-              get :index
-              expect(controller.params).to eq default_params
-            end
-          end
-        end
-
-        context 'and using a method converter' do
-          controller(ActionController::Base) do
-            rename :amount_due, to: :amount_due_in_cents, convert: :to_cents
-
-            def index
-              head :ok
-            end
-
-            private
-
-            def to_cents(value)
-              value.to_f * 100
-            end
-          end
-
-          it 'renames amount_due to amount_due_in_cents and converts value' do
-            get :index, { amount_due: 100 }
-            expect(controller.params).to eq default_params.merge('amount_due_in_cents' => 10000)
-          end
-
-          context 'if param is not sent' do
-            it 'leaves params as they were' do
-              get :index
-              expect(controller.params).to eq default_params
-            end
-          end
-        end
-      end
-
-      describe 'when nested params' do
-        context 'using only one namespace' do
-          controller(ActionController::Base) do
-            rename :username, to: :login, namespace: :session
-
-            def index
-              head :ok
-            end
-          end
-
-          it 'renames username to login' do
-            get :index, { 'session' => { 'username' => 'aperson' } }
-            expect(controller.params).to eq default_params.merge('session' => { 'login' => 'aperson' })
-          end
-
-          context 'if param is not sent' do
-            it 'leaves params as they were' do
-              get :index, { 'session' => '' }
-              expect(controller.params).to eq default_params.merge('session' => '')
-            end
-          end
-        end
-
-        context 'using more than one nest levels' do
-          controller(ActionController::Base) do
-            rename :username, to: :login, namespace: [:session, :credentials]
-
-            def index
-              head :ok
-            end
-          end
-
-          it 'renames username to login' do
-            get :index, { 'session' => { 'credentials' => { 'username' => 'aperson' } } }
-            expect(controller.params).to eq default_params.merge('session' => { 'credentials' => { 'login' => 'aperson' } })
-          end
-
-          context 'if param is not sent' do
-            it 'leaves params as they were' do
-              get :index, { 'session' => { 'credentials' => '' } }
-              expect(controller.params).to eq default_params.merge('session' => { 'credentials' => '' })
-            end
-          end
-
-          context 'if namespace is not sent' do
-            it 'leaves params as they were' do
-              get :index, { 'session' => '' }
-              expect(controller.params).to eq default_params.merge('session' => '')
-            end
-          end
-        end
-      end
-    end
-
-    context 'when filtering' do
-      context 'using only' do
-        controller(ActionController::Base) do
-          rename :username, to: :login, only: :show
-
-          def index
-            head :ok
-          end
-
-          def show
-            head :ok
-          end
-        end
-
-        describe 'show' do
-          before { routes.draw { get 'show' => 'anonymous#show' } }
-
-          it 'renames username to login' do
-            get :show, { 'username' => 'aperson' }
-            expect(controller.params).to eq('controller' => 'anonymous', 'action' => 'show', 'login' => 'aperson')
-          end
-        end
-
-        describe 'index' do
-          before { routes.draw { get 'index' => 'anonymous#index' } }
-
-          it 'keeps username param' do
-            get :index, { 'username' => 'aperson' }
-            expect(controller.params).to eq('controller' => 'anonymous', 'action' => 'index', 'username' => 'aperson')
-          end
-        end
-      end
-
-      context 'using except' do
-        controller(ActionController::Base) do
-          rename :username, to: :login, except: :show
-
-          def index
-            head :ok
-          end
-
-          def show
-            head :ok
-          end
-        end
-
-        describe 'show' do
-          before { routes.draw { get 'show' => 'anonymous#show' } }
-
-          it 'keeps username param' do
-            get :show, { 'username' => 'aperson' }
-            expect(controller.params).to eq('controller' => 'anonymous', 'action' => 'show', 'username' => 'aperson')
-          end
-        end
-
-        describe 'index' do
-          before { routes.draw { get 'index' => 'anonymous#index' } }
-
-          it 'renames username to login' do
-            get :index, { 'username' => 'aperson' }
-            expect(controller.params).to eq('controller' => 'anonymous', 'action' => 'index', 'login' => 'aperson')
-          end
-        end
-      end
-    end
-  end
-end