spree_auth 1.1.1 → 1.1.2.rc1

data/app/controllers/spree/base_controller_decorator.rb

@@ -1,5 +1,6 @@
 Spree::BaseController.class_eval do
   before_filter :set_current_user
+  before_filter :set_current_order
 
   # graceful error handling for cancan authorization exceptions
   rescue_from CanCan::AccessDenied do |exception|
@@ -46,4 +47,17 @@ Spree::BaseController.class_eval do
     def set_current_user
       Spree::User.current = current_user
     end
+
+    def set_current_order
+      if current_user
+        if current_user.respond_to?(:last_incomplete_order)
+          last_incomplete_order = current_user.last_incomplete_order
+          if session[:order_id].nil? && last_incomplete_order
+            session[:order_id] = last_incomplete_order.id
+          elsif current_order && last_incomplete_order && current_order != last_incomplete_order
+            current_order.merge!(last_incomplete_order)
+          end
+        end
+      end
+    end
 end

data/app/controllers/spree/products_controller_decorator.rb

@@ -6,7 +6,7 @@ Spree::ProductsController.class_eval do
       @product = Spree::Product.find_by_permalink!(params[:id])
       if !@product.deleted? && (@product.available_on.nil? || @product.available_on.future?)
         # Allow admins to view any yet to be available products
-        raise CanCan::AccessDenied unless current_user && current_user.admin?
+        raise CanCan::AccessDenied unless current_user && current_user.has_role?("admin")
       end
     end
 end

data/app/controllers/spree/user_sessions_controller.rb

@@ -9,11 +9,6 @@ class Spree::UserSessionsController < Devise::SessionsController
   ssl_required :new, :create, :destroy, :update
   ssl_allowed :login_bar
 
-  # GET /resource/sign_in
-  def new
-    super
-  end
-
   def create
     authenticate_user!
 
@@ -34,12 +29,6 @@ class Spree::UserSessionsController < Devise::SessionsController
     end
   end
 
-  def destroy
-    cookies.clear
-    session.clear
-    super
-  end
-
   def nav_bar
     render :partial => 'spree/shared/nav_bar'
   end

data/app/models/spree/user.rb

@@ -51,6 +51,10 @@ module Spree
       UserMailer.reset_password_instructions(self).deliver
     end
 
+    def last_incomplete_order
+      orders.incomplete.order("created_at desc").last
+    end
+
     protected
       def password_required?
         !persisted? || password.present? || password_confirmation.present?

data/app/views/spree/layouts/admin/_login_nav.html.erb

@@ -2,7 +2,7 @@
   <ul id="login-nav">
     <li><%= t(:logged_in_as) %>: <%= current_user.email %></li>
     <li><%= link_to t(:account), spree.edit_user_path(current_user) %></li>
-    <li><%= link_to t(:logout), spree.destroy_user_session_path %></li>
+    <li><%= link_to t(:logout), spree.destroy_user_session_path, :method => :delete %></li>
     <li><%= link_to t(:store), spree.products_path %></li>
   </ul>
 <% end %>

data/app/views/spree/shared/_login_bar.html.erb

@@ -1,6 +1,6 @@
 <% if current_user %>
   <li><%= link_to t(:my_account), spree.account_path %></li>
-  <li><%= link_to t(:logout), spree.destroy_user_session_path %></li>
+  <li><%= link_to t(:logout), spree.destroy_user_session_path, :method => :delete %></li>
 <% else %>
   <li id="link-to-login"><%= link_to t(:login), spree.login_path %></li>
 <% end %>

data/config/initializers/devise.rb

@@ -138,4 +138,6 @@ Devise.setup do |config|
   # Don't put a too small interval or your users won't have the time to
   # change their passwords.
   config.reset_password_within = 6.hours
+
+  config.sign_out_via = :delete
 end

metadata

@@ -1,30 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: spree_auth
 version: !ruby/object:Gem::Version
-  version: 1.1.1
-  prerelease: 
+  version: 1.1.2.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-16 00:00:00.000000000 Z
+date: 2012-06-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
-  requirement: &70261468871880 !ruby/object:Gem::Requirement
+  requirement: &70283083574620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.2.rc1
   type: :runtime
   prerelease: false
-  version_requirements: *70261468871880
+  version_requirements: *70283083574620
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70261468871080 !ruby/object:Gem::Requirement
+  requirement: &70283083574160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70261468871080
+  version_requirements: *70283083574160
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70261468870180 !ruby/object:Gem::Requirement
+  requirement: &70283083573700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,7 +43,7 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70261468870180
+  version_requirements: *70283083573700
 description: Required dependency for Spree
 email: sean@spreecommerce.com
 executables: []
@@ -129,12 +129,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 2326672717691546910
+      version: 1.3.1
 requirements:
 - none
 rubyforge_project: