nyauth 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b179e705b0291eb4ab1cb5ceb28ed1ab60f6c36e
-  data.tar.gz: 789c2faca7c10305ecfdef41985394aeca889a4c
+  metadata.gz: f37035167e1f90170a80e5e56b0523d7bc51b64e
+  data.tar.gz: 066c6ab929e8ec5a62bf4f408d907af17fb1a86e
 SHA512:
-  metadata.gz: ae1e764608c2e31037aef15d9e52038f70de3f40b37998c30128078013abdb619a412c52ae63c073ed5fdd9280eb954a1c2bd498666eb251dfc5754e0efb3586
-  data.tar.gz: de4269ccf19ad4fb969f05f3b0ae33ca0fbdd846032f3f688c7fc182b0deb6f70a215ba0c6e74f471659a9dbba26c65c77fcd1db2afe84e500598a42912ba529
+  metadata.gz: 6345b60be6812d70b38e502fae73fe497b342db02843c56579ffa70d5d8f57445464019d6deb59711baeb536df2b33e521b9bd94548289088e3c699a2919cb1b
+  data.tar.gz: 0fd6d78ce22fc48f4cb0a10bf7912ceedd8b1fec33db34a2dc3a167f87eb511c6fbcf9c197af15ef7bf51158ed529791dfeeff39a2ad81398b8309d8b98a6242

data/README.md

@@ -135,6 +135,7 @@ nyauth.configure do |config|
   config.encryption_secret = ENV['NYAUTH_ENCRYPTION_SECRET'] || ENV['SECRET_KEY_BASE']
   config.confirmation_expire_limit = 1.hour
   config.reset_password_expire_limit = 1.hour
+  config.mail_delivery_method = :deliver_now
   config.redirect_path do |urls|
     # config.redirect_path_after_sign_in = -> (client_name) {
     #  if client_name == :admin
@@ -158,39 +159,57 @@ end
 I18n
 
 ```yaml
-ja:
+en:
   flash:
     nyauth:
       passwords:
         update:
-          notice: 'パスワードを更新しました'
+          notice: 'updated password'
       registrations:
         create:
-          notice: '登録完了しました'
+          notice: 'registration success'
       sessions:
         create:
-          notice: 'ログインしました'
+          notice: 'sign in success'
         destroy:
-          notice: 'ログアウトしました'
+          notice: 'sign out success'
       confirmations:
         update:
-          notice: 'メールアドレスの確認をしました'
+          notice: 'confirmed'
       confirmation_requests:
         create:
-          notice: 'メールアドレスへ確認メールを送信しました'
+          notice: 'sent mail'
       reset_password_requests:
         create:
-          notice: 'メールアドレスへパスワードリセットの案内を送信しました'
+          notice: 'sent mail'
       reset_passwords:
         update:
-          notice: 'パスワードを再設定しました'
+          notice: 'updated password'
   activerecord:
     errors:
       messages:
-        key_expired: 'URLの有効期限が切れてしまいました'
+        key_expired: 'This URL is expired'
   errors:
     messages:
-      invalid_email_or_password: 'ログイン情報に誤りがあります'
+      invalid_email_or_password: 'Invalid email or password'
+      invalid_email: 'Invalid email'
+  nav:
+    nyauth:
+      common:
+        send: 'Send'
+        set: 'Set'
+        update: 'Update'
+      sessions:
+        new: 'Sign in'
+        destroy: 'Sign out'
+      registrations:
+        new: 'Sign up'
+      passwords:
+        edit: 'Change password'
+      reset_password_requests:
+        new: 'Reset password'
+      confirmation_requests:
+        new: 'Confirm E-mail address'
 ```
 
 ## test

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

@@ -4,8 +4,6 @@ module Nyauth
     included do |base|
       helper_method :nyauth_client_class
       helper_method :nyauth_client_name
-      helper_method :client_class # deprecated
-      helper_method :client_name # deprecated
     end
 
     def initialize
@@ -29,15 +27,5 @@ module Nyauth
     def nyauth_client_name
       nyauth_client_class.name.underscore.to_sym
     end
-
-    def client_class
-      warn 'DEPRECATION WARNING: client_class is deprecated. Please use nyauth_client_class'
-      nyauth_client_class
-    end
-
-    def client_name
-      warn 'DEPRECATION WARNING: client_name is deprecated. Please use nyauth_client_name'
-      nyauth_client_name
-    end
   end
 end

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

@@ -36,8 +36,10 @@ module Nyauth
       options.reverse_merge!(as: :user)
       return if self.class.allow_actions == :all
       return if self.class.allow_actions.present? && request[:action].to_sym.in?(self.class.allow_actions)
-      session["#{options[:as]}_return_to"] = request.url if request.get?
-      redirect_to new_session_path_for(options[:as]) unless signed_in?(options)
+      unless signed_in?(options)
+        session["#{options[:as]}_return_to"] = request.url if request.get?
+        redirect_to new_session_path_for(options[:as])
+      end
     end
 
     def current_authenticated(options = {})

data/app/controllers/nyauth/confirmation_requests_controller.rb

@@ -27,7 +27,8 @@ module Nyauth
     end
 
     def send_mail
-      Nyauth::RequestMailer.request_confirmation(@service.client).deliver_now
+      Nyauth::RequestMailer.request_confirmation(@service.client)
+                           .__send__(Nyauth.configuration.mail_delivery_method)
     end
   end
 end

data/app/controllers/nyauth/reset_password_requests_controller.rb

@@ -27,7 +27,8 @@ module Nyauth
     end
 
     def send_mail
-      Nyauth::RequestMailer.request_reset_password(@service.client).deliver_now
+      Nyauth::RequestMailer.request_reset_password(@service.client)
+                           .__send__(Nyauth.configuration.mail_delivery_method)
     end
   end
 end

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

@@ -1,4 +1,8 @@
+<div class="nyauth-error-messages">
+  <%= @service.errors.full_messages.join(',') %>
+</div>
+
 <%= form_for @service, url: confirmation_requests_path_for(nyauth_client_name) do |f| %>
-  <%= f.email_field :email %>
-  <%= f.submit 'request confirmation' %>
+  <%= f.email_field :email, placeholder: 'email' %>
+  <%= f.submit t('nav.nyauth.common.send') %>
 <% end %>

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

@@ -1 +1,3 @@
-<%= @client.errors.full_messages.join ',' %>
+<div class="nyauth-error-messages">
+  <%= @client.errors.full_messages.join ',' %>
+</div>

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

@@ -1,6 +1,13 @@
+<div class="nyauth-error-messages">
+  <%= @client.errors.full_messages.join(',') %>
+</div>
+
 <%= form_for @client, url: password_path_for(nyauth_client_name) do |f| %>
-  <%= f.object.errors.full_messages %>
-  <%= f.password_field :password %>
-  <%= f.password_field :password_confirmation %>
-  <%= f.submit 'Update' %>
+  <div>
+    <%= f.password_field :password, placeholder: 'password' %>
+  </div>
+  <div>
+    <%= f.password_field :password_confirmation, placeholder: 'password confirmation' %>
+  </div>
+  <%= f.submit t('nav.nyauth.common.update') %>
 <% end %>

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

@@ -1,7 +1,18 @@
+<div class="nyauth-error-messages">
+  <%= @service.errors.full_messages.join(',') %>
+</div>
+
 <%= form_for @service, url: registration_path_for(nyauth_client_name) do |f| %>
-  <%= f.object.errors.full_messages.join ',' %>
-  <%= f.email_field :email %>
-  <%= f.password_field :password %>
-  <%= f.password_field :password_confirmation %>
-  <%= f.submit 'Sign up' %>
+  <div>
+    <%= f.email_field :email, placeholder: 'email' %>
+  </div>
+  <div>
+    <%= f.password_field :password, placeholder: 'password' %>
+  </div>
+  <div>
+    <%= f.password_field :password_confirmation, placeholder: 'password confirmation' %>
+  </div>
+  <div>
+    <%= f.submit t('nav.nyauth.registrations.new') %>
+  </div>
 <% end %>

data/app/views/nyauth/reset_password_requests/new.html.erb

@@ -1,4 +1,8 @@
+<div class="nyauth-error-messages">
+  <%= @service.errors.full_messages.join(',') %>
+</div>
+
 <%= form_for @service, url: reset_password_requests_path_for(nyauth_client_name) do |f| %>
-  <%= f.text_field :email %>
-  <%= f.submit 'reset password' %>
+  <%= f.text_field :email, placeholder: 'email' %>
+  <%= f.submit t('nav.nyauth.common.send') %>
 <% end %>

data/app/views/nyauth/reset_passwords/edit.html.erb

@@ -1,6 +1,13 @@
+<div class="nyauth-error-messages">
+  <%= @client.errors.full_messages.join(',') %>
+</div>
+
 <%= form_for @client, url: reset_password_path_for(nyauth_client_name, params[:reset_password_key]) do |f| %>
-  <%= f.object.errors.full_messages %>
-  <%= f.password_field :password %>
-  <%= f.password_field :password_confirmation %>
-  <%= f.submit 'Update' %>
+  <div>
+    <%= f.password_field :password, placeholder: 'password' %>
+  </div>
+  <div>
+    <%= f.password_field :password_confirmation, placeholder: 'password confirmation' %>
+  </div>
+  <%= f.submit t('nav.nyauth.common.set') %>
 <% end %>

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

@@ -1,6 +1,28 @@
+<div class="nyauth-error-messages">
+  <%= @service.errors.full_messages.join(',') %>
+</div>
+
 <%= form_for @service, url: session_path_for(nyauth_client_name) do |f| %>
-  <%= f.object.errors.full_messages.join ',' %>
-  <%= f.email_field :email %>
-  <%= f.password_field :password %>
-  <%= f.submit 'Sign in' %>
+  <div>
+    <%= f.email_field :email, placeholder: 'email' %>
+  </div>
+  <div>
+    <%= f.password_field :password, placeholder: 'password' %>
+  </div>
+  <div>
+    <%= f.submit t('nav.nyauth.sessions.new') %>
+  </div>
 <% end %>
+
+<ul>
+  <li>
+    <%= link_to new_registration_path_for(nyauth_client_name) do %>
+      <%= t('nav.nyauth.registrations.new') %>
+    <% end %>
+  </li>
+  <li>
+    <%= link_to new_reset_password_request_path_for(nyauth_client_name) do %>
+      <%= t('nav.nyauth.reset_password_requests.new') %>
+    <% end %>
+  </li>
+</ul>

data/config/locales/en.yml

@@ -32,3 +32,20 @@ en:
     messages:
       invalid_email_or_password: 'Invalid email or password'
       invalid_email: 'Invalid email'
+  nav:
+    nyauth:
+      common:
+        send: 'Send'
+        set: 'Set'
+        update: 'Update'
+      sessions:
+        new: 'Sign in'
+        destroy: 'Sign out'
+      registrations:
+        new: 'Sign up'
+      passwords:
+        edit: 'Change password'
+      reset_password_requests:
+        new: 'Reset password'
+      confirmation_requests:
+        new: 'Confirm E-mail address'

data/config/locales/ja.yml

@@ -32,3 +32,20 @@ ja:
     messages:
       invalid_email_or_password: 'ログイン情報に誤りがあります'
       invalid_email: 'メールアドレスに誤りがあります'
+  nav:
+    nyauth:
+      common:
+        send: '送信する'
+        set: '設定する'
+        update: '更新する'
+      sessions:
+        new: 'ログイン'
+        destroy: 'ログアウト'
+      registrations:
+        new: '会員登録'
+      passwords:
+        edit: 'パスワード変更'
+      reset_password_requests:
+        new: 'パスワードリセット'
+      confirmation_requests:
+        new: 'メール認証'

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

@@ -2,6 +2,7 @@ Nyauth.configure do |config|
   config.encryption_secret = ENV['NYAUTH_ENCRYPTION_SECRET']
   config.confirmation_expire_limit = 1.hour
   config.reset_password_expire_limit = 1.hour
+  config.mail_delivery_method = :deliver_now
   config.redirect_path do |urls|
     # config.redirect_path_after_sign_in = -> (client_name) {
     #  if client_name == :admin

data/lib/nyauth/configuration.rb

@@ -13,7 +13,8 @@ module Nyauth
                   :reset_password_expire_limit,
                   :password_minium,
                   :password_digest_stretches,
-                  :encryption_secret
+                  :encryption_secret,
+                  :mail_delivery_method
 
 
     def initialize
@@ -30,6 +31,7 @@ module Nyauth
       @password_minium = 8
       @password_digest_stretches = 1000
       @encryption_secret = ENV['NYAUTH_ENCRYPTION_SECRET']
+      @mail_delivery_method = :deliver_now
       @redirect_path_block = Proc.new {}
     end
 

data/lib/nyauth/version.rb

@@ -1,3 +1,3 @@
 module Nyauth
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

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

@@ -0,0 +1,3 @@
+class SecretPagesController < ApplicationController
+  before_action -> { require_authentication! as: :user }
+end

data/spec/dummy/app/views/layouts/application.html.erb

@@ -8,19 +8,20 @@
 </head>
 <body>
 
-<%= yield %>
 <% if flash[:notice] %>
   <%= flash[:notice] %>
 <% end %>
 <% if flash[:alert] %>
   <%= flash[:alert] %>
 <% end %>
-<%= link_to "URL helper on application", posts_path %>
+<%= link_to "Secret page(URL helper on application)", secret_page_path %>
 <% if signed_in?(as: :user) %>
-  <%= link_to 'Sign out', session_path_for(:user), class: 'pure-menu-link', method: :delete %>
+  <%= link_to t('nav.nyauth.sessions.destroy'), session_path_for(:user), class: 'pure-menu-link', method: :delete %>
 <% end %>
 <% if signed_in?(as: :admin) %>
-  <%= link_to 'Sign out', session_path_for(:admin), class: 'pure-menu-link', method: :delete %>
+  <%= link_to t('nav.nyauth.sessions.destroy'), session_path_for(:admin), class: 'pure-menu-link', method: :delete %>
 <% end %>
+
+<%= yield %>
 </body>
 </html>

data/spec/dummy/app/views/pages/index.html.erb

@@ -0,0 +1 @@
+

data/spec/dummy/app/views/secret_pages/show.html.erb

@@ -0,0 +1,16 @@
+<p>
+It's a secret page!
+</p>
+
+<ul>
+  <li>
+    <%= link_to new_confirmation_request_path_for(nyauth_client_name) do %>
+      <%= t('nav.nyauth.confirmation_requests.new') %>
+    <% end %>
+  </li>
+  <li>
+    <%= link_to edit_password_path_for(nyauth_client_name) do %>
+      <%= t('nav.nyauth.passwords.edit') %>
+    <% end %>
+  </li>
+</ul>

data/spec/dummy/config/routes.rb

@@ -4,6 +4,6 @@ Rails.application.routes.draw do
   end
   mount Nyauth::Engine, at: '/', as: :nyauth
 
-  resources :posts, only: %i(index)
+  resource :secret_page, only: %i(show)
   root 'pages#index'
 end