spree_core 2.0.13 → 2.1.0

data/db/default/spree/states.rb

@@ -1,57 +1,58 @@
-# encoding: utf-8
-country = Spree::Country.find_by_name('United States')
+country = Spree::Country.find_by(name: 'United States')
 
-Spree::State.create!({"name"=>"Michigan", "abbr"=>"MI", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"South Dakota", "abbr"=>"SD", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Washington", "abbr"=>"WA", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Wisconsin", "abbr"=>"WI", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Arizona", "abbr"=>"AZ", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Illinois", "abbr"=>"IL", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"New Hampshire", "abbr"=>"NH", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"North Carolina", "abbr"=>"NC", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Kansas", "abbr"=>"KS", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Missouri", "abbr"=>"MO", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Arkansas", "abbr"=>"AR", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Nevada", "abbr"=>"NV", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"District of Columbia", "abbr"=>"DC", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Idaho", "abbr"=>"ID", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Nebraska", "abbr"=>"NE", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Pennsylvania", "abbr"=>"PA", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Hawaii", "abbr"=>"HI", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Utah", "abbr"=>"UT", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Vermont", "abbr"=>"VT", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Delaware", "abbr"=>"DE", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Rhode Island", "abbr"=>"RI", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Oklahoma", "abbr"=>"OK", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Louisiana", "abbr"=>"LA", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Montana", "abbr"=>"MT", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Tennessee", "abbr"=>"TN", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Maryland", "abbr"=>"MD", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Florida", "abbr"=>"FL", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Virginia", "abbr"=>"VA", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Minnesota", "abbr"=>"MN", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"New Jersey", "abbr"=>"NJ", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Ohio", "abbr"=>"OH", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"California", "abbr"=>"CA", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"North Dakota", "abbr"=>"ND", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Maine", "abbr"=>"ME", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Indiana", "abbr"=>"IN", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Texas", "abbr"=>"TX", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Oregon", "abbr"=>"OR", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Wyoming", "abbr"=>"WY", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Alabama", "abbr"=>"AL", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Iowa", "abbr"=>"IA", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Mississippi", "abbr"=>"MS", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Kentucky", "abbr"=>"KY", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"New Mexico", "abbr"=>"NM", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Georgia", "abbr"=>"GA", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Colorado", "abbr"=>"CO", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Massachusetts", "abbr"=>"MA", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Connecticut", "abbr"=>"CT", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"New York", "abbr"=>"NY", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"South Carolina", "abbr"=>"SC", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"Alaska", "abbr"=>"AK", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"West Virginia", "abbr"=>"WV", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"U.S. Armed Forces – Americas", "abbr"=>"AA", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"U.S. Armed Forces – Europe", "abbr"=>"AE", :country=>country}, :without_protection => true)
-Spree::State.create!({"name"=>"U.S. Armed Forces – Pacific", "abbr"=>"AP", :country=>country}, :without_protection => true)
+Spree::State.create!([
+  { name: 'Michigan', abbr: 'MI', country: country },
+  { name: 'South Dakota', abbr: 'SD', country: country },
+  { name: 'Washington', abbr: 'WA', country: country },
+  { name: 'Wisconsin', abbr: 'WI', country: country },
+  { name: 'Arizona', abbr: 'AZ', country: country },
+  { name: 'Illinois', abbr: 'IL', country: country },
+  { name: 'New Hampshire', abbr: 'NH', country: country },
+  { name: 'North Carolina', abbr: 'NC', country: country },
+  { name: 'Kansas', abbr: 'KS', country: country },
+  { name: 'Missouri', abbr: 'MO', country: country },
+  { name: 'Arkansas', abbr: 'AR', country: country },
+  { name: 'Nevada', abbr: 'NV', country: country },
+  { name: 'District of Columbia', abbr: 'DC', country: country },
+  { name: 'Idaho', abbr: 'ID', country: country },
+  { name: 'Nebraska', abbr: 'NE', country: country },
+  { name: 'Pennsylvania', abbr: 'PA', country: country },
+  { name: 'Hawaii', abbr: 'HI', country: country },
+  { name: 'Utah', abbr: 'UT', country: country },
+  { name: 'Vermont', abbr: 'VT', country: country },
+  { name: 'Delaware', abbr: 'DE', country: country },
+  { name: 'Rhode Island', abbr: 'RI', country: country },
+  { name: 'Oklahoma', abbr: 'OK', country: country },
+  { name: 'Louisiana', abbr: 'LA', country: country },
+  { name: 'Montana', abbr: 'MT', country: country },
+  { name: 'Tennessee', abbr: 'TN', country: country },
+  { name: 'Maryland', abbr: 'MD', country: country },
+  { name: 'Florida', abbr: 'FL', country: country },
+  { name: 'Virginia', abbr: 'VA', country: country },
+  { name: 'Minnesota', abbr: 'MN', country: country },
+  { name: 'New Jersey', abbr: 'NJ', country: country },
+  { name: 'Ohio', abbr: 'OH', country: country },
+  { name: 'California', abbr: 'CA', country: country },
+  { name: 'North Dakota', abbr: 'ND', country: country },
+  { name: 'Maine', abbr: 'ME', country: country },
+  { name: 'Indiana', abbr: 'IN', country: country },
+  { name: 'Texas', abbr: 'TX', country: country },
+  { name: 'Oregon', abbr: 'OR', country: country },
+  { name: 'Wyoming', abbr: 'WY', country: country },
+  { name: 'Alabama', abbr: 'AL', country: country },
+  { name: 'Iowa', abbr: 'IA', country: country },
+  { name: 'Mississippi', abbr: 'MS', country: country },
+  { name: 'Kentucky', abbr: 'KY', country: country },
+  { name: 'New Mexico', abbr: 'NM', country: country },
+  { name: 'Georgia', abbr: 'GA', country: country },
+  { name: 'Colorado', abbr: 'CO', country: country },
+  { name: 'Massachusetts', abbr: 'MA', country: country },
+  { name: 'Connecticut', abbr: 'CT', country: country },
+  { name: 'New York', abbr: 'NY', country: country },
+  { name: 'South Carolina', abbr: 'SC', country: country },
+  { name: 'Alaska', abbr: 'AK', country: country },
+  { name: 'West Virginia', abbr: 'WV', country: country },
+  { name: 'U.S. Armed Forces - Americas', abbr: 'AA', country: country },
+  { name: 'U.S. Armed Forces - Europe', abbr: 'AE', country: country },
+  { name: 'U.S. Armed Forces - Pacific', abbr: 'AP', country: country }
+])

data/db/default/spree/zones.rb

@@ -1,17 +1,17 @@
-eu_vat = Spree::Zone.create!(:name => "EU_VAT", :description => "Countries that make up the EU VAT zone.")
-north_america = Spree::Zone.create!(:name => "North America", :description => "USA + Canada")
+eu_vat = Spree::Zone.create!(name: "EU_VAT", description: "Countries that make up the EU VAT zone.")
+north_america = Spree::Zone.create!(name: "North America", description: "USA + Canada")
 
 ["Poland", "Finland", "Portugal", "Romania", "Germany", "France",
  "Slovakia", "Hungary", "Slovenia", "Ireland", "Austria", "Spain",
  "Italy", "Belgium", "Sweden", "Latvia", "Bulgaria", "United Kingdom",
  "Lithuania", "Cyprus", "Luxembourg", "Malta", "Denmark", "Netherlands",
  "Estonia"].
-each do |name| 
-  eu_vat.zone_members.create!(:zoneable => Spree::Country.find_by_name!(name))
+each do |name|
+  eu_vat.zone_members.create!(zoneable: Spree::Country.find_by!(name: name))
 end
 
 ["United States", "Canada"].each do |name|
-  north_america.zone_members.create!(:zoneable => Spree::Country.find_by_name!(name))
+  north_america.zone_members.create!(zoneable: Spree::Country.find_by!(name: name))
 end
 
 

data/db/migrate/20130213191427_create_default_stock.rb

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

data/db/migrate/20130417120035_update_adjustment_states.rb

@@ -1,10 +1,10 @@
 class UpdateAdjustmentStates < ActiveRecord::Migration
   def up
-    Spree::Order.complete.find_each do |order|
+    Spree::Order.complete.each do |order|
       order.adjustments.update_all(:state => 'closed')
     end
 
-    Spree::Shipment.shipped.includes(:adjustment).find_each do |shipment|
+    Spree::Shipment.shipped.each do |shipment|
       shipment.adjustment.update_column(:state, 'finalized') if shipment.adjustment
     end
 

data/db/migrate/20130417123427_add_shipping_rates_to_shipments.rb

@@ -1,6 +1,6 @@
 class AddShippingRatesToShipments < ActiveRecord::Migration
   def up
-    Spree::Shipment.find_each do |shipment|
+    Spree::Shipment.all.each do |shipment|
       shipment.shipping_rates.create(:shipping_method_id => shipment.shipping_method_id,
                                      :cost => shipment.cost,
                                      :selected => true)

data/db/migrate/20130509115210_add_number_to_stock_transfer.rb

@@ -6,7 +6,7 @@ class AddNumberToStockTransfer < ActiveRecord::Migration
     rename_column :spree_stock_transfers, :reference_number, :reference
     add_column :spree_stock_transfers, :number, :string
 
-    Spree::StockTransfer.find_each do |transfer|
+    Spree::StockTransfer.all.each do |transfer|
       transfer.send(:generate_stock_transfer_number)
       transfer.save!
     end

data/db/migrate/20130611054351_rename_shipping_methods_zones_to_spree_shipping_methods_zones.rb

@@ -1,10 +1,5 @@
 class RenameShippingMethodsZonesToSpreeShippingMethodsZones < ActiveRecord::Migration
   def change
     rename_table :shipping_methods_zones, :spree_shipping_methods_zones
-    # If Spree::ShippingMethod zones association was patched in
-    # CreateShippingMethodZone migrations, it needs to be patched back
-    Spree::ShippingMethod.has_and_belongs_to_many :zones, :join_table => 'spree_shipping_methods_zones',
-                                                          :class_name => 'Spree::Zone',
-                                                          :foreign_key => 'shipping_method_id'
   end
 end

data/db/migrate/20130611185927_add_user_id_index_to_spree_orders.rb

@@ -0,0 +1,5 @@
+class AddUserIdIndexToSpreeOrders < ActiveRecord::Migration
+  def change
+    add_index :spree_orders, :user_id
+  end
+end

data/db/migrate/20130618041418_add_updated_at_to_spree_countries.rb

@@ -0,0 +1,9 @@
+class AddUpdatedAtToSpreeCountries < ActiveRecord::Migration
+  def up
+    add_column :spree_countries, :updated_at, :datetime
+  end
+
+  def down
+    remove_column :spree_countries, :updated_at
+  end
+end

data/db/migrate/20130619012236_add_updated_at_to_spree_states.rb

@@ -0,0 +1,9 @@
+class AddUpdatedAtToSpreeStates < ActiveRecord::Migration
+  def up
+    add_column :spree_states, :updated_at, :datetime
+  end
+
+  def down
+    remove_column :spree_states, :updated_at
+  end
+end

data/db/migrate/20130802022321_migrate_tax_categories_to_line_items.rb

@@ -1,10 +1,9 @@
 class MigrateTaxCategoriesToLineItems < ActiveRecord::Migration
   def change
-    Spree::LineItem.find_each do |line_item|
-      next if line_item.variant.nil?
-      next if line_item.variant.product.nil?
-      next if line_item.product.nil?
-      line_item.update_column(:tax_category_id, line_item.product.tax_category_id)
+  	Spree::LineItem.includes(:variant => { :product => :tax_category }).find_in_batches do |line_items|
+  	  line_items.each do |line_item|
+        line_item.update_column(:tax_category_id, line_item.product.tax_category_id)
+      end
     end
   end
 end

data/db/migrate/20130806145853_set_default_stock_location_on_shipments.rb

@@ -1,7 +1,7 @@
 class SetDefaultStockLocationOnShipments < ActiveRecord::Migration
   def change
     if Spree::Shipment.where('stock_location_id IS NULL').count > 0
-      location = Spree::StockLocation.find_by_name('default') || Spree::StockLocation.first
+      location = Spree::StockLocation.find_by(name: 'default') || Spree::StockLocation.first
       Spree::Shipment.where('stock_location_id IS NULL').update_all(stock_location_id: location.id)
     end
   end

data/lib/generators/spree/dummy/dummy_generator.rb

@@ -53,9 +53,9 @@ module Spree
     def test_dummy_inject_extension_requirements
       if DummyGeneratorHelper.inject_extension_requirements
         inside dummy_path do
-          inject_require_for('spree_frontend')
-          inject_require_for('spree_backend')
-          inject_require_for('spree_api')
+          %w(spree_frontend spree_backend spree_api).each do |requirement|
+            inject_into_file 'config/application.rb', "require '#{requirement}'\n", :before => /require '#{@lib_name}'/, :verbose => true
+          end
         end
       end
     end
@@ -82,17 +82,6 @@ module Spree
     attr :database
 
     protected
-
-    def inject_require_for(requirement)
-      inject_into_file 'config/application.rb', %Q[
-begin
-  require '#{requirement}'
-rescue LoadError
-  # #{requirement} is not available.
-end
-      ], :before => /require '#{@lib_name}'/, :verbose => true
-    end
-
     def dummy_path
       ENV['DUMMY_PATH'] || 'spec/dummy'
     end

data/lib/generators/spree/dummy/templates/rails/database.yml

@@ -27,31 +27,21 @@ production:
   database: <%= database_prefix %>spree_production
   encoding: utf8
 <% when 'postgres' %>
-<% db_host = ENV['DB_HOST'] -%>
 development:
   adapter: postgresql
   database: <%= database_prefix %>spree_development
   username: postgres
   min_messages: warning
-<% unless db_host.blank? %>
-  host: <%= db_host %>
-<% end %>
 test:
   adapter: postgresql
   database: <%= database_prefix %>spree_test
   username: postgres
   min_messages: warning
-<% unless db_host.blank? %>
-  host: <%= db_host %>
-<% end %>
 production:
   adapter: postgresql
   database: <%= database_prefix %>spree_production
   username: postgres
   min_messages: warning
-<% unless db_host.blank? %>
-  host: <%= db_host %>
-<% end %>
 <% else %>
 development:
   adapter: sqlite3

data/lib/generators/spree/dummy/templates/rails/test.rb

@@ -11,13 +11,12 @@ Dummy::Application.configure do
   config.serve_static_assets = true
   config.static_cache_control = "public, max-age=3600"
 
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
-
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
+  config.eager_load = false
+
   # Raise exceptions instead of rendering exception templates
   config.action_dispatch.show_exceptions = false
 
@@ -30,10 +29,6 @@ Dummy::Application.configure do
   config.action_mailer.delivery_method = :test
   ActionMailer::Base.default :from => "spree@example.com"
 
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
-
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
 end
-

data/lib/generators/spree/install/install_generator.rb

@@ -70,14 +70,19 @@ Disallow: /account
     def setup_assets
       @lib_name = 'spree'
       %w{javascripts stylesheets images}.each do |path|
-        empty_directory "app/assets/#{path}/store"
-        empty_directory "app/assets/#{path}/admin"
+        empty_directory "app/assets/#{path}/store" if defined? Spree::Frontend || Rails.env.test?
+        empty_directory "app/assets/#{path}/admin" if defined? Spree::Backend || Rails.env.test?
       end
 
-      template "app/assets/javascripts/store/all.js"
-      template "app/assets/javascripts/admin/all.js"
-      template "app/assets/stylesheets/store/all.css"
-      template "app/assets/stylesheets/admin/all.css"
+      if defined? Spree::Frontend || Rails.env.test?
+        template "app/assets/javascripts/store/all.js"
+        template "app/assets/stylesheets/store/all.css"
+      end
+
+      if defined? Spree::Backend || Rails.env.test?
+        template "app/assets/javascripts/admin/all.js"
+        template "app/assets/stylesheets/admin/all.css"
+      end
     end
 
     def create_overrides_directory
@@ -99,8 +104,6 @@ Disallow: /account
       end
     end
       APP
-
-      append_file "config/environment.rb", "\nActiveRecord::Base.include_root_in_json = false\n"
     end
 
     def include_seed_data

data/lib/spree/core/calculated_adjustments.rb

@@ -5,7 +5,6 @@ module Spree
         klass.class_eval do
           has_one   :calculator, :class_name => "Spree::Calculator", :as => :calculable, :dependent => :destroy
           accepts_nested_attributes_for :calculator
-          attr_accessible :calculator_type, :calculator_attributes
           validates :calculator, :presence => true
 
           def self.calculators
@@ -33,12 +32,14 @@ module Spree
             calculable = calculable.to_package if calculable.is_a?(Spree::Shipment)
             amount = compute_amount(calculable)
             return if amount == 0 && !mandatory
-            target.adjustments.create({ :amount => amount,
-                                        :source => old_calculable,
-                                        :originator => self,
-                                        :label => label,
-                                        :mandatory => mandatory,
-                                        :state => state }, :without_protection => true)
+            target.adjustments.create(
+              :amount => amount,
+              :source => old_calculable,
+              :originator => self,
+              :label => label,
+              :mandatory => mandatory,
+              :state => state
+            )
           end
 
           # Updates the amount of the adjustment using our Calculator and calling the +compute+ method with the +calculable+
@@ -49,7 +50,7 @@ module Spree
             # It's only the package that contains the correct information.
             # See https://github.com/spree/spree_active_shipping/pull/96 et. al
             calculable = calculable.to_package if calculable.is_a?(Spree::Shipment)
-            adjustment.update_attribute_without_callbacks(:amount, compute_amount(calculable))
+            adjustment.update_column(:amount, compute_amount(calculable))
           end
 
           # Calculate the amount to be used when creating an adjustment

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

@@ -9,7 +9,7 @@ module Spree
           helper_method :try_spree_current_user
 
           rescue_from CanCan::AccessDenied do |exception|
-            return unauthorized
+            unauthorized
           end
         end
 
@@ -27,8 +27,7 @@ module Spree
             redirect_to '/unauthorized'
           else
             store_location
-            url = spree.respond_to?(:login_path) ? spree.login_path : spree.root_path
-            redirect_to url
+            redirect_to respond_to?(:spree_login_path) ? spree_login_path : spree.root_path
           end
         end
 

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

@@ -11,16 +11,13 @@ module Spree
         end
 
         # The current incomplete order from the session for use in cart and during checkout
-        def current_order(options = {})
-          options[:create_order_if_necessary] ||= false
-          options[:lock] ||= false
+        def current_order(create_order_if_necessary = false)
           return @current_order if @current_order
           if session[:order_id]
-            current_order = Spree::Order.includes(:adjustments).lock(options[:lock]).where(id: session[:order_id], currency: current_currency).first
+            current_order = Spree::Order.includes(:adjustments).find_by(id: session[:order_id], currency: current_currency)
             @current_order = current_order unless current_order.try(:completed?)
           end
-
-          if options[:create_order_if_necessary] and (@current_order.nil? or @current_order.completed?)
+          if create_order_if_necessary and (@current_order.nil? or @current_order.completed?)
             @current_order = Spree::Order.new(currency: current_currency)
             @current_order.user ||= try_spree_current_user
             # See issue #3346 for reasons why this line is here
@@ -42,16 +39,14 @@ module Spree
         def associate_user
           @order ||= current_order
           if try_spree_current_user && @order
-            if @order.user.blank? || @order.email.blank?
-              @order.associate_user!(try_spree_current_user)
-            end
+            @order.associate_user!(try_spree_current_user) if @order.user.blank? || @order.email.blank?
           end
 
           # This will trigger any "first order" promotions to be triggered
           # Assuming of course that this session variable was set correctly in
           # the authentication provider's registrations controller
           if session[:spree_user_signup] && @order
-            fire_event('spree.user.signup', :user => try_spree_current_user, :order => @order)
+            fire_event('spree.user.signup', user: try_spree_current_user, order: @order)
             session[:spree_user_signup] = nil
           end
 
@@ -63,8 +58,8 @@ module Spree
             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(create_order_if_necessary: true) && last_incomplete_order && current_order != last_incomplete_order
-              current_order.merge!(last_incomplete_order, user)
+            elsif current_order(true) && last_incomplete_order && current_order != last_incomplete_order
+              current_order.merge!(last_incomplete_order)
             end
           end
         end
@@ -74,7 +69,7 @@ module Spree
         end
 
         def ip_address
-          request.remote_ip
+          request.env['HTTP_X_REAL_IP'] || request.env['REMOTE_ADDR']
         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)
-            self.ssl_allowed_actions ||= []
-            self.ssl_allowed_actions.concat actions
+            class_attribute :ssl_allowed_actions
+            self.ssl_allowed_actions = actions
           end
 
           def self.ssl_required(*actions)
-            ssl_allowed *actions
+            class_attribute :ssl_required_actions
+            self.ssl_required_actions = actions
             if ssl_supported?
-              if actions.empty? or Rails.application.config.force_ssl
+              if ssl_required_actions.empty? or Rails.application.config.force_ssl
                 force_ssl
               else
-                force_ssl :only => actions
+                force_ssl :only => ssl_required_actions
               end
             end
           end
@@ -31,28 +31,19 @@ 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)
-              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
+              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
               end
             end
         end

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

@@ -0,0 +1,36 @@
+module Spree
+  module Core
+    module ControllerHelpers
+      module StrongParameters
+        def permitted_attributes
+          Spree::PermittedAttributes
+        end
+
+        delegate *Spree::PermittedAttributes::ATTRIBUTES,
+                 :to => :permitted_attributes,
+                 :prefix => :permitted
+
+        def permitted_payment_attributes
+          permitted_attributes.payment_attributes + [
+            :source_attributes => permitted_source_attributes
+          ]
+        end
+
+        def permitted_checkout_attributes
+          permitted_attributes.checkout_attributes + [
+            :bill_address_attributes => permitted_address_attributes,
+            :ship_address_attributes => permitted_address_attributes,
+            :payments_attributes => permitted_payment_attributes,
+            :shipments_attributes => permitted_shipment_attributes
+          ]
+        end
+
+        def permitted_order_attributes
+          permitted_checkout_attributes + [
+            :line_items_attributes => permitted_line_item_attributes
+          ]
+        end
+      end
+    end
+  end
+end