nyauth 0.0.3 → 0.1.0

data/spec/factories/users.rb

@@ -13,9 +13,9 @@ FactoryGirl.define do
       confirmation_key_expired_at { Time.current + 1.hour }
     end
 
-    trait :requested_new_password do
-      new_password_key 'key'
-      new_password_key_expired_at { Time.current + 1.hour }
+    trait :requested_reset_password do
+      reset_password_key 'key'
+      reset_password_key_expired_at { Time.current + 1.hour }
     end
   end
 end

data/spec/featrues/nyauth/{new_password_requests_spec.rb → reset_password_requests_spec.rb}

@@ -4,20 +4,20 @@ RSpec.describe 'Nyauth::NewPasswordRequests' do
   let!(:user) { create(:user) }
 
   feature 'confirmation' do
-    let(:new_password) { 'cool_password' }
+    let(:reset_password) { 'cool_password' }
     background do
-      visit nyauth.new_new_password_request_path
+      visit nyauth.new_reset_password_request_path
     end
 
-    scenario 'request & set new password' do
+    scenario 'request & set reset password' do
       fill_in('user_email', with: user.email)
-      click_button('request new password')
+      click_button('reset password')
 
       open_email(user.email)
       current_email.click_link('set new password')
 
-      fill_in('user_password', with: new_password)
-      fill_in('user_password_confirmation', with: new_password)
+      fill_in('user_password', with: reset_password)
+      fill_in('user_password_confirmation', with: reset_password)
       click_button('Update')
 
       expect(page).to have_content('updated')
@@ -26,14 +26,14 @@ RSpec.describe 'Nyauth::NewPasswordRequests' do
 
     scenario 'request expired' do
       fill_in('user_email', with: user.email)
-      click_button('request new password')
+      click_button('reset password')
 
       Timecop.freeze(Time.current + 3.hours) do
         open_email(user.email)
         current_email.click_link('set new password')
 
-        fill_in('user_password', with: new_password)
-        fill_in('user_password_confirmation', with: new_password)
+        fill_in('user_password', with: reset_password)
+        fill_in('user_password_confirmation', with: reset_password)
         click_button('Update')
 
         expect(page).to have_content('expired')

data/spec/helpers/nyauth/application_helper_spec.rb

@@ -100,8 +100,8 @@ RSpec.describe Nyauth::ApplicationHelper do
     end
   end
 
-  describe '#new_password_requests_path_for' do
-    subject { helper.new_password_requests_path_for(client_name) }
+  describe '#reset_password_requests_path_for' do
+    subject { helper.reset_password_requests_path_for(client_name) }
 
     context 'when client_name is admin' do
       let(:client_name) { :admin }
@@ -110,12 +110,12 @@ RSpec.describe Nyauth::ApplicationHelper do
 
     context 'when client_name is user' do
       let(:client_name) { :user }
-      it { is_expected.to eq "/new_password_requests" }
+      it { is_expected.to eq "/reset_password_requests" }
     end
   end
 
-  describe '#new_new_password_request_path_for' do
-    subject { helper.new_new_password_request_path_for(client_name) }
+  describe '#new_reset_password_request_path_for' do
+    subject { helper.new_reset_password_request_path_for(client_name) }
 
     context 'when client_name is admin' do
       let(:client_name) { :admin }
@@ -124,13 +124,13 @@ RSpec.describe Nyauth::ApplicationHelper do
 
     context 'when client_name is user' do
       let(:client_name) { :user }
-      it { is_expected.to eq "/new_password_requests/new" }
+      it { is_expected.to eq "/reset_password_requests/new" }
     end
   end
 
-  describe '#new_password_path_for(:new_password_key)' do
-    subject { helper.new_password_path_for(client_name, new_password_key) }
-    let(:new_password_key) { 'hogehoge' }
+  describe '#reset_password_path_for(:reset_password_key)' do
+    subject { helper.reset_password_path_for(client_name, reset_password_key) }
+    let(:reset_password_key) { 'hogehoge' }
 
     context 'when client_name is admin' do
       let(:client_name) { :admin }
@@ -139,7 +139,7 @@ RSpec.describe Nyauth::ApplicationHelper do
 
     context 'when client_name is user' do
       let(:client_name) { :user }
-      it { is_expected.to eq "/new_passwords/#{new_password_key}" }
+      it { is_expected.to eq "/reset_passwords/#{reset_password_key}" }
     end
   end
 end

data/spec/mailers/nyauth/request_mailer_spec.rb

@@ -7,9 +7,9 @@ RSpec.describe Nyauth::RequestMailer do
     it { expect(mail).to have_body_text 'Plese confirm your email' }
   end
 
-  describe '#request_new_password' do
-    let(:user) { create(:user, :requested_new_password) }
-    subject(:mail) { Nyauth::RequestMailer.request_new_password(user) }
+  describe '#request_reset_password' do
+    let(:user) { create(:user, :requested_reset_password) }
+    subject(:mail) { Nyauth::RequestMailer.request_reset_password(user) }
     it { expect(mail).to have_body_text 'Plese set your new password' }
   end
 end

data/spec/models/user_spec.rb

@@ -5,5 +5,5 @@ RSpec.describe User do
   it { expect(user).to be_persisted }
   it_behaves_like 'Nyauth::Authenticatable', User
   it_behaves_like 'Nyauth::Confirmable', User
-  it_behaves_like 'Nyauth::NewPasswordAvility', User
+  it_behaves_like 'Nyauth::ResetPasswordAvility', User
 end

data/spec/support/models/nyauth/reset_password_ability.rb

@@ -0,0 +1,13 @@
+RSpec.shared_examples 'Nyauth::ResetPasswordAvility' do |klass|
+  let!(:instance) { create(klass.name.downcase.to_sym) }
+
+  describe '#request_reset_password' do
+    subject { instance.request_reset_password }
+
+    it do
+      expect {
+        subject
+      }.to change(instance, :reset_password_key).from(nil)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nyauth
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - ppworks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -97,17 +97,17 @@ files:
 - app/controllers/concerns/nyauth/session_concern.rb
 - app/controllers/nyauth/confirmation_requests_controller.rb
 - app/controllers/nyauth/confirmations_controller.rb
-- app/controllers/nyauth/new_password_requests_controller.rb
-- app/controllers/nyauth/new_passwords_controller.rb
 - app/controllers/nyauth/passwords_controller.rb
 - app/controllers/nyauth/registrations_controller.rb
+- app/controllers/nyauth/reset_password_requests_controller.rb
+- app/controllers/nyauth/reset_passwords_controller.rb
 - app/controllers/nyauth/sessions_controller.rb
 - app/helpers/nyauth/application_helper.rb
 - app/mailers/nyauth/request_mailer.rb
 - app/models/concerns/nyauth/authenticatable.rb
 - app/models/concerns/nyauth/confirmable.rb
-- app/models/concerns/nyauth/new_password_ability.rb
 - app/models/concerns/nyauth/password_digest_ability.rb
+- app/models/concerns/nyauth/reset_password_ability.rb
 - app/responders/nyauth/app_responder.rb
 - app/responders/nyauth/confirmation_responder.rb
 - app/services/nyauth/confirmation_request_service.rb
@@ -119,14 +119,14 @@ files:
 - app/views/nyauth/layouts/application.html.slim
 - app/views/nyauth/layouts/mailer.html.slim
 - app/views/nyauth/layouts/mailer.text.slim
-- app/views/nyauth/new_password_requests/new.html.slim
-- app/views/nyauth/new_passwords/edit.html.slim
 - app/views/nyauth/passwords/edit.html.slim
 - app/views/nyauth/registrations/new.html.slim
 - app/views/nyauth/request_mailer/request_confirmation.html.slim
 - app/views/nyauth/request_mailer/request_confirmation.text.erb
-- app/views/nyauth/request_mailer/request_new_password.html.slim
-- app/views/nyauth/request_mailer/request_new_password.text.erb
+- app/views/nyauth/request_mailer/request_reset_password.html.slim
+- app/views/nyauth/request_mailer/request_reset_password.text.erb
+- app/views/nyauth/reset_password_requests/new.html.slim
+- app/views/nyauth/reset_passwords/edit.html.slim
 - app/views/nyauth/sessions/new.html.slim
 - config/application.yml
 - config/locales/en.yml
@@ -178,6 +178,7 @@ files:
 - spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/20150303135922_create_users.rb
 - spec/dummy/db/migrate/20150317141956_create_admins.rb
+- spec/dummy/db/production.sqlite3
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/log/development.log
@@ -207,9 +208,9 @@ files:
 - spec/factories/admins.rb
 - spec/factories/users.rb
 - spec/featrues/nyauth/confirmation_requests_spec.rb
-- spec/featrues/nyauth/new_password_requests_spec.rb
 - spec/featrues/nyauth/passwords_spec.rb
 - spec/featrues/nyauth/registrations_spec.rb
+- spec/featrues/nyauth/reset_password_requests_spec.rb
 - spec/featrues/nyauth/sessions_spec.rb
 - spec/featrues/url_helper_on_application_spec.rb
 - spec/helpers/nyauth/application_helper_spec.rb
@@ -225,8 +226,8 @@ files:
 - spec/support/macros/feature_macros.rb
 - spec/support/models/nyauth/authenticatable.rb
 - spec/support/models/nyauth/confirmable.rb
-- spec/support/models/nyauth/new_password_ability.rb
 - spec/support/models/nyauth/password_digest_ability.rb
+- spec/support/models/nyauth/reset_password_ability.rb
 homepage: https://github.com/ppworks/nyauth
 licenses:
 - MIT
@@ -289,6 +290,7 @@ test_files:
 - spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/20150303135922_create_users.rb
 - spec/dummy/db/migrate/20150317141956_create_admins.rb
+- spec/dummy/db/production.sqlite3
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/log/development.log
@@ -320,9 +322,9 @@ test_files:
 - spec/factories/admins.rb
 - spec/factories/users.rb
 - spec/featrues/nyauth/confirmation_requests_spec.rb
-- spec/featrues/nyauth/new_password_requests_spec.rb
 - spec/featrues/nyauth/passwords_spec.rb
 - spec/featrues/nyauth/registrations_spec.rb
+- spec/featrues/nyauth/reset_password_requests_spec.rb
 - spec/featrues/nyauth/sessions_spec.rb
 - spec/featrues/url_helper_on_application_spec.rb
 - spec/helpers/nyauth/application_helper_spec.rb
@@ -338,5 +340,5 @@ test_files:
 - spec/support/macros/feature_macros.rb
 - spec/support/models/nyauth/authenticatable.rb
 - spec/support/models/nyauth/confirmable.rb
-- spec/support/models/nyauth/new_password_ability.rb
 - spec/support/models/nyauth/password_digest_ability.rb
+- spec/support/models/nyauth/reset_password_ability.rb

data/app/models/concerns/nyauth/new_password_ability.rb

@@ -1,35 +0,0 @@
-module Nyauth
-  module NewPasswordAbility
-    extend ActiveSupport::Concern
-
-    included do
-      before_validation :check_new_password_key, on: :new_password
-      validates :email, email: { strict_mode: false }
-      validates :password, presence: true,
-                           length: { minimum: 8 },
-                           on: [:create, :update_password, :new_password]
-      validates :password, confirmation: true
-    end
-
-    def update_new_password(params)
-      self.attributes = params
-      self.save(context: :new_password)
-    end
-
-    def request_new_password
-      self.new_password_key = SecureRandom.hex(32)
-      self.new_password_key_expired_at = Time.current + 1.hour
-      save
-    end
-
-    private
-
-    def check_new_password_key
-      if new_password_key_expired_at.past?
-        errors.add(:new_password_key, :expired)
-      else
-        self.new_password_key = nil
-      end
-    end
-  end
-end

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

@@ -1,5 +0,0 @@
-= 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)
-  = f.submit 'request new password', data: { disable_with: '...' }, class: 'pure-button pure-button-primary'

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

@@ -1,2 +0,0 @@
-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

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

data/spec/support/models/nyauth/new_password_ability.rb

@@ -1,13 +0,0 @@
-RSpec.shared_examples 'Nyauth::NewPasswordAvility' do |klass|
-  let!(:instance) { create(klass.name.downcase.to_sym) }
-
-  describe '#request_new_password' do
-    subject { instance.request_new_password }
-
-    it do
-      expect {
-        subject
-      }.to change(instance, :new_password_key).from(nil)
-    end
-  end
-end