spree_auth_devise 3.0.6 → 3.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of spree_auth_devise might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/Gemfile +5 -1
- data/app/overrides/auth_shared_login_bar.rb +2 -2
- data/app/overrides/spree/admin/shared/_header/auth_admin_login_navigation_bar.html.erb.deface +1 -1
- data/config/initializers/devise.rb +1 -1
- data/config/locales/de.yml +2 -2
- data/config/locales/en.yml +2 -1
- data/config/locales/es.yml +1 -1
- data/config/locales/fr.yml +1 -1
- data/config/locales/it.yml +1 -1
- data/config/locales/nl.yml +1 -1
- data/config/locales/pt-BR.yml +1 -1
- data/config/locales/tr.yml +1 -1
- data/config/routes.rb +2 -1
- data/db/migrate/20150416152553_add_missing_indices_on_user.rb +10 -0
- data/lib/assets/javascripts/spree/frontend/account.js.coffee +5 -0
- data/lib/assets/javascripts/spree/frontend/spree_auth.js.erb +1 -0
- data/lib/controllers/frontend/spree/store_controller_decorator.rb +6 -0
- data/lib/controllers/frontend/spree/user_registrations_controller.rb +15 -7
- data/lib/generators/spree/auth/install/install_generator.rb +4 -0
- data/lib/spree_auth_devise.rb +2 -2
- data/lib/views/frontend/spree/shared/_link_to_account.html.erb +6 -0
- data/lib/views/frontend/spree/shared/_login.html.erb +2 -2
- data/lib/views/frontend/spree/shared/_login_bar.html.erb +1 -6
- data/lib/views/frontend/spree/user_passwords/edit.html.erb +4 -4
- data/lib/views/frontend/spree/user_passwords/new.html.erb +1 -1
- data/spec/features/account_spec.rb +3 -3
- data/spec/features/admin/sign_in_spec.rb +1 -1
- data/spec/features/admin/sign_out_spec.rb +1 -1
- data/spec/features/change_email_spec.rb +1 -1
- data/spec/features/sign_in_spec.rb +1 -1
- data/spec/features/sign_out_spec.rb +1 -1
- data/spree_auth_devise.gemspec +2 -5
- metadata +12 -50
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: ac4c5f43e14c76fb098fc727c2749e4c3e2784e3
|
4
|
+
data.tar.gz: ea45c92f87d2da7a95a7a84f417c4343bc0713de
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1f5feb17f90670ba23070017133349ba09599e4d83f283700f4032a3ab6572408327e21b8faad00db5d4cd77751a993fba210643d6d256e415d07cb619c0d6c1
|
7
|
+
data.tar.gz: 17948f62075b6e0eb1841f457dd5d8d581bff2815b8ce694aa96f2bc2fb27abe024bab1097c966c089c40a247f5329ba5b101ce23335407cba67d19b40abe06f
|
data/Gemfile
CHANGED
@@ -2,6 +2,6 @@ Deface::Override.new(:virtual_path => "spree/shared/_nav_bar",
|
|
2
2
|
:name => "auth_shared_login_bar",
|
3
3
|
:insert_before => "li#search-bar",
|
4
4
|
:partial => "spree/shared/login_bar",
|
5
|
-
:disabled => false,
|
6
|
-
:original => '
|
5
|
+
:disabled => false,
|
6
|
+
:original => 'c00d67dfc0496d21a351b48c41a728412cb5ed2c')
|
7
7
|
|
data/app/overrides/spree/admin/shared/_header/auth_admin_login_navigation_bar.html.erb.deface
CHANGED
@@ -1,4 +1,4 @@
|
|
1
1
|
<!-- insert_top "[data-hook='admin_login_navigation_bar'], #admin_login_navigation_bar[data-hook]"
|
2
|
-
original '
|
2
|
+
original '71d12ae155143c6ea8090942955299485f534153' -->
|
3
3
|
|
4
4
|
<%= render partial: "spree/layouts/admin/login_nav" %>
|
@@ -111,7 +111,7 @@ Devise.setup do |config|
|
|
111
111
|
# access, but formats like :xml or :json, should return 401.
|
112
112
|
# If you have any extra navigational formats, like :iphone or :mobile, you
|
113
113
|
# should add them to the navigational formats lists. Default is [:html]
|
114
|
-
config.navigational_formats = [:html
|
114
|
+
config.navigational_formats = [:html]
|
115
115
|
|
116
116
|
# ==> Warden configuration
|
117
117
|
# If you want to use other strategies, that are not (yet) supported by Devise,
|
data/config/locales/de.yml
CHANGED
@@ -25,7 +25,7 @@ de:
|
|
25
25
|
unlocks:
|
26
26
|
send_instructions: In ein paar Minuten erhalten Sie eine E-Mail mit Anweisungen um Ihr Konto freizuschalten.
|
27
27
|
unlocked: Ihr Konto wurde erfolgreich freigeschaltet.
|
28
|
-
|
28
|
+
passwords:
|
29
29
|
spree_user:
|
30
30
|
cannot_be_blank: Ihr Passwort darf nicht leer sein.
|
31
31
|
send_instructions: In ein paar Minuten erhalten Sie eine E-Mail mit Anweisungen um Ihr Passwort zurücksetzen.
|
@@ -40,7 +40,7 @@ de:
|
|
40
40
|
signed_out: Erfolgreich abgemeldet.
|
41
41
|
errors:
|
42
42
|
messages:
|
43
|
-
already_confirmed: wurde
|
43
|
+
already_confirmed: wurde bereits bestätigt
|
44
44
|
email_is_invalid: E-Mail-Adresse darf nicht leer sein
|
45
45
|
not_found: nicht gefunden
|
46
46
|
not_locked: war nicht gesperrt
|
data/config/locales/en.yml
CHANGED
@@ -30,7 +30,7 @@ en:
|
|
30
30
|
unlocks:
|
31
31
|
send_instructions: You will receive an email with instructions about how to unlock your account in a few minutes.
|
32
32
|
unlocked: Your account was successfully unlocked. You are now signed in.
|
33
|
-
|
33
|
+
passwords:
|
34
34
|
spree_user:
|
35
35
|
cannot_be_blank: Your password cannot be blank.
|
36
36
|
no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
|
@@ -45,6 +45,7 @@ en:
|
|
45
45
|
signed_in: Signed in successfully.
|
46
46
|
signed_out: Signed out successfully.
|
47
47
|
already_signed_in: Already signed in.
|
48
|
+
already_signed_out: Already signed out.
|
48
49
|
errors:
|
49
50
|
messages:
|
50
51
|
already_confirmed: was already confirmed
|
data/config/locales/es.yml
CHANGED
@@ -25,7 +25,7 @@ es:
|
|
25
25
|
unlocks:
|
26
26
|
send_instructions: Recibirá un email con instrucciones acerca de cómo desbloquear su cuenta en pocos minutos.
|
27
27
|
unlocked: Su cuenta ha sido desbloqueada correctamente. Ahora está conectado.
|
28
|
-
|
28
|
+
passwords:
|
29
29
|
spree_user:
|
30
30
|
cannot_be_blank: La contraseña no puede estar en blanco.
|
31
31
|
send_instructions: Recibirá un email con instrucciones acerca de como restaurar su contraseña en pocos minutos.
|
data/config/locales/fr.yml
CHANGED
@@ -25,7 +25,7 @@ fr:
|
|
25
25
|
unlocks:
|
26
26
|
send_instructions: Vous recevrez dans quelques minutes un courriel avec les instructions sur la façon de déverrouiller votre compte.
|
27
27
|
unlocked: Votre compte a été déverrouillé. Vous êtes maintenant connecté(e).
|
28
|
-
|
28
|
+
passwords:
|
29
29
|
spree_user:
|
30
30
|
cannot_be_blank: Votre mot de passe ne peut pas être vide.
|
31
31
|
send_instructions: Vous recevrez dans quelques minutes un courriel avec les instructions sur la façon de réinitialiser votre mot de passe.
|
data/config/locales/it.yml
CHANGED
@@ -50,7 +50,7 @@ it:
|
|
50
50
|
send_instructions: Riceverai un messaggio email con le istruzioni per sbloccare il tuo account entro qualche minuto.
|
51
51
|
send_paranoid_instructions: Se la tua e-mail esiste nel nostro database, riceverai un messaggio email con le istruzioni per sbloccare il tuo account entro qualche minuto.
|
52
52
|
unlocked: Il tuo account è stato correttamente sbloccato. Ora sei collegato.
|
53
|
-
|
53
|
+
passwords:
|
54
54
|
spree_user:
|
55
55
|
cannot_be_blank: La tua password non può essere vuota.
|
56
56
|
send_instructions: Riceverai un'email con le istruzioni per resettare la tua password entro qualche minuto.
|
data/config/locales/nl.yml
CHANGED
@@ -25,7 +25,7 @@ nl:
|
|
25
25
|
unlocks:
|
26
26
|
send_instructions: Binnen enkele minuten ontvang je een e-mail om je account te ontgrendelen.
|
27
27
|
unlocked: Je account is succesvol ontgrendeld. Je bent nu ingelogd.
|
28
|
-
|
28
|
+
passwords:
|
29
29
|
spree_user:
|
30
30
|
cannot_be_blank: Je wachtwoord kan niet leeg zijn.
|
31
31
|
send_instructions: Binnen enkele minuten ontvang je een e-mail met instructies om je wachtwoord te resetten.
|
data/config/locales/pt-BR.yml
CHANGED
@@ -27,7 +27,7 @@ pt-BR:
|
|
27
27
|
unlocks:
|
28
28
|
send_instructions: Você receberá um e-mail com instruções sobre como desbloquear sua conta em poucos minutos.
|
29
29
|
unlocked: Sua conta foi desbloqueada com sucesso. Agora você está conectado.
|
30
|
-
|
30
|
+
passwords:
|
31
31
|
spree_user:
|
32
32
|
cannot_be_blank: Sua senha não pode estar em branco.
|
33
33
|
send_instructions: Você receberá um e-mail com instruções sobre como redefinir sua senha em poucos minutos.
|
data/config/locales/tr.yml
CHANGED
@@ -25,7 +25,7 @@ tr:
|
|
25
25
|
unlocks:
|
26
26
|
send_instructions: Birkaç dakika içinde hesabınızın kilidini nasıl açacağınızı anlatan bir e-posta alacaksınız.
|
27
27
|
unlocked: Hesabınızın kilidi başarıyla açıldı. Oturumunuz açıldı.
|
28
|
-
|
28
|
+
passwords:
|
29
29
|
spree_user:
|
30
30
|
cannot_be_blank: Boş parola giremezsiniz.
|
31
31
|
send_instructions: Birkaç dakika içinde şifrenizi nasıl yeniden ayarlayacağınızı anlatan bir e-posta alacaksınız.
|
data/config/routes.rb
CHANGED
@@ -27,9 +27,10 @@ Spree::Core::Engine.add_routes do
|
|
27
27
|
get '/checkout/registration' => 'checkout#registration', :as => :checkout_registration
|
28
28
|
put '/checkout/registration' => 'checkout#update_registration', :as => :update_checkout_registration
|
29
29
|
|
30
|
+
get '/account_link' => 'store#account_link'
|
30
31
|
resource :account, :controller => 'users'
|
31
32
|
|
32
|
-
namespace :admin do
|
33
|
+
namespace :admin, path: Spree.admin_path do
|
33
34
|
devise_for :spree_user,
|
34
35
|
:class_name => 'Spree::User',
|
35
36
|
:controllers => { :sessions => 'spree/admin/user_sessions',
|
@@ -0,0 +1,10 @@
|
|
1
|
+
class AddMissingIndicesOnUser < ActiveRecord::Migration
|
2
|
+
def change
|
3
|
+
unless index_exists?(:spree_users, :bill_address_id)
|
4
|
+
add_index :spree_users, :bill_address_id
|
5
|
+
end
|
6
|
+
unless index_exists?(:spree_users, :ship_address_id)
|
7
|
+
add_index :spree_users, :ship_address_id
|
8
|
+
end
|
9
|
+
end
|
10
|
+
end
|
@@ -18,14 +18,22 @@ class Spree::UserRegistrationsController < Devise::RegistrationsController
|
|
18
18
|
# POST /resource/sign_up
|
19
19
|
def create
|
20
20
|
@user = build_resource(spree_user_params)
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
21
|
+
resource_saved = resource.save
|
22
|
+
yield resource if block_given?
|
23
|
+
if resource_saved
|
24
|
+
if resource.active_for_authentication?
|
25
|
+
set_flash_message :notice, :signed_up
|
26
|
+
if current_order
|
27
|
+
current_order.associate_user! @user
|
28
|
+
end
|
29
|
+
sign_up(resource_name, resource)
|
30
|
+
session[:spree_user_signup] = true
|
31
|
+
respond_with resource, location: after_sign_up_path_for(resource)
|
32
|
+
else
|
33
|
+
set_flash_message :notice, :"signed_up_but_#{resource.inactive_message}"
|
34
|
+
expire_data_after_sign_in!
|
35
|
+
respond_with resource, location: after_inactive_sign_up_path_for(resource)
|
25
36
|
end
|
26
|
-
sign_in(:spree_user, @user)
|
27
|
-
session[:spree_user_signup] = true
|
28
|
-
respond_with resource, location: after_sign_up_path_for(resource)
|
29
37
|
else
|
30
38
|
clean_up_passwords(resource)
|
31
39
|
render :new
|
@@ -8,6 +8,10 @@ module Spree
|
|
8
8
|
paths.flatten
|
9
9
|
end
|
10
10
|
|
11
|
+
def add_javascripts
|
12
|
+
append_file 'vendor/assets/javascripts/spree/frontend/all.js', "//= require spree/frontend/spree_auth\n"
|
13
|
+
end
|
14
|
+
|
11
15
|
def generate_devise_key
|
12
16
|
return if ENV['CI']
|
13
17
|
template 'config/initializers/devise.rb', 'config/initializers/devise.rb'
|
data/lib/spree_auth_devise.rb
CHANGED
@@ -1,11 +1,11 @@
|
|
1
1
|
<%= form_for Spree::User.new, :as => :spree_user, :url => spree.create_new_session_path do |f| %>
|
2
2
|
<div id="password-credentials">
|
3
3
|
<p>
|
4
|
-
<%= f.label :email, Spree.t(:email)
|
4
|
+
<%= f.label :email, Spree.t(:email) %>
|
5
5
|
<%= f.email_field :email, :class => 'form-control', :tabindex => 1, autofocus: true %>
|
6
6
|
</p>
|
7
7
|
<p>
|
8
|
-
<%= f.label :password, Spree.t(:password)
|
8
|
+
<%= f.label :password, Spree.t(:password) %>
|
9
9
|
<%= f.password_field :password, :class => 'form-control', :tabindex => 2 %>
|
10
10
|
</p>
|
11
11
|
</div>
|
@@ -1,6 +1 @@
|
|
1
|
-
|
2
|
-
<li><%= link_to Spree.t(:my_account), spree.account_path %></li>
|
3
|
-
<li><%= link_to Spree.t(:logout), spree.logout_path %></li>
|
4
|
-
<% else %>
|
5
|
-
<li id="link-to-login"><%= link_to Spree.t(:login), spree.login_path %></li>
|
6
|
-
<% end %>
|
1
|
+
<script>if(typeof Spree.fetch_account !== 'undefined') Spree.fetch_account()</script>
|
@@ -7,12 +7,12 @@
|
|
7
7
|
<div class="panel-body">
|
8
8
|
<%= form_for @spree_user, :as => :spree_user, :url => spree.update_password_path, :method => :put do |f| %>
|
9
9
|
<p>
|
10
|
-
<%= f.label :password, Spree.t(:password)
|
11
|
-
<%= f.password_field :password, :class => "form-control"
|
10
|
+
<%= f.label :password, Spree.t(:password) %>
|
11
|
+
<%= f.password_field :password, :class => "form-control" %>
|
12
12
|
</p>
|
13
13
|
<p>
|
14
|
-
<%= f.label :password_confirmation, Spree.t(:confirm_password)
|
15
|
-
<%= f.password_field :password_confirmation, :class => "form-control"
|
14
|
+
<%= f.label :password_confirmation, Spree.t(:confirm_password) %>
|
15
|
+
<%= f.password_field :password_confirmation, :class => "form-control" %>
|
16
16
|
</p>
|
17
17
|
<%= f.hidden_field :reset_password_token %>
|
18
18
|
<%= f.submit Spree.t(:update), :class => 'btn btn-lg btn-success btn-block' %>
|
@@ -9,7 +9,7 @@
|
|
9
9
|
|
10
10
|
<%= form_for Spree::User.new, :as => :spree_user, :url => spree.reset_password_path do |f| %>
|
11
11
|
<p>
|
12
|
-
<%= f.label :email, Spree.t(:email)
|
12
|
+
<%= f.label :email, Spree.t(:email) %>
|
13
13
|
<%= f.email_field :email, :class => "form-control" %>
|
14
14
|
</p>
|
15
15
|
<p>
|
@@ -1,7 +1,7 @@
|
|
1
1
|
RSpec.feature 'Accounts', type: :feature do
|
2
2
|
|
3
3
|
context 'editing' do
|
4
|
-
scenario 'can edit an admin user' do
|
4
|
+
scenario 'can edit an admin user', js: true do
|
5
5
|
user = create(:admin_user, email: 'admin@person.com', password: 'password', password_confirmation: 'password')
|
6
6
|
visit spree.login_path
|
7
7
|
|
@@ -13,7 +13,7 @@ RSpec.feature 'Accounts', type: :feature do
|
|
13
13
|
expect(page).to have_text 'admin@person.com'
|
14
14
|
end
|
15
15
|
|
16
|
-
scenario 'can edit a new user' do
|
16
|
+
scenario 'can edit a new user', js: true do
|
17
17
|
Spree::Auth::Config.set(signout_after_password_change: false)
|
18
18
|
visit spree.signup_path
|
19
19
|
|
@@ -34,7 +34,7 @@ RSpec.feature 'Accounts', type: :feature do
|
|
34
34
|
expect(page).to have_text 'Account updated'
|
35
35
|
end
|
36
36
|
|
37
|
-
scenario 'can edit an existing user account' do
|
37
|
+
scenario 'can edit an existing user account', js: true do
|
38
38
|
Spree::Auth::Config.set(signout_after_password_change: false)
|
39
39
|
user = create(:user, email: 'email@person.com', password: 'secret', password_confirmation: 'secret')
|
40
40
|
visit spree.login_path
|
@@ -10,7 +10,7 @@ RSpec.feature 'Admin - Sign In', type: :feature do
|
|
10
10
|
expect(page).not_to have_text 'Authorization Failure'
|
11
11
|
end
|
12
12
|
|
13
|
-
scenario 'lets a user sign in successfully' do
|
13
|
+
scenario 'lets a user sign in successfully', js: true do
|
14
14
|
fill_in 'Email', with: @user.email
|
15
15
|
fill_in 'Password', with: 'secret'
|
16
16
|
click_button 'Login'
|
@@ -13,7 +13,7 @@ RSpec.feature 'Admin - Sign Out', type: :feature do
|
|
13
13
|
click_button 'Login'
|
14
14
|
end
|
15
15
|
|
16
|
-
scenario 'allows a signed in user to logout' do
|
16
|
+
scenario 'allows a signed in user to logout', js: true do
|
17
17
|
click_link 'Logout'
|
18
18
|
visit spree.admin_login_path
|
19
19
|
expect(page).to have_button 'Login'
|
@@ -12,7 +12,7 @@ RSpec.feature 'Change email', type: :feature do
|
|
12
12
|
visit spree.edit_account_path
|
13
13
|
end
|
14
14
|
|
15
|
-
scenario 'work with correct password' do
|
15
|
+
scenario 'work with correct password', js: true do
|
16
16
|
fill_in 'user_email', with: 'tests@example.com'
|
17
17
|
fill_in 'user_password', with: 'password'
|
18
18
|
fill_in 'user_password_confirmation', with: 'password'
|
@@ -10,7 +10,7 @@ RSpec.feature 'Sign In', type: :feature do
|
|
10
10
|
expect(page).not_to have_text 'Authorization Failure'
|
11
11
|
end
|
12
12
|
|
13
|
-
scenario 'let a user sign in successfully' do
|
13
|
+
scenario 'let a user sign in successfully', js: true do
|
14
14
|
fill_in 'Email', with: @user.email
|
15
15
|
fill_in 'Password', with: @user.password
|
16
16
|
click_button 'Login'
|
@@ -16,7 +16,7 @@ RSpec.feature 'Sign Out', type: :feature do
|
|
16
16
|
click_button 'Login'
|
17
17
|
end
|
18
18
|
|
19
|
-
scenario 'allow a signed in user to logout' do
|
19
|
+
scenario 'allow a signed in user to logout', js: true do
|
20
20
|
click_link 'Logout'
|
21
21
|
visit spree.root_path
|
22
22
|
expect(page).to have_text 'Login'
|
data/spree_auth_devise.gemspec
CHANGED
@@ -3,7 +3,7 @@
|
|
3
3
|
Gem::Specification.new do |s|
|
4
4
|
s.platform = Gem::Platform::RUBY
|
5
5
|
s.name = 'spree_auth_devise'
|
6
|
-
s.version = '3.0
|
6
|
+
s.version = '3.1.0'
|
7
7
|
s.summary = 'Provides authentication and authorization services for use with Spree by using Devise and CanCan.'
|
8
8
|
s.description = s.summary
|
9
9
|
|
@@ -19,12 +19,10 @@ Gem::Specification.new do |s|
|
|
19
19
|
s.require_path = 'lib'
|
20
20
|
s.requirements << 'none'
|
21
21
|
|
22
|
-
spree_version = '~> 3.0.
|
22
|
+
spree_version = '~> 3.1.0.beta'
|
23
23
|
|
24
24
|
s.add_dependency 'devise', '~> 3.5.4'
|
25
25
|
s.add_dependency 'devise-encryptable', '0.1.2'
|
26
|
-
s.add_dependency 'json'
|
27
|
-
s.add_dependency 'multi_json'
|
28
26
|
s.add_dependency 'spree_core', spree_version
|
29
27
|
|
30
28
|
s.add_development_dependency 'capybara', '~> 2.4.1'
|
@@ -39,7 +37,6 @@ Gem::Specification.new do |s|
|
|
39
37
|
s.add_development_dependency 'poltergeist', '~> 1.5'
|
40
38
|
s.add_development_dependency 'pry'
|
41
39
|
s.add_development_dependency 'rspec-rails', '~> 3.4.1'
|
42
|
-
s.add_development_dependency 'sass-rails', '~> 5.0.0'
|
43
40
|
s.add_development_dependency 'shoulda-matchers', '~> 2.6.2'
|
44
41
|
s.add_development_dependency 'simplecov', '~> 0.9.0'
|
45
42
|
s.add_development_dependency 'spree_backend', spree_version
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: spree_auth_devise
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.0
|
4
|
+
version: 3.1.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Sean Schofield
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-
|
11
|
+
date: 2016-04-07 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: devise
|
@@ -38,48 +38,20 @@ dependencies:
|
|
38
38
|
- - '='
|
39
39
|
- !ruby/object:Gem::Version
|
40
40
|
version: 0.1.2
|
41
|
-
- !ruby/object:Gem::Dependency
|
42
|
-
name: json
|
43
|
-
requirement: !ruby/object:Gem::Requirement
|
44
|
-
requirements:
|
45
|
-
- - ">="
|
46
|
-
- !ruby/object:Gem::Version
|
47
|
-
version: '0'
|
48
|
-
type: :runtime
|
49
|
-
prerelease: false
|
50
|
-
version_requirements: !ruby/object:Gem::Requirement
|
51
|
-
requirements:
|
52
|
-
- - ">="
|
53
|
-
- !ruby/object:Gem::Version
|
54
|
-
version: '0'
|
55
|
-
- !ruby/object:Gem::Dependency
|
56
|
-
name: multi_json
|
57
|
-
requirement: !ruby/object:Gem::Requirement
|
58
|
-
requirements:
|
59
|
-
- - ">="
|
60
|
-
- !ruby/object:Gem::Version
|
61
|
-
version: '0'
|
62
|
-
type: :runtime
|
63
|
-
prerelease: false
|
64
|
-
version_requirements: !ruby/object:Gem::Requirement
|
65
|
-
requirements:
|
66
|
-
- - ">="
|
67
|
-
- !ruby/object:Gem::Version
|
68
|
-
version: '0'
|
69
41
|
- !ruby/object:Gem::Dependency
|
70
42
|
name: spree_core
|
71
43
|
requirement: !ruby/object:Gem::Requirement
|
72
44
|
requirements:
|
73
45
|
- - "~>"
|
74
46
|
- !ruby/object:Gem::Version
|
75
|
-
version: 3.0.
|
47
|
+
version: 3.1.0.beta
|
76
48
|
type: :runtime
|
77
49
|
prerelease: false
|
78
50
|
version_requirements: !ruby/object:Gem::Requirement
|
79
51
|
requirements:
|
80
52
|
- - "~>"
|
81
53
|
- !ruby/object:Gem::Version
|
82
|
-
version: 3.0.
|
54
|
+
version: 3.1.0.beta
|
83
55
|
- !ruby/object:Gem::Dependency
|
84
56
|
name: capybara
|
85
57
|
requirement: !ruby/object:Gem::Requirement
|
@@ -248,20 +220,6 @@ dependencies:
|
|
248
220
|
- - "~>"
|
249
221
|
- !ruby/object:Gem::Version
|
250
222
|
version: 3.4.1
|
251
|
-
- !ruby/object:Gem::Dependency
|
252
|
-
name: sass-rails
|
253
|
-
requirement: !ruby/object:Gem::Requirement
|
254
|
-
requirements:
|
255
|
-
- - "~>"
|
256
|
-
- !ruby/object:Gem::Version
|
257
|
-
version: 5.0.0
|
258
|
-
type: :development
|
259
|
-
prerelease: false
|
260
|
-
version_requirements: !ruby/object:Gem::Requirement
|
261
|
-
requirements:
|
262
|
-
- - "~>"
|
263
|
-
- !ruby/object:Gem::Version
|
264
|
-
version: 5.0.0
|
265
223
|
- !ruby/object:Gem::Dependency
|
266
224
|
name: shoulda-matchers
|
267
225
|
requirement: !ruby/object:Gem::Requirement
|
@@ -296,28 +254,28 @@ dependencies:
|
|
296
254
|
requirements:
|
297
255
|
- - "~>"
|
298
256
|
- !ruby/object:Gem::Version
|
299
|
-
version: 3.0.
|
257
|
+
version: 3.1.0.beta
|
300
258
|
type: :development
|
301
259
|
prerelease: false
|
302
260
|
version_requirements: !ruby/object:Gem::Requirement
|
303
261
|
requirements:
|
304
262
|
- - "~>"
|
305
263
|
- !ruby/object:Gem::Version
|
306
|
-
version: 3.0.
|
264
|
+
version: 3.1.0.beta
|
307
265
|
- !ruby/object:Gem::Dependency
|
308
266
|
name: spree_frontend
|
309
267
|
requirement: !ruby/object:Gem::Requirement
|
310
268
|
requirements:
|
311
269
|
- - "~>"
|
312
270
|
- !ruby/object:Gem::Version
|
313
|
-
version: 3.0.
|
271
|
+
version: 3.1.0.beta
|
314
272
|
type: :development
|
315
273
|
prerelease: false
|
316
274
|
version_requirements: !ruby/object:Gem::Requirement
|
317
275
|
requirements:
|
318
276
|
- - "~>"
|
319
277
|
- !ruby/object:Gem::Version
|
320
|
-
version: 3.0.
|
278
|
+
version: 3.1.0.beta
|
321
279
|
- !ruby/object:Gem::Dependency
|
322
280
|
name: sqlite3
|
323
281
|
requirement: !ruby/object:Gem::Requirement
|
@@ -375,8 +333,10 @@ files:
|
|
375
333
|
- db/migrate/20120605211305_make_users_email_index_unique.rb
|
376
334
|
- db/migrate/20140904000425_add_deleted_at_to_users.rb
|
377
335
|
- db/migrate/20141002154641_add_confirmable_to_users.rb
|
336
|
+
- db/migrate/20150416152553_add_missing_indices_on_user.rb
|
378
337
|
- db/seeds.rb
|
379
338
|
- lib/assets/javascripts/spree/backend/spree_auth.js.erb
|
339
|
+
- lib/assets/javascripts/spree/frontend/account.js.coffee
|
380
340
|
- lib/assets/javascripts/spree/frontend/spree_auth.js.erb
|
381
341
|
- lib/assets/stylesheets/spree/backend/spree_auth.css.erb
|
382
342
|
- lib/assets/stylesheets/spree/frontend/spree_auth.css.erb
|
@@ -387,6 +347,7 @@ files:
|
|
387
347
|
- lib/controllers/backend/spree/admin/user_passwords_controller.rb
|
388
348
|
- lib/controllers/backend/spree/admin/user_sessions_controller.rb
|
389
349
|
- lib/controllers/frontend/spree/checkout_controller_decorator.rb
|
350
|
+
- lib/controllers/frontend/spree/store_controller_decorator.rb
|
390
351
|
- lib/controllers/frontend/spree/user_confirmations_controller.rb
|
391
352
|
- lib/controllers/frontend/spree/user_passwords_controller.rb
|
392
353
|
- lib/controllers/frontend/spree/user_registrations_controller.rb
|
@@ -409,6 +370,7 @@ files:
|
|
409
370
|
- lib/views/frontend/spree/checkout/_new_user.html.erb
|
410
371
|
- lib/views/frontend/spree/checkout/registration.html.erb
|
411
372
|
- lib/views/frontend/spree/shared/_flashes.html.erb
|
373
|
+
- lib/views/frontend/spree/shared/_link_to_account.html.erb
|
412
374
|
- lib/views/frontend/spree/shared/_login.html.erb
|
413
375
|
- lib/views/frontend/spree/shared/_login_bar.html.erb
|
414
376
|
- lib/views/frontend/spree/shared/_user_form.html.erb
|