spree_core 1.3.5 → 2.0.0.rc1

data/db/migrate/20120831092359_spree_promo_one_two.rb

@@ -0,0 +1,45 @@
+class SpreePromoOneTwo < ActiveRecord::Migration
+  def up
+    # This migration is just a compressed migration for all previous versions of spree_promo
+    return if table_exists?(:spree_products_promotion_rules)
+
+    create_table :spree_products_promotion_rules, :id => false, :force => true do |t|
+      t.references :product
+      t.references :promotion_rule
+    end
+
+    add_index :spree_products_promotion_rules, [:product_id], :name => 'index_products_promotion_rules_on_product_id'
+    add_index :spree_products_promotion_rules, [:promotion_rule_id], :name => 'index_products_promotion_rules_on_promotion_rule_id'
+
+    create_table :spree_promotion_action_line_items, :force => true do |t|
+      t.references :promotion_action
+      t.references :variant
+      t.integer    :quantity,            :default => 1
+    end
+
+    create_table :spree_promotion_actions, :force => true do |t|
+      t.references :activator
+      t.integer    :position
+      t.string     :type
+    end
+
+    create_table :spree_promotion_rules, :force => true do |t|
+      t.references :activator
+      t.references :user
+      t.references :product_group
+      t.string     :type
+      t.timestamps
+    end
+
+    add_index :spree_promotion_rules, [:product_group_id], :name => 'index_promotion_rules_on_product_group_id'
+    add_index :spree_promotion_rules, [:user_id], :name => 'index_promotion_rules_on_user_id'
+
+    create_table :spree_promotion_rules_users, :id => false, :force => true do |t|
+      t.references :user
+      t.references :promotion_rule
+    end
+
+    add_index :spree_promotion_rules_users, [:promotion_rule_id], :name => 'index_promotion_rules_users_on_promotion_rule_id'
+    add_index :spree_promotion_rules_users, [:user_id], :name => 'index_promotion_rules_users_on_user_id'
+  end
+end

data/db/migrate/20121213162028_add_state_to_spree_adjustments.rb

@@ -0,0 +1,6 @@
+class AddStateToSpreeAdjustments < ActiveRecord::Migration
+  def change
+    add_column :spree_adjustments, :state, :string
+    remove_column :spree_adjustments, :locked
+  end
+end

data/db/migrate/20130211190146_create_spree_stock_items.rb

@@ -0,0 +1,14 @@
+class CreateSpreeStockItems < ActiveRecord::Migration
+  def change
+    create_table :spree_stock_items do |t|
+      t.belongs_to :stock_location
+      t.belongs_to :variant
+      t.integer :count_on_hand, null: false, default: 0
+      t.integer :lock_version
+
+      t.timestamps
+    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'
+  end
+end

data/db/migrate/20130211191120_create_spree_stock_locations.rb

@@ -0,0 +1,11 @@
+class CreateSpreeStockLocations < ActiveRecord::Migration
+  def change
+    create_table :spree_stock_locations do |t|
+      t.string :name
+      t.belongs_to :address
+
+      t.timestamps
+    end
+    add_index :spree_stock_locations, :address_id
+  end
+end

data/db/migrate/20130213191427_create_default_stock.rb

@@ -0,0 +1,26 @@
+class CreateDefaultStock < ActiveRecord::Migration
+  def up
+    Spree::StockLocation.skip_callback(:create, :after, :create_stock_items)
+    Spree::StockItem.skip_callback(:save, :after, :process_backorders)
+    location = Spree::StockLocation.create(name: 'default')
+    Spree::Variant.all.each do |variant|
+      stock_item = location.stock_items.build(variant: variant)
+      stock_item.send(:count_on_hand=, variant.count_on_hand)
+      stock_item.save!
+    end
+
+    remove_column :spree_variants, :count_on_hand
+  end
+
+  def down
+    add_column :spree_variants, :count_on_hand, :integer
+
+    Spree::StockItem.all.each do |stock_item|
+      stock_item.variant.update_column :count_on_hand, stock_item.count_on_hand
+    end
+
+    Spree::StockLocation.delete_all
+    Spree::StockItem.delete_all
+  end
+end
+

data/db/migrate/20130226191231_add_stock_location_id_to_spree_shipments.rb

@@ -0,0 +1,5 @@
+class AddStockLocationIdToSpreeShipments < ActiveRecord::Migration
+  def change
+    add_column :spree_shipments, :stock_location_id, :integer
+  end
+end

data/db/migrate/20130227143905_add_pending_to_inventory_unit.rb

@@ -0,0 +1,6 @@
+class AddPendingToInventoryUnit < ActiveRecord::Migration
+  def change
+    add_column :spree_inventory_units, :pending, :boolean, :default => true
+    Spree::InventoryUnit.update_all(:pending => false)
+  end
+end

data/db/migrate/20130228164411_remove_on_demand_from_product_and_variant.rb

@@ -0,0 +1,6 @@
+class RemoveOnDemandFromProductAndVariant < ActiveRecord::Migration
+  def change
+    remove_column :spree_products, :on_demand
+    remove_column :spree_variants, :on_demand
+  end
+end

data/db/migrate/20130228210442_create_shipping_method_zone.rb

@@ -0,0 +1,17 @@
+class CreateShippingMethodZone < ActiveRecord::Migration
+  def up
+    create_table :shipping_methods_zones, :id => false do |t|
+      t.integer :shipping_method_id
+      t.integer :zone_id
+    end
+
+    Spree::ShippingMethod.all.each{|sm| sm.zones << Spree::Zone.find(sm.zone_id)}
+
+    remove_column :spree_shipping_methods, :zone_id
+  end
+
+  def down
+    drop_table :shipping_methods_zones
+    add_column :spree_shipping_methods, :zone_id, :integer
+  end
+end

data/db/migrate/20130301162745_remove_shipping_category_id_from_shipping_method.rb

@@ -0,0 +1,5 @@
+class RemoveShippingCategoryIdFromShippingMethod < ActiveRecord::Migration
+  def change
+    remove_column :spree_shipping_methods, :shipping_category_id
+  end
+end

data/db/migrate/20130301162924_create_shipping_method_categories.rb

@@ -0,0 +1,13 @@
+class CreateShippingMethodCategories < ActiveRecord::Migration
+  def change
+    create_table :spree_shipping_method_categories do |t|
+      t.integer :shipping_method_id, :null => false
+      t.integer :shipping_category_id, :null => false
+
+      t.timestamps
+    end
+
+    add_index :spree_shipping_method_categories, :shipping_method_id
+    add_index :spree_shipping_method_categories, :shipping_category_id
+  end
+end

data/db/migrate/20130301205200_add_tracking_url_to_spree_shipping_methods.rb

@@ -0,0 +1,5 @@
+class AddTrackingUrlToSpreeShippingMethods < ActiveRecord::Migration
+  def change
+    add_column :spree_shipping_methods, :tracking_url, :string
+  end
+end

data/db/migrate/20130304162240_create_spree_shipping_rates.rb

@@ -0,0 +1,24 @@
+class CreateSpreeShippingRates < ActiveRecord::Migration
+  def up
+    create_table :spree_shipping_rates do |t|
+      t.belongs_to :shipment
+      t.belongs_to :shipping_method
+      t.boolean :selected, :default => false
+      t.decimal :cost, :precision => 8, :scale => 2
+      t.timestamps
+    end
+    add_index(:spree_shipping_rates, [:shipment_id, :shipping_method_id],
+              :name => 'spree_shipping_rates_join_index',
+              :unique => true)
+
+    # Spree::Shipment.all.each do |shipment|
+    #   shipping_method = Spree::ShippingMethod.find(shipment.shipment_method_id)
+    #   shipment.add_shipping_method(shipping_method, true)
+    # end
+  end
+
+  def down
+    # add_column :spree_shipments, :shipping_method_id, :integer
+    drop_table :spree_shipping_rates
+  end
+end

data/db/migrate/20130304192936_remove_category_match_attributes_from_shipping_method.rb

@@ -0,0 +1,7 @@
+class RemoveCategoryMatchAttributesFromShippingMethod < ActiveRecord::Migration
+  def change
+    remove_column :spree_shipping_methods, :match_none
+    remove_column :spree_shipping_methods, :match_one
+    remove_column :spree_shipping_methods, :match_all
+  end
+end

data/db/migrate/20130305143310_create_stock_movements.rb

@@ -0,0 +1,12 @@
+class CreateStockMovements < ActiveRecord::Migration
+  def change
+    create_table :spree_stock_movements do |t|
+      t.belongs_to :stock_item
+      t.integer :quantity
+      t.string :action
+
+      t.timestamps
+    end
+    add_index :spree_stock_movements, :stock_item_id
+  end
+end

data/db/migrate/20130306181701_add_address_fields_to_stock_location.rb

@@ -0,0 +1,19 @@
+class AddAddressFieldsToStockLocation < ActiveRecord::Migration
+  def change
+    remove_column :spree_stock_locations, :address_id
+
+    add_column :spree_stock_locations, :address1, :string
+    add_column :spree_stock_locations, :address2, :string
+    add_column :spree_stock_locations, :city, :string
+    add_column :spree_stock_locations, :state_id, :integer
+    add_column :spree_stock_locations, :state_name, :string
+    add_column :spree_stock_locations, :country_id, :integer
+    add_column :spree_stock_locations, :zipcode, :string
+    add_column :spree_stock_locations, :phone, :string
+
+
+    usa = Spree::Country.where(:iso => 'US').first
+    Spree::Country.reset_column_information
+    Spree::StockLocation.update_all(:country_id => usa)
+  end
+end

data/db/migrate/20130306191917_add_active_field_to_stock_locations.rb

@@ -0,0 +1,5 @@
+class AddActiveFieldToStockLocations < ActiveRecord::Migration
+  def change
+    add_column :spree_stock_locations, :active, :boolean, :default => true
+  end
+end

data/db/migrate/20130306195650_add_backorderable_to_stock_item.rb

@@ -0,0 +1,5 @@
+class AddBackorderableToStockItem < ActiveRecord::Migration
+  def change
+    add_column :spree_stock_items, :backorderable, :boolean, :default => true
+  end
+end

data/db/migrate/20130307161754_add_default_quantity_to_stock_movement.rb

@@ -0,0 +1,5 @@
+class AddDefaultQuantityToStockMovement < ActiveRecord::Migration
+  def change
+    change_column :spree_stock_movements, :quantity, :integer, :default => 0
+  end
+end

data/db/migrate/20130318151756_add_source_and_destination_to_stock_movements.rb

@@ -0,0 +1,8 @@
+class AddSourceAndDestinationToStockMovements < ActiveRecord::Migration
+  def change
+    change_table :spree_stock_movements do |t|
+      t.references :source, polymorphic: true
+      t.references :destination, polymorphic: true
+    end
+  end
+end

data/db/migrate/20130319183250_add_originator_to_stock_movement.rb

@@ -0,0 +1,7 @@
+class AddOriginatorToStockMovement < ActiveRecord::Migration
+  def change
+    change_table :spree_stock_movements do |t|
+      t.references :originator, polymorphic: true
+    end
+  end
+end

data/db/migrate/20130319190507_drop_source_and_destination_from_stock_movement.rb

@@ -0,0 +1,15 @@
+class DropSourceAndDestinationFromStockMovement < ActiveRecord::Migration
+  def up
+    change_table :spree_stock_movements do |t|
+      t.remove_references :source, :polymorphic => true
+      t.remove_references :destination, :polymorphic => true
+    end
+  end
+
+  def down
+    change_table :spree_stock_movements do |t|
+      t.references :source, polymorphic: true
+      t.references :destination, polymorphic: true
+    end
+  end
+end

data/db/migrate/20130325163316_migrate_inventory_unit_sold_to_on_hand.rb

@@ -0,0 +1,9 @@
+class MigrateInventoryUnitSoldToOnHand < ActiveRecord::Migration
+  def up
+    Spree::InventoryUnit.where(:state => 'sold').update_all(:state => 'on_hand')
+  end
+
+  def down
+    Spree::InventoryUnit.where(:state => 'on_hand').update_all(:state => 'sold')
+  end
+end

data/db/migrate/20130326175857_add_stock_location_to_rma.rb

@@ -0,0 +1,5 @@
+class AddStockLocationToRma < ActiveRecord::Migration
+  def change
+    add_column :spree_return_authorizations, :stock_location_id, :integer
+  end
+end

data/db/migrate/20130328130308_update_shipment_state_for_canceled_orders.rb

@@ -0,0 +1,15 @@
+class UpdateShipmentStateForCanceledOrders < ActiveRecord::Migration
+  def up
+    shipments = Spree::Shipment.joins(:order).
+      where("spree_orders.state = 'canceled'")
+    case Spree::Shipment.connection.adapter_name
+    when "SQLite3"
+      shipments.update_all("state = 'cancelled'")
+    when "MySQL" || "PostgreSQL"
+      shipments.update_all("spree_shipments.state = 'cancelled'")
+    end
+  end
+
+  def down
+  end
+end

data/db/migrate/20130329134939_remove_stock_item_and_variant_lock.rb

@@ -0,0 +1,14 @@
+class RemoveStockItemAndVariantLock < ActiveRecord::Migration
+  def up
+    # we are moving to pessimistic locking on stock_items
+    remove_column :spree_stock_items, :lock_version
+
+    # variants no longer manage their count_on_hand so we are removing their lock
+    remove_column :spree_variants, :lock_version
+  end
+
+  def down
+    add_column :spree_stock_items, :lock_version, :integer
+    add_column :spree_variants, :lock_version, :integer
+  end
+end

data/db/migrate/20130417120035_update_adjustment_states.rb

@@ -0,0 +1,16 @@
+class UpdateAdjustmentStates < ActiveRecord::Migration
+  def up
+    Spree::Order.complete.each do |order|
+      order.adjustments.update_all(:state => 'closed')
+    end
+
+    Spree::Shipment.shipped.each do |shipment|
+      shipment.adjustment.update_column(:state, 'finalized') if shipment.adjustment
+    end
+
+    Spree::Adjustment.where(:state => nil).update_all(:state => 'open')
+  end
+
+  def down
+  end
+end

data/db/migrate/20130417123427_add_shipping_rates_to_shipments.rb

@@ -0,0 +1,15 @@
+class AddShippingRatesToShipments < ActiveRecord::Migration
+  def up
+    Spree::Shipment.all.each do |shipment|
+      shipment.shipping_rates.create(:shipping_method_id => shipment.shipping_method_id,
+                                     :cost => shipment.cost,
+                                     :selected => true)
+    end
+
+    remove_column :spree_shipments, :shipping_method_id
+  end
+
+  def down
+    add_column :spree_shipments, :shipping_method_id, :integer
+  end
+end

data/db/migrate/20130418125341_create_spree_stock_transfers.rb

@@ -0,0 +1,14 @@
+class CreateSpreeStockTransfers < ActiveRecord::Migration
+  def change
+    create_table :spree_stock_transfers do |t|
+      t.string :type
+      t.string :reference_number
+      t.integer :source_location_id
+      t.integer :destination_location_id
+      t.timestamps
+    end
+
+    add_index :spree_stock_transfers, :source_location_id
+    add_index :spree_stock_transfers, :destination_location_id
+  end
+end

data/db/migrate/20130423110707_drop_products_count_on_hand.rb

@@ -0,0 +1,5 @@
+class DropProductsCountOnHand < ActiveRecord::Migration
+  def up
+    remove_column :spree_products, :count_on_hand
+  end
+end

data/db/migrate/20130423223847_set_default_shipping_rate_cost.rb

@@ -0,0 +1,5 @@
+class SetDefaultShippingRateCost < ActiveRecord::Migration
+  def change
+    change_column :spree_shipping_rates, :cost, :decimal, default: 0, precision: 8, scale: 2
+  end
+end

data/db/migrate/20130509115210_add_number_to_stock_transfer.rb

@@ -0,0 +1,23 @@
+class AddNumberToStockTransfer < ActiveRecord::Migration
+  def up
+    remove_index :spree_stock_transfers, :source_location_id
+    remove_index :spree_stock_transfers, :destination_location_id
+
+    rename_column :spree_stock_transfers, :reference_number, :reference
+    add_column :spree_stock_transfers, :number, :string
+
+    Spree::StockTransfer.all.each do |transfer|
+      transfer.send(:generate_stock_transfer_number)
+      transfer.save!
+    end
+
+    add_index :spree_stock_transfers, :number
+    add_index :spree_stock_transfers, :source_location_id
+    add_index :spree_stock_transfers, :destination_location_id
+  end
+
+  def down
+    rename_column :spree_stock_transfers, :reference, :reference_number
+    remove_column :spree_stock_transfers, :number, :string
+  end
+end

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

@@ -1,4 +1,6 @@
 require "rails/generators/rails/app/app_generator"
+require 'active_support/core_ext/hash'
+require 'spree/core/version'
 
 module Spree
   class DummyGenerator < Rails::Generators::Base
@@ -22,7 +24,9 @@ module Spree
     ]
 
     def generate_test_dummy
-      opts = (options || {}).slice(*PASSTHROUGH_OPTIONS)
+      # calling slice on a Thor::CoreExtensions::HashWithIndifferentAccess
+      # object has been known to return nil
+      opts = {}.merge(options).slice(*PASSTHROUGH_OPTIONS)
       opts[:database] = 'sqlite3' if opts[:database].blank?
       opts[:force] = true
       opts[:skip_bundle] = true
@@ -41,10 +45,21 @@ module Spree
       template "rails/boot.rb", "#{dummy_path}/config/boot.rb", :force => true
       template "rails/application.rb", "#{dummy_path}/config/application.rb", :force => true
       template "rails/routes.rb", "#{dummy_path}/config/routes.rb", :force => true
+      template "rails/test.rb", "#{dummy_path}/config/environments/test.rb", :force => true
       template "rails/script/rails", "#{dummy_path}/spec/dummy/script/rails", :force => true
       template "initializers/custom_user.rb", "#{dummy_path}/config/initializers/custom_user.rb", :force => true
     end
 
+    def test_dummy_inject_extension_requirements
+      if DummyGeneratorHelper.inject_extension_requirements
+        inside dummy_path do
+          %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
+
     def test_dummy_clean
       inside dummy_path do
         remove_file ".gitignore"
@@ -60,6 +75,7 @@ module Spree
         remove_file "vendor"
         remove_file "spec"
       end
+
     end
 
     attr :lib_name
@@ -102,6 +118,11 @@ module Spree
         '../../../../../Gemfile'
       end
     end
-
   end
 end
+
+module Spree::DummyGeneratorHelper
+  mattr_accessor :inject_extension_requirements
+  self.inject_extension_requirements = false
+end
+

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

@@ -16,41 +16,34 @@ production:
 development:
   adapter: mysql2
   database: <%= database_prefix %>spree_development
+  username:
   encoding: utf8
 test:
   adapter: mysql2
   database: <%= database_prefix %>spree_test
+  username:
   encoding: utf8
 production:
   adapter: mysql2
   database: <%= database_prefix %>spree_production
+  username:
   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

@@ -0,0 +1,39 @@
+Dummy::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # The test environment is used exclusively to run your application's
+  # test suite. You never need to work with it otherwise. Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs. Don't rely on the data there!
+  config.cache_classes = true
+
+  # Configure static asset server for tests with Cache-Control for performance
+  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
+
+  # Raise exceptions instead of rendering exception templates
+  config.action_dispatch.show_exceptions = false
+
+  # Disable request forgery protection in test environment
+  config.action_controller.allow_forgery_protection    = false
+
+  # Tell Action Mailer not to deliver emails to the real world.
+  # The :test delivery method accumulates sent emails in the
+  # ActionMailer::Base.deliveries array.
+  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/templates/app/assets/javascripts/admin/all.js

@@ -7,8 +7,7 @@
 //= require jquery
 //= require jquery_ujs
 <% if options[:lib_name] == 'spree' %>
-//= require admin/spree_core
-//= require admin/spree_promo
+//= require admin/spree_backend
 <% else %>
 //= require admin/<%= options[:lib_name].gsub("/", "_") %>
 <% end %>

data/lib/generators/spree/install/templates/app/assets/javascripts/store/all.js

@@ -7,8 +7,7 @@
 //= require jquery
 //= require jquery_ujs
 <% if options[:lib_name] == 'spree' %>
-//= require store/spree_core
-//= require store/spree_promo
+//= require store/spree_frontend
 <% else %>
 //= require store/<%= options[:lib_name].gsub("/", "_") %>
 <% end %>

data/lib/generators/spree/install/templates/app/assets/stylesheets/admin/all.css

@@ -4,8 +4,7 @@
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *
 <% if options[:lib_name] == 'spree' %>
- *= require admin/spree_core
- *= require admin/spree_promo
+ *= require admin/spree_backend
 <% else %>
  *= require admin/<%= options[:lib_name].gsub("/", "_") %>
 <% end %>

data/lib/generators/spree/install/templates/app/assets/stylesheets/store/all.css

@@ -4,8 +4,7 @@
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *
 <% if options[:lib_name] == 'spree' %>
- *= require store/spree_core
- *= require store/spree_promo
+ *= require store/spree_frontend
 <% else %>
  *= require store/<%= options[:lib_name].gsub("/", "_") %>
 <% end %>