solidus_auth_devise 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb97d2596201f6b868061b6064d27ab4ea0df410
-  data.tar.gz: b05459072856d24460abed0bd7adc90a2d258113
+  metadata.gz: b5cf4aa80513d06a54e23702ed88741c43c7382a
+  data.tar.gz: 657066204c77305b7e9dbfa8fe00f2d064cb518b
 SHA512:
-  metadata.gz: 636e4dd8e7aed3bd4309a8075c5b6831bdcf5063a406290ed8b46079cc31fd5305989b94d5ac5805264bc4147ca09786012cba274a102e45a36c19ad19bd3930
-  data.tar.gz: d109430fe560ecae80f6172192a0b8181cbcaa5f51770f56f67a6f81f6f024be0a2cf2e1d8d001d970d090a92f09779d79e486cadab4a9ebda6cc7fa9cbea9f5
+  metadata.gz: 76a34014abe38b2f73397f0a969719c2d35523252e76e830b550fa6d9935c1615e3157f2df99372ac50930a4980186597dacd11c96ffbbb32031d39e81eceb93
+  data.tar.gz: b922becf025a09a3203ec8b79414d39f5daa6f109c866d456bbac32295dc3cc0e6ea0fe0a6708133e64cbe057dcecc20f4754ee7de5f17796e4f6b3b74259c90

data/app/models/spree/user.rb

@@ -2,6 +2,7 @@ module Spree
   class User < ActiveRecord::Base
     include UserAddress
     include UserPaymentSource
+    include UserMethods
 
     devise :database_authenticatable, :registerable, :recoverable,
            :rememberable, :trackable, :validatable, :encryptable, :encryptor => 'authlogic_sha512'

data/lib/controllers/backend/spree/admin/admin_controller_decorator.rb

@@ -1,26 +1,11 @@
 Spree::Admin::BaseController.class_eval do
-
-  # Redirect as appropriate when an access request fails.  The default action is to redirect to the login screen.
-  # Override this method in your controllers if you want to have special behavior in case the user is not authorized
-  # to access the requested action.  For example, a popup window might simply close itself.
-  def unauthorized
-    if try_spree_current_user
-      flash[:error] = Spree.t(:authorization_failure)
-      redirect_to spree.admin_unauthorized_path
-    else
-      store_location
-      redirect_to spree.admin_login_path
-    end
-  end
-
   protected
 
-    def model_class
-      const_name = controller_name.classify
-      if Spree.const_defined?(const_name, false)
-        return "Spree::#{const_name}".constantize
-      end
-      nil
+  def model_class
+    const_name = controller_name.classify
+    if Spree.const_defined?(const_name, false)
+      return "Spree::#{const_name}".constantize
     end
-
+    nil
+  end
 end

data/lib/generators/{spree → solidus}/auth/install/install_generator.rb

@@ -1,4 +1,4 @@
-module Spree
+module Solidus
   module Auth
     module Generators
       class InstallGenerator < Rails::Generators::Base
@@ -9,8 +9,7 @@ module Spree
         end
 
         def generate_devise_key
-          return if ENV['TRAVIS']
-          template 'config/initializers/devise.rb', 'config/initializers/devise.rb'
+          template 'config/initializers/devise.rb', 'config/initializers/devise.rb', skip: true
         end
 
         def add_migrations

data/lib/spree/auth/engine.rb

@@ -44,6 +44,26 @@ module Spree
           end
         end
         ApplicationController.send :include, Spree::AuthenticationHelpers
+
+        Spree::BaseController.unauthorized_redirect = -> do
+          if try_spree_current_user
+            flash[:error] = Spree.t(:authorization_failure)
+            redirect_to spree.unauthorized_path
+          else
+            store_location
+            redirect_to spree.login_path
+          end
+        end
+
+        Spree::Admin::BaseController.unauthorized_redirect = -> do
+          if try_spree_current_user
+            flash[:error] = Spree.t(:authorization_failure)
+            redirect_to spree.admin_unauthorized_path
+          else
+            store_location
+            redirect_to spree.admin_login_path
+          end
+        end
       end
 
       def self.backend_available?

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.1.0"
+  s.version     = "1.2.0"
   s.summary     = "Provides authentication and authorization services for use with Solidus by using Devise and CanCan."
   s.description = s.summary
 
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.require_path = "lib"
   s.requirements << "none"
 
-  solidus_version = [">= 1.0.0.pre", "< 2"]
+  solidus_version = [">= 1.0.0.pre2", "< 2"]
 
   s.add_dependency "solidus_core", solidus_version
   s.add_dependency "devise", '~> 3.5.1'
@@ -29,7 +29,7 @@ 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.0.0"
+  s.add_development_dependency "rspec-rails", "~> 3.3"
   s.add_development_dependency "simplecov", "~> 0.9.0"
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "sass-rails", "~> 4.0.0"

data/spec/features/admin/sign_in_spec.rb

@@ -39,6 +39,6 @@ RSpec.feature 'Admin - Sign In', type: :feature do
     click_button 'Login'
 
     expect(page).to have_text 'Logged in as: admin@person.com'
-    expect(current_path).to eq '/admin/orders'
+    expect(current_path).to eq '/admin/dashboards/home'
   end
 end

data/spec/features/checkout_spec.rb

@@ -90,7 +90,6 @@ RSpec.feature 'Checkout', :js, type: :feature do
 
     # Regression test for #890
     scenario 'associate an incomplete guest order with user after successful password reset' do
-      create(:store)
       user = create(:user, email: 'email@person.com', password: 'password', password_confirmation: 'password')
       click_link 'RoR Mug'
       click_button 'Add To Cart'
@@ -103,7 +102,7 @@ RSpec.feature 'Checkout', :js, type: :feature do
       # Need to do this now because the token stored in the DB is the encrypted version
       # The 'plain-text' version is sent in the email and there's one way to get that!
       reset_password_email = ActionMailer::Base.deliveries.first
-      token_url_regex = /^http:\/\/www.example.com\/user\/spree_user\/password\/edit\?reset_password_token=(.*)$/
+      token_url_regex = /\/user\/spree_user\/password\/edit\?reset_password_token=(.*)$/
       token = token_url_regex.match(reset_password_email.body.to_s)[1]
 
       visit spree.edit_spree_user_password_path(reset_password_token: token)

data/spec/features/sign_in_spec.rb

@@ -39,7 +39,7 @@ RSpec.feature 'Sign In', type: :feature do
     click_button 'Login'
 
     expect(page).to have_text 'Logged in as: admin@person.com'
-    expect(current_path).to eq '/admin/orders'
+    expect(current_path).to eq '/admin/dashboards/home'
   end
 
   it "should store the user previous location" do

data/spec/mailers/user_mailer_spec.rb

@@ -5,14 +5,14 @@ RSpec.describe Spree::UserMailer, type: :mailer do
 
   before do
     user = create(:user)
-    Spree::UserMailer.reset_password_instructions(user, 'token goes here').deliver
+    Spree::UserMailer.reset_password_instructions(user, 'token goes here').deliver_now
     @message = ActionMailer::Base.deliveries.last
   end
 
   describe '#reset_password_instructions' do
     describe 'message contents' do
       before do
-        described_class.reset_password_instructions(user, 'token goes here').deliver
+        described_class.reset_password_instructions(user, 'token goes here').deliver_now
         @message = ActionMailer::Base.deliveries.last
       end
 
@@ -38,7 +38,7 @@ RSpec.describe Spree::UserMailer, type: :mailer do
     describe 'legacy support for User object' do
       it 'sends an email' do
         expect {
-          described_class.reset_password_instructions(user, 'token goes here').deliver
+          described_class.reset_password_instructions(user, 'token goes here').deliver_now
         }.to change(ActionMailer::Base.deliveries, :size).by(1)
       end
     end

data/spec/support/confirm_helpers.rb

@@ -1,5 +1,7 @@
 module ConfirmHelpers
   def set_confirmable_option(value)
+    # FIXME: This is terrible terribleness and causes anything loaded
+    # on the user at initialization to be lost.
     Spree::Auth::Config[:confirmable] = value
     Spree.send(:remove_const, 'User')
     load File.expand_path("../../../app/models/spree/user.rb", __FILE__)
@@ -8,4 +10,4 @@ end
 
 RSpec.configure do |c|
   c.include ConfirmHelpers
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_auth_devise
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre
+        version: 1.0.0.pre2
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre
+        version: 1.0.0.pre2
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -92,7 +92,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre
+        version: 1.0.0.pre2
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -102,7 +102,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre
+        version: 1.0.0.pre2
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -112,7 +112,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre
+        version: 1.0.0.pre2
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre
+        version: 1.0.0.pre2
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -132,14 +132,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -313,7 +313,6 @@ files:
 - lib/assets/stylesheets/spree/frontend/solidus_auth.css
 - lib/controllers/backend/spree/admin/admin_controller_decorator.rb
 - lib/controllers/backend/spree/admin/admin_orders_controller_decorator.rb
-- lib/controllers/backend/spree/admin/admin_resource_controller_decorator.rb
 - lib/controllers/backend/spree/admin/orders/customer_details_controller_decorator.rb
 - lib/controllers/backend/spree/admin/user_passwords_controller.rb
 - lib/controllers/backend/spree/admin/user_sessions_controller.rb
@@ -323,8 +322,8 @@ files:
 - lib/controllers/frontend/spree/user_registrations_controller.rb
 - lib/controllers/frontend/spree/user_sessions_controller.rb
 - lib/controllers/frontend/spree/users_controller.rb
-- lib/generators/spree/auth/install/install_generator.rb
-- lib/generators/spree/auth/install/templates/config/initializers/devise.rb
+- lib/generators/solidus/auth/install/install_generator.rb
+- lib/generators/solidus/auth/install/templates/config/initializers/devise.rb
 - lib/solidus/auth.rb
 - lib/solidus_auth_devise.rb
 - lib/spree/auth/devise.rb

data/lib/controllers/backend/spree/admin/admin_resource_controller_decorator.rb

@@ -1,3 +0,0 @@
-Spree::Admin::ResourceController.class_eval do
-  rescue_from CanCan::AccessDenied, :with => :unauthorized
-end