solidus_auth_devise 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1a8bbe532616691acca8ba8cd61bf30a08cb718
-  data.tar.gz: 957b80f590477451fbf617fde9c1b84f26164e9f
+  metadata.gz: 2aa5444b3b4f513d26041de6927b83fce140609e
+  data.tar.gz: 814e99c4606750c1adef166de70fbda5a49eed43
 SHA512:
-  metadata.gz: 0e4ccfc768a4641c9235cddc8403d917dc509cca8f69bb332b0d43463d9269c353ab7b9111bef62cb74343bee697ce6fc689df273bdb2dbd53446885285a80f0
-  data.tar.gz: edb14fb8c87e92595bdc5340f38f561db9e91f78fa8804b4668e4d20168a82f74ae739963ae913ce8b6bf7ec6d6e7853365b225ffe8573b5147504b4ed100060
+  metadata.gz: 4b543060c56aff1657ac4cff719aa50e85c7077d420c8ab146c7e1bc853b698593362f28e955c19c12e7302f5bb1ca1cd9b0f9d8c8c5b644d8db40d309c8042d
+  data.tar.gz: a76c61997cc0294846d6c80d9e620dacdef12802579b7e35dabf16527fa7773d79100b7f264cb08e3f800278c23d0ca53a1e291ae6079ade61c7030781773091

data/.travis.yml

@@ -12,6 +12,7 @@ env:
     - SOLIDUS_BRANCH=v2.0 DB=postgres
     - SOLIDUS_BRANCH=v2.1 DB=postgres
     - SOLIDUS_BRANCH=v2.2 DB=postgres
+    - SOLIDUS_BRANCH=v2.3 DB=postgres
     - SOLIDUS_BRANCH=master DB=postgres
     - SOLIDUS_BRANCH=v1.0 DB=mysql
     - SOLIDUS_BRANCH=v1.1 DB=mysql
@@ -21,4 +22,5 @@ env:
     - SOLIDUS_BRANCH=v2.0 DB=mysql
     - SOLIDUS_BRANCH=v2.1 DB=mysql
     - SOLIDUS_BRANCH=v2.2 DB=mysql
+    - SOLIDUS_BRANCH=v2.3 DB=mysql
     - SOLIDUS_BRANCH=master DB=mysql

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## Master (unreleased)
 
+## Solidus Auth Devise v1.6.4 (2017-07-24)
+
+* Fix error trying to call helper_method in api-only applications
+* Fix deprecated devise `bypass` option
+* Pin development dependencies to minor versions
+* Update outdated development dependencies
+* Remove implicit dependency on highline
+
 ## Solidus Auth Devise v1.6.3 (2017-05-09)
 
 * Add missing translations for already_authenticated

data/app/overrides/auth_shared_login_bar.rb

@@ -1,8 +1,10 @@
-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: 'eb3fa668cd98b6a1c75c36420ef1b238a1fc55ac'
-)
+if Spree::Auth::Engine.frontend_available?
+  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: 'eb3fa668cd98b6a1c75c36420ef1b238a1fc55ac'
+  )
+end

data/db/default/users.rb

@@ -1,17 +1,11 @@
-require 'highline/import'
-
 # see last line where we create an admin if there is none, asking for email and password
 def prompt_for_admin_password
   if ENV['ADMIN_PASSWORD']
     password = ENV['ADMIN_PASSWORD'].dup
-    say "Admin Password #{password}"
+    puts "Admin Password #{password}"
   else
-    password = ask('Password [test123]: ') do |q|
-      q.echo = false
-      q.validate = /^(|.{5,40})$/
-      q.responses[:not_valid] = 'Invalid password. Must be at least 5 characters long.'
-      q.whitespace = :strip
-    end
+    print "Password [test123]: "
+    password = STDIN.gets.strip
     password = 'test123' if password.blank?
   end
 
@@ -21,12 +15,10 @@ end
 def prompt_for_admin_email
   if ENV['ADMIN_EMAIL']
     email = ENV['ADMIN_EMAIL'].dup
-    say "Admin User #{email}"
+    puts "Admin User #{email}"
   else
-    email = ask('Email [admin@example.com]: ') do |q|
-      q.echo = true
-      q.whitespace = :strip
-    end
+    print "Email [admin@example.com]: "
+    email = STDIN.gets.strip
     email = 'admin@example.com' if email.blank?
   end
 
@@ -53,7 +45,7 @@ def create_admin_user
   load 'spree/user.rb'
 
   if Spree::User.find_by_email(email)
-    say "\nWARNING: There is already a user with the email: #{email}, so no account changes were made.  If you wish to create an additional admin user, please run rake spree_auth:admin:create again with a different email.\n\n"
+    puts "\nWARNING: There is already a user with the email: #{email}, so no account changes were made.  If you wish to create an additional admin user, please run rake spree_auth:admin:create again with a different email.\n\n"
   else
     admin = Spree::User.new(attributes)
     if admin.save
@@ -61,11 +53,11 @@ def create_admin_user
       admin.spree_roles << role
       admin.save
       admin.generate_spree_api_key!
-      say "Done!"
+      puts "Done!"
     else
-      say "There was some problems with persisting new admin user:"
+      puts "There was some problems with persisting new admin user:"
       admin.errors.full_messages.each do |error|
-        say error
+        puts error
       end
     end
   end
@@ -75,7 +67,8 @@ if Spree::User.admin.empty?
   create_admin_user
 else
   puts 'Admin user has already been previously created.'
-  if agree('Would you like to create a new admin user? (yes/no)')
+  puts 'Would you like to create a new admin user? (yes/no)'
+  if ["yes", "y"].include? STDIN.gets.strip.downcase
     create_admin_user
   else
     puts 'No admin user created.'

data/db/seeds.rb

@@ -1,5 +1 @@
-# Loads seed data out of default dir
-default_path = File.join(File.dirname(__FILE__), 'default')
-
-Rake::Task['db:load_dir'].reenable
-Rake::Task['db:load_dir'].invoke(default_path)
+require_relative 'default/users.rb'

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

@@ -27,8 +27,9 @@ class Spree::UsersController < Spree::StoreController
     if @user.update_attributes(user_params)
       if params[:user][:password].present?
         # this logic needed b/c devise wants to log us out after password changes
-        user = Spree::User.reset_password_by_token(params[:user])
-        sign_in(@user, event: :authentication, bypass: !Spree::Auth::Config[:signout_after_password_change])
+        unless Spree::Auth::Config[:signout_after_password_change]
+          bypass_sign_in(@user)
+        end
       end
       redirect_to spree.account_url, notice: Spree.t(:account_updated)
     else

data/lib/spree/authentication_helpers.rb

@@ -1,12 +1,14 @@
 module Spree
   module AuthenticationHelpers
     def self.included(receiver)
-      receiver.send :helper_method, :spree_current_user
+      if receiver.send(:respond_to?, :helper_method)
+        receiver.send(:helper_method, :spree_current_user)
 
-      if Spree::Auth::Engine.frontend_available?
-        receiver.send :helper_method, :spree_login_path
-        receiver.send :helper_method, :spree_signup_path
-        receiver.send :helper_method, :spree_logout_path
+        if Spree::Auth::Engine.frontend_available?
+          receiver.send(:helper_method, :spree_login_path)
+          receiver.send(:helper_method, :spree_signup_path)
+          receiver.send(:helper_method, :spree_logout_path)
+        end
       end
     end
 

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.3"
+  s.version     = "1.6.4"
   s.summary     = "Provides authentication and authorization services for use with Solidus by using Devise and CanCan."
   s.description = s.summary
 
@@ -29,14 +29,14 @@ Gem::Specification.new do |s|
   s.add_development_dependency "solidus_backend", solidus_version
   s.add_development_dependency "solidus_frontend", solidus_version
   s.add_development_dependency "rspec-rails", "~> 3.3"
-  s.add_development_dependency "simplecov", "~> 0.11.2"
+  s.add_development_dependency "simplecov", "~> 0.14"
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "sass-rails"
   s.add_development_dependency "coffee-rails"
-  s.add_development_dependency "shoulda-matchers", "~> 3.1.1"
+  s.add_development_dependency "shoulda-matchers", "~> 3.1"
   s.add_development_dependency "factory_girl", "~> 4.4"
-  s.add_development_dependency "capybara", "~> 2.7.1"
+  s.add_development_dependency "capybara", "~> 2.14"
   s.add_development_dependency "poltergeist", "~> 1.5"
-  s.add_development_dependency "database_cleaner", "~> 1.5.3"
+  s.add_development_dependency "database_cleaner", "~> 1.6"
   s.add_development_dependency "capybara-screenshot"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_auth_devise
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-09 00:00:00.000000000 Z
+date: 2017-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -146,14 +146,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -202,14 +202,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
@@ -230,14 +230,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.1
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.1
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
@@ -258,14 +258,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: capybara-screenshot
   requirement: !ruby/object:Gem::Requirement