spree_core 2.1.1 → 2.1.2

data/db/migrate/20130213191427_create_default_stock.rb

@@ -4,10 +4,13 @@ class CreateDefaultStock < ActiveRecord::Migration
     Spree::StockItem.skip_callback(:save, :after, :process_backorders)
     location = Spree::StockLocation.new(name: 'default')
     location.save(validate: false)
+
     Spree::Variant.all.each do |variant|
-      stock_item = location.stock_items.build(variant: variant)
+      stock_item = Spree::StockItem.unscoped.build(stock_location: location, variant: variant)
       stock_item.send(:count_on_hand=, variant.count_on_hand)
-      stock_item.save!
+      # Avoid running default_scope defined by acts_as_paranoid, related to #3805,
+      # validations would run a query with a delete_at column tha might not be present yet
+      stock_item.save! validate: false
     end
 
     remove_column :spree_variants, :count_on_hand

data/db/migrate/20130830001033_add_shipping_category_to_shipping_methods_and_products.rb

@@ -0,0 +1,15 @@
+class AddShippingCategoryToShippingMethodsAndProducts < ActiveRecord::Migration
+  def up
+    default_category = Spree::ShippingCategory.first
+    default_category ||= Spree::ShippingCategory.create!(:name => "Default")
+
+    Spree::ShippingMethod.all.each do |method|
+      method.shipping_categories << default_category if method.shipping_categories.blank?
+    end
+
+    Spree::Product.where(shipping_category_id: nil).update_all(shipping_category_id: default_category.id)
+  end
+
+  def down
+  end
+end

data/db/migrate/20130830001159_migrate_old_shipping_calculators.rb

@@ -0,0 +1,19 @@
+class MigrateOldShippingCalculators < ActiveRecord::Migration
+  def up
+    Spree::ShippingMethod.all.each do |shipping_method|
+      old_calculator = shipping_method.calculator
+      next if old_calculator.class < Spree::ShippingCalculator # We don't want to mess with new shipping calculators
+      new_calculator = eval("Spree::Calculator::Shipping::#{old_calculator.class.name.demodulize}").new
+      new_calculator.preferences.keys.each do |pref|
+        # Preferences can't be read/set by name, you have to prefix preferred_
+        pref_method = "preferred_#{pref}"
+        new_calculator.send("#{pref_method}=", old_calculator.send(pref_method))
+      end
+      new_calculator.calculable = old_calculator.calculable
+      new_calculator.save
+    end
+  end
+
+  def down
+  end
+end

data/db/migrate/20130909115621_change_states_required_for_countries.rb

@@ -0,0 +1,9 @@
+class ChangeStatesRequiredForCountries < ActiveRecord::Migration
+  def up
+    change_column_default :spree_countries, :states_required, false
+  end
+
+  def down
+    change_column_default :spree_countries, :states_required, true
+  end
+end

data/db/migrate/20131001013410_remove_unused_credit_card_fields.rb

@@ -0,0 +1,12 @@
+class RemoveUnusedCreditCardFields < ActiveRecord::Migration
+  def up
+    remove_column :spree_credit_cards, :start_month
+    remove_column :spree_credit_cards, :start_year
+    remove_column :spree_credit_cards, :issue_number
+  end
+  def down
+    add_column :spree_credit_cards, :start_month,  :string
+    add_column :spree_credit_cards, :start_year,   :string
+    add_column :spree_credit_cards, :issue_number, :string
+  end
+end

data/lib/spree/core/controller_helpers/order.rb

@@ -59,7 +59,7 @@ module Spree
             if session[:order_id].nil? && last_incomplete_order
               session[:order_id] = last_incomplete_order.id
             elsif current_order(true) && last_incomplete_order && current_order != last_incomplete_order
-              current_order.merge!(last_incomplete_order)
+              current_order.merge!(last_incomplete_order, user)
             end
           end
         end

data/lib/spree/core/controller_helpers/ssl.rb

@@ -6,20 +6,20 @@ module Spree
 
         included do
           before_filter :force_non_ssl_redirect, :if => Proc.new { Spree::Config[:redirect_https_to_http] }
+          class_attribute :ssl_allowed_actions
 
           def self.ssl_allowed(*actions)
-            class_attribute :ssl_allowed_actions
-            self.ssl_allowed_actions = actions
+            self.ssl_allowed_actions ||= []
+            self.ssl_allowed_actions.concat actions
           end
 
           def self.ssl_required(*actions)
-            class_attribute :ssl_required_actions
-            self.ssl_required_actions = actions
+            ssl_allowed *actions
             if ssl_supported?
-              if ssl_required_actions.empty? or Rails.application.config.force_ssl
+              if actions.empty? or Rails.application.config.force_ssl
                 force_ssl
               else
-                force_ssl :only => ssl_required_actions
+                force_ssl :only => actions
               end
             end
           end
@@ -31,19 +31,28 @@ module Spree
           end
 
           private
+            def ssl_allowed?
+              (!ssl_allowed_actions.nil? && (ssl_allowed_actions.empty? || ssl_allowed_actions.include?(action_name.to_sym)))
+            end
 
             # Redirect the existing request to use the HTTP protocol.
             #
             # ==== Parameters
             # * <tt>host</tt> - Redirect to a different host name
             def force_non_ssl_redirect(host = nil)
-              return true if defined?(ssl_allowed_actions) and ssl_allowed_actions.include?(action_name.to_sym)
-              if request.ssl? and (!defined?(ssl_required_actions) or !ssl_required_actions.include?(action_name.to_sym))
-                redirect_options = {:protocol => 'http://', :status => :moved_permanently}
-                redirect_options.merge!(:host => host) if host
-                redirect_options.merge!(:params => request.query_parameters)
-                flash.keep if respond_to?(:flash)
-                redirect_to redirect_options
+              if request.ssl? && !ssl_allowed?
+                if request.get?
+                  redirect_options = {
+                    :protocol => 'http://',
+                    :host     => host || request.host,
+                    :path     => request.fullpath,
+                  }
+                  flash.keep if respond_to?(:flash)
+                  insecure_url = ActionDispatch::Http::URL.url_for(redirect_options)
+                  redirect_to insecure_url, :status => :moved_permanently
+                else
+                  render :text => Spree.t(:change_protocol, :scope => :ssl), :status => :upgrade_required
+                end
               end
             end
         end

data/lib/spree/core/engine.rb

@@ -16,16 +16,6 @@ module Spree
         end
       end
 
-      # We need to reload the routes here due to how Spree sets them up.
-      # The different facets of Spree (backend, frontend, etc.) append/prepend
-      # routes to Core *after* Core has been loaded.
-      #
-      # So we wait until after initialization is complete to do one final reload.
-      # This then makes the appended/prepended routes available to the application.
-      config.after_initialize do
-        Rails.application.routes_reloader.reload!
-      end
-
       initializer "spree.environment", :before => :load_config_initializers do |app|
         app.config.spree = Spree::Core::Environment.new
         Spree::Config = app.config.spree.preferences #legacy access
@@ -111,3 +101,5 @@ module Spree
     end
   end
 end
+
+require 'spree/core/routes'

data/lib/spree/core/permalinks.rb

@@ -14,11 +14,7 @@ module Spree
           options[:field] ||= :permalink
           self.permalink_options = options
 
-          if self.connected?
-            if self.table_exists? && self.column_names.include?(permalink_options[:field].to_s)
-              before_validation(:on => :create) { save_permalink }
-            end
-          end
+          before_validation(:on => :create) { save_permalink }
         end
 
         def find_by_param(value, *args)

data/lib/spree/core/preference_rescue.rb

@@ -0,0 +1,25 @@
+module Spree
+  class OldPrefs < ActiveRecord::Base
+    self.table_name = "spree_preferences"
+    belongs_to  :owner, :polymorphic => true
+    attr_accessor :owner_klass
+  end
+
+  class PreferenceRescue
+    def self.try
+      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"
+          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
+  end
+end

data/lib/spree/core/product_filters.rb

@@ -97,28 +97,26 @@ module Spree
       #   the (uniquely named) field "p_brand.value". There's also a test for brand info
       #   being blank: note that this relies on with_property doing a left outer join
       #   rather than an inner join.
-      if Spree::Property.table_exists?
-        Spree::Product.add_search_scope :brand_any do |*opts|
-          conds = opts.map {|o| ProductFilters.brand_filter[:conds][o]}.reject { |c| c.nil? }
-          scope = conds.shift
-          conds.each do |new_scope|
-            scope = scope.or(new_scope)
-          end
-          Spree::Product.with_property('brand').where(scope)
+      Spree::Product.add_search_scope :brand_any do |*opts|
+        conds = opts.map {|o| ProductFilters.brand_filter[:conds][o]}.reject { |c| c.nil? }
+        scope = conds.shift
+        conds.each do |new_scope|
+          scope = scope.or(new_scope)
         end
+        Spree::Product.with_property('brand').where(scope)
+      end
 
-        def ProductFilters.brand_filter
-          brand_property = Spree::Property.find_by(name: 'brand')
-          brands = brand_property ? Spree::ProductProperty.where(property_id: brand_property.id).pluck(:value).uniq.map(&:to_s) : []
-          pp = Spree::ProductProperty.arel_table
-          conds = Hash[*brands.map { |b| [b, pp[:value].eq(b)] }.flatten]
-          {
-            name:   'Brands',
-            scope:  :brand_any,
-            conds:  conds,
-            labels: (brands.sort).map { |k| [k, k] }
-          }
-        end
+      def ProductFilters.brand_filter
+        brand_property = Spree::Property.find_by(name: 'brand')
+        brands = brand_property ? Spree::ProductProperty.where(property_id: brand_property.id).pluck(:value).uniq.map(&:to_s) : []
+        pp = Spree::ProductProperty.arel_table
+        conds = Hash[*brands.map { |b| [b, pp[:value].eq(b)] }.flatten]
+        {
+          name:   'Brands',
+          scope:  :brand_any,
+          conds:  conds,
+          labels: (brands.sort).map { |k| [k, k] }
+        }
       end
 
       # Example: a parameterized filter
@@ -140,25 +138,23 @@ module Spree
       #
       #   The brand-finding code can be simplified if a few more named scopes were added to
       #   the product properties model.
-      if Spree::Property.table_exists?
-        Spree::Product.add_search_scope :selective_brand_any do |*opts|
-          Spree::Product.brand_any(*opts)
-        end
+      Spree::Product.add_search_scope :selective_brand_any do |*opts|
+        Spree::Product.brand_any(*opts)
+      end
 
-        def ProductFilters.selective_brand_filter(taxon = nil)
-          taxon ||= Spree::Taxonomy.first.root
-          brand_property = Spree::Property.find_by(name: 'brand')
-          scope = Spree::ProductProperty.where(property: brand_property).
-            joins(product: :taxons).
-            where("#{Spree::Taxon.table_name}.id" => [taxon] + taxon.descendants).
-            scoped
-          brands = scope.pluck(:value).uniq
-          {
-            name:   'Applicable Brands',
-            scope:  :selective_brand_any,
-            labels: brands.sort.map { |k| [k, k] }
-          }
-        end
+      def ProductFilters.selective_brand_filter(taxon = nil)
+        taxon ||= Spree::Taxonomy.first.root
+        brand_property = Spree::Property.find_by(name: 'brand')
+        scope = Spree::ProductProperty.where(property: brand_property).
+          joins(product: :taxons).
+          where("#{Spree::Taxon.table_name}.id" => [taxon] + taxon.descendants).
+          scoped
+        brands = scope.pluck(:value).uniq
+        {
+          name:   'Applicable Brands',
+          scope:  :selective_brand_any,
+          labels: brands.sort.map { |k| [k, k] }
+        }
       end
 
       # Provide filtering on the immediate children of a taxon

data/lib/spree/core/routes.rb

@@ -0,0 +1,48 @@
+module Spree
+  module Core
+    class Engine < ::Rails::Engine
+      def self.add_routes(&block)
+        @spree_routes ||= []
+
+        # Anything that causes the application's routes to be reloaded,
+        # will cause this method to be called more than once
+        # i.e. https://github.com/plataformatec/devise/blob/31971e69e6a1bcf6c7f01eaaa44f227c4af5d4d2/lib/devise/rails.rb#L14
+        # In the case of Devise, this *only* happens in the production env
+        # This coupled with Rails 4's insistence that routes are not drawn twice,
+        # poses quite a serious problem.
+        #
+        # This is mainly why this whole file exists in the first place.
+        #
+        # Thus we need to make sure that the routes aren't drawn twice.
+        unless @spree_routes.include?(block)
+          @spree_routes << block
+        end
+      end
+
+      def self.append_routes(&block)
+        @append_routes ||= []
+        # See comment in add_routes.
+        unless @append_routes.include?(block)
+          @append_routes << block
+        end
+      end
+
+      def self.draw_routes(&block)
+        @spree_routes ||= []
+        @append_routes ||= []
+        eval_block(block) if block_given?
+        @spree_routes.each { |r| eval_block(&r) }
+        @append_routes.each { |r| eval_block(&r) }
+        # # Clear out routes so that they aren't drawn twice.
+        @spree_routes = []
+        @append_routes = []
+      end
+
+      private
+
+        def eval_block(&block)
+          Spree::Core::Engine.routes.eval_block(block)
+        end
+    end
+  end
+end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "2.1.1"
+    "2.1.2"
   end
 end

data/lib/spree/money.rb

@@ -33,6 +33,10 @@ module Spree
       output
     end
 
+    def as_json(*)
+      to_s
+    end
+
     def ==(obj)
       @money == obj.money
     end

data/lib/spree/permitted_attributes.rb

@@ -31,7 +31,7 @@ module Spree
       :city, :country_id, :state_id, :zipcode, :phone,
       :state_name, :alternative_phone, :company]
 
-    @@checkout_attributes = [:email, :use_billing, :shipping_method_id, :coupon_code]
+    @@checkout_attributes = [:email, :use_billing, :shipping_method_id, :coupon_code, :special_instructions]
 
     @@image_attributes = [:alt, :attachment, :position, :viewable_type, :viewable_id]
 

data/lib/spree/testing_support/factories/credit_card_factory.rb

@@ -7,7 +7,7 @@ FactoryGirl.define do
   factory :credit_card, class: TestCard do
     verification_value 123
     month 12
-    year 2013
+    year { Time.now.year }
     number '4111111111111111'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2013-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.34.0
+        version: 1.39.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.34.0
+        version: 1.39.2
 - !ruby/object:Gem::Dependency
   name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc.1
+        version: 3.0.0.rc.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc.1
+        version: 3.0.0.rc.2
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -168,14 +168,14 @@ dependencies:
   name: money
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 5.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 5.1.1
 - !ruby/object:Gem::Dependency
@@ -416,13 +416,13 @@ files:
 - app/views/spree/order_mailer/cancel_email.text.erb
 - app/views/spree/order_mailer/confirm_email.text.erb
 - app/views/spree/payments/_payment.html.erb
-- app/views/spree/shared/_address.html.erb
 - app/views/spree/shared/_error_messages.html.erb
 - app/views/spree/shared/_routes.html.erb
 - app/views/spree/shipment_mailer/shipped_email.text.erb
 - app/views/spree/test_mailer/test_email.text.erb
 - config/initializers/user_class_extensions.rb
 - config/locales/en.yml
+- config/routes.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
 - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt
 - lib/generators/spree/custom_user/templates/initializer.rb.tt
@@ -460,8 +460,10 @@ files:
 - lib/spree/core/mail_interceptor.rb
 - lib/spree/core/mail_settings.rb
 - lib/spree/core/permalinks.rb
+- lib/spree/core/preference_rescue.rb
 - lib/spree/core/product_duplicator.rb
 - lib/spree/core/product_filters.rb
+- lib/spree/core/routes.rb
 - lib/spree/core/s3_support.rb
 - lib/spree/core/search/base.rb
 - lib/spree/core/token_resource.rb
@@ -618,7 +620,11 @@ files:
 - db/migrate/20130809164330_add_admin_name_column_to_spree_stock_locations.rb
 - db/migrate/20130813140619_expand_order_number_size.rb
 - db/migrate/20130826062534_add_depth_to_spree_taxons.rb
+- db/migrate/20130830001033_add_shipping_category_to_shipping_methods_and_products.rb
+- db/migrate/20130830001159_migrate_old_shipping_calculators.rb
+- db/migrate/20130909115621_change_states_required_for_countries.rb
 - db/migrate/20130915032339_add_deleted_at_to_spree_stock_items.rb
+- db/migrate/20131001013410_remove_unused_credit_card_fields.rb
 - db/seeds.rb
 - vendor/assets/javascripts/jquery-migrate-1.0.0.js
 - vendor/assets/javascripts/jquery.payment.js