spree_core 1.1.6 → 1.2.0.rc1

data/lib/generators/spree/dummy/templates/initializers/custom_user.rb

@@ -0,0 +1 @@
+# Spree.user_class = "User"

data/lib/generators/spree/install/templates/app/assets/javascripts/admin/all.js

@@ -8,7 +8,6 @@
 //= require jquery_ujs
 <% if options[:lib_name] == 'spree' %>
 //= require admin/spree_core
-//= require admin/spree_auth
 //= require admin/spree_promo
 <% else %>
 //= require admin/<%= options[:lib_name].gsub("/", "_") %>

data/lib/generators/spree/install/templates/app/assets/javascripts/store/all.js

@@ -8,7 +8,6 @@
 //= require jquery_ujs
 <% if options[:lib_name] == 'spree' %>
 //= require store/spree_core
-//= require store/spree_auth
 //= require store/spree_promo
 <% else %>
 //= require store/<%= options[:lib_name].gsub("/", "_") %>

data/lib/generators/spree/install/templates/app/assets/stylesheets/admin/all.css

@@ -5,7 +5,6 @@
  *
 <% if options[:lib_name] == 'spree' %>
  *= require admin/spree_core
- *= require admin/spree_auth
  *= require admin/spree_promo
 <% else %>
  *= require admin/<%= options[:lib_name].gsub("/", "_") %>

data/lib/generators/spree/install/templates/app/assets/stylesheets/store/all.css

@@ -5,7 +5,6 @@
  *
 <% if options[:lib_name] == 'spree' %>
  *= require store/spree_core
- *= require store/spree_auth
  *= require store/spree_promo
 <% else %>
  *= require store/<%= options[:lib_name].gsub("/", "_") %>

data/lib/generators/spree/install/templates/config/initializers/spree.rb

@@ -10,3 +10,5 @@ Spree.config do |config|
   # Uncomment to override the default site name.
   # config.site_name = "Spree Demo Site"
 end
+
+Spree.user_class = "Spree::LegacyUser"

data/lib/spree/core.rb

@@ -37,8 +37,21 @@ require 'active_merchant'
 require 'ransack'
 require 'jquery-rails'
 require 'deface'
+require 'cancan'
+require 'select2-rails'
 
 module Spree
+
+  mattr_accessor :user_class
+
+  def self.user_class
+    if @@user_class.is_a?(Class)
+      raise "Spree.user_class MUST be a String object, not a Class object."
+    elsif @@user_class.is_a?(String)
+      @@user_class.constantize
+    end
+  end
+
   module Core
   end
 
@@ -58,7 +71,6 @@ module Spree
 end
 
 require 'spree/core/ext/active_record'
-require 'spree/core/ext/hash'
 
 require 'spree/core/delegate_belongs_to'
 
@@ -74,6 +86,8 @@ require 'spree/core/mail_interceptor'
 require 'spree/core/middleware/redirect_legacy_product_url'
 require 'spree/core/middleware/seo_assist'
 require 'spree/core/permalinks'
+require 'spree/core/token_resource'
+require 'spree/core/s3_support'
 
 silence_warnings do
   require 'spree/core/authorize_net_cim_hack'
@@ -83,7 +97,6 @@ require 'spree/core/version'
 
 require 'spree/core/engine'
 require 'generators/spree/dummy/dummy_generator'
-require 'generators/spree/sandbox/sandbox_generator'
 
 ActiveRecord::Base.class_eval do
   include Spree::Core::CalculatedAdjustments

data/lib/spree/core/controller_helpers.rb

@@ -1,27 +1,40 @@
+# This module exists so that controllers that don't inherit from Spree::BaseController
+# Can still inherit the important bits of functionality and use the Spree layout by default.
 module Spree
   module Core
     module ControllerHelpers
-      def self.included(receiver)
-        receiver.send :layout, :get_layout
-        receiver.send :before_filter, 'instantiate_controller_and_action_names'
-        receiver.send :before_filter, 'set_user_language'
-        receiver.send :helper_method, 'title'
-        receiver.send :helper_method, 'title='
-        receiver.send :helper_method, 'accurate_title'
-        receiver.send :helper_method, 'get_taxonomies'
-        receiver.send :helper_method, 'current_order'
-        receiver.send :include, SslRequirement
-        receiver.send :include, Spree::Core::CurrentOrder
-      end
+      def self.included(base)
+        base.class_eval do
+          include Spree::Core::CurrentOrder
+          include Spree::Core::RespondWith
+          include SslRequirement
 
-      def access_forbidden
-        render :text => 'Access Forbidden', :layout => true, :status => 401
-      end
+          helper_method :title
+          helper_method :title=
+          helper_method :accurate_title
+          helper_method :current_order
+          helper_method :try_spree_current_user
+
+          before_filter :set_user_language
+          before_filter :set_current_order
+
+          rescue_from CanCan::AccessDenied do |exception|
+            return unauthorized
+          end
 
+          layout :get_layout
+        end
+      end
       # can be used in views as well as controllers.
       # e.g. <% title = 'This is a custom title for this view' %>
       attr_writer :title
 
+      # proxy method to *possible* spree_current_user method
+      # Authentication extensions (such as spree_auth_devise) are meant to provide spree_current_user
+      def try_spree_current_user
+        respond_to?(:spree_current_user) ? spree_current_user : nil
+      end
+
       def title
         title_string = @title.present? ? @title : accurate_title
         if title_string.present?
@@ -37,69 +50,117 @@ module Spree
 
       protected
 
-        def default_title
-          Spree::Config[:site_name]
+      def set_current_order
+        if user = try_spree_current_user
+          last_incomplete_order = user.last_incomplete_spree_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
 
-        # this is a hook for subclasses to provide title
-        def accurate_title
-          Spree::Config[:default_seo_title]
-        end
+      # Needs to be overriden so that we use Spree's Ability rather than anyone else's.
+      def current_ability
+        @current_ability ||= Spree::Ability.new(try_spree_current_user)
+      end
 
-        def render_404(exception = nil)
-          respond_to do |type|
-            type.html { render :status => :not_found, :file    => "#{::Rails.root}/public/404", :formats => [:html], :layout => nil}
-            type.all  { render :status => :not_found, :nothing => true }
+      def store_location
+        # disallow return to login, logout, signup pages
+        authentication_routes = [:spree_signup_path, :spree_login_path, :spree_logout_path]
+        disallowed_urls = []
+        authentication_routes.each do |route|
+          if respond_to?(route)
+            disallowed_urls << send(route)
           end
         end
 
-        # Convenience method for firing instrumentation events with the default payload hash
-        def fire_event(name, extra_payload = {})
-          ActiveSupport::Notifications.instrument(name, default_notification_payload.merge(extra_payload))
+        disallowed_urls.map!{ |url| url[/\/\w+$/] }
+        unless disallowed_urls.include?(request.fullpath)
+          session['user_return_to'] = request.fullpath.gsub('//', '/')
         end
+      end
+      # 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
+        respond_to do |format|
+          format.html do
+            if try_spree_current_user
+              flash.now[:error] = t(:authorization_failure)
+              render 'spree/shared/unauthorized', :layout => '/spree/layouts/spree_application', :status => 401
+            else
+              store_location
+              url = respond_to?(:spree_login_path) ? spree_login_path : root_path
+              redirect_to url
+            end
+          end
+          format.xml do
+            request_http_basic_authentication 'Web Password'
+          end
+          format.json do
+            render :text => "Not Authorized \n", :status => 401
+          end
+        end
+      end
 
-        # Creates the hash that is sent as the payload for all notifications. Specific notifications will
-        # add additional keys as appropriate. Override this method if you need additional data when
-        # responding to a notification
-        def default_notification_payload
-          {:user => (respond_to?(:current_user) && current_user), :order => current_order}
+
+      def default_title
+        Spree::Config[:site_name]
+      end
+
+      # this is a hook for subclasses to provide title
+      def accurate_title
+        Spree::Config[:default_seo_title]
+      end
+
+      def render_404(exception = nil)
+        respond_to do |type|
+          type.html { render :status => :not_found, :file    => "#{::Rails.root}/public/404", :formats => [:html], :layout => nil}
+          type.all  { render :status => :not_found, :nothing => true }
         end
+      end
+
+      # Convenience method for firing instrumentation events with the default payload hash
+      def fire_event(name, extra_payload = {})
+        ActiveSupport::Notifications.instrument(name, default_notification_payload.merge(extra_payload))
+      end
+
+      # Creates the hash that is sent as the payload for all notifications. Specific notifications will
+      # add additional keys as appropriate. Override this method if you need additional data when
+      # responding to a notification
+      def default_notification_payload
+        {:user => try_spree_current_user, :order => current_order}
+      end
 
       private
 
-        def redirect_back_or_default(default)
-          redirect_to(session["user_return_to"] || default)
-          session["user_return_to"] = nil
-        end
+      def redirect_back_or_default(default)
+        redirect_to(session["user_return_to"] || default)
+        session["user_return_to"] = nil
+      end
 
-        def instantiate_controller_and_action_names
-          @current_action = action_name
-          @current_controller = controller_name
-        end
+      def set_user_language
+        locale = session[:locale]
+        locale ||= Spree::Config[:default_locale] unless Spree::Config[:default_locale].blank?
+        locale ||= Rails.application.config.i18n.default_locale
+        locale ||= I18n.default_locale unless I18n.available_locales.include?(locale.to_sym)
+        I18n.locale = locale.to_sym
+      end
 
-        def associate_user
-          return unless current_user and current_order
-          current_order.associate_user!(current_user)
-          session[:guest_token] = nil
-        end
+      # Returns which layout to render.
+      # 
+      # You can set the layout you want to render inside your Spree configuration with the +:layout+ option.
+      # 
+      # Default layout is: +app/views/spree/layouts/spree_application+
+      # 
+      def get_layout
+        layout ||= Spree::Config[:layout]
+      end
 
-        def set_user_language
-          locale = session[:locale]
-          locale ||= Spree::Config[:default_locale] unless Spree::Config[:default_locale].blank?
-          locale ||= Rails.application.config.i18n.default_locale
-          locale ||= I18n.default_locale unless I18n.available_locales.map(&:to_s).include?(locale)
-          I18n.locale = locale
-        end
 
-        # Returns which layout to render.
-        # 
-        # You can set the layout you want to render inside your Spree configuration with the +:layout+ option.
-        # 
-        # Default layout is: +app/views/spree/layouts/spree_application+
-        # 
-        def get_layout
-          layout ||= Spree::Config[:layout]
-        end
     end
   end
 end
+

data/lib/spree/core/current_order.rb

@@ -1,6 +1,11 @@
 module Spree
   module Core
     module CurrentOrder
+      def self.included(base)
+        base.class_eval do
+          helper_method :current_order
+        end
+      end
 
       # This should be overridden by an auth-related extension which would then have the
       # opportunity to associate the new order with the # current user before saving.

data/lib/spree/core/engine.rb

@@ -10,6 +10,7 @@ module Spree
       config.autoload_paths += %W(#{config.root}/lib)
 
       def self.activate
+        Spree::Order.define_state_machine!
       end
 
       config.to_prepare &method(:activate).to_proc
@@ -22,7 +23,6 @@ module Spree
             activator.activate(payload)
           end
         end
-
       end
 
       # We need to reload the routes here due to how Spree sets them up.

data/lib/spree/core/mail_settings.rb

@@ -21,8 +21,7 @@ module Spree
             mail_server_settings[:password] = mail_method.preferred_smtp_password
           end
 
-          tls = mail_method.preferred_secure_connection_type == 'TLS'
-          mail_server_settings[:enable_starttls_auto] = tls
+          mail_server_settings[:enable_starttls_auto] = (mail_method.preferred_secure_connection_type == 'TLS')
 
           ActionMailer::Base.smtp_settings = mail_server_settings
           ActionMailer::Base.perform_deliveries = true

data/lib/spree/core/permalinks.rb

@@ -35,12 +35,8 @@ module Spree
 
         def permalink_order
           order = permalink_options[:order]
-
-          if order
-            "#{order} ASC,"
-          end
+          "#{order} ASC," if order
         end
-
       end
 
       def save_permalink

data/lib/spree/core/preference_rescue.rb

@@ -10,10 +10,14 @@ module Spree
       OldPrefs.where(:key => nil).each do |old_pref|
         next unless owner = (old_pref.owner rescue nil)
         unless old_pref.owner_type == "Spree::Activator" || old_pref.owner_type == "Spree::Configuration"
-          old_pref.key = [owner.class.name, old_pref.name, owner.id].join('::').underscore
-          old_pref.value_type = owner.preference_type(old_pref.name)
-          puts "Migrating Preference: #{old_pref.key}"
-          old_pref.save
+          begin
+            old_pref.key = [owner.class.name, old_pref.name, owner.id].join('::').underscore
+            old_pref.value_type = owner.preference_type(old_pref.name)
+            puts "Migrating Preference: #{old_pref.key}"
+            old_pref.save
+          rescue NoMethodError => ex
+            puts ex.message
+          end
         end
       end
     end

data/lib/spree/core/relation_serialization.rb

@@ -0,0 +1,9 @@
+module Spree
+  module Core
+    module RelationSerialization
+      def serializable_hash(options = nil)
+        self.map { |a| a.serializable_hash(options) }
+      end
+    end
+  end
+end

data/lib/spree/core/respond_with.rb

@@ -59,7 +59,7 @@ module Spree
               options = {action_name.to_sym => {format_name.to_sym => {:success => format_value}}}
             end
 
-            self.spree_responders.rmerge!(self.name.to_sym => options)
+            self.spree_responders.deep_merge!(self.name.to_sym => options)
           end
         end
       end

data/lib/spree/core/s3_support.rb

@@ -0,0 +1,25 @@
+module Spree
+  module Core
+    # This module exists to reduce duplication in S3 settings between
+    # the Image and Taxon models in Spree
+    module S3Support
+      extend ActiveSupport::Concern
+
+      included do
+        def self.supports_s3(field)
+          # Load user defined paperclip settings
+          config = Spree::Config
+          if config[:use_s3]
+            s3_creds = { :access_key_id => config[:s3_access_key], :secret_access_key => config[:s3_secret], :bucket => config[:s3_bucket] }
+            self.attachment_definitions[field][:storage] = :s3
+            self.attachment_definitions[field][:s3_credentials] = s3_creds
+            self.attachment_definitions[field][:s3_headers] = ActiveSupport::JSON.decode(config[:s3_headers])
+            self.attachment_definitions[field][:bucket] = config[:s3_bucket]
+            self.attachment_definitions[field][:s3_protocol] = config[:s3_protocol] unless config[:s3_protocol].blank?
+            self.attachment_definitions[field][:s3_host_alias] = config[:s3_host_alias] unless config[:s3_host_alias].blank?
+          end
+        end
+      end
+    end
+  end
+end

data/lib/spree/core/search/base.rb

@@ -28,7 +28,7 @@ module Spree
           def get_base_scope
             base_scope = Spree::Product.active
             base_scope = base_scope.in_taxon(taxon) unless taxon.blank?
-            base_scope = get_products_conditions_for(base_scope, keywords)
+            base_scope = get_products_conditions_for(base_scope, keywords) unless keywords.blank?
             base_scope = base_scope.on_hand unless Spree::Config[:show_zero_stock_products]
             base_scope = add_search_scopes(base_scope)
             base_scope
@@ -48,10 +48,7 @@ module Spree
 
           # method should return new scope based on base_scope
           def get_products_conditions_for(base_scope, query)
-            unless query.blank?
-              base_scope = base_scope.like_any([:name, :description], query.split)
-            end
-            base_scope
+            base_scope.like_any([:name, :description], query.split)
           end
 
           def prepare(params)