spree_core 0.30.0.beta1 → 0.30.0

data/db/migrate/20101026184959_generate_anonymous_users.rb

@@ -0,0 +1,14 @@
+class GenerateAnonymousUsers < ActiveRecord::Migration
+  def self.up
+    User.reset_column_information
+    Order.where(:user_id => nil).each do |order|
+      user = User.anonymous!
+      user.email ||= order.email
+      order.user = user
+      order.save!
+    end
+  end
+
+  def self.down
+  end
+end

data/db/migrate/20101026185022_update_order_state.rb

@@ -0,0 +1,8 @@
+class UpdateOrderState < ActiveRecord::Migration
+  def self.up
+    Order.all.map(&:update!)
+  end
+
+  def self.down
+  end
+end

data/db/migrate/20101026192225_cleanup_legacy_tables.rb

@@ -0,0 +1,11 @@
+class CleanupLegacyTables < ActiveRecord::Migration
+  def self.up
+    drop_table :checkouts
+    drop_table :transactions
+    drop_table :open_id_authentication_associations
+    drop_table :open_id_authentication_nonces
+  end
+
+  def self.down
+  end
+end

data/db/migrate/20101028151745_remove_number_and_cvv_from_credicard.rb

@@ -0,0 +1,9 @@
+class RemoveNumberAndCvvFromCredicard < ActiveRecord::Migration
+  def self.up
+    remove_column :creditcards, :number
+    remove_column :creditcards, :verification_value
+  end
+
+  def self.down
+  end
+end

data/db/migrate/20101103212716_drop_anonymous_field_for_user.rb

@@ -0,0 +1,8 @@
+class DropAnonymousFieldForUser < ActiveRecord::Migration
+  def self.up
+    remove_column :users, :anonymous
+  end
+
+  def self.down
+  end
+end

data/db/seeds.rb

@@ -0,0 +1,3 @@
+# Loads seed data out of default dir
+Rake::Task["db:load_dir"].invoke( "default" )
+puts "Default data has been loaded"

data/lib/generators/spree_core/upgrade_generator.rb

@@ -0,0 +1,23 @@
+module SpreeCore
+  module Generators
+    class UpgradeGenerator < Rails::Generators::Base
+      source_root File.expand_path("../../templates", __FILE__)
+
+      desc "Upgrade an existing Rails application to use with a new version of Spree."
+
+      def copy_migrations
+        directory "db"
+        create_file ".rspec", "--colour"
+      end
+
+      def copy_public
+        directory "public"
+      end
+
+      def config_middleware
+        application 'config.middleware.use "SeoAssist"'
+        application 'config.middleware.use "RedirectLegacyProductUrl"'
+      end
+    end
+  end
+end

data/lib/scopes/product.rb

@@ -54,11 +54,6 @@ module Scopes::Product
   #   Product.not_deleted.available(args.first).scope(:find)
   # }
 
-  ::Product.scope :keywords, lambda{|query|
-    return {} if query.blank?
-    Spree::Config.searcher.get_products_conditions_for(query)
-  }
-
   ::Product.scope :price_between, lambda {|low,high|
     { :joins => :master, :conditions => ["variants.price BETWEEN ? AND ?", low, high] }
   }

data/lib/spree/config.rb

@@ -19,12 +19,12 @@ module Spree
         @configuration
       end
 
-      def searcher
-        @searcher ||= Spree::Search::Base.new
+      def searcher_class
+        @searcher_class ||= Spree::Search::Base
       end
 
-      def searcher=(searcher_obj)
-        @searcher = searcher_obj
+      def searcher_class=(sclass)
+        @searcher_class = sclass
       end
     end
   end

data/lib/spree/current_order.rb

@@ -1,14 +1,22 @@
 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.
+    def before_save_new_order
+    end
+
     # The current incomplete order from the session for use in cart and during checkout
     def current_order(create_order_if_necessary = false)
       return @current_order if @current_order
       @current_order ||= Order.find_by_id(session[:order_id], :include => :adjustments)
-      if create_order_if_necessary and (@current_order.nil? or @current_order.complete?)
-        @current_order = Order.create
+      if create_order_if_necessary and (@current_order.nil? or @current_order.completed?)
+        @current_order = Order.new
+        before_save_new_order
+        @current_order.save!
       end
       session[:order_id] = @current_order ? @current_order.id : nil
       @current_order
     end
   end
-end
+end

data/lib/spree/i18n_utils.rb

@@ -0,0 +1,47 @@
+require 'rails'
+
+module Spree
+  module I18nUtils
+
+    # #Retrieve comments, translation data in hash form
+    def read_file(filename, basename)
+      (comments, data) = IO.read(filename).split(/\n#{basename}:\s*\n/)   #Add error checking for failed file read?
+      return comments, create_hash(data)
+    end
+
+    #Creates hash of translation data
+    def create_hash(data)
+      words = Hash.new
+      return words if !data
+      parent = Array.new
+      previous_key = 'base'
+      data.split("\n").each do |w|
+        next if w.strip.blank?
+        (key, value) = w.split(':', 2)
+        value ||= ''
+        shift = (key =~ /\w/)/2 - parent.size                             #Determine level of current key in comparison to parent array
+        key = key.sub(/^\s+/,'')
+        parent << previous_key if shift > 0                               #If key is child of previous key, add previous key as parent
+        (shift*-1).times { parent.pop } if shift < 0                      #If key is not related to previous key, remove parent keys
+        previous_key = key                                                #Track key in case next key is child of this key
+        words[parent.join(':')+':'+key] = value
+      end
+      words
+    end
+
+    #Writes to file from translation data hash structure
+    def write_file(filename,basename,comments,words,comment_values=true, fallback_values={})
+      File.open(filename, "w") do |log|
+        log.puts(comments+"\n"+basename+": \n")
+        words.sort.each do |k,v|
+          keys = k.split(':')
+          (keys.size-1).times { keys[keys.size-1] = '  ' + keys[keys.size-1] }   #Add indentation for children keys
+          value = v.strip
+          value = ("#" + value) if comment_values and not value.blank?
+          log.puts "#{keys[keys.size-1]}: #{value}\n"
+        end
+      end
+    end
+
+  end
+end

data/lib/spree/mail_interceptor.rb

@@ -0,0 +1,23 @@
+# Allows us to intercept any outbound mail message and make last minute changes (such as specifying a "from" address or
+# sending to a test email account.)
+#
+# See http://railscasts.com/episodes/206-action-mailer-in-rails-3 for more details.
+module Spree
+  class MailInterceptor
+
+    def self.delivering_email(message)
+      return unless mail_method = MailMethod.current
+      message.from ||= mail_method.preferred_mails_from
+
+      if mail_method.preferred_intercept_email.present?
+        message.subject = "[#{message.to}] #{message.subject}"
+        message.to = mail_method.preferred_intercept_email
+      end
+
+      if mail_method.preferred_mail_bcc.present?
+        message.bcc = mail_method.preferred_mail_bcc
+      end
+    end
+
+  end
+end

data/lib/spree/mail_settings.rb

@@ -0,0 +1,34 @@
+module Spree
+  module MailSettings
+
+    # 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
+      if mail_method.prefers_enable_mail_delivery?
+        mail_server_settings = {
+          :address => mail_method.preferred_mail_host,
+          :domain => mail_method.preferred_mail_domain,
+          :port => mail_method.preferred_mail_port,
+          :authentication => mail_method.preferred_mail_auth_type
+        }
+
+        if mail_method.preferred_mail_auth_type != 'none'
+          mail_server_settings[:user_name] = mail_method.preferred_smtp_username
+          mail_server_settings[:password] = mail_method.preferred_smtp_password
+        end
+
+        ActionMailer::Base.smtp_settings = mail_server_settings
+        ActionMailer::Base.perform_deliveries = true
+
+        if mail_method.preferred_secure_connection_type == 'TLS'
+          mail_server_settings[:enable_starttls_auto] = true
+        end
+      else
+        #logger.warn "NOTICE: Mail not enabled"
+        ActionMailer::Base.perform_deliveries = false
+      end
+    end
+
+  end
+end

data/lib/spree/search/base.rb

@@ -2,20 +2,64 @@ module Spree::Search
   class Base
     attr_accessor :properties
 
-    def initialize
+    def initialize(params)
       @properties = {}
+      prepare(params)
     end
 
-    # method should return hash with conditions {:conditions=> "..."} for Product model
-    def get_products_conditions_for(query)
-      Product.like_any([:name, :description], query.split)
-    end
+    def retrieve_products
+      base_scope = get_base_scope
+      @products_scope = @product_group.apply_on(base_scope)
 
-    def prepare(params)
+      curr_page = manage_pagination && keywords ? 1 : page
+      @products = @products_scope.all.paginate({
+          :include  => [:images, :master],
+          :per_page => per_page,
+          :page     => curr_page
+        })
+
+      return @products
     end
 
     def method_missing(name)
       @properties[name]
     end
+
+    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 = 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
+    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)
+    end
+
+    def prepare(params)
+      @properties[:taxon] = params[:taxon].blank? ? nil : Taxon.find(params[:taxon])
+      @properties[:keywords] = params[:keywords]
+
+      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 
+      
+      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])
+      else
+        @product_group = ProductGroup.new
+      end
+      @product_group = @product_group.from_search(params[:search]) if params[:search]
+      
+    end
   end
 end

data/lib/spree_core.rb

@@ -46,7 +46,6 @@ require 'spree_core/validation_group'
 require 'spree_core/enumerable_constants'
 require 'spree_core/find_by_param'
 require 'spree_core/ssl_requirement'
-require 'spree_core/preferences/mail_settings'
 require 'spree_core/preferences/model_hooks'
 require 'spree_core/preferences/preference_definition'
 require 'store_helpers'
@@ -55,12 +54,18 @@ require 'spree/calculated_adjustments'
 require 'spree/current_order'
 require 'spree/preference_access'
 require 'spree/config'
+require 'spree/mail_settings'
+require 'spree/mail_interceptor'
 require 'redirect_legacy_product_url'
 require 'seo_assist'
 
+silence_warnings do
+  require 'spree_core/authorize_net_cim_hack'
+end
+
 module Spree
   def self.version
-    "0.30.0.beta1"
+    "0.30.0"
   end
 end
 
@@ -87,12 +92,7 @@ module SpreeCore
           Gateway::PayPal,
           Gateway::SagePay,
           Gateway::Beanstream,
-          PaymentMethod::Check,
-
-          Calculator::FlatPercentItemTotal,
-          Calculator::FlexiRate,
-          Calculator::PerItem,
-          Calculator::PriceBucket
+          PaymentMethod::Check
         ].each{|gw|
           begin
             gw.register
@@ -109,6 +109,7 @@ module SpreeCore
           Calculator::PerItem,
           Calculator::SalesTax,
           Calculator::Vat,
+          Calculator::PriceBucket
         ].each{|c_model|
           begin
             c_model.register if c_model.table_exists?

data/lib/spree_core/ext/active_record.rb

@@ -2,11 +2,13 @@ module ActiveRecord::Persistence
 
   # Update attributes of a record in the database without callbacks, validations etc.
   def update_attributes_without_callbacks(attributes)
+    self.send(:attributes=, attributes, false)
     self.class.update_all(attributes, { :id => id })
   end
 
   # Update a single attribute in the database
   def update_attribute_without_callbacks(name, value)
+    send("#{name}=", value)
     update_attributes_without_callbacks(name => value)
   end
 

data/lib/spree_core/ssl_requirement.rb

@@ -71,39 +71,33 @@ module SslRequirement
   protected
     # Returns true if the current action is supposed to run as SSL
     def ssl_required?
-      (self.class.read_inheritable_attribute(:ssl_required_actions) || []).include?(action_name.to_sym)
+      actions = self.class.read_inheritable_attribute(:ssl_required_actions)
+      return false if actions.nil?
+      actions.empty? || actions.include?(action_name.to_sym)
     end
 
     def ssl_allowed?
-      (self.class.read_inheritable_attribute(:ssl_allowed_actions) || []).include?(action_name.to_sym)
+      actions = self.class.read_inheritable_attribute(:ssl_allowed_actions)
+      return false if actions.nil?
+      actions.empty? || actions.include?(action_name.to_sym)
     end
 
   private
-    def dvp_mode?
-      ENV['RAILS_ENV'] == 'development'
-    end
-
-    def test_mode?
-      ENV['RAILS_ENV'] == 'test' || ENV['RAILS_ENV'] == 'cucumber'
-    end
 
-    # don't require ssl in development or test mode
     def ssl_supported?
-      ((dvp_mode? || test_mode?) && Spree::Config[:allow_ssl_in_development_and_test]) ||
-      (!dvp_mode? && !test_mode? && Spree::Config[:allow_ssl_in_production]) ? true : false
+      return true if (Rails.env.development? or Rails.env.test?) and Spree::Config[:allow_ssl_in_development_and_test]
+      (Rails.env.staging? or Rails.env.production?) and Spree::Config[:allow_ssl_in_production]
     end
 
     def ensure_proper_protocol
       return true if ssl_allowed?
-
       if ssl_required? && !request.ssl? && ssl_supported?
         redirect_to "https://" + request.host + request.fullpath
         flash.keep
-        return false
       elsif request.ssl? && !ssl_required?
         redirect_to "http://" + request.host + request.fullpath
         flash.keep
-        return false
       end
+
     end
 end