spree_core 0.40.4 → 0.50.0

data/lib/spree/calculated_adjustments.rb

@@ -5,7 +5,7 @@ module Spree::CalculatedAdjustments
       accepts_nested_attributes_for :calculator
       validates :calculator, :presence => true if options[:require]
 
-      class_inheritable_accessor :calculators
+      class_attribute :calculators
       self.calculators = Set.new
       # @available_calculators = []
       def register_calculator(calculator)
@@ -50,7 +50,10 @@ module Spree::CalculatedAdjustments
     # By default the adjustment will not be considered mandatory
     def create_adjustment(label, target, calculable, mandatory=false)
       amount = self.calculator.compute(calculable)
-      target.adjustments.create(:amount => amount, :source => calculable, :originator => self, :label => label, :mandatory => mandatory)
+      target.adjustments.create(:amount => amount,  :source => calculable,
+                                                    :originator => self,
+                                                    :label => label,
+                                                    :mandatory => mandatory)
     end
 
     # Updates the amount of the adjustment using our Calculator and calling the +compute+ method with the +calculable+

data/lib/spree/config.rb

@@ -19,6 +19,7 @@ module Spree
         @configuration
       end
 
+      # searcher_class allows spree extension writers to provide their own Search class
       def searcher_class
         @searcher_class ||= Spree::Search::Base
       end
@@ -26,6 +27,7 @@ module Spree
       def searcher_class=(sclass)
         @searcher_class = sclass
       end
+
     end
   end
 end

data/lib/spree/current_order.rb

@@ -1,13 +1,13 @@
 module Spree
   module CurrentOrder
 
-    # This should be overridden by an auth-related extension which would then have the opporutnity to associate the new order with the
-    # current user before saving.
+    # 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.
     def before_save_new_order
     end
 
-    # This should be overridden by an auth-related extension which would then have the opporutnity to store tokens, etc. in the session
-    # after saving.
+    # This should be overridden by an auth-related extension which would then have the
+    # opporutnity to store tokens, etc. in the session # after saving.
     def after_save_new_order
     end
 

data/lib/spree/mail_settings.rb

@@ -1,7 +1,8 @@
 module Spree
   module MailSettings
 
-    # Override the Rails application mail settings based on preference.  This makes it possible to configure the mail settings
+    # Override the Rails application mail settings based on preference.
+    # This makes it possible to configure the mail settings
     # through an admin interface instead of requiring changes to the Rails envrionment file.
     def self.init
       return unless mail_method = MailMethod.current
@@ -29,4 +30,4 @@ module Spree
     end
 
   end
-end
+end

data/lib/spree/search/base.rb

@@ -10,15 +10,13 @@ module Spree::Search
     def retrieve_products
       base_scope = get_base_scope
       @products_scope = @product_group.apply_on(base_scope)
-
       curr_page = manage_pagination && keywords ? 1 : page
-      @products = @products_scope.all.paginate({
+
+      @products = @products_scope.paginate({
           :include  => [:images, :master],
           :per_page => per_page,
           :page     => curr_page
         })
-
-      return @products
     end
 
     def method_missing(name)
@@ -28,13 +26,14 @@ module Spree::Search
     protected
     def get_base_scope
       base_scope = @cached_product_group ? @cached_product_group.products.active : Product.active
-      base_scope = base_scope.in_taxon(taxon) unless taxon.blank? 
+      base_scope = base_scope.in_taxon(taxon) unless taxon.blank?
       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 = base_scope.group_by_products_id if @product_group.product_scopes.size > 1
       base_scope
     end
-    
+
     # method should return new scope based on base_scope
     def get_products_conditions_for(base_scope, query)
       base_scope.like_any([:name, :description], query.split)
@@ -46,20 +45,20 @@ module Spree::Search
 
       per_page = params[:per_page].to_i
       @properties[:per_page] = per_page > 0 ? per_page : Spree::Config[:products_per_page]
-      @properties[:page] = (params[:page].to_i <= 0) ? 1 : params[:page].to_i 
-      
+      @properties[:page] = (params[:page].to_i <= 0) ? 1 : params[:page].to_i
+
       if !params[:order_by_price].blank?
         @product_group = ProductGroup.new.from_route([params[:order_by_price]+"_by_master_price"])
       elsif params[:product_group_name]
         @cached_product_group = ProductGroup.find_by_permalink(params[:product_group_name])
         @product_group = ProductGroup.new
       elsif params[:product_group_query]
-        @product_group = ProductGroup.new.from_route(params[:product_group_query])
+        @product_group = ProductGroup.new.from_route(params[:product_group_query].split("/"))
       else
         @product_group = ProductGroup.new
       end
       @product_group = @product_group.from_search(params[:search]) if params[:search]
-      
+
     end
   end
 end

data/lib/spree_base.rb

@@ -3,13 +3,11 @@ module SpreeBase
     def access_forbidden
       render :text => 'Access Forbidden', :layout => true, :status => 401
     end
-    
+
     # can be used in views as well as controllers.
     # e.g. <% title = 'This is a custom title for this view' %>
-    def title=(title)
-      @title = title
-    end
-    
+    attr_writer :title
+
     def title
       title_string = @title.blank? ? accurate_title : @title
       if title_string.blank?
@@ -22,17 +20,18 @@ module SpreeBase
         end
       end
     end
-    
+
     protected
-    
+
     def default_title
       Spree::Config[:site_name]
     end
-    
+
+    # this is a hook for subclasses to provide title
     def accurate_title
-      return nil
+      nil
     end
-    
+
     # def reject_unknown_object
     #   # workaround to catch problems with loading errors for permalink ids (reconsider RC permalink hack elsewhere?)
     #   begin
@@ -51,35 +50,35 @@ module SpreeBase
     #   end
     #   true
     # end
-    
-    def render_404(exception=nil)
+
+    def render_404(exception = nil)
       respond_to do |type|
-        type.html { render :status => :not_found, :file    => "#{Rails.root}/public/404.html", :layout=>nil}
+        type.html { render :status => :not_found, :file    => "#{Rails.root}/public/404.html", :layout => nil}
         type.all  { render :status => :not_found, :nothing => true }
       end
     end
-    
+
     private
-    
+
     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 get_taxonomies
       @taxonomies ||= Taxonomy.includes(:root => :children)
       @taxonomies.reject { |t| t.root.nil? }
     end
-    
+
     def current_gateway
       @current_gateway ||= Gateway.current
     end
-    
+
     #RAILS 3 TODO
     # # Load all models using STI to fix associations such as @order.credits giving no results and resulting in incorrect order totals
     # def touch_sti_subclasses
@@ -87,14 +86,14 @@ module SpreeBase
     #     load(File.join(SPREE_ROOT,'config/initializers/touch.rb'))
     #   end
     # end
-    
+
     def set_user_language
       locale = session[:locale] || Spree::Config[:default_locale]
-      locale = I18n.default_locale unless I18n.available_locales.include?(locale.to_sym)
+      locale = I18n.default_locale unless locale && I18n.available_locales.include?(locale.to_sym)
       I18n.locale = locale.to_sym
     end
   end
-  
+
   def self.included(receiver)
     #receiver.extend         ClassMethods
     receiver.send :include, InstanceMethods
@@ -104,7 +103,7 @@ module SpreeBase
     #  #RAILS 3 TODO
     #  #before_filter :touch_sti_subclasses
     receiver.send :before_filter, 'set_user_language'
-    
+
     receiver.send :helper_method, 'title'
     receiver.send :helper_method, 'title='
     receiver.send :helper_method, 'get_taxonomies'

data/lib/spree_core.rb

@@ -33,16 +33,18 @@ require 'paperclip'
 require 'stringex'
 require 'will_paginate'
 #require 'less' #TODO RAILS3: consider making this optional
-require 'awesome_nested_set'
+require 'nested_set'
 require 'acts_as_list'
 require 'resource_controller'
-require 'searchlogic'
 require 'active_merchant'
+require "meta_search"
 
 require 'spree_core/ext/active_record'
+
 require 'spree_core/delegate_belongs_to'
+ActiveRecord::Base.send :include, DelegateBelongsTo
+
 require 'spree_core/theme_support'
-require 'spree_core/validation_group'
 require 'spree_core/enumerable_constants'
 require 'spree_core/find_by_param'
 require 'spree_core/ssl_requirement'
@@ -57,7 +59,7 @@ require 'spree/config'
 require 'spree/mail_settings'
 require 'spree/mail_interceptor'
 require 'redirect_legacy_product_url'
-require 'seo_assist'
+require 'middleware/seo_assist'
 
 require 'spree_base' # added 11-3 JBD
 
@@ -65,78 +67,17 @@ silence_warnings do
   require 'spree_core/authorize_net_cim_hack'
 end
 
-module Spree
-  def self.version
-    "0.40.4"
-  end
-end
-
-module SpreeCore
-  class Engine < Rails::Engine
-
-    config.autoload_paths += %W(#{config.root}/lib)
-    # TODO - register state monitor observer?
-
-    def self.activate
-
-      Spree::ThemeSupport::HookListener.subclasses.each do |hook_class|
-        Spree::ThemeSupport::Hook.add_listener(hook_class)
-      end
-
-      #register all payment methods (unless we're in middle of rake task since migrations cannot be run for this first time without this check)
-      if File.basename( $0 ) != "rake"
-        [
-          Gateway::Bogus,
-          Gateway::AuthorizeNet,
-          Gateway::AuthorizeNetCim,
-          Gateway::Eway,
-          Gateway::Linkpoint,
-          Gateway::PayPal,
-          Gateway::SagePay,
-          Gateway::Beanstream,
-          PaymentMethod::Check
-        ].each{|gw|
-          begin
-            gw.register
-          rescue Exception => e
-            $stderr.puts "Error registering gateway #{gw}: #{e}"
-          end
-        }
-
-        #register all calculators
-        [
-          Calculator::FlatPercentItemTotal,
-          Calculator::FlatRate,
-          Calculator::FlexiRate,
-          Calculator::PerItem,
-          Calculator::SalesTax,
-          Calculator::Vat,
-          Calculator::PriceBucket
-        ].each{|c_model|
-          begin
-            c_model.register if c_model.table_exists?
-          rescue Exception => e
-            $stderr.puts "Error registering calculator #{c_model}"
-          end
-        }
-
-      end
-
-    end
-
-    config.to_prepare &method(:activate).to_proc
-
-  end
-end
+require 'spree_core/version'
 
-ActiveRecord::Base.class_eval { include Spree::CalculatedAdjustments }
+require 'spree_core/railtie'
 
 ActiveRecord::Base.class_eval do
+  include Spree::CalculatedAdjustments
   include CollectiveIdea::Acts::NestedSet
 end
 
 if defined?(ActionView)
-  require 'awesome_nested_set/helper'
+  require 'nested_set/helper'
   ActionView::Base.class_eval do
     include CollectiveIdea::Acts::NestedSet::Helper
   end

data/lib/spree_core/authorize_net_cim_hack.rb

@@ -27,7 +27,7 @@ module ActiveMerchant #:nodoc:
     # 5. Click Submit
     class AuthorizeNetCimGateway < Gateway
 
-      class_inheritable_accessor :test_url, :live_url
+      class_attribute :test_url, :live_url
 
       self.test_url = 'https://apitest.authorize.net/xml/v1/request.api'
       self.live_url = 'https://api.authorize.net/xml/v1/request.api'

data/lib/spree_core/delegate_belongs_to.rb

@@ -1,7 +1,7 @@
 ##
 # Creates methods on object which delegate to an association proxy.
 # see delegate_belongs_to for two uses
-# 
+#
 # Todo - integrate with ActiveRecord::Dirty to make sure changes to delegate object are noticed
 # Should do
 # class User < ActiveRecord::Base; delegate_belongs_to :contact, :firstname; end
@@ -10,21 +10,22 @@
 # u.changed? # => false
 # u.firstname = 'Bobby'
 # u.changed? # => true
-# 
+#
 # Right now the second call to changed? would return false
-# 
+#
 # Todo - add has_one support. fairly straightforward addition
 ##
 module DelegateBelongsTo
-  
+  extend ActiveSupport::Concern
+
   module ClassMethods
-    
+
     @@default_rejected_delegate_columns = ['created_at','created_on','updated_at','updated_on','lock_version','type','id','position','parent_id','lft','rgt']
     mattr_accessor :default_rejected_delegate_columns
-        
+
     ##
     # Creates methods for accessing and setting attributes on an association.  Uses same
-    # default list of attributes as delegates_to_association.  
+    # default list of attributes as delegates_to_association.
     # @todo Integrate this with ActiveRecord::Dirty, so if you set a property through one of these setters and then call save on this object, it will save the associated object automatically.
     # delegate_belongs_to :contact
     # delegate_belongs_to :contact, [:defaults]  ## same as above, and useless
@@ -33,7 +34,7 @@ module DelegateBelongsTo
     def delegate_belongs_to(association, *attrs)
       opts = attrs.extract_options!
       initialize_association :belongs_to, association, opts
-      attrs = get_association_column_names(association) if attrs.empty?      
+      attrs = get_association_column_names(association) if attrs.empty?
       attrs.concat get_association_column_names(association) if attrs.delete :defaults
       attrs.each do |attr|
         class_def attr do |*args|
@@ -48,48 +49,41 @@ module DelegateBelongsTo
         end
       end
     end
-    
+
     protected
 
     def get_association_column_names(association, without_default_rejected_delegate_columns=true)
       begin
-        association_klass = reflect_on_association(association).klass    
-        methods = association_klass.column_names    
+        association_klass = reflect_on_association(association).klass
+        methods = association_klass.column_names
         methods.reject!{|x|default_rejected_delegate_columns.include?(x.to_s)} if without_default_rejected_delegate_columns
         return methods
       rescue
         return []
       end
     end
-    
+
     ##
     # initialize_association :belongs_to, :contact
     def initialize_association(type, association, opts={})
       raise 'Illegal or unimplemented association type.' unless [:belongs_to].include?(type.to_s.to_sym)
       send type, association, opts if reflect_on_association(association).nil?
     end
-    
+
     private
-    
+
     def class_def(name, method=nil, &blk)
       class_eval { method.nil? ? define_method(name, &blk) : define_method(name, method) }
     end
-    
+
   end
-  
+
   module InstanceMethods
-    protected  
+    protected
     def delegator_for(association)
       send("#{association}=", self.class.reflect_on_association(association).klass.new) if send(association).nil?
       send(association)
     end
   end
-  
-  def self.included(receiver)
-    receiver.extend ClassMethods
-    receiver.send :include, InstanceMethods
-  end
 
 end
-
-ActiveRecord::Base.send :include, DelegateBelongsTo