spree_auth_devise 3.2.0.beta → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b630de047d5f4283ed5ba9e231ea628746ec44e4
-  data.tar.gz: 0004afefacaefd265e29ed1c6ba63ddcf3ecb371
+  metadata.gz: c416bde8da0e837612d21c9c997eb656de79a87c
+  data.tar.gz: a23838fbc1f0174e88a8d122fe6c6f60d371b026
 SHA512:
-  metadata.gz: 336eacc0e625a31d85682f35e6d8f70fff506059a2cdaea427f0f73ebfc5ed346e69bea426007d957588db422a75f0cee7df23dc1a39e7afbb3bbd14ad38c0ea
-  data.tar.gz: df132a9472e5d2a4e9dbf45187472f6f05e09098e41bcde3c7dd5d45c5f6f398d93f1d83416336b0d0c11c84fa0d4dbe1da55b2b9f87c88a188b9fae81cb84ea
+  metadata.gz: 0d9c6d3684f8f057a2437e9ae81ef2dd0706c07eaf9c38cd0f6518755516612c298fcb700562804cd44777459ec136dc72f507cca8df3e3eaece28035889d2eb
+  data.tar.gz: 51aeb6dc11bb728e0bae88f3f11ee7723a44998932e7a7bda84da8c1586e81582c49cd6e4567c70a51e03e1dd06987ce139f74eb615ecbf86c5ae5d95017a01e

data/.gitignore

@@ -1,10 +1,21 @@
-spec/dummy
-.sass-cache
+\#*
+*~
+.#*
+.DS_Store
+.idea
+.localeapp/locales
+.project
 coverage
+default
 Gemfile.lock
-*.swp
+tmp
+nbproject
+pkg
+*.sw?
+spec/dummy
 .rvmrc
-.ruby-gemset
+.sass-cache
+public/spree
 .ruby-version
-.bundle
-.DS_Store
+.ruby-gemset
+gemfiles/*.gemfile.lock

data/.travis.yml

@@ -1,16 +1,28 @@
-before_script:
+sudo: required
+dist: trusty
+
+script:
   - bundle exec rake test_app
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
-cache:
-  bundler: true
+  - bundle exec rake spec
 
 env:
   - DB=mysql
   - DB=postgres
+
 language: ruby
+
 rvm:
   - 2.3.1
-  - 2.2.5
+  - 2.2.7
+
+gemfile:
+  - gemfiles/spree_3_1.gemfile
+  - gemfiles/spree_3_2.gemfile
+  - gemfiles/spree_master.gemfile
 
-sudo: false
+addons:
+   apt:
+     packages:
+     - mysql-server-5.6
+     - mysql-client-core-5.6
+     - mysql-client-5.6

data/Appraisals

@@ -0,0 +1,13 @@
+appraise 'spree-3-1' do
+  gem 'spree', '~> 3.1.0'
+end
+
+appraise 'spree-3-2' do
+  gem 'spree', '~> 3.2.0'
+  gem 'rails-controller-testing'
+end
+
+appraise 'spree-master' do
+  gem 'spree', github: 'spree/spree', branch: 'master'
+  gem 'rails-controller-testing'
+end

data/CHANGELOG.md

@@ -1,9 +1,17 @@
-## Spree Auth Devise v3.2.0 (master, unreleased)
+## Spree Auth Devise v3.2.0 (2017-06-15)
 
-* Supports `Spree 3.1` and any other newer version lesser than `4.0` (https://github.com/spree/spree_auth_devise/pull/353)
-* `devise` updated to `4.0` (https://github.com/spree/spree_auth_devise/pull/344)
+* `Rails 5` support
+* Supports `Spree 3.1` `Spree 3.2` and any other newer version lesser than `4.0` (https://github.com/spree/spree_auth_devise/pull/353, https://github.com/spree/spree_auth_devise/pull/386)
+* `devise` updated to `4.3` (https://github.com/spree/spree_auth_devise/pull/382)
+* `devise-encryptable` updated to `0.2.0` (https://github.com/spree/spree_auth_devise/commit/5f51e6e4e81dbf99fe95848dbd4fa9cba03b6910)
 * updated development dependencies (https://github.com/spree/spree_auth_devise/pull/351)
 * include `Spree::UserMethods` in `Spree::User` (https://github.com/spree/spree_auth_devise/pull/343)
+* fixed: Unnecessary breaking changes of I18n key (https://github.com/spree/spree_auth_devise/pull/387)
+* fixed: use proper scoping to find translations related to order states (https://github.com/spree/spree_auth_devise/pull/384)
+* fixed: spree_api is not required anymore (https://github.com/spree/spree_auth_devise/pull/380)
+* Install generator: Add option to skip migrations (https://github.com/spree/spree_auth_devise/pull/378)
+* Added Portuguese translation (https://github.com/spree/spree_auth_devise/pull/365)
+* Replaced registration_error flash with standard error (https://github.com/spree/spree_auth_devise/pull/361)
 
 ## Spree Auth Devise v3.1.0 (2016-04-05)
 

data/Gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
+gem "rails-controller-testing"
 gem 'spree', github: 'spree/spree', branch: 'master'
 
 gemspec

data/README.md

@@ -1,42 +1,47 @@
 # Spree Auth (Devise)
 
-[![Build Status](https://secure.travis-ci.org/spree/spree_auth_devise.png?branch=master)](https://travis-ci.org/spree/spree_auth_devise)
-[![Code Climate](https://codeclimate.com/github/spree/spree_auth_devise.png)](https://codeclimate.com/github/spree/spree_auth_devise)
+[![Build Status](https://travis-ci.org/spree/spree_auth_devise.svg?branch=master)](https://travis-ci.org/spree/spree_auth_devise)
+[![Code Climate](https://codeclimate.com/github/spree/spree_auth_devise/badges/gpa.svg)](https://codeclimate.com/github/spree/spree_auth_devise)
 
 Provides authentication services for Spree, using the Devise gem.
 
+
 ## Installation
 
-At one stage in the past, this used to be the auth component for Spree. If that's the feature that you're now finding lacking from Spree, that's easily fixed.
+1. Add this extension to your Gemfile with this line:
 
-Just add this line to your `Gemfile`:
-```ruby
-gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: 'master'
-```
+  #### Spree >= 3.1
 
-Please ensure you're using the correct branch of `spree_auth_devise` relative to your version of Spree.
+  ```ruby
+  gem 'spree_auth_devise', github: 'spree/spree_auth_devise'
+  ```
 
-Spree 1.3.x or 1-3-stable:
-```ruby
-gem 'spree_auth_devise', :github => 'spree/spree_auth_devise', :branch => '1-3-stable'
-```
+  #### Spree 3.0 and Spree 2.x
 
-Spree 1.2.x or 1-2-stable:
-```ruby
-gem 'spree_auth_devise', :github => 'spree/spree_auth_devise', :branch => '1-2-stable'
-```
+  ```ruby
+  gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: 'X-X-stable'
+  ```
 
-Then run `bundle install`. Authentication will then work exactly as it did in previous versions of Spree.
+  The `branch` option is important: it must match the version of Spree you're using.
+  For example, use `3-0-stable` if you're using Spree `3-0-stable` or any `3.0.x` version.
 
-If you're installing this in a new Spree 1.2+ application, you'll need to install and run the migrations with
+2. Install the gem using Bundler:
+  ```ruby
+  bundle install
+  ```
 
-    bundle exec rake spree_auth:install:migrations
-    bundle exec rake db:migrate
-    bundle exec rails g spree:auth:install
+3. Copy & run migrations
+  ```ruby
+  bundle exec rails g spree:auth:install
+  ```
 
-and then, run this command in order to set up the admin user for the application.
+## Upgrading from Spree 3.0 to 3.1
 
-    bundle exec rake spree_auth:admin:create
+If you're upgrading from 3.0 to 3.1 you need to rerun the installer to copy new asset files (javascripts)
+
+```ruby
+bundle exec rails g spree:auth:install
+```
 
 ## Configuration
 
@@ -93,7 +98,7 @@ Spree::Ability.register_ability(YourAbilityClass)
 
 Inside of your host application you can then use CanCan like you normally would.
 ```ruby
-<% if can? :show SomeRailsObject %>
+<% if can? :show, SomeRailsObject %>
 
 <% end %>
 ```
@@ -110,6 +115,4 @@ You need to do a quick one-time creation of a test application and then you can
 
 Then run the rspec tests.
 
-    bundle exec rake spec
-
-If everything doesn't pass on your machine (using Ruby (1.9.3 or 2.0.0) and (MySQL or PostgreSQL or SQLite3)) then we would consider that a bug. Please file a bug report on the issues page for this project with your test output and we will investigate it.
+    bundle exec rspec

data/Rakefile

@@ -6,7 +6,7 @@ require 'spree/testing_support/common_rake'
 
 RSpec::Core::RakeTask.new
 
-task :default => :spec
+task default: :spec
 
 desc 'Generates a dummy app for testing'
 task :test_app do

data/app/mailers/spree/user_mailer.rb

@@ -1,16 +1,16 @@
 module Spree
   class UserMailer < BaseMailer
-    def reset_password_instructions(user, token, *args)
-      @edit_password_reset_url = spree.edit_spree_user_password_url(:reset_password_token => token, :host => Spree::Store.current.url)
+    def reset_password_instructions(user, token, *_args)
+      @edit_password_reset_url = spree.edit_spree_user_password_url(reset_password_token: token, host: Spree::Store.current.url)
 
-      mail to: user.email, from: from_address, subject: Spree::Store.current.name + ' ' + I18n.t(:subject, :scope => [:devise, :mailer, :reset_password_instructions])
+      mail to: user.email, from: from_address, subject: Spree::Store.current.name + ' ' + I18n.t(:subject, scope: [:devise, :mailer, :reset_password_instructions])
     end
 
-    def confirmation_instructions(user, token, opts={})
-      @confirmation_url = spree.spree_user_confirmation_url(:confirmation_token => token, :host => Spree::Store.current.url)
+    def confirmation_instructions(user, token, _opts = {})
+      @confirmation_url = spree.spree_user_confirmation_url(confirmation_token: token, host: Spree::Store.current.url)
       @email = user.email
 
-      mail to: user.email, from: from_address, subject: Spree::Store.current.name + ' ' + I18n.t(:subject, :scope => [:devise, :mailer, :confirmation_instructions])
+      mail to: user.email, from: from_address, subject: Spree::Store.current.name + ' ' + I18n.t(:subject, scope: [:devise, :mailer, :confirmation_instructions])
     end
   end
 end

data/app/models/spree/auth_configuration.rb

@@ -1,7 +1,7 @@
 module Spree
   class AuthConfiguration < Preferences::Configuration
-    preference :registration_step, :boolean, :default => true
-    preference :signout_after_password_change, :boolean, :default => true
-    preference :confirmable, :boolean, :default => false
+    preference :registration_step, :boolean, default: true
+    preference :signout_after_password_change, :boolean, default: true
+    preference :confirmable, :boolean, default: false
   end
 end

data/app/models/spree/user.rb

@@ -5,7 +5,7 @@ module Spree
     include UserPaymentSource
 
     devise :database_authenticatable, :registerable, :recoverable,
-           :rememberable, :trackable, :validatable, :encryptable, :encryptor => 'authlogic_sha512'
+           :rememberable, :trackable, :validatable, :encryptable, encryptor: 'authlogic_sha512'
     devise :confirmable if Spree::Auth::Config[:confirmable]
 
     acts_as_paranoid
@@ -27,23 +27,24 @@ module Spree
     end
 
     protected
-      def password_required?
-        !persisted? || password.present? || password_confirmation.present?
-      end
+
+    def password_required?
+      !persisted? || password.present? || password_confirmation.present?
+    end
 
     private
 
-      def set_login
-        # for now force login to be same as email, eventually we will make this configurable, etc.
-        self.login ||= self.email if self.email
-      end
-
-      def scramble_email_and_password
-        self.email = SecureRandom.uuid + "@example.net"
-        self.login = self.email
-        self.password = SecureRandom.hex(8)
-        self.password_confirmation = self.password
-        self.save
-      end
+    def set_login
+      # for now force login to be same as email, eventually we will make this configurable, etc.
+      self.login ||= email if email
+    end
+
+    def scramble_email_and_password
+      self.email = SecureRandom.uuid + "@example.net"
+      self.login = email
+      self.password = SecureRandom.hex(8)
+      self.password_confirmation = password
+      save
+    end
   end
 end

data/app/overrides/auth_shared_login_bar.rb

@@ -1,7 +1,6 @@
-Deface::Override.new(:virtual_path => "spree/shared/_nav_bar",
-                     :name => "auth_shared_login_bar",
-                     :insert_before => "li#search-bar",
-                     :partial => "spree/shared/login_bar",
-                     :disabled => false,
-                     :original => 'c00d67dfc0496d21a351b48c41a728412cb5ed2c')
-
+Deface::Override.new(virtual_path: "spree/shared/_nav_bar",
+                     name: "auth_shared_login_bar",
+                     insert_before: "li#search-bar",
+                     partial: "spree/shared/login_bar",
+                     disabled: false,
+                     original: 'c00d67dfc0496d21a351b48c41a728412cb5ed2c')

data/config.ru

@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../spec/dummy/config/environment',  __FILE__)
+require ::File.expand_path('../spec/dummy/config/environment', __FILE__)
 run Dummy::Application

data/config/initializers/devise.rb

@@ -29,7 +29,7 @@ Devise.setup do |config|
   config.http_authenticatable = true
 
   # Set this to true to use Basic Auth for AJAX requests.  True by default.
-  #config.http_authenticatable_on_xhr = false
+  # config.http_authenticatable_on_xhr = false
 
   # The realm used in Http Basic Authentication
   config.http_authentication_realm = 'Spree Application'

data/config/initializers/warden.rb

@@ -1,5 +1,5 @@
 # Merges users orders to their account after sign in and sign up.
-Warden::Manager.after_set_user except: :fetch do |user, auth, opts|
+Warden::Manager.after_set_user except: :fetch do |user, auth, _opts|
   if auth.cookies.signed[:guest_token].present?
     if user.is_a?(Spree::User)
       Spree::Order.incomplete.where(guest_token: auth.cookies.signed[:guest_token], user_id: nil).each do |order|
@@ -9,6 +9,6 @@ Warden::Manager.after_set_user except: :fetch do |user, auth, opts|
   end
 end
 
-Warden::Manager.before_logout do |user, auth, opts|
+Warden::Manager.before_logout do |_user, auth, _opts|
   auth.cookies.delete :guest_token
 end

data/config/locales/bg.yml

@@ -0,0 +1,54 @@
+bg:
+  spree:
+    admin_login: "Админ вход"
+    change_your_password: "Промени своята парола"
+  devise:
+    confirmations:
+      confirmed: Вашият акаунт е потвърден. Вече сте вписан.
+      send_instructions: До няколко минути ще получите съобщение с обяснение как да потвърдите своя акаунт.
+    failure:
+      inactive: Вашият акаунт все още не е активен.
+      invalid: Грешен имейл или парола.
+      invalid_token: Невалиден token.
+      locked: Вашият акаунт е заключен.
+      timeout: 'Вашата сесия е изтекла, моля влезте отново.'
+      unauthenticated: За да продължите трябва да влезете в профила си.
+      unconfirmed: Трябва да потвърдите акаунта си преди да продължите.
+    mailer:
+      confirmation_instructions:
+        subject: Инструкции за потвърждаване
+      reset_password_instructions:
+        subject: Инструкции за смяна на паролата
+      unlock_instructions:
+        subject: Инструкции за отключване
+    oauth_callbacks:
+      failure: "Не можете да бъдете оторизиран от %{kind}, поради %{reason}."
+      success: "Влязохте успешно с вашият %{kind} профил."
+    unlocks:
+      send_instructions: До няколко минути ще получите имейл с инструкции как да отключите своя акаунт.
+      unlocked: Вашият акаунт бе отключен успешно. Вече сте вписани.
+    user_passwords:
+      spree_user:
+        cannot_be_blank: Вашата парола не може бъде празна.
+        no_token: Не можете да достъпите тази страница ако не влезете през мейла за забравена парола.
+        send_instructions: До няколко минути ще получите имейл с инструкции как да промените паролата си.
+        updated: Вашата парола бе променена успешко. Вече сте вписани.
+    user_registrations:
+      destroyed: Вашият акаунт бе отменен успешно. Надяваме се да Ви видим скоро.
+      inactive_signed_up: 'Вие се регистрирахте успешно, въпреки това не можете да се логнете в системата, поради %{reason}.'
+      signed_up: Вие се регистрирахте успешно.
+      updated: Успешно обновихте своя акаунт.
+    user_sessions:
+      signed_in: Успешно влизане
+      signed_out: Успешно излизане
+      already_signed_in: Вече сте влезли
+      already_signed_out: Вече сте излезли
+  errors:
+    messages:
+      already_confirmed: Вече бе потвърден
+      email_is_invalid: Email не може да бъде празен
+      not_found: Не е намерен
+      not_locked: Не е заключен
+      not_saved:
+        one: '1 грешка предотврати запазването на %{resource}:'
+        other: '%{count} грешки предотвратиха запазването на %{resource}:'

data/config/locales/de.yml

@@ -25,7 +25,7 @@ de:
     unlocks:
       send_instructions: In ein paar Minuten erhalten Sie eine E-Mail mit Anweisungen um Ihr Konto freizuschalten.
       unlocked: Ihr Konto wurde erfolgreich freigeschaltet.
-    passwords:
+    user_passwords:
       spree_user:
         cannot_be_blank: Ihr Passwort darf nicht leer sein.
         send_instructions: In ein paar Minuten erhalten Sie eine E-Mail mit Anweisungen um Ihr Passwort zurücksetzen.

data/config/locales/en.yml

@@ -30,7 +30,7 @@ en:
     unlocks:
       send_instructions: You will receive an email with instructions about how to unlock your account in a few minutes.
       unlocked: Your account was successfully unlocked. You are now signed in.
-    passwords:
+    user_passwords:
       spree_user:
         cannot_be_blank: Your password cannot be blank.
         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."

data/config/locales/es.yml

@@ -25,7 +25,7 @@ es:
     unlocks:
       send_instructions: Recibirá un email con instrucciones acerca de cómo desbloquear su cuenta en pocos minutos.
       unlocked: Su cuenta ha sido desbloqueada correctamente. Ahora está conectado.
-    passwords:
+    user_passwords:
       spree_user:
         cannot_be_blank: La contraseña no puede estar en blanco.
         send_instructions: Recibirá un email con instrucciones acerca de como restaurar su contraseña en pocos minutos.

data/config/locales/fr.yml

@@ -25,7 +25,7 @@ fr:
     unlocks:
       send_instructions: Vous recevrez dans quelques minutes un courriel avec les instructions sur la façon de déverrouiller votre compte.
       unlocked: Votre compte a été déverrouillé. Vous êtes maintenant connecté(e).
-    passwords:
+    user_passwords:
       spree_user:
         cannot_be_blank: Votre mot de passe ne peut pas être vide.
         send_instructions: Vous recevrez dans quelques minutes un courriel avec les instructions sur la façon de réinitialiser votre mot de passe.