nyauth 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa665b789065b1cb2ce9a772c824d6f2d03c158a
-  data.tar.gz: e6fc77b3c1d8804ee127efb05b2c62f7ad898b43
+  metadata.gz: fd6e65944c1dc06e5b03ed7744365a09f3611cb5
+  data.tar.gz: 91ae82f9fd0543b01abb601a2a8f780e54dd92ad
 SHA512:
-  metadata.gz: de301bc13261d9feae6f717b4787de4aac4840ccc2fb48b4853c592c014b34516d35add7db2dd6a9fd013ae62886fb8759cecb14148a10c7825ab4d398cbee34
-  data.tar.gz: 551c3947db51fdc8e5761711654f9c61c053fb0d4be9080f825e8923a861d74c6ef8aa08a1fb827acf03a08c30a011985b9e6d564a48c162f49d64b30f02fd01
+  metadata.gz: 2ac0d0c2c4a60a97a29f42a03cc71800d74a046944e3ed64e5ebb82a07d4d6f30a2b3d96228c4a3e67e5f21be4013dd5495f21ff383510322b173b4778b72627
+  data.tar.gz: 2deefd3ca405a7686c3e1a5c6eccdfc3e12f27c48bf09279fff447167f258e1968ae69ea9fd7441afca7f4404d64c14ab6f8a97c9bb50befcb908ed9998849d6

data/README.md

@@ -1,13 +1,16 @@
 # Nyauth
 
-```application_controller
+### application_controller.rb
+
+```ruby
 class ApplicationController < ActionController::Base
   include Nyauth::SessionConcern
-  self.responder = Nyauth::AppResponder
 end
 ```
 
-```schema
+### migration
+
+```ruby
 class CreateUsers < ActiveRecord::Migration
   def change
     create_table :users do |t|
@@ -28,7 +31,9 @@ class CreateUsers < ActiveRecord::Migration
 end
 ```
 
-```model
+### model
+
+```ruby
 class User < ActiveRecord::Base
   include Nyauth::Authenticatable
   include Nyauth::Confirmable
@@ -36,8 +41,16 @@ class User < ActiveRecord::Base
 end
 ```
 
-```routes
+### config/routes.rb
+
+```ruby
 Rails.application.routes.draw do
+  # for admin
+  namespace :nyauth, path: :admin, as: :admin do
+    resource :session, only: %i(new create destory)
+  end
+
+  # for user
   mount Nyauth::Engine => "/"
 end
 ```
@@ -46,7 +59,7 @@ end
 rake routes
 ```
 
-```
+```ruby
 Prefix Verb URI Pattern Controller#Action
 nyauth      /nyauth     Nyauth::Engine
 
@@ -69,3 +82,8 @@ new_new_password_request GET    /new_password_requests/new(.:format)
                          PUT    /new_passwords/:new_password_key(.:format)      nyauth/new_passwords#update
                     root GET    /                                               nyauth/sessions#new
 ```
+
+```
+new_session_path_for(:user) # /session/new
+new_session_path_for(:admin) # /admin/session/new
+```

data/app/controllers/concerns/nyauth/application_concern.rb

@@ -0,0 +1,10 @@
+module Nyauth
+  module ApplicationConcern
+    extend ActiveSupport::Concern
+    include Nyauth::ApplicationHelper
+
+    included do
+      helper Nyauth::ApplicationHelper
+    end
+  end
+end

data/app/controllers/concerns/nyauth/client_concern.rb

@@ -0,0 +1,31 @@
+module Nyauth
+  module ClientConcern
+    extend ActiveSupport::Concern
+    included do |base|
+      helper_method :client_class
+      helper_method :client_name
+    end
+
+    def initialize
+      @client_classes = {}
+      super
+    end
+
+    private
+
+    def mounted_path
+      request.script_name.presence || "/#{request.path.split('/').try(:second)}"
+    end
+
+    # specify client class from mounted_path
+    def client_class
+      @client_classes[mounted_path] ||= mounted_path[1..-1].classify.constantize
+    rescue
+      @client_classes[mounted_path] = User
+    end
+
+    def client_name
+      client_class.name.underscore.to_sym
+    end
+  end
+end

data/app/controllers/nyauth/confirmation_requests_controller.rb

@@ -1,28 +1,30 @@
 module Nyauth
-  class ConfirmationRequestsController < Nyauth::BaseController
+  class ConfirmationRequestsController < ApplicationController
+    include Nyauth::ApplicationConcern
+    include Nyauth::ClientConcern
     allow_everyone
     respond_to :html, :json
-    before_action :set_user, only: [:create]
-    after_action :send_mail, only: [:create], if: -> { @user.confirmation_key.present? }
+    before_action :set_client, only: [:create]
+    after_action :send_mail, only: [:create], if: -> { @client.confirmation_key.present? }
 
     def new
     end
 
     def create
-      @user.request_confirmation
-      respond_with(@user, location: root_path)
+      @client.request_confirmation
+      respond_with(@client, location: Nyauth.configuration.redirect_path_after_create_request_confirmation || main_app.root_path)
     end
 
     private
 
-    def set_user
-      @user = User.find_by!(email: params[:user][:email])
+    def set_client
+      @client = client_class.find_by!(email: params[client_name][:email])
     rescue ActiveRecord::RecordNotFound
       render :new
     end
 
     def send_mail
-      Nyauth::UserMailer.request_confirmation(@user).deliver_now
+      Nyauth::RequestMailer.request_confirmation(@client).deliver_now
     end
   end
 end

data/app/controllers/nyauth/confirmations_controller.rb

@@ -1,19 +1,21 @@
 module Nyauth
-  class ConfirmationsController < Nyauth::BaseController
+  class ConfirmationsController < ApplicationController
+    include Nyauth::ApplicationConcern
+    include Nyauth::ClientConcern
     allow_everyone
     self.responder = ConfirmationResponder
     respond_to :html, :json
-    before_action :set_user
+    before_action :set_client
 
     def update
-      @user.confirm
-      respond_with(@user, location: root_path)
+      @client.confirm
+      respond_with(@client, location: Nyauth.configuration.redirect_path_after_update_confirmation || main_app.root_path)
     end
 
     private
 
-    def set_user
-      @user = User.find_by!(confirmation_key: params[:confirmation_key])
+    def set_client
+      @client = client_class.find_by!(confirmation_key: params[:confirmation_key])
     end
   end
 end

data/app/controllers/nyauth/new_password_requests_controller.rb

@@ -1,28 +1,30 @@
 module Nyauth
-  class NewPasswordRequestsController < Nyauth::BaseController
+  class NewPasswordRequestsController < ApplicationController
+    include Nyauth::ApplicationConcern
+    include Nyauth::ClientConcern
     allow_everyone
     respond_to :html, :json
-    before_action :set_user, only: [:create]
-    after_action :send_mail, only: [:create], if: -> { @user.new_password_key.present? }
+    before_action :set_client, only: [:create]
+    after_action :send_mail, only: [:create], if: -> { @client.new_password_key.present? }
 
     def new
     end
 
     def create
-      @user.request_new_password
-      respond_with(@user, location: root_path)
+      @client.request_new_password
+      respond_with(@client, location: Nyauth.configuration.redirect_path_after_new_password_request || main_app.root_path)
     end
 
     private
 
-    def set_user
-      @user = User.find_by!(email: params[:user][:email])
+    def set_client
+      @client = client_class.find_by!(email: params[client_name][:email])
     rescue ActiveRecord::RecordNotFound
       render :new
     end
 
     def send_mail
-      Nyauth::UserMailer.request_new_password(@user).deliver_now
+      Nyauth::RequestMailer.request_new_password(@client).deliver_now
     end
   end
 end

data/app/controllers/nyauth/new_passwords_controller.rb

@@ -1,25 +1,27 @@
 module Nyauth
-  class NewPasswordsController < Nyauth::BaseController
+  class NewPasswordsController < ApplicationController
+    include Nyauth::ApplicationConcern
+    include Nyauth::ClientConcern
     allow_everyone
     respond_to :html, :json
-    before_action :set_user
+    before_action :set_client
 
     def edit
     end
 
     def update
-      @user.update_new_password(user_params)
-      respond_with(@user, location: nyauth.new_session_path)
+      @client.update_new_password(client_params)
+      respond_with(@client, location: Nyauth.configuration.redirect_path_after_update_new_password || new_session_path_for(client_name))
     end
 
     private
 
-    def set_user
-      @user = User.find_by!(new_password_key: params[:new_password_key])
+    def set_client
+      @client = client_class.find_by!(new_password_key: params[:new_password_key])
     end
 
-    def user_params
-      params.fetch(:user, {})
+    def client_params
+      params.fetch(client_name, {})
             .permit(:password, :password_confirmation)
     end
   end

data/app/controllers/nyauth/passwords_controller.rb

@@ -1,25 +1,27 @@
 module Nyauth
-  class PasswordsController < Nyauth::BaseController
+  class PasswordsController < ApplicationController
+    include Nyauth::ApplicationConcern
+    include Nyauth::ClientConcern
     respond_to :html, :json
-    before_action :set_user
+    before_action :set_client
 
     def edit
     end
 
     def update
-      @user.attributes = user_params
-      @user.save(context: :update_password)
-      respond_with(@user, location: root_path)
+      @client.attributes = client_params
+      @client.save(context: :update_password)
+      respond_with(@client, location: Nyauth.configuration.redirect_path_after_update_password || main_app.root_path)
     end
 
     private
 
-    def set_user
-      @user = User.find(current_authenticated.id)
+    def set_client
+      @client = client_class.find(current_authenticated.id)
     end
 
-    def user_params
-      params.fetch(:user, {})
+    def client_params
+      params.fetch(client_name, {})
             .permit(:password, :password_confirmation)
     end
   end

data/app/controllers/nyauth/registrations_controller.rb

@@ -1,25 +1,27 @@
 module Nyauth
-  class RegistrationsController < Nyauth::BaseController
+  class RegistrationsController < ApplicationController
+    include Nyauth::ApplicationConcern
+    include Nyauth::ClientConcern
     allow_everyone
     respond_to :html, :json
-    before_action :set_user
+    before_action :set_client
 
     def new
     end
 
     def create
-      sign_in(@user) if @user.save
-      respond_with(@user, location: root_path)
+      sign_in(@client) if @client.save
+      respond_with(@client, location: Nyauth.configuration.redirect_path_after_registration || main_app.root_path)
     end
 
     private
 
-    def set_user
-      @user = User.new(user_params)
+    def set_client
+      @client = client_class.new(client_params)
     end
 
-    def user_params
-      params.fetch(:user, {})
+    def client_params
+      params.fetch(client_name, {})
             .permit(:email, :password, :password_confirmation)
     end
   end

data/app/controllers/nyauth/sessions_controller.rb

@@ -1,5 +1,7 @@
 module Nyauth
-  class SessionsController < Nyauth::BaseController
+  class SessionsController < ApplicationController
+    include Nyauth::ApplicationConcern
+    include Nyauth::ClientConcern
     allow_everyone only: [:new, :create]
     respond_to :html, :json
     before_action :set_session_service
@@ -8,13 +10,13 @@ module Nyauth
     end
 
     def create
-      sign_in(@session_service.client) if @session_service.save
-      respond_with @session_service, location: root_path
+      sign_in(@session_service.client) if @session_service.save(as: client_name)
+      respond_with @session_service, location: Nyauth.configuration.redirect_path_after_sign_in || main_app.root_path
     end
 
     def destroy
       sign_out
-      respond_with @session_service, location: root_path
+      respond_with @session_service, location: Nyauth.configuration.redirect_path_after_sign_out || new_session_path
     end
 
     private

data/app/helpers/nyauth/application_helper.rb

@@ -1,11 +1,48 @@
 module Nyauth
   module ApplicationHelper
     def method_missing method, *args, &block
-      if method =~ /(_url|_path)\z/
+      if method =~ /(.+)_path_for\z/
+        detect_url_helper($1, *args)
+      elsif method =~ /(_url|_path)\z/
         main_app.send(method, *args)
       else
         super
       end
     end
+
+    # OPTIMEZE: :(
+    def detect_url_helper(feature, client_name, *args)
+      @__methods ||= Nyauth::Engine.routes.url_helpers.instance_methods + Rails.application.routes.url_helpers.instance_methods
+      @__candidates ||= @__methods.reject{|m| m =~ /\A(:?rails_|_)/}.map(&:to_s)
+      if client_name.to_sym == :user
+        detect_url_helper_for_nyauth(feature, *args)
+      else
+        detect_url_helper_for_app(feature, client_name, *args)
+      end
+    end
+
+    def detect_url_helper_for_nyauth(feature, *args)
+      path = @__candidates.grep(/\A#{feature}_path\z/).first
+      return nil unless path
+      nyauth.__send__(path, *args)
+    end
+
+    def detect_url_helper_for_app(feature, client_name, *args)
+      if feature =~ /new_(.+)/
+        path = @__candidates.grep(/\Anew_#{client_name}_#{$1}_path\z/).first
+      else
+        path = @__candidates.grep(/\A#{client_name}_#{feature}_path\z/).first
+      end
+      return nil unless path
+      __send__(path, *args)
+    end
+
+    def root_path
+      if main_app.respond_to?(:root_path)
+        main_app.__send__(:root_path)
+      else
+        '/'
+      end
+    end
   end
 end

data/app/mailers/nyauth/request_mailer.rb

@@ -0,0 +1,15 @@
+module Nyauth
+  class RequestMailer < ActionMailer::Base
+    default from: "from@example.com"
+    layout 'nyauth/mailer'
+    def request_confirmation(client)
+      @client = client
+      mail to: client.email
+    end
+
+    def request_new_password(client)
+      @client = client
+      mail to: client.email
+    end
+  end
+end

data/app/views/nyauth/confirmation_requests/new.html.slim

@@ -1,4 +1,4 @@
-= form_for(User.new, url: confirmation_requests_path, mehotd: :post, html: { class: 'pure-form' }) do |f|
+= form_for(client_class.new, url: confirmation_requests_path_for(client_name), mehotd: :post, html: { class: 'pure-form' }) do |f|
   fieldset
     legend= t 'nav.confirmation_requests.new'
   = f.text_field(:email, placeholder: :email)

data/app/views/nyauth/confirmations/edit.html.slim

@@ -1,5 +1,5 @@
-- if @user.errors.present?
+- if @client.errors.present?
   h2 errors
   ul.errors
-    - @user.errors.full_messages.each do |e|
+    - @client.errors.full_messages.each do |e|
       li #{e}

data/app/views/nyauth/new_password_requests/new.html.slim

@@ -1,4 +1,4 @@
-= form_for(User.new, url: new_password_requests_path, mehotd: :post, html: { class: 'pure-form' }) do |f|
+= form_for(client_class.new, url: new_password_requests_path_for(client_name), mehotd: :post, html: { class: 'pure-form' }) do |f|
   fieldset
     legend= t 'nav.new_password_requests.new'
   = f.text_field(:email, placeholder: :email)

data/app/views/nyauth/new_passwords/edit.html.slim

@@ -1,10 +1,10 @@
-= form_for(@user, url: new_password_path(params[:new_password_key]), html: { class: 'pure-form pure-form-stacked' }) do |f|
+= form_for(@client, url: new_password_path_for(client_name, params[:new_password_key]), html: { class: 'pure-form pure-form-stacked' }) do |f|
   fieldset
     legend
-    - if @user.errors.present?
+    - if @client.errors.present?
       h2 errors
       ul.errors
-        - @user.errors.full_messages.each do |e|
+        - @client.errors.full_messages.each do |e|
           li #{e}
     = f.password_field :password, placeholder: :password
     = f.password_field :password_confirmation, placeholder: :confirmation

data/app/views/nyauth/passwords/edit.html.slim

@@ -1,10 +1,10 @@
-= form_for(@user, url: password_path, html: { class: 'pure-form pure-form-stacked' }) do |f|
+= form_for(@client, url: password_path_for(client_name), html: { class: 'pure-form pure-form-stacked' }) do |f|
   fieldset
     legend
-    - if @user.errors.present?
+    - if @client.errors.present?
       h2 errors
       ul.errors
-        - @user.errors.full_messages.each do |e|
+        - @client.errors.full_messages.each do |e|
           li #{e}
     = f.password_field :password, placeholder: :password
     = f.password_field :password_confirmation, placeholder: :confirmation

data/app/views/nyauth/registrations/new.html.slim

@@ -1,10 +1,10 @@
-= form_for @user, url: registration_path, html: { class: 'pure-form pure-form-stacked' } do |f|
+= form_for @client, url: registration_path_for(client_name), html: { class: 'pure-form pure-form-stacked' } do |f|
   fieldset
     legend= t 'nav.registrations.new'
-    - if @user.errors.present?
+    - if @client.errors.present?
       h2 errors
       ul.errors
-        - @user.errors.full_messages.each do |e|
+        - @client.errors.full_messages.each do |e|
           li #{e}
     = f.text_field :email, placeholder: :email
     = f.password_field :password, placeholder: :password

data/app/views/nyauth/request_mailer/request_confirmation.html.slim

@@ -0,0 +1,2 @@
+p Plese confirm your email
+p = link_to 'confirm', confirmation_url(@client.confirmation_key)

data/app/views/nyauth/request_mailer/request_confirmation.text.erb

@@ -0,0 +1,3 @@
+Plese confirm your email
+
+<%= confirmation_url(@client.confirmation_key) %>

data/app/views/nyauth/request_mailer/request_new_password.html.slim

@@ -0,0 +1,2 @@
+p Plese set your new password
+p = link_to 'set new password', edit_new_password_url(@client.new_password_key)

data/app/views/nyauth/request_mailer/request_new_password.text.erb

@@ -0,0 +1,3 @@
+Plese set your new password
+
+<%= edit_new_password_url(@client.new_password_key) %>

data/app/views/nyauth/sessions/new.html.slim

@@ -1,4 +1,4 @@
-= form_for @session_service, url: session_path, html: { class: 'pure-form' } do |f|
+= form_for @session_service, url: session_path_for(client_name), html: { class: 'pure-form' } do |f|
   fieldset
     legend= t 'nav.sessions.new'
     - if @session_service.errors.present?
@@ -9,7 +9,3 @@
     = f.email_field :email, placeholder: :email
     = f.password_field :password, placeholder: :password
     = f.submit 'Sign in', data: { disable_with: '...' }, class: 'pure-button pure-button-primary'
-
-ul
-  li= link_to 'sign up', new_registration_path
-  li= link_to 'request new password', new_new_password_request_path

data/config/routes.rb

@@ -6,5 +6,5 @@ Nyauth::Engine.routes.draw do
   get '/confirmations/:confirmation_key' => 'confirmations#update', as: :confirmation
   resources :new_password_requests, only: %i(new create)
   resources :new_passwords, param: :new_password_key, only: %i(edit update)
-  root 'sessions#new'
+  Nyauth.configuration.setup_redirect_path
 end

data/lib/generators/nyauth/install_generator.rb

@@ -0,0 +1,11 @@
+module Nyauth
+  class InstallGenerator < Rails::Generators::Base
+    source_root File.expand_path("../templates", __FILE__)
+    desc "Creates Nyauth initializer for your application"
+
+    def copy_initializer
+      template "nyauth_install_initializer.rb", "config/initializers/nyauth.rb"
+      puts "Install complete"
+    end
+  end
+end

data/lib/generators/nyauth/templates/nyauth_install_initializer.rb

@@ -0,0 +1,7 @@
+Nyauth.configure do |config|
+  config.redirect_path do |urls|
+    # config.redirect_path_after_sign_in = urls.admin_secret_notes_path
+    # config.redirect_path_after_sign_out = urls.root_path
+    # config.redirect_path_after_registration = urls.root_path
+  end
+end

data/lib/nyauth/configuration.rb

@@ -0,0 +1,40 @@
+module Nyauth
+  class Configuration
+    attr_accessor :redirect_path_block,
+                  :redirect_path_after_sign_in,
+                  :redirect_path_after_sign_out,
+                  :redirect_path_after_registration,
+                  :redirect_path_after_create_request_confirmation,
+                  :redirect_path_after_update_confirmation,
+                  :redirect_path_after_new_password_request,
+                  :redirect_path_after_update_new_password,
+                  :redirect_path_after_update_password
+
+
+    def initialize
+      @redirect_path_after_sign_in = nil
+      @redirect_path_after_sign_out = nil
+      @redirect_path_after_registration = nil
+      @redirect_path_after_create_request_confirmation = nil
+      @redirect_path_after_update_confirmation = nil
+      @redirect_path_after_new_password_request = nil
+      @redirect_path_after_update_new_password = nil
+      @redirect_path_after_update_password = nil
+      @redirect_path_block = Proc.new {}
+    end
+
+    def redirect_path(&block)
+      @redirect_path_block = block
+    end
+
+    def setup_redirect_path
+      UrlHelper.class_eval do
+        include Rails.application.routes.url_helpers
+      end
+      @redirect_path_block.call(UrlHelper.new)
+    end
+  end
+
+  class UrlHelper
+  end
+end

data/lib/nyauth/engine.rb

@@ -10,6 +10,8 @@ module Nyauth
   class Engine < ::Rails::Engine
     isolate_namespace Nyauth
 
+    config.nyauth = ActiveSupport::OrderedOptions.new
+    config.nyauth.admin = 'admin'
     config.i18n.load_path += Dir[Engine.root.join('config', 'locales', '**', '*.{rb,yml}').to_s]
     config.generators do |g|
       g.test_framework      :rspec,        fixture: false

data/lib/nyauth/version.rb

@@ -1,3 +1,3 @@
 module Nyauth
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/nyauth.rb

@@ -1,5 +1,15 @@
 require 'nyauth/engine'
 require 'nyauth/encryptor'
+require 'nyauth/configuration'
 
 module Nyauth
+  class << self
+    attr_accessor :configuration
+  end
+
+  def self.configure
+    self.configuration ||= Configuration.new
+    yield(configuration)
+  end
 end
+Nyauth.configure {}

data/spec/dummy/app/controllers/pages_controller.rb

@@ -0,0 +1,4 @@
+class PagesController < ApplicationController
+  def index
+  end
+end

data/spec/dummy/app/controllers/posts_controller.rb

@@ -0,0 +1,5 @@
+class PostsController < ApplicationController
+  def index
+    head :ok
+  end
+end

data/spec/dummy/app/models/admin.rb

@@ -0,0 +1,3 @@
+class Admin < ActiveRecord::Base
+  include Nyauth::Authenticatable
+end