devise-better_routes 0.0.2 → 0.0.3

data/README.md

@@ -73,7 +73,11 @@ Do you like this one?
               PUT    /me(.:format)        me#update
               DELETE /me(.:format)        me#destroy
 
+## Changes
 
+### 0.0.3
+
+* __Add session routes__
 
 ## Installation
 

data/lib/devise/better_routes.rb

@@ -13,11 +13,12 @@ module Devise
           cancel_registration: 'cancel_#{current_resource_name}'
         }
         [:path, :url].each do |path_or_url|
+          # TODO: use real helper name
           class_eval <<-URL_HELPERS, __FILE__, __LINE__ + 1
             def registration_#{path_or_url}(resource_or_scope, *args)
               scope = Devise::Mapping.find_scope!(resource_or_scope)
               current_resource_name = _devise_path_name(scope, "current_\#{scope}")
-              if respond_to?(:controller_name) && controller_name == current_resource_name.pluralize
+              if respond_to?(:controller_name) && controller_name == _devise_registration_controller(scope, current_resource_name)
                 send("\#{current_resource_name}_#{path_or_url}", *args)
               else
                 send("\#{scope.to_s.pluralize}_#{path_or_url}", *args)
@@ -45,7 +46,17 @@ module Devise
       def _devise_path_name(scope, name)
         Devise.mappings[scope].path_names[name.to_sym]
       end
-      private :_devise_path_name
+      def _devise_registration_controller(scope, name)
+        controllers = Devise.mappings[scope].controllers
+        if controllers.include?(name.to_sym)
+          controllers[name.to_sym]
+        elsif controllers.include?(:registrations)
+          controllers[:registrations]
+        else
+          name.pluralize
+        end
+      end
+      private :_devise_path_name, :_devise_registration_controller
     end
   end
 
@@ -60,11 +71,40 @@ module ActionDispatch
   module Routing
     class Mapper
       protected
+        def devise_session(mapping, controllers)
+          current_resource_name = mapping.path_names["current_#{mapping.singular}".to_sym]
+          path, as, @scope[:path], @scope[:as] = @scope[:path], @scope[:as], nil, nil
+          resource current_resource_name, only: [] do
+            resource :session, only: [:create, :destroy], controller: controllers[:sessions]
+            resource :session, only: [], controller: controllers[:sessions], path: '' do
+              get :new, path: mapping.path_names[:'session/new'], as: 'new'
+            end
+          end
+        ensure
+          @scope[:path], @scope[:as] = path, as
+        end
+
         def devise_registration(mapping, controllers)
           path, as, @scope[:path], @scope[:as] = @scope[:path], @scope[:as], nil, nil
-          current_resource_name = mapping.path_names["current_#{mapping.singular}".to_sym]
-          resources mapping.path, only: [:create, :new]
-          resource current_resource_name, only: [:edit, :update, :destroy] do
+          current_resource_name = mapping.path_names["current_#{mapping.name}".to_sym]
+          resources_controller_name =
+            if controllers.include?(mapping.path.to_sym)
+              controllers[mapping.path.to_sym]
+            elsif controllers.include?(:registrations)
+              controllers[:registrations]
+            else
+              nil
+            end
+          current_resource_controller_name =
+            if controllers.include?(current_resource_name.to_sym)
+              controllers[current_resource_name.to_sym]
+            elsif controllers.include?(:registrations)
+              controllers[:registrations]
+            else
+              nil
+            end
+          resources mapping.path, only: [:create, :new], controller: resources_controller_name
+          resource current_resource_name, only: [:edit, :update, :destroy], controller: current_resource_controller_name do
             get :cancel
           end
         ensure

data/lib/devise/better_routes/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module BetterRoutes
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/spec/devise/better_routes_spec.rb

@@ -8,46 +8,146 @@ describe Devise::BetterRoutes do
   context 'routing' do
     include RSpec::Rails::RoutingExampleGroup
     describe 'users' do
-      it 'routes to users#create' do
-        expect(post('/users')).to route_to('users#create')
+      context 'registration' do
+        it 'routes to users#create' do
+          expect(post('/users')).to route_to('users#create')
+        end
+        it 'routes to users#new' do
+          expect(get('/users/new')).to route_to('users#new')
+        end
+        it 'routes to current_users#cancel' do
+          expect(get('/current_user/cancel')).to route_to('current_users#cancel')
+        end
+        it 'routes to current_users#edit' do
+          expect(get('/current_user/edit')).to route_to('current_users#edit')
+        end
+        it 'routes to current_users#update' do
+          expect(put('/current_user')).to route_to('current_users#update')
+          #expect(patch('/current_user')).to route_to('current_users#update')
+        end
+        it 'routes to current_users#destroy' do
+          expect(delete('/current_user')).to route_to('current_users#destroy')
+        end
       end
-      it 'routes to users#new' do
-        expect(get('/users/new')).to route_to('users#new')
-      end
-      it 'routes to current_users#cancel' do
-        expect(get('/current_user/cancel')).to route_to('current_users#cancel')
-      end
-      it 'routes to current_users#edit' do
-        expect(get('/current_user/edit')).to route_to('current_users#edit')
-      end
-      it 'routes to current_users#update' do
-        expect(put('/current_user')).to route_to('current_users#update')
-        #expect(patch('/current_user')).to route_to('current_users#update')
-      end
-      it 'routes to current_users#destroy' do
-        expect(delete('/current_user')).to route_to('current_users#destroy')
+
+      context 'session' do
+        it 'routes to devise/sessions#create' do
+          expect(post('/current_user/session')).to route_to('devise/sessions#create')
+        end
+        it 'routes to devise/sessions#destroy' do
+          expect(delete('/current_user/session')).to route_to('devise/sessions#destroy')
+        end
+        it 'routes to devise/sessions#new' do
+          expect(get('/current_user/session/new')).to route_to('devise/sessions#new')
+        end
       end
     end
 
     describe 'rails_programmers' do
-      it 'routes to rails_programmers#create' do
-        expect(post('/rails_programmers')).to route_to('rails_programmers#create')
+      context 'registration' do
+        it 'routes to rails_programmers#create' do
+          expect(post('/rails_programmers')).to route_to('rails_programmers#create')
+        end
+        it 'routes to rails_programmers#new' do
+          expect(get('/rails_programmers/new')).to route_to('rails_programmers#new')
+        end
+        it 'routes to me#cancel' do
+          expect(get('/me/cancel')).to route_to('me#cancel')
+        end
+        it 'routes to me#edit' do
+          expect(get('/me/edit')).to route_to('me#edit')
+        end
+        it 'routes to me#update' do
+          expect(put('/me')).to route_to('me#update')
+          #expect(patch('/me')).to route_to('me#update')
+        end
+        it 'routes to me#destroy' do
+          expect(delete('/me')).to route_to('me#destroy')
+        end
       end
-      it 'routes to rails_programmers#new' do
-        expect(get('/rails_programmers/new')).to route_to('rails_programmers#new')
+
+      context 'session' do
+        it 'routes to devise/sessions#create' do
+          expect(post('/me/session')).to route_to('devise/sessions#create')
+        end
+        it 'routes to devise/sessions#destroy' do
+          expect(delete('/me/session')).to route_to('devise/sessions#destroy')
+        end
+        it 'routes to devise/sessions#new' do
+          expect(get('/me/session/new')).to route_to('devise/sessions#new')
+        end
       end
-      it 'routes to me#cancel' do
-        expect(get('/me/cancel')).to route_to('me#cancel')
+    end
+
+    describe 'programmers' do
+      context 'registration' do
+        it 'routes to rails_programmers#create' do
+          expect(post('/programmers')).to route_to('rails_programmers#create')
+        end
+        it 'routes to rails_programmers#new' do
+          expect(get('/programmers/new')).to route_to('rails_programmers#new')
+        end
+        it 'routes to me#cancel' do
+          expect(get('/current_programmer/cancel')).to route_to('me#cancel')
+        end
+        it 'routes to me#edit' do
+          expect(get('/current_programmer/edit')).to route_to('me#edit')
+        end
+        it 'routes to me#update' do
+          expect(put('/current_programmer')).to route_to('me#update')
+          #expect(patch('/current_programmer')).to route_to('me#update')
+        end
+        it 'routes to me#destroy' do
+          expect(delete('/current_programmer')).to route_to('me#destroy')
+        end
       end
-      it 'routes to me#edit' do
-        expect(get('/me/edit')).to route_to('me#edit')
+
+      context 'session' do
+        it 'routes to devise/sessions#create' do
+          expect(post('/current_programmer/session')).to route_to('devise/sessions#create')
+        end
+        it 'routes to devise/sessions#destroy' do
+          expect(delete('/current_programmer/session')).to route_to('devise/sessions#destroy')
+        end
+        it 'routes to devise/sessions#new' do
+          expect(get('/current_programmer/session/new')).to route_to('devise/sessions#new')
+        end
       end
-      it 'routes to me#update' do
-        expect(put('/me')).to route_to('me#update')
-        #expect(patch('/me')).to route_to('me#update')
+    end
+
+    describe 'engineers' do
+      context 'registration' do
+        it 'routes to rails_programmers#create' do
+          expect(post('/engineers')).to route_to('rails_programmers#create')
+        end
+        it 'routes to rails_programmers#new' do
+          expect(get('/engineers/new')).to route_to('rails_programmers#new')
+        end
+        it 'routes to rails_programmers#cancel' do
+          expect(get('/current_engineer/cancel')).to route_to('rails_programmers#cancel')
+        end
+        it 'routes to rails_programmers#edit' do
+          expect(get('/current_engineer/edit')).to route_to('rails_programmers#edit')
+        end
+        it 'routes to rails_programmers#update' do
+          expect(put('/current_engineer')).to route_to('rails_programmers#update')
+          #expect(patch('/current_engineer')).to route_to('rails_programmers#update')
+        end
+        it 'routes to rails_programmers#destroy' do
+          expect(delete('/current_engineer')).to route_to('rails_programmers#destroy')
+        end
       end
-      it 'routes to me#destroy' do
-        expect(delete('/me')).to route_to('me#destroy')
+
+      context 'session' do
+        it 'routes to devise/sessions#create' do
+          expect(post('/current_engineer/session')).to route_to('devise/sessions#create')
+        end
+        it 'routes to devise/sessions#destroy' do
+          expect(delete('/current_engineer/session')).to route_to('devise/sessions#destroy')
+        end
+        it 'routes to devise/sessions#new' do
+          expect(get('/current_engineer/session/new')).to route_to('devise/sessions#new')
+        end
       end
     end
   end
@@ -56,52 +156,130 @@ describe Devise::BetterRoutes do
     include Rails.application.routes.url_helpers
     include Devise::Controllers::UrlHelpers
     describe 'users' do
-      specify { expect(users_path).to eq '/users' }
-      specify { expect(new_user_path).to eq '/users/new' }
-      specify { expect(cancel_current_user_path).to eq '/current_user/cancel' }
-      specify { expect(edit_current_user_path).to eq '/current_user/edit' }
-      specify { expect(current_user_path).to eq '/current_user' }
-      it 'registration_path is delegated to users_path' do
-        expect(registration_path(:user)).to eq users_path
+      context 'registration' do
+        specify { expect(users_path).to eq '/users' }
+        specify { expect(new_user_path).to eq '/users/new' }
+        specify { expect(cancel_current_user_path).to eq '/current_user/cancel' }
+        specify { expect(edit_current_user_path).to eq '/current_user/edit' }
+        specify { expect(current_user_path).to eq '/current_user' }
+        it 'registration_path is delegated to users_path' do
+          expect(registration_path(:user)).to eq users_path
+        end
+        it 'registration_path is delegated to current_user_path on current_users' do
+          instance_eval { def controller_name; 'current_users' end }
+          expect(registration_path(:user)).to eq current_user_path
+          instance_eval { undef controller_name }
+        end
+        it 'new_registration_path is delegated to new_user_path' do
+          expect(new_registration_path(:user)).to eq new_user_path
+        end
+        it 'cancel_registration_path is delegated to cancel_current_user_path' do
+          expect(cancel_registration_path(:user)).to eq cancel_current_user_path
+        end
+        it 'edit_registration_path is delegated to edit_current_user_path' do
+          expect(edit_registration_path(:user)).to eq edit_current_user_path
+        end
       end
-      it 'registration_path is delegated to current_user_path on current_users' do
-        instance_eval { def controller_name; 'current_users' end }
-        expect(registration_path(:user)).to eq current_user_path
-        instance_eval { undef controller_name }
+
+      context 'session' do
+        specify { expect(current_user_session_path).to eq '/current_user/session' }
+        specify { expect(new_current_user_session_path).to eq '/current_user/session/new' }
+      end
+    end
+
+    describe 'rails_programmers' do
+      context 'registration' do
+        specify { expect(rails_programmers_path).to eq '/rails_programmers' }
+        specify { expect(new_rails_programmer_path).to eq '/rails_programmers/new' }
+        specify { expect(cancel_me_path).to eq '/me/cancel' }
+        specify { expect(edit_me_path).to eq '/me/edit' }
+        specify { expect(me_path).to eq '/me' }
+        it 'registration_path is delegated to rails_programmers_path' do
+          expect(registration_path(:rails_programmer)).to eq rails_programmers_path
+        end
+        it 'registration_path is delegated to me_path on me' do
+          instance_eval { def controller_name; 'me' end }
+          expect(registration_path(:rails_programmer)).to eq me_path
+          instance_eval { undef controller_name }
+        end
+        it 'new_registration_path is delegated to new_rails_programmer_path' do
+          expect(new_registration_path(:rails_programmer)).to eq new_rails_programmer_path
+        end
+        it 'cancel_registration_path is delegated to cancel_me_path' do
+          expect(cancel_registration_path(:rails_programmer)).to eq cancel_me_path
+        end
+        it 'edit_registration_path is delegated to edit_me_path' do
+          expect(edit_registration_path(:rails_programmer)).to eq edit_me_path
+        end
       end
-      it 'new_registration_path is delegated to new_user_path' do
-        expect(new_registration_path(:user)).to eq new_user_path
+
+      context 'session' do
+        specify { expect(me_session_path).to eq '/me/session' }
+        specify { expect(new_me_session_path).to eq '/me/session/new' }
       end
-      it 'cancel_registration_path is delegated to cancel_current_user_path' do
-        expect(cancel_registration_path(:user)).to eq cancel_current_user_path
+    end
+
+    describe 'programmers' do
+      context 'registration' do
+        specify { expect(programmers_path).to eq '/programmers' }
+        specify { expect(new_programmer_path).to eq '/programmers/new' }
+        specify { expect(cancel_current_programmer_path).to eq '/current_programmer/cancel' }
+        specify { expect(edit_current_programmer_path).to eq '/current_programmer/edit' }
+        specify { expect(current_programmer_path).to eq '/current_programmer' }
+        it 'registration_path is delegated to programmers_path' do
+          expect(registration_path(:programmer)).to eq programmers_path
+        end
+        it 'registration_path is delegated to current_programmer_path on me' do
+          instance_eval { def controller_name; 'me' end }
+          expect(registration_path(:programmer)).to eq current_programmer_path
+          instance_eval { undef controller_name }
+        end
+        it 'new_registration_path is delegated to new_programmer_path' do
+          expect(new_registration_path(:programmer)).to eq new_programmer_path
+        end
+        it 'cancel_registration_path is delegated to cancel_current_programmer_path' do
+          expect(cancel_registration_path(:programmer)).to eq cancel_current_programmer_path
+        end
+        it 'edit_registration_path is delegated to edit_current_programmer_path' do
+          expect(edit_registration_path(:programmer)).to eq edit_current_programmer_path
+        end
       end
-      it 'edit_registration_path is delegated to edit_current_user_path' do
-        expect(edit_registration_path(:user)).to eq edit_current_user_path
+
+      context 'session' do
+        specify { expect(current_programmer_session_path).to eq '/current_programmer/session' }
+        specify { expect(new_current_programmer_session_path).to eq '/current_programmer/session/new' }
       end
     end
 
-    describe 'rails_programmers' do
-      specify { expect(rails_programmers_path).to eq '/rails_programmers' }
-      specify { expect(new_rails_programmer_path).to eq '/rails_programmers/new' }
-      specify { expect(cancel_me_path).to eq '/me/cancel' }
-      specify { expect(edit_me_path).to eq '/me/edit' }
-      specify { expect(me_path).to eq '/me' }
-      it 'registration_path is delegated to rails_programmers_path' do
-        expect(registration_path(:rails_programmer)).to eq rails_programmers_path
-      end
-      it 'registration_path is delegated to me_path on me' do
-        instance_eval { def controller_name; 'me' end }
-        expect(registration_path(:rails_programmer)).to eq me_path
-        instance_eval { undef controller_name }
-      end
-      it 'new_registration_path is delegated to new_rails_programmer_path' do
-        expect(new_registration_path(:rails_programmer)).to eq new_rails_programmer_path
-      end
-      it 'cancel_registration_path is delegated to cancel_me_path' do
-        expect(cancel_registration_path(:rails_programmer)).to eq cancel_me_path
-      end
-      it 'edit_registration_path is delegated to edit_me_path' do
-        expect(edit_registration_path(:rails_programmer)).to eq edit_me_path
+    describe 'engineers' do
+      context 'registration' do
+        specify { expect(engineers_path).to eq '/engineers' }
+        specify { expect(new_engineer_path).to eq '/engineers/new' }
+        specify { expect(cancel_current_engineer_path).to eq '/current_engineer/cancel' }
+        specify { expect(edit_current_engineer_path).to eq '/current_engineer/edit' }
+        specify { expect(current_engineer_path).to eq '/current_engineer' }
+        it 'registration_path is delegated to engineers_path' do
+          expect(registration_path(:engineer)).to eq engineers_path
+        end
+        it 'registration_path is delegated to current_engineer_path on me' do
+          instance_eval { def controller_name; 'rails_programmers' end }
+          expect(registration_path(:engineer)).to eq current_engineer_path
+          instance_eval { undef controller_name }
+        end
+        it 'new_registration_path is delegated to new_engineer_path' do
+          expect(new_registration_path(:engineer)).to eq new_engineer_path
+        end
+        it 'cancel_registration_path is delegated to cancel_current_engineer_path' do
+          expect(cancel_registration_path(:engineer)).to eq cancel_current_engineer_path
+        end
+        it 'edit_registration_path is delegated to edit_current_engineer_path' do
+          expect(edit_registration_path(:engineer)).to eq edit_current_engineer_path
+        end
+      end
+
+      context 'session' do
+        specify { expect(current_engineer_session_path).to eq '/current_engineer/session' }
+        specify { expect(new_current_engineer_session_path).to eq '/current_engineer/session/new' }
       end
     end
   end

data/spec/rails_app/app/models/user.rb

@@ -1,3 +1,6 @@
 class User < ActiveRecord::Base
-  devise :registerable
+  devise :database_authenticatable, :registerable
 end
+class RailsProgrammer < User; end
+class Programmer < User; end
+class Engineer < User; end

data/spec/rails_app/config/routes.rb

@@ -1,4 +1,6 @@
 RailsApp::Application.routes.draw do
   devise_for :users
   devise_for :rails_programmers, path_names: {current_rails_programmer: 'me'}
+  devise_for :programmers, controllers: {programmers: 'rails_programmers', current_programmer: 'me'}
+  devise_for :engineers, controllers: {registrations: 'rails_programmers'}
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise-better_routes
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-25 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -155,7 +155,6 @@ files:
 - spec/rails_app/app/mailers/.keep
 - spec/rails_app/app/models/.keep
 - spec/rails_app/app/models/concerns/.keep
-- spec/rails_app/app/models/rails_programmer.rb
 - spec/rails_app/app/models/user.rb
 - spec/rails_app/app/views/layouts/application.html.erb
 - spec/rails_app/config.ru
@@ -199,7 +198,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4262153083475956853
+      hash: -574275781529839639
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -208,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4262153083475956853
+      hash: -574275781529839639
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -231,7 +230,6 @@ test_files:
 - spec/rails_app/app/mailers/.keep
 - spec/rails_app/app/models/.keep
 - spec/rails_app/app/models/concerns/.keep
-- spec/rails_app/app/models/rails_programmer.rb
 - spec/rails_app/app/models/user.rb
 - spec/rails_app/app/views/layouts/application.html.erb
 - spec/rails_app/config.ru

data/spec/rails_app/app/models/rails_programmer.rb

@@ -1,3 +0,0 @@
-class RailsProgrammer < User
-  devise :registerable
-end