spree_core 2.4.10 → 3.0.0.rc1

data/db/default/spree/countries.rb

@@ -1,19 +1,29 @@
 require 'carmen'
 
-countries = []
-Carmen::Country.all.each do |country|
-  countries << {
-    name: country.name,
-    iso3: country.alpha_3_code,
-    iso: country.alpha_2_code,
-    iso_name: country.name.upcase,
-    numcode: country.numeric_code,
-    states_required: country.subregions?
-  }
-end
+connection      = ActiveRecord::Base.connection
+country_inserts = []
+
+country_values = -> do
+  Carmen::Country.all.each do |country|
+    name            = connection.quote country.name
+    iso3            = connection.quote country.alpha_3_code
+    iso             = connection.quote country.alpha_2_code
+    iso_name        = connection.quote country.name.upcase
+    numcode         = connection.quote country.numeric_code
+    states_required = connection.quote country.subregions?
+
+    country_inserts << [name, iso3, iso, iso_name, numcode, states_required].join(", ")
+  end
 
-ActiveRecord::Base.transaction do
-  Spree::Country.create!(countries)
+  country_inserts.join("), (")
 end
 
+columns = ["name", "iso3", "iso", "iso_name", "numcode", "states_required"]
+columns = connection.adapter_name =~ /MySQL/i ? columns.join(", ") : "\"#{columns.join('", "')}\""
+
+connection.execute <<-SQL
+  INSERT INTO spree_countries (#{columns})
+  VALUES (#{country_values.call});
+SQL
+
 Spree::Config[:default_country_id] = Spree::Country.find_by(name: "United States").id

data/db/default/spree/states.rb

@@ -1,16 +1,28 @@
-ActiveRecord::Base.transaction do
-  Spree::Country.all.each do |country|
+connection = ActiveRecord::Base.connection
+state_inserts = []
+
+state_values = -> do
+  Spree::Country.where(states_required: true).each do |country|
     carmen_country = Carmen::Country.named(country.name)
-    @states ||= []
-    if carmen_country.subregions?
-      carmen_country.subregions.each do |subregion|
-        @states << {
-          name: subregion.name,
-          abbr: subregion.code,
-          country: country
-        }
-      end
+    carmen_country.subregions.each do |subregion|
+      name       = connection.quote subregion.name
+      abbr       = connection.quote subregion.code
+      country_id = connection.quote country.id
+
+      state_inserts << [name, abbr, country_id].join(", ")
     end
   end
-  Spree::State.create!(@states)
+
+  state_inserts.map { |x| "(#{x})" }
+end
+
+columns = ["name", "abbr", "country_id"].map do |column|
+  connection.quote_column_name column
+end.join(', ')
+
+state_values.call.each_slice(500) do |state_values_batch|
+  connection.execute <<-SQL
+    INSERT INTO spree_states (#{columns})
+    VALUES #{state_values_batch.join(", ")};
+  SQL
 end

data/db/default/spree/stores.rb

@@ -3,7 +3,7 @@ unless Spree::Store.where(code: 'spree').exists?
   Spree::Store.new do |s|
     s.code              = 'spree'
     s.name              = 'Spree Demo Site'
-    s.url               = 'demo.spreecommerce.com'
+    s.url               = 'example.com'
     s.mail_from_address = 'spree@example.com'
   end.save!
 end

data/db/migrate/20120831092320_spree_one_two.rb

@@ -18,7 +18,7 @@ class SpreeOneTwo < ActiveRecord::Migration
       t.string     :code
       t.boolean    :advertise,    :default => false
       t.string     :path
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :spree_addresses do |t|
@@ -34,7 +34,7 @@ class SpreeOneTwo < ActiveRecord::Migration
       t.string     :company
       t.references :state
       t.references :country
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :spree_addresses, [:firstname], :name => 'index_addresses_on_firstname'
@@ -49,7 +49,7 @@ class SpreeOneTwo < ActiveRecord::Migration
       t.boolean    :mandatory
       t.boolean    :locked
       t.boolean    :eligible,   :default => true
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :spree_adjustments, [:adjustable_id], :name => 'index_adjustments_on_order_id'
@@ -73,13 +73,13 @@ class SpreeOneTwo < ActiveRecord::Migration
     create_table :spree_calculators do |t|
       t.string     :type
       t.references :calculable, :polymorphic => true
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :spree_configurations do |t|
       t.string     :name
       t.string     :type, :limit => 50
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :spree_configurations, [:name, :type], :name => 'index_spree_configurations_on_name_and_type'
@@ -105,7 +105,7 @@ class SpreeOneTwo < ActiveRecord::Migration
       t.references :address
       t.string     :gateway_customer_profile_id
       t.string     :gateway_payment_profile_id
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :spree_gateways do |t|
@@ -116,7 +116,7 @@ class SpreeOneTwo < ActiveRecord::Migration
       t.string     :environment, :default => 'development'
       t.string     :server,      :default => 'test'
       t.boolean    :test_mode,   :default => true
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :spree_inventory_units do |t|
@@ -126,7 +126,7 @@ class SpreeOneTwo < ActiveRecord::Migration
       t.references :order
       t.references :shipment
       t.references :return_authorization
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :spree_inventory_units, [:order_id],    :name => 'index_inventory_units_on_order_id'
@@ -138,7 +138,7 @@ class SpreeOneTwo < ActiveRecord::Migration
       t.references :order
       t.integer    :quantity,                               :null => false
       t.decimal    :price,    :precision => 8, :scale => 2, :null => false
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :spree_line_items, [:order_id],   :name => 'index_spree_line_items_on_order_id'
@@ -147,20 +147,20 @@ class SpreeOneTwo < ActiveRecord::Migration
     create_table :spree_log_entries do |t|
       t.references :source, :polymorphic => true
       t.text     :details
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :spree_mail_methods do |t|
       t.string     :environment
       t.boolean    :active,     :default => true
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :spree_option_types do |t|
       t.string    :name,         :limit => 100
       t.string    :presentation, :limit => 100
       t.integer   :position,                   :default => 0, :null => false
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :spree_option_types_prototypes, :id => false do |t|
@@ -173,7 +173,7 @@ class SpreeOneTwo < ActiveRecord::Migration
       t.string     :name
       t.string     :presentation
       t.references :option_type
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :spree_option_values_variants, :id => false do |t|
@@ -200,7 +200,7 @@ class SpreeOneTwo < ActiveRecord::Migration
       t.string     :payment_state
       t.string     :email
       t.text       :special_instructions
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :spree_orders, [:number], :name => 'index_spree_orders_on_number'
@@ -213,7 +213,7 @@ class SpreeOneTwo < ActiveRecord::Migration
       t.string     :environment, :default => 'development'
       t.datetime   :deleted_at
       t.string     :display_on
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :spree_payments do |t|
@@ -224,7 +224,7 @@ class SpreeOneTwo < ActiveRecord::Migration
       t.string     :state
       t.string     :response_code
       t.string     :avs_response
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :spree_preferences do |t|
@@ -233,7 +233,7 @@ class SpreeOneTwo < ActiveRecord::Migration
       t.text       :value
       t.string     :key
       t.string     :value_type
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :spree_preferences, [:key], :name => 'index_spree_preferences_on_key', :unique => true
@@ -242,14 +242,14 @@ class SpreeOneTwo < ActiveRecord::Migration
       t.integer    :position
       t.references :product
       t.references :option_type
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :spree_product_properties do |t|
       t.string     :value
       t.references :product
       t.references :property
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :spree_product_properties, [:product_id], :name => 'index_product_properties_on_product_id'
@@ -265,7 +265,7 @@ class SpreeOneTwo < ActiveRecord::Migration
       t.references :tax_category
       t.references :shipping_category
       t.integer    :count_on_hand,        :default => 0,  :null => false
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :spree_products, [:available_on], :name => 'index_spree_products_on_available_on'
@@ -284,7 +284,7 @@ class SpreeOneTwo < ActiveRecord::Migration
     create_table :spree_properties do |t|
       t.string     :name
       t.string     :presentation, :null => false
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :spree_properties_prototypes, :id => false do |t|
@@ -294,7 +294,7 @@ class SpreeOneTwo < ActiveRecord::Migration
 
     create_table :spree_prototypes do |t|
       t.string     :name
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :spree_return_authorizations do |t|
@@ -303,7 +303,7 @@ class SpreeOneTwo < ActiveRecord::Migration
       t.decimal    :amount, :precision => 8, :scale => 2, :default => 0.0, :null => false
       t.references :order
       t.text       :reason
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :spree_roles do |t|
@@ -327,14 +327,14 @@ class SpreeOneTwo < ActiveRecord::Migration
       t.references :shipping_method
       t.references :address
       t.string     :state
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :spree_shipments, [:number], :name => 'index_shipments_on_number'
 
     create_table :spree_shipping_categories do |t|
       t.string   :name
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :spree_shipping_methods do |t|
@@ -346,7 +346,7 @@ class SpreeOneTwo < ActiveRecord::Migration
       t.boolean    :match_all
       t.boolean    :match_one
       t.datetime   :deleted_at
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :spree_state_changes do |t|
@@ -356,7 +356,7 @@ class SpreeOneTwo < ActiveRecord::Migration
       t.references :user
       t.string     :stateful_type
       t.string     :next_state
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :spree_states do |t|
@@ -370,7 +370,7 @@ class SpreeOneTwo < ActiveRecord::Migration
       t.string     :description
       t.boolean    :is_default, :default => false
       t.datetime   :deleted_at
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :spree_tax_rates do |t|
@@ -378,12 +378,12 @@ class SpreeOneTwo < ActiveRecord::Migration
       t.references :zone
       t.references :tax_category
       t.boolean    :included_in_price, :default => false
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :spree_taxonomies do |t|
       t.string     :name, :null => false
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :spree_taxons do |t|
@@ -399,7 +399,7 @@ class SpreeOneTwo < ActiveRecord::Migration
       t.integer    :icon_file_size
       t.datetime   :icon_updated_at
       t.text       :description
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :spree_taxons, [:parent_id],   :name => 'index_taxons_on_parent_id'
@@ -409,7 +409,7 @@ class SpreeOneTwo < ActiveRecord::Migration
     create_table :spree_tokenized_permissions, :force => true do |t|
       t.references :permissable, :polymorphic => true
       t.string     :token
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :spree_tokenized_permissions, [:permissable_id, :permissable_type], :name => 'index_tokenized_name_and_type'
@@ -418,7 +418,7 @@ class SpreeOneTwo < ActiveRecord::Migration
       t.string     :environment
       t.string     :analytics_id
       t.boolean    :active,       :default => true
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :spree_users do |t|
@@ -444,7 +444,7 @@ class SpreeOneTwo < ActiveRecord::Migration
       t.datetime   :locked_at
       t.datetime   :remember_created_at
       t.datetime   :reset_password_sent_at
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :spree_variants do |t|
@@ -467,7 +467,7 @@ class SpreeOneTwo < ActiveRecord::Migration
     create_table :spree_zone_members do |t|
       t.references :zoneable, :polymorphic => true
       t.references :zone
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :spree_zones do |t|
@@ -475,7 +475,7 @@ class SpreeOneTwo < ActiveRecord::Migration
       t.string     :description
       t.boolean    :default_tax,        :default => false
       t.integer    :zone_members_count, :default => 0
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end

data/db/migrate/20120831092359_spree_promo_one_two.rb

@@ -28,7 +28,7 @@ class SpreePromoOneTwo < ActiveRecord::Migration
       t.references :user
       t.references :product_group
       t.string     :type
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :spree_promotion_rules, [:product_group_id], :name => 'index_promotion_rules_on_product_group_id'

data/db/migrate/20130211190146_create_spree_stock_items.rb

@@ -6,7 +6,7 @@ class CreateSpreeStockItems < ActiveRecord::Migration
       t.integer :count_on_hand, null: false, default: 0
       t.integer :lock_version
 
-      t.timestamps
+      t.timestamps null: false
     end
     add_index :spree_stock_items, :stock_location_id
     add_index :spree_stock_items, [:stock_location_id, :variant_id], :name => 'stock_item_by_loc_and_var_id'

data/db/migrate/20130211191120_create_spree_stock_locations.rb

@@ -4,7 +4,7 @@ class CreateSpreeStockLocations < ActiveRecord::Migration
       t.string :name
       t.belongs_to :address
 
-      t.timestamps
+      t.timestamps null: false
     end
     add_index :spree_stock_locations, :address_id
   end

data/db/migrate/20130301162924_create_shipping_method_categories.rb

@@ -4,7 +4,7 @@ class CreateShippingMethodCategories < ActiveRecord::Migration
       t.integer :shipping_method_id, :null => false
       t.integer :shipping_category_id, :null => false
 
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :spree_shipping_method_categories, :shipping_method_id

data/db/migrate/20130304162240_create_spree_shipping_rates.rb

@@ -5,7 +5,7 @@ class CreateSpreeShippingRates < ActiveRecord::Migration
       t.belongs_to :shipping_method
       t.boolean :selected, :default => false
       t.decimal :cost, :precision => 8, :scale => 2
-      t.timestamps
+      t.timestamps null: false
     end
     add_index(:spree_shipping_rates, [:shipment_id, :shipping_method_id],
               :name => 'spree_shipping_rates_join_index',

data/db/migrate/20130305143310_create_stock_movements.rb

@@ -5,7 +5,7 @@ class CreateStockMovements < ActiveRecord::Migration
       t.integer :quantity
       t.string :action
 
-      t.timestamps
+      t.timestamps null: false
     end
     add_index :spree_stock_movements, :stock_item_id
   end