solidus_auth_devise 1.6.2 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 601953fd74741f135c859fa0a62ff28186f3bf7e
-  data.tar.gz: 769599d2154ca0ed69cd3241e9b29e610c6d7b14
+  metadata.gz: e1a8bbe532616691acca8ba8cd61bf30a08cb718
+  data.tar.gz: 957b80f590477451fbf617fde9c1b84f26164e9f
 SHA512:
-  metadata.gz: ed4af47908d361784886f3587cb6fcc97c082c71f4ca055ae7aa13cc1b1a04f0adb53caf104563eddf4596f80fc218a0b52657a3fb07c235b0f5d1006b8606ec
-  data.tar.gz: 7c84c3019011bdebef14e2d8cebe422f0b5a0e324ccf678b178afc8177aac1a14541a688e65bb1ef2c40df0f3526570d1bb5a558883e86a9a562c5b55e9fc8de
+  metadata.gz: 0e4ccfc768a4641c9235cddc8403d917dc509cca8f69bb332b0d43463d9269c353ab7b9111bef62cb74343bee697ce6fc689df273bdb2dbd53446885285a80f0
+  data.tar.gz: edb14fb8c87e92595bdc5340f38f561db9e91f78fa8804b4668e4d20168a82f74ae739963ae913ce8b6bf7ec6d6e7853365b225ffe8573b5147504b4ed100060

data/.travis.yml

@@ -10,6 +10,8 @@ env:
     - SOLIDUS_BRANCH=v1.3 DB=postgres
     - SOLIDUS_BRANCH=v1.4 DB=postgres
     - SOLIDUS_BRANCH=v2.0 DB=postgres
+    - SOLIDUS_BRANCH=v2.1 DB=postgres
+    - SOLIDUS_BRANCH=v2.2 DB=postgres
     - SOLIDUS_BRANCH=master DB=postgres
     - SOLIDUS_BRANCH=v1.0 DB=mysql
     - SOLIDUS_BRANCH=v1.1 DB=mysql
@@ -17,4 +19,6 @@ env:
     - SOLIDUS_BRANCH=v1.3 DB=mysql
     - SOLIDUS_BRANCH=v1.4 DB=mysql
     - SOLIDUS_BRANCH=v2.0 DB=mysql
+    - SOLIDUS_BRANCH=v2.1 DB=mysql
+    - SOLIDUS_BRANCH=v2.2 DB=mysql
     - SOLIDUS_BRANCH=master DB=mysql

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## Master (unreleased)
 
+## Solidus Auth Devise v1.6.3 (2017-05-09)
+
+* Add missing translations for already_authenticated
+* Do not require core email validator
+* Remove dependency on `json`, `multi_json`
+* Remove unnecessary sass/coffeescript requires
+* Fix warnings on Rails 5, support Rails 5.1
+* Change deface dependency from `~> 1.0.0` to `~> 1.0`
+
 ## Solidus Auth Devise v1.6.2 (2016-11-18)
 
 * Fix an issue where invalid addresses could be persisted after starting a

data/Gemfile

@@ -3,8 +3,12 @@ source "https://rubygems.org"
 branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
 gem "solidus", github: "solidusio/solidus", branch: branch
 
-if branch == 'master' || branch >= "v2.0"
-  gem "rails-controller-testing", group: :test
+group :test do
+  if branch == 'master' || branch >= "v2.0"
+    gem "rails-controller-testing"
+  else
+    gem "rails_test_params_backport"
+  end
 end
 
 gem 'pg'

data/config/locales/de.yml

@@ -7,6 +7,7 @@ de:
       confirmed: Ihr Konto wurde erfolgreich aktiviert.
       send_instructions: 'In ein paar Minuten erhalten Sie eine E-Mail mit Anweisungen, um Ihr Konto zu aktivieren.'
     failure:
+      already_authenticated: Sie sind bereits angemeldet.
       inactive: Ihr Konto wurde noch nicht aktiviert.
       invalid: Ungültige E-Mail-Adresse oder Passwort.
       invalid_token: Ungültiger Authentifizierungsschlüssel.

data/config/locales/en.yml

@@ -7,6 +7,7 @@ en:
       confirmed: Your account was successfully confirmed. You are now signed in.
       send_instructions: You will receive an email with instructions about how to confirm your account in a few minutes.
     failure:
+      already_authenticated: You are already signed in.
       inactive: Your account was not activated yet.
       invalid: Invalid email or password.
       invalid_token: Invalid authentication token.

data/config/locales/es.yml

@@ -5,6 +5,7 @@ es:
       confirmed: Su cuenta ha sido confirmada. Ahora está conectado.
       send_instructions: Recibirá un email con instrucciones acerca de como confirmar su cuenta en pocos minutos.
     failure:
+      already_authenticated: Ya has iniciado sesión.
       inactive: Su cuenta no ha sido activada aún.
       invalid: Dirección de correo o contraseña no válidos.
       invalid_token: Token de autenticación no válido.

data/config/locales/fr.yml

@@ -5,6 +5,7 @@ fr:
       confirmed: Votre compte a été confirmé. Vous êtes maintenant connecté(e).
       send_instructions: Vous recevrez dans quelques minutes un courriel avec les instructions sur la façon de confirmer votre compte.
     failure:
+      already_authenticated: Vous êtes déjà connecté(e).
       inactive: Votre compte n'a pas encore été activé.
       invalid: Courriel ou mot de passe non valide.
       invalid_token: Jeton d'authentification non valide.

data/config/locales/nl.yml

@@ -5,6 +5,7 @@ nl:
       confirmed: Je account is succesvol bevestigd. Je bent nu ingelogd.
       send_instructions: Binnen enkele minuten ontvang je een e-mail om je account te bevestigen.
     failure:
+      already_authenticated: Je bent reeds aangemeld.
       inactive: Je account is nog niet geactiveerd.
       invalid: E-mailadres of wachtwoord is onjuist.
       invalid_token: Verkeerde authenticatie token.

data/config/locales/pt-BR.yml

@@ -7,6 +7,7 @@ pt-BR:
       confirmed: Sua conta foi confirmada com sucesso. Agora você está conectado.
       send_instructions: Você receberá um e-mail com instruções sobre como confirmar sua conta em poucos minutos.
     failure:
+      already_authenticated: Você já está autenticado.
       inactive: Sua conta não foi ativada ainda.
       invalid: Email ou senha inválida.
       invalid_token: Token de autenticação inválido.

data/config/locales/tr.yml

@@ -5,6 +5,7 @@ tr:
       confirmed: Hesabınız başarıyla doğrulandı. Oturumunuz açıldı.
       send_instructions: Birkaç dakika içinde hesabınızı nasıl doğrulayacağınızı anlatan bir e-posta alacaksınız.
     failure:
+      already_authenticated: Zaten giriş yaptınız.
       inactive: Hesabınız henüz faal değil.
       invalid: Geçersiz e-posta ya da şifre.
       invalid_token: Geçersiz anahtar.

data/config/locales/zh-CN.yml

@@ -7,6 +7,7 @@ zh-CN:
       confirmed: 账户确认成功，现已登录。
       send_instructions: 稍后您将收到邮件，了解如何确认账户。
     failure:
+      already_authenticated: 登录成功
       inactive: 您的账户尚未激活。
       invalid: 邮箱或密码错误。
       invalid_token: 验证凭证错误。

data/db/migrate/20101026184949_create_users.rb

@@ -1,4 +1,4 @@
-class CreateUsers < ActiveRecord::Migration
+class CreateUsers < SolidusSupport::Migration[4.2]
   def up
     unless table_exists?("spree_users")
       create_table "spree_users", :force => true do |t|

data/db/migrate/20101026184950_rename_columns_for_devise.rb

@@ -1,4 +1,4 @@
-class RenameColumnsForDevise < ActiveRecord::Migration
+class RenameColumnsForDevise < SolidusSupport::Migration[4.2]
   def up
     return if column_exists?(:spree_users, :password_salt)
     rename_column :spree_users, :crypted_password, :encrypted_password

data/db/migrate/20101214150824_convert_user_remember_field.rb

@@ -1,4 +1,4 @@
-class ConvertUserRememberField < ActiveRecord::Migration
+class ConvertUserRememberField < SolidusSupport::Migration[4.2]
   def up
     remove_column :spree_users, :remember_created_at
     add_column :spree_users, :remember_created_at, :datetime

data/db/migrate/20120203010234_add_reset_password_sent_at_to_spree_users.rb

@@ -1,4 +1,4 @@
-class AddResetPasswordSentAtToSpreeUsers < ActiveRecord::Migration
+class AddResetPasswordSentAtToSpreeUsers < SolidusSupport::Migration[4.2]
   def change
     Spree::User.reset_column_information
     unless Spree::User.column_names.include?("reset_password_sent_at")

data/db/migrate/20120605211305_make_users_email_index_unique.rb

@@ -1,4 +1,4 @@
-class MakeUsersEmailIndexUnique < ActiveRecord::Migration
+class MakeUsersEmailIndexUnique < SolidusSupport::Migration[4.2]
   def up
     add_index "spree_users", ["email"], :name => "email_idx_unique", :unique => true
   end

data/db/migrate/20140904000425_add_deleted_at_to_users.rb

@@ -1,4 +1,4 @@
-class AddDeletedAtToUsers < ActiveRecord::Migration
+class AddDeletedAtToUsers < SolidusSupport::Migration[4.2]
   def change
     add_column :spree_users, :deleted_at, :datetime
     add_index :spree_users, :deleted_at

data/db/migrate/20141002154641_add_confirmable_to_users.rb

@@ -1,4 +1,4 @@
-class AddConfirmableToUsers < ActiveRecord::Migration
+class AddConfirmableToUsers < SolidusSupport::Migration[4.2]
   def change
     add_column :spree_users, :confirmation_token, :string
     add_column :spree_users, :confirmed_at, :datetime

data/lib/controllers/frontend/spree/checkout_controller_decorator.rb

@@ -1,4 +1,3 @@
-require 'spree/core/validators/email'
 Spree::CheckoutController.class_eval do
   prepend_before_action :check_registration,
     except: [:registration, :update_registration]

data/lib/solidus_auth_devise.rb

@@ -1,6 +1,5 @@
 require "spree_core"
+require "solidus_support"
 require "spree/auth/devise"
 require "spree/authentication_helpers"
-require "sass/rails"
-require "coffee_script"
 require "deface"

data/solidus_auth_devise.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = "solidus_auth_devise"
-  s.version     = "1.6.2"
+  s.version     = "1.6.3"
   s.summary     = "Provides authentication and authorization services for use with Solidus by using Devise and CanCan."
   s.description = s.summary
 
@@ -21,12 +21,10 @@ Gem::Specification.new do |s|
   solidus_version = [">= 1.0.6", "< 3"]
 
   s.add_dependency "solidus_core", solidus_version
+  s.add_dependency "solidus_support"
   s.add_dependency "devise", '~> 4.1'
   s.add_dependency "devise-encryptable", "0.2.0"
-  s.add_dependency 'deface', '~> 1.0.0'
-
-  s.add_dependency "json"
-  s.add_dependency "multi_json"
+  s.add_dependency 'deface', '~> 1.0'
 
   s.add_development_dependency "solidus_backend", solidus_version
   s.add_development_dependency "solidus_frontend", solidus_version

data/spec/controllers/spree/checkout_controller_spec.rb

@@ -17,14 +17,14 @@ RSpec.describe Spree::CheckoutController, type: :controller do
         before { allow(controller).to receive(:spree_current_user) { user } }
 
         it 'proceeds to the first checkout step' do
-          get :edit, { state: 'address' }
+          get :edit, params: { state: 'address' }
           expect(response).to render_template :edit
         end
       end
 
       context 'when not authenticated as guest' do
         it 'redirects to registration step' do
-          get :edit, { state: 'address' }
+          get :edit, params: { state: 'address' }
           expect(response).to redirect_to spree.checkout_registration_path
         end
       end
@@ -33,7 +33,7 @@ RSpec.describe Spree::CheckoutController, type: :controller do
         before { order.email = 'guest@solidus.io' }
 
         it 'proceeds to the first checkout step' do
-          get :edit, { state: 'address' }
+          get :edit, params: { state: 'address' }
           expect(response).to render_template :edit
         end
 
@@ -47,7 +47,7 @@ RSpec.describe Spree::CheckoutController, type: :controller do
           end
 
           it 'redirects to registration step' do
-            get :edit, { state: 'address' }
+            get :edit, params: { state: 'address' }
             expect(response).to redirect_to spree.checkout_registration_path
           end
         end
@@ -63,14 +63,14 @@ RSpec.describe Spree::CheckoutController, type: :controller do
         before { allow(controller).to receive(:spree_current_user) { user } }
 
         it 'proceeds to the first checkout step' do
-          get :edit, { state: 'address' }
+          get :edit, params: { state: 'address' }
           expect(response).to render_template :edit
         end
       end
 
       context 'when authenticated as guest' do
         it 'proceeds to the first checkout step' do
-          get :edit, { state: 'address' }
+          get :edit, params: { state: 'address' }
           expect(response).to render_template :edit
         end
       end
@@ -92,7 +92,7 @@ RSpec.describe Spree::CheckoutController, type: :controller do
 
         it 'redirects to the tokenized order view' do
           request.cookie_jar.signed[:guest_token] = 'ABC'
-          post :update, { state: 'confirm' }
+          post :update, params: { state: 'confirm' }
           expect(response).to redirect_to spree.token_order_path(order, 'ABC')
           expect(flash.notice).to eq Spree.t(:order_processed_successfully)
         end
@@ -106,7 +106,7 @@ RSpec.describe Spree::CheckoutController, type: :controller do
         end
 
         it 'redirects to the standard order view' do
-          post :update, { state: 'confirm' }
+          post :update, params: { state: 'confirm' }
           expect(response).to redirect_to spree.order_path(order)
         end
       end
@@ -122,12 +122,12 @@ RSpec.describe Spree::CheckoutController, type: :controller do
     it 'checks if the user is authorized for :edit' do
       expect(controller).to receive(:authorize!).with(:edit, order, token)
       request.cookie_jar.signed[:guest_token] = token
-      get :registration, {}
+      get :registration, params: {}
     end
   end
 
   context '#update_registration' do
-    subject { put :update_registration, { order: { email: email } } }
+    subject { put :update_registration, params: { order: { email: email } } }
     let(:email) { 'foo@example.com' }
 
     it 'does not check registration' do
@@ -179,7 +179,7 @@ RSpec.describe Spree::CheckoutController, type: :controller do
       let(:cookie_token) { 'lol_no_access' }
 
       it 'redirects to login' do
-        put :update_registration, { order: { email: 'foo@example.com' } }
+        put :update_registration, params: { order: { email: 'foo@example.com' } }
         expect(response).to redirect_to(login_path)
       end
     end
@@ -188,7 +188,7 @@ RSpec.describe Spree::CheckoutController, type: :controller do
       let(:cookie_token) { nil }
 
       it 'redirects to login' do
-        put :update_registration, { order: { email: 'foo@example.com' } }
+        put :update_registration, params: { order: { email: 'foo@example.com' } }
         expect(response).to redirect_to(login_path)
       end
     end

data/spec/controllers/spree/products_controller_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe Spree::ProductsController, type: :controller do
     allow(controller).to receive(:before_save_new_order)
     allow(controller).to receive(:spree_current_user) { user }
     allow(user).to receive(:has_spree_role?) { true }
-    get :show, id: product.to_param
+    get :show, params: { id: product.to_param }
     expect(response.status).to eq(200)
   end
 
@@ -15,7 +15,7 @@ RSpec.describe Spree::ProductsController, type: :controller do
     allow(controller).to receive(:before_save_new_order)
     allow(controller).to receive(:spree_current_user) { user }
     allow(user).to receive(:has_spree_role?) { false }
-    get :show, id: product.to_param
+    get :show, params: { id: product.to_param }
     expect(response.status).to eq(404)
   end
 end

data/spec/controllers/spree/user_passwords_controller_spec.rb

@@ -24,7 +24,7 @@ RSpec.describe Spree::UserPasswordsController, type: :controller do
 
     context 'when the user token has been specified' do
       it 'does something' do
-        get :edit, reset_password_token: token
+        get :edit, params: { reset_password_token: token }
         expect(response.code).to eq('200')
       end
     end
@@ -33,7 +33,7 @@ RSpec.describe Spree::UserPasswordsController, type: :controller do
   context '#update' do
     context 'when updating password with blank password' do
       it 'shows error flash message, sets spree_user with token and re-displays password edit form' do
-        put :update, { spree_user: { password: '', password_confirmation: '', reset_password_token: token } }
+        put :update, params: { spree_user: { password: '', password_confirmation: '', reset_password_token: token } }
         expect(assigns(:spree_user).kind_of?(Spree::User)).to eq true
         expect(assigns(:spree_user).reset_password_token).to eq token
         expect(flash[:error]).to eq I18n.t(:cannot_be_blank, scope: [:devise, :user_passwords, :spree_user])

data/spec/controllers/spree/user_registrations_controller_spec.rb

@@ -12,12 +12,15 @@ RSpec.describe Spree::UserRegistrationsController, type: :controller do
     let(:password_confirmation) { 'foobar123' }
 
     subject do
-      post(:create,
-        spree_user: {
-          email: 'foobar@example.com',
-          password: 'foobar123',
-          password_confirmation: password_confirmation
-        })
+      post(:create, {
+        params: {
+          spree_user: {
+            email: 'foobar@example.com',
+            password: 'foobar123',
+            password_confirmation: password_confirmation
+          }
+        }
+      })
     end
 
     context 'when user created successfuly' do

data/spec/controllers/spree/user_sessions_controller_spec.rb

@@ -8,12 +8,15 @@ RSpec.describe Spree::UserSessionsController, type: :controller do
     let(:password) { 'secret' }
 
     subject do
-      post(:create,
-        spree_user: {
-          email: user.email,
-          password: password
-        },
-        format: format)
+      post(:create, {
+        params: {
+          spree_user: {
+            email: user.email,
+            password: password
+          },
+          format: format
+        }
+      })
     end
 
     context "when using correct login information" do

data/spec/controllers/spree/users_controller_spec.rb

@@ -9,14 +9,14 @@ RSpec.describe Spree::UsersController, type: :controller do
   context '#load_object' do
     it 'redirects to signup path if user is not found' do
       allow(controller).to receive(:spree_current_user) { nil }
-      put :update, { user: { email: 'foobar@example.com' } }
+      put :update, params: { user: { email: 'foobar@example.com' } }
       expect(response).to redirect_to spree.login_path
     end
   end
 
   context '#create' do
     it 'creates a new user' do
-      post :create, { user: { email: 'foobar@example.com', password: 'foobar123', password_confirmation: 'foobar123' } }
+      post :create, params: { user: { email: 'foobar@example.com', password: 'foobar123', password_confirmation: 'foobar123' } }
       expect(assigns[:user].new_record?).to be false
     end
   end
@@ -24,14 +24,14 @@ RSpec.describe Spree::UsersController, type: :controller do
   context '#update' do
     context 'when updating own account' do
       it 'performs update' do
-        put :update, { user: { email: 'mynew@email-address.com' } }
+        put :update, params: { user: { email: 'mynew@email-address.com' } }
         expect(assigns[:user].email).to eq 'mynew@email-address.com'
         expect(response).to redirect_to spree.account_url(only_path: true)
       end
     end
 
     it 'does not update roles' do
-      put :update, user: { spree_role_ids: [role.id] }
+      put :update, params: { user: { spree_role_ids: [role.id] } }
       expect(assigns[:user].spree_roles).to_not include role
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_auth_devise
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.6.3
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -30,6 +30,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: solidus_support
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -64,42 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: solidus_backend
   requirement: !ruby/object:Gem::Requirement
@@ -437,7 +423,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Provides authentication and authorization services for use with Solidus by