spree_auth 1.0.0.rc3 → 1.0.0.rc4

data/app/models/spree/user.rb

@@ -1,5 +1,7 @@
 module Spree
   class User < ActiveRecord::Base
+    include Core::UserBanners
+
     devise :database_authenticatable, :token_authenticatable, :registerable, :recoverable,
            :rememberable, :trackable, :validatable, :encryptable, :encryptor => 'authlogic_sha512'
 
@@ -10,6 +12,7 @@ module Spree
 
     before_save :check_admin
     before_validation :set_login
+    before_destroy :check_completed_orders
 
     # Setup accessible (or protected) attributes for your model
     attr_accessible :email, :password, :password_confirmation, :remember_me, :persistence_token
@@ -20,6 +23,8 @@ module Spree
     scope :admin, lambda { includes(:roles).where("#{roles_table_name}.name" => "admin") }
     scope :registered, where("#{users_table_name}.email NOT LIKE ?", "%@example.net")
 
+    class DestroyWithOrdersError < StandardError; end
+
     # has_role? simply needs to return true or false whether a user has a role or not.
     def has_role?(role_in_question)
       roles.any? { |role| role.name == role_in_question.to_s }
@@ -52,6 +57,11 @@ module Spree
       end
 
     private
+
+      def check_completed_orders
+        raise DestroyWithOrdersError if orders.complete.present?
+      end
+
       def check_admin
         return if self.class.admin_created?
         admin_role = Role.find_or_create_by_name 'admin'

data/db/default/users.rb

@@ -63,15 +63,14 @@ def create_admin_user
   end
 end
 
-if Rails.env.development?
-  if Spree::User.admin.empty?
+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)')
     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)')
-      create_admin_user
-    else
-      puts 'No admin user created.'
-    end
+    puts 'No admin user created.'
   end
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_auth
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc3
+  version: 1.0.0.rc4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-31 00:00:00.000000000 Z
+date: 2012-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
-  requirement: &70156358869740 !ruby/object:Gem::Requirement
+  requirement: &70299989919900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: 1.0.0.rc4
   type: :runtime
   prerelease: false
-  version_requirements: *70156358869740
+  version_requirements: *70299989919900
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70156358868540 !ruby/object:Gem::Requirement
+  requirement: &70299989919360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.8
   type: :runtime
   prerelease: false
-  version_requirements: *70156358868540
+  version_requirements: *70299989919360
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70156358867500 !ruby/object:Gem::Requirement
+  requirement: &70299989918900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,7 +43,7 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70156358867500
+  version_requirements: *70299989918900
 description: Required dependency for Spree
 email: sean@spreecommerce.com
 executables: []