devise-better_routes 0.0.1 → 0.0.2

data/README.md

@@ -56,6 +56,25 @@ Then you can create two controllers as follows:
     end
 
 
+## Option
+
+If you don't like "current_user", you can specify the name.
+
+    # config/routes.rb
+    devise_for :users, path_names: {current_user: 'me'}
+
+Do you like this one?
+
+        users POST   /users(.:format)     users#create
+     new_user GET    /users/new(.:format) users#new
+    cancel_me GET    /me/cancel(.:format) me#cancel
+      edit_me GET    /me/edit(.:format)   me#edit
+           me PATCH  /me(.:format)        me#update
+              PUT    /me(.:format)        me#update
+              DELETE /me(.:format)        me#destroy
+
+
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/devise-better_routes.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['tkawa@4bit.net']
   spec.description   = %q{Better routes patch for Devise}
   spec.summary       = %q{Better routes patch for Devise}
-  spec.homepage      = ''
+  spec.homepage      = 'https://github.com/tkawa/devise-better_routes'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)

data/lib/devise/better_routes.rb

@@ -9,15 +9,16 @@ module Devise
       def self.override_registration_helpers!(registration_routes = nil)
         helper_mappings = {
           new_registration: 'new_#{scope}',
-          edit_registration: 'edit_current_#{scope}',
-          cancel_registration: 'cancel_current_#{scope}'
+          edit_registration: 'edit_#{current_resource_name}',
+          cancel_registration: 'cancel_#{current_resource_name}'
         }
         [:path, :url].each do |path_or_url|
           class_eval <<-URL_HELPERS, __FILE__, __LINE__ + 1
             def registration_#{path_or_url}(resource_or_scope, *args)
               scope = Devise::Mapping.find_scope!(resource_or_scope)
-              if respond_to?(:controller_name) && controller_name == "current_\#{scope.to_s.pluralize}"
-                send("current_\#{scope}_#{path_or_url}", *args)
+              current_resource_name = _devise_path_name(scope, "current_\#{scope}")
+              if respond_to?(:controller_name) && controller_name == current_resource_name.pluralize
+                send("\#{current_resource_name}_#{path_or_url}", *args)
               else
                 send("\#{scope.to_s.pluralize}_#{path_or_url}", *args)
               end
@@ -28,6 +29,7 @@ module Devise
             class_eval <<-URL_HELPERS, __FILE__, __LINE__ + 1
               def #{method}(resource_or_scope, *args)
                 scope = Devise::Mapping.find_scope!(resource_or_scope)
+                current_resource_name = _devise_path_name(scope, "current_\#{scope}")
                 send("#{new_name}_#{path_or_url}", *args)
               end
             URL_HELPERS
@@ -39,6 +41,11 @@ module Devise
       def self.run_generate_hooks!
         self.override_registration_helpers!(Devise::URL_HELPERS[:registration])
       end
+
+      def _devise_path_name(scope, name)
+        Devise.mappings[scope].path_names[name.to_sym]
+      end
+      private :_devise_path_name
     end
   end
 

data/lib/devise/better_routes/version.rb

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

data/spec/devise/better_routes_spec.rb

@@ -36,18 +36,18 @@ describe Devise::BetterRoutes do
       it 'routes to rails_programmers#new' do
         expect(get('/rails_programmers/new')).to route_to('rails_programmers#new')
       end
-      it 'routes to current_rails_programmers#cancel' do
-        expect(get('/current_rails_programmer/cancel')).to route_to('current_rails_programmers#cancel')
+      it 'routes to me#cancel' do
+        expect(get('/me/cancel')).to route_to('me#cancel')
       end
-      it 'routes to current_rails_programmers#edit' do
-        expect(get('/current_rails_programmer/edit')).to route_to('current_rails_programmers#edit')
+      it 'routes to me#edit' do
+        expect(get('/me/edit')).to route_to('me#edit')
       end
-      it 'routes to current_rails_programmers#update' do
-        expect(put('/current_rails_programmer')).to route_to('current_rails_programmers#update')
-        #expect(patch('/current_rails_programmer')).to route_to('current_rails_programmers#update')
+      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 current_rails_programmers#destroy' do
-        expect(delete('/current_rails_programmer')).to route_to('current_rails_programmers#destroy')
+      it 'routes to me#destroy' do
+        expect(delete('/me')).to route_to('me#destroy')
       end
     end
   end
@@ -83,25 +83,25 @@ describe Devise::BetterRoutes do
     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_current_rails_programmer_path).to eq '/current_rails_programmer/cancel' }
-      specify { expect(edit_current_rails_programmer_path).to eq '/current_rails_programmer/edit' }
-      specify { expect(current_rails_programmer_path).to eq '/current_rails_programmer' }
+      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 current_rails_programmer_path on current_rails_programmers' do
-        instance_eval { def controller_name; 'current_rails_programmers' end }
-        expect(registration_path(:rails_programmer)).to eq current_rails_programmer_path
+      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_current_rails_programmer_path' do
-        expect(cancel_registration_path(:rails_programmer)).to eq cancel_current_rails_programmer_path
+      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_current_rails_programmer_path' do
-        expect(edit_registration_path(:rails_programmer)).to eq edit_current_rails_programmer_path
+      it 'edit_registration_path is delegated to edit_me_path' do
+        expect(edit_registration_path(:rails_programmer)).to eq edit_me_path
       end
     end
   end

data/spec/rails_app/app/controllers/me_controller.rb

@@ -0,0 +1,2 @@
+class MeController < Devise::RegistrationsController
+end

data/spec/rails_app/config/routes.rb

@@ -1,4 +1,4 @@
 RailsApp::Application.routes.draw do
   devise_for :users
-  devise_for :rails_programmers
+  devise_for :rails_programmers, path_names: {current_rails_programmer: 'me'}
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise-better_routes
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-23 00:00:00.000000000 Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
@@ -147,8 +147,8 @@ files:
 - spec/rails_app/app/assets/stylesheets/application.css
 - spec/rails_app/app/controllers/application_controller.rb
 - spec/rails_app/app/controllers/concerns/.keep
-- spec/rails_app/app/controllers/current_rails_programmers_controller.rb
 - spec/rails_app/app/controllers/current_users_controller.rb
+- spec/rails_app/app/controllers/me_controller.rb
 - spec/rails_app/app/controllers/rails_programmers_controller.rb
 - spec/rails_app/app/controllers/users_controller.rb
 - spec/rails_app/app/helpers/application_helper.rb
@@ -184,7 +184,7 @@ files:
 - spec/rails_app/public/500.html
 - spec/rails_app/public/favicon.ico
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/tkawa/devise-better_routes
 licenses:
 - MIT
 post_install_message: 
@@ -199,7 +199,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1753925327031690861
+      hash: 4262153083475956853
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -208,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1753925327031690861
+      hash: 4262153083475956853
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -223,8 +223,8 @@ test_files:
 - spec/rails_app/app/assets/stylesheets/application.css
 - spec/rails_app/app/controllers/application_controller.rb
 - spec/rails_app/app/controllers/concerns/.keep
-- spec/rails_app/app/controllers/current_rails_programmers_controller.rb
 - spec/rails_app/app/controllers/current_users_controller.rb
+- spec/rails_app/app/controllers/me_controller.rb
 - spec/rails_app/app/controllers/rails_programmers_controller.rb
 - spec/rails_app/app/controllers/users_controller.rb
 - spec/rails_app/app/helpers/application_helper.rb

data/spec/rails_app/app/controllers/current_rails_programmers_controller.rb

@@ -1,2 +0,0 @@
-class CurrentRailsProgrammersController < Devise::RegistrationsController
-end