spree_core 2.1.3 → 2.1.4

data/lib/spree/permitted_attributes.rb

@@ -54,8 +54,8 @@ module Spree
       :name, :description, :available_on, :permalink, :meta_description,
       :meta_keywords, :price, :sku, :deleted_at, :prototype_id,
       :option_values_hash, :weight, :height, :width, :depth,
-      :shipping_category_id, :tax_category_id, :product_properties_attributes,
-      :variants_attributes, :taxon_ids, :option_type_ids, :cost_currency, :cost_price]
+      :shipping_category_id, :tax_category_id,
+      :taxon_ids, :option_type_ids, :cost_currency, :cost_price]
 
     @@property_attributes = [:name, :presentation]
 
@@ -69,7 +69,7 @@ module Spree
     @@source_attributes = [
       :number, :month, :year, :expiry, :verification_value,
       :first_name, :last_name, :cc_type, :gateway_customer_profile_id, 
-      :gateway_payment_profile_id, :last_digits]
+      :gateway_payment_profile_id, :last_digits, :name]
 
     @@stock_item_attributes = [:variant, :stock_location, :backorderable, :variant_id]
 
@@ -85,7 +85,7 @@ module Spree
 
     @@taxon_attributes = [
       :name, :parent_id, :position, :icon, :description, :permalink, :taxonomy_id,
-      :meta_description, :meta_keywords, :meta_title]
+      :meta_description, :meta_keywords, :meta_title, :child_index]
 
     # TODO Should probably use something like Spree.user_class.attributes
     @@user_attributes = [:email, :password, :password_confirmation]
@@ -93,7 +93,7 @@ module Spree
     @@variant_attributes = [
       :name, :presentation, :cost_price, :lock_version,
       :position, :option_value_ids,
-      :product_id, :option_values_attributes, :price,
-      :weight, :height, :width, :depth, :sku, :cost_currency]
+      :product_id, :product, :option_values_attributes, :price,
+      :weight, :height, :width, :depth, :sku, :cost_currency, options: [ :name, :value ]]
   end
 end

data/lib/spree/testing_support/capybara_ext.rb

@@ -36,8 +36,8 @@ module CapybaraExt
     label = find_label_by_text(options[:from])
     within label.first(:xpath,".//..") do
       options[:from] = "##{find(".select2-container")["id"]}"
-      targetted_select2_search(value, options)
     end
+    targetted_select2_search(value, options)
   end
 
   def targetted_select2_search(value, options)
@@ -51,8 +51,8 @@ module CapybaraExt
 
     within label.first(:xpath,".//..") do
       options[:from] = "##{find(".select2-container")["id"]}"
-      targetted_select2(value, options)
     end
+    targetted_select2(value, options)
   end
 
   def select2_no_label value, options={}
@@ -73,9 +73,10 @@ module CapybaraExt
   end
 
   def select_select2_result(value)
-    #p %Q{$("div.select2-result-label:contains('#{value}')").mouseup()}
-    sleep(1)
-    page.execute_script(%Q{$("div.select2-result-label:contains('#{value}')").mouseup()})
+    # results are in a div appended to the end of the document
+    within(:xpath, '//body') do
+      page.find("div.select2-result-label", text: %r{#{Regexp.escape(value)}}i).click
+    end
   end
 
   def find_label_by_text(text)

data/lib/spree/testing_support/controller_requests.rb

@@ -46,10 +46,19 @@ module Spree
       end
 
       def spree_xhr_get(action, parameters = nil, session = nil, flash = nil)
-        parameters ||= {}
-        parameters.reverse_merge!(:format => :json)
-        parameters.merge!(:use_route => :spree)
-        xml_http_request(:get, action, parameters, session, flash)
+        process_spree_xhr_action(action, parameters, session, flash, :get)
+      end
+
+      def spree_xhr_post(action, parameters = nil, session = nil, flash = nil)
+        process_spree_xhr_action(action, parameters, session, flash, :post)
+      end
+
+      def spree_xhr_put(action, parameters = nil, session = nil, flash = nil)
+        process_spree_xhr_action(action, parameters, session, flash, :put)
+      end
+
+      def spree_xhr_delete(action, parameters = nil, session = nil, flash = nil)
+        process_spree_xhr_action(action, parameters, session, flash, :delete)
       end
 
       private
@@ -58,6 +67,13 @@ module Spree
         parameters ||= {}
         process(action, method, parameters.merge!(:use_route => :spree), session, flash)
       end
+
+      def process_spree_xhr_action(action, parameters = nil, session = nil, flash = nil, method = :get)
+        parameters ||= {}
+        parameters.reverse_merge!(:format => :json)
+        parameters.merge!(:use_route => :spree)
+        xml_http_request(method, action, parameters, session, flash)
+      end
     end
   end
 end

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

@@ -12,6 +12,10 @@ FactoryGirl.define do
     # ensure stock item will be created for this products master
     before(:create) { create(:stock_location) if Spree::StockLocation.count == 0 }
 
+    after(:create) do |p|
+      p.variants_including_master.each { |v| v.save! }
+    end
+
     factory :custom_product do
       name 'Custom Product'
       price 17.99

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

@@ -9,6 +9,8 @@ FactoryGirl.define do
     height { generate(:random_float) }
     width  { generate(:random_float) }
     depth  { generate(:random_float) }
+    is_master 0
+    track_inventory true
 
     product { |p| p.association(:base_product) }
     option_values { [create(:option_value)] }
@@ -20,5 +22,18 @@ FactoryGirl.define do
       # on_hand 5
       product { |p| p.association(:product) }
     end
+
+    factory :master_variant do
+      is_master 1
+    end
+
+    factory :on_demand_variant do
+      track_inventory false
+
+      factory :on_demand_master_variant do
+        is_master 1
+      end
+    end
+
   end
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2014-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.42.2
+        version: 1.42.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.42.2
+        version: 1.42.3
 - !ruby/object:Gem::Dependency
   name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc.2
+        version: 3.0.0.rc.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc.2
+        version: 3.0.0.rc.3
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -70,154 +70,140 @@ dependencies:
   name: cancan
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.10
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.18
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.1
-- !ruby/object:Gem::Dependency
-  name: money
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '5.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.4.1
 - !ruby/object:Gem::Dependency
   name: paranoia
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
@@ -252,14 +238,14 @@ dependencies:
   name: stringex
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.1
 - !ruby/object:Gem::Dependency
@@ -311,6 +297,7 @@ files:
 - app/models/spree/app_configuration.rb
 - app/models/spree/asset.rb
 - app/models/spree/billing_integration.rb
+- app/models/spree/calculator.rb
 - app/models/spree/calculator/default_tax.rb
 - app/models/spree/calculator/flat_percent_item_total.rb
 - app/models/spree/calculator/flat_rate.rb
@@ -324,14 +311,13 @@ files:
 - app/models/spree/calculator/shipping/flexi_rate.rb
 - app/models/spree/calculator/shipping/per_item.rb
 - app/models/spree/calculator/shipping/price_sack.rb
-- app/models/spree/calculator.rb
 - app/models/spree/classification.rb
 - app/models/spree/configuration.rb
 - app/models/spree/country.rb
 - app/models/spree/credit_card.rb
+- app/models/spree/gateway.rb
 - app/models/spree/gateway/bogus.rb
 - app/models/spree/gateway/bogus_simple.rb
-- app/models/spree/gateway.rb
 - app/models/spree/image.rb
 - app/models/spree/inventory_unit.rb
 - app/models/spree/legacy_user.rb
@@ -339,27 +325,28 @@ files:
 - app/models/spree/log_entry.rb
 - app/models/spree/option_type.rb
 - app/models/spree/option_value.rb
-- app/models/spree/order/checkout.rb
 - app/models/spree/order.rb
+- app/models/spree/order/checkout.rb
 - app/models/spree/order_contents.rb
 - app/models/spree/order_inventory.rb
 - app/models/spree/order_populator.rb
 - app/models/spree/order_updater.rb
-- app/models/spree/payment/processing.rb
 - app/models/spree/payment.rb
-- app/models/spree/payment_method/check.rb
+- app/models/spree/payment/processing.rb
 - app/models/spree/payment_method.rb
+- app/models/spree/payment_method/check.rb
 - app/models/spree/preference.rb
 - app/models/spree/preferences/configuration.rb
 - app/models/spree/preferences/preferable.rb
 - app/models/spree/preferences/preferable_class_methods.rb
 - app/models/spree/preferences/store.rb
 - app/models/spree/price.rb
-- app/models/spree/product/scopes.rb
 - app/models/spree/product.rb
+- app/models/spree/product/scopes.rb
 - app/models/spree/product_option_type.rb
 - app/models/spree/product_property.rb
 - app/models/spree/product_scope/scopes.rb
+- app/models/spree/promotion.rb
 - app/models/spree/promotion/actions/create_adjustment.rb
 - app/models/spree/promotion/actions/create_line_items.rb
 - app/models/spree/promotion/rules/first_order.rb
@@ -367,7 +354,6 @@ files:
 - app/models/spree/promotion/rules/product.rb
 - app/models/spree/promotion/rules/user.rb
 - app/models/spree/promotion/rules/user_logged_in.rb
-- app/models/spree/promotion.rb
 - app/models/spree/promotion_action.rb
 - app/models/spree/promotion_action_line_item.rb
 - app/models/spree/promotion_rule.rb
@@ -408,8 +394,8 @@ files:
 - app/models/spree/taxonomy.rb
 - app/models/spree/tokenized_permission.rb
 - app/models/spree/tracker.rb
-- app/models/spree/variant/scopes.rb
 - app/models/spree/variant.rb
+- app/models/spree/variant/scopes.rb
 - app/models/spree/zone.rb
 - app/models/spree/zone_member.rb
 - app/views/spree/admin/orders/customer_details/_autocomplete.js.erb
@@ -423,6 +409,109 @@ files:
 - config/initializers/user_class_extensions.rb
 - config/locales/en.yml
 - config/routes.rb
+- db/default/spree/countries.rb
+- db/default/spree/roles.rb
+- db/default/spree/states.rb
+- db/default/spree/zones.rb
+- db/migrate/20120831092320_spree_one_two.rb
+- db/migrate/20120831092359_spree_promo_one_two.rb
+- db/migrate/20120905145253_add_tax_rate_label.rb
+- db/migrate/20120905151823_add_toggle_tax_rate_display.rb
+- db/migrate/20120929093553_remove_unused_preference_columns.rb
+- db/migrate/20121009142519_add_lock_version_to_variant.rb
+- db/migrate/20121010142909_add_states_required_to_countries.rb
+- db/migrate/20121012071449_add_on_demand_to_product_and_variant.rb
+- db/migrate/20121017010007_remove_not_null_constraint_from_products_on_hand.rb
+- db/migrate/20121031162139_split_prices_from_variants.rb
+- db/migrate/20121107003422_remove_not_null_from_spree_prices_amount.rb
+- db/migrate/20121107184631_add_currency_to_line_items.rb
+- db/migrate/20121107194006_add_currency_to_orders.rb
+- db/migrate/20121109173623_add_cost_currency_to_variants.rb
+- db/migrate/20121111231553_remove_display_on_from_payment_methods.rb
+- db/migrate/20121124203911_add_position_to_taxonomies.rb
+- db/migrate/20121126040517_add_last_ip_to_spree_orders.rb
+- db/migrate/20121213162028_add_state_to_spree_adjustments.rb
+- db/migrate/20130114053446_add_display_on_to_spree_payment_methods.rb
+- db/migrate/20130120201805_add_position_to_product_properties.spree.rb
+- db/migrate/20130203232234_add_identifier_to_spree_payments.rb
+- db/migrate/20130207155350_add_order_id_index_to_payments.rb
+- db/migrate/20130208032954_add_primary_to_spree_products_taxons.rb
+- db/migrate/20130211190146_create_spree_stock_items.rb
+- db/migrate/20130211191120_create_spree_stock_locations.rb
+- db/migrate/20130213191427_create_default_stock.rb
+- db/migrate/20130222032153_add_order_id_index_to_shipments.rb
+- db/migrate/20130226032817_change_meta_description_on_spree_products_to_text.rb
+- db/migrate/20130226191231_add_stock_location_id_to_spree_shipments.rb
+- db/migrate/20130227143905_add_pending_to_inventory_unit.rb
+- db/migrate/20130228164411_remove_on_demand_from_product_and_variant.rb
+- db/migrate/20130228210442_create_shipping_method_zone.rb
+- db/migrate/20130301162745_remove_shipping_category_id_from_shipping_method.rb
+- db/migrate/20130301162924_create_shipping_method_categories.rb
+- db/migrate/20130301205200_add_tracking_url_to_spree_shipping_methods.rb
+- db/migrate/20130304162240_create_spree_shipping_rates.rb
+- db/migrate/20130304192936_remove_category_match_attributes_from_shipping_method.rb
+- db/migrate/20130305143310_create_stock_movements.rb
+- db/migrate/20130306181701_add_address_fields_to_stock_location.rb
+- db/migrate/20130306191917_add_active_field_to_stock_locations.rb
+- db/migrate/20130306195650_add_backorderable_to_stock_item.rb
+- db/migrate/20130307161754_add_default_quantity_to_stock_movement.rb
+- db/migrate/20130318151756_add_source_and_destination_to_stock_movements.rb
+- db/migrate/20130319062004_change_orders_total_precision.rb
+- db/migrate/20130319063911_change_spree_payments_amount_precision.rb
+- db/migrate/20130319064308_change_spree_return_authorization_amount_precision.rb
+- db/migrate/20130319082943_change_adjustments_amount_precision.rb
+- db/migrate/20130319183250_add_originator_to_stock_movement.rb
+- db/migrate/20130319190507_drop_source_and_destination_from_stock_movement.rb
+- db/migrate/20130325163316_migrate_inventory_unit_sold_to_on_hand.rb
+- db/migrate/20130326175857_add_stock_location_to_rma.rb
+- db/migrate/20130328130308_update_shipment_state_for_canceled_orders.rb
+- db/migrate/20130328195253_add_seo_metas_to_taxons.rb
+- db/migrate/20130329134939_remove_stock_item_and_variant_lock.rb
+- db/migrate/20130417120034_add_index_to_source_columns_on_adjustments.rb
+- db/migrate/20130417120035_update_adjustment_states.rb
+- db/migrate/20130417123427_add_shipping_rates_to_shipments.rb
+- db/migrate/20130418125341_create_spree_stock_transfers.rb
+- db/migrate/20130423110707_drop_products_count_on_hand.rb
+- db/migrate/20130423223847_set_default_shipping_rate_cost.rb
+- db/migrate/20130509115210_add_number_to_stock_transfer.rb
+- db/migrate/20130514151929_add_sku_index_to_spree_variants.rb
+- db/migrate/20130515180736_add_backorderable_default_to_spree_stock_location.rb
+- db/migrate/20130516151222_add_propage_all_variants_to_spree_stock_location.rb
+- db/migrate/20130611054351_rename_shipping_methods_zones_to_spree_shipping_methods_zones.rb
+- db/migrate/20130611185927_add_user_id_index_to_spree_orders.rb
+- db/migrate/20130618041418_add_updated_at_to_spree_countries.rb
+- db/migrate/20130619012236_add_updated_at_to_spree_states.rb
+- db/migrate/20130626232741_add_cvv_result_code_and_cvv_result_message_to_spree_payments.rb
+- db/migrate/20130628021056_add_unique_index_to_permalink_on_spree_products.rb
+- db/migrate/20130628022817_add_unique_index_to_orders_shipments_and_stock_transfers.rb
+- db/migrate/20130708052307_add_deleted_at_to_spree_tax_rates.rb
+- db/migrate/20130711200933_remove_lock_version_from_inventory_units.rb
+- db/migrate/20130718042445_add_cost_price_to_line_item.rb
+- db/migrate/20130718233855_set_backorderable_to_default_to_false.rb
+- db/migrate/20130725031716_add_created_by_id_to_spree_orders.rb
+- db/migrate/20130729214043_index_completed_at_on_spree_orders.rb
+- db/migrate/20130802014537_add_tax_category_id_to_spree_line_items.rb
+- db/migrate/20130802022321_migrate_tax_categories_to_line_items.rb
+- db/migrate/20130806022521_drop_spree_mail_methods.rb
+- db/migrate/20130806145853_set_default_stock_location_on_shipments.rb
+- db/migrate/20130809164245_add_admin_name_column_to_spree_shipping_methods.rb
+- 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/migrate/20131026154747_add_track_inventory_to_variant.rb
+- db/migrate/20131113035136_add_channel_to_spree_orders.rb
+- db/migrate/20131118041203_add_tax_total_to_spree_orders.rb
+- db/migrate/20131118043021_add_order_id_to_spree_adjustments.rb
+- db/migrate/20131118074808_add_included_to_spree_adjustments.rb
+- db/migrate/20131120234456_add_updated_at_to_variants.rb
+- db/migrate/20131211192741_unique_shipping_method_categories.rb
+- db/migrate/20140120160805_add_index_to_variant_id_and_currency_on_prices.rb
+- db/seeds.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
@@ -441,7 +530,9 @@ files:
 - lib/generators/spree/install/templates/app/assets/stylesheets/admin/all.css
 - lib/generators/spree/install/templates/app/assets/stylesheets/store/all.css
 - lib/generators/spree/install/templates/config/initializers/spree.rb
+- lib/spree/core.rb
 - lib/spree/core/calculated_adjustments.rb
+- lib/spree/core/controller_helpers.rb
 - lib/spree/core/controller_helpers/auth.rb
 - lib/spree/core/controller_helpers/common.rb
 - lib/spree/core/controller_helpers/order.rb
@@ -449,14 +540,14 @@ files:
 - lib/spree/core/controller_helpers/search.rb
 - lib/spree/core/controller_helpers/ssl.rb
 - lib/spree/core/controller_helpers/strong_parameters.rb
-- lib/spree/core/controller_helpers.rb
 - lib/spree/core/delegate_belongs_to.rb
 - lib/spree/core/engine.rb
-- lib/spree/core/environment/calculators.rb
 - lib/spree/core/environment.rb
+- lib/spree/core/environment/calculators.rb
 - lib/spree/core/environment_extension.rb
 - lib/spree/core/gateway_error.rb
 - lib/spree/core/mail_interceptor.rb
+- lib/spree/core/mail_method.rb
 - lib/spree/core/mail_settings.rb
 - lib/spree/core/permalinks.rb
 - lib/spree/core/preference_rescue.rb
@@ -466,12 +557,13 @@ files:
 - lib/spree/core/s3_support.rb
 - lib/spree/core/search/base.rb
 - lib/spree/core/token_resource.rb
+- lib/spree/core/user_address.rb
 - lib/spree/core/validators/email.rb
 - lib/spree/core/version.rb
-- lib/spree/core.rb
+- lib/spree/i18n.rb
 - lib/spree/i18n/base.rb
 - lib/spree/i18n/initializer.rb
-- lib/spree/i18n.rb
+- lib/spree/migrations.rb
 - lib/spree/money.rb
 - lib/spree/permitted_attributes.rb
 - lib/spree/promo/coupon_applicator.rb
@@ -484,6 +576,7 @@ files:
 - lib/spree/testing_support/common_rake.rb
 - lib/spree/testing_support/controller_requests.rb
 - lib/spree/testing_support/extension_rake.rb
+- lib/spree/testing_support/factories.rb
 - lib/spree/testing_support/factories/activator_factory.rb
 - lib/spree/testing_support/factories/address_factory.rb
 - lib/spree/testing_support/factories/adjustment_factory.rb
@@ -522,7 +615,6 @@ files:
 - lib/spree/testing_support/factories/user_factory.rb
 - lib/spree/testing_support/factories/variant_factory.rb
 - lib/spree/testing_support/factories/zone_factory.rb
-- lib/spree/testing_support/factories.rb
 - lib/spree/testing_support/flash.rb
 - lib/spree/testing_support/i18n.rb
 - lib/spree/testing_support/order_walkthrough.rb
@@ -530,104 +622,6 @@ files:
 - lib/spree/testing_support/url_helpers.rb
 - lib/spree_core.rb
 - lib/tasks/core.rake
-- db/default/spree/countries.rb
-- db/default/spree/roles.rb
-- db/default/spree/states.rb
-- db/default/spree/zones.rb
-- db/migrate/20120831092320_spree_one_two.rb
-- db/migrate/20120831092359_spree_promo_one_two.rb
-- db/migrate/20120905145253_add_tax_rate_label.rb
-- db/migrate/20120905151823_add_toggle_tax_rate_display.rb
-- db/migrate/20120929093553_remove_unused_preference_columns.rb
-- db/migrate/20121009142519_add_lock_version_to_variant.rb
-- db/migrate/20121010142909_add_states_required_to_countries.rb
-- db/migrate/20121012071449_add_on_demand_to_product_and_variant.rb
-- db/migrate/20121017010007_remove_not_null_constraint_from_products_on_hand.rb
-- db/migrate/20121031162139_split_prices_from_variants.rb
-- db/migrate/20121107003422_remove_not_null_from_spree_prices_amount.rb
-- db/migrate/20121107184631_add_currency_to_line_items.rb
-- db/migrate/20121107194006_add_currency_to_orders.rb
-- db/migrate/20121109173623_add_cost_currency_to_variants.rb
-- db/migrate/20121111231553_remove_display_on_from_payment_methods.rb
-- db/migrate/20121124203911_add_position_to_taxonomies.rb
-- db/migrate/20121126040517_add_last_ip_to_spree_orders.rb
-- db/migrate/20121213162028_add_state_to_spree_adjustments.rb
-- db/migrate/20130114053446_add_display_on_to_spree_payment_methods.rb
-- db/migrate/20130120201805_add_position_to_product_properties.spree.rb
-- db/migrate/20130203232234_add_identifier_to_spree_payments.rb
-- db/migrate/20130207155350_add_order_id_index_to_payments.rb
-- db/migrate/20130208032954_add_primary_to_spree_products_taxons.rb
-- db/migrate/20130211190146_create_spree_stock_items.rb
-- db/migrate/20130211191120_create_spree_stock_locations.rb
-- db/migrate/20130213191427_create_default_stock.rb
-- db/migrate/20130222032153_add_order_id_index_to_shipments.rb
-- db/migrate/20130226032817_change_meta_description_on_spree_products_to_text.rb
-- db/migrate/20130226191231_add_stock_location_id_to_spree_shipments.rb
-- db/migrate/20130227143905_add_pending_to_inventory_unit.rb
-- db/migrate/20130228164411_remove_on_demand_from_product_and_variant.rb
-- db/migrate/20130228210442_create_shipping_method_zone.rb
-- db/migrate/20130301162745_remove_shipping_category_id_from_shipping_method.rb
-- db/migrate/20130301162924_create_shipping_method_categories.rb
-- db/migrate/20130301205200_add_tracking_url_to_spree_shipping_methods.rb
-- db/migrate/20130304162240_create_spree_shipping_rates.rb
-- db/migrate/20130304192936_remove_category_match_attributes_from_shipping_method.rb
-- db/migrate/20130305143310_create_stock_movements.rb
-- db/migrate/20130306181701_add_address_fields_to_stock_location.rb
-- db/migrate/20130306191917_add_active_field_to_stock_locations.rb
-- db/migrate/20130306195650_add_backorderable_to_stock_item.rb
-- db/migrate/20130307161754_add_default_quantity_to_stock_movement.rb
-- db/migrate/20130318151756_add_source_and_destination_to_stock_movements.rb
-- db/migrate/20130319062004_change_orders_total_precision.rb
-- db/migrate/20130319063911_change_spree_payments_amount_precision.rb
-- db/migrate/20130319064308_change_spree_return_authorization_amount_precision.rb
-- db/migrate/20130319082943_change_adjustments_amount_precision.rb
-- db/migrate/20130319183250_add_originator_to_stock_movement.rb
-- db/migrate/20130319190507_drop_source_and_destination_from_stock_movement.rb
-- db/migrate/20130325163316_migrate_inventory_unit_sold_to_on_hand.rb
-- db/migrate/20130326175857_add_stock_location_to_rma.rb
-- db/migrate/20130328130308_update_shipment_state_for_canceled_orders.rb
-- db/migrate/20130328195253_add_seo_metas_to_taxons.rb
-- db/migrate/20130329134939_remove_stock_item_and_variant_lock.rb
-- db/migrate/20130417120035_update_adjustment_states.rb
-- db/migrate/20130417123427_add_shipping_rates_to_shipments.rb
-- db/migrate/20130418125341_create_spree_stock_transfers.rb
-- db/migrate/20130423110707_drop_products_count_on_hand.rb
-- db/migrate/20130423223847_set_default_shipping_rate_cost.rb
-- db/migrate/20130509115210_add_number_to_stock_transfer.rb
-- db/migrate/20130514151929_add_sku_index_to_spree_variants.rb
-- db/migrate/20130515180736_add_backorderable_default_to_spree_stock_location.rb
-- db/migrate/20130516151222_add_propage_all_variants_to_spree_stock_location.rb
-- db/migrate/20130611054351_rename_shipping_methods_zones_to_spree_shipping_methods_zones.rb
-- db/migrate/20130611185927_add_user_id_index_to_spree_orders.rb
-- db/migrate/20130618041418_add_updated_at_to_spree_countries.rb
-- db/migrate/20130619012236_add_updated_at_to_spree_states.rb
-- db/migrate/20130626232741_add_cvv_result_code_and_cvv_result_message_to_spree_payments.rb
-- db/migrate/20130628021056_add_unique_index_to_permalink_on_spree_products.rb
-- db/migrate/20130628022817_add_unique_index_to_orders_shipments_and_stock_transfers.rb
-- db/migrate/20130708052307_add_deleted_at_to_spree_tax_rates.rb
-- db/migrate/20130711200933_remove_lock_version_from_inventory_units.rb
-- db/migrate/20130718042445_add_cost_price_to_line_item.rb
-- db/migrate/20130718233855_set_backorderable_to_default_to_false.rb
-- db/migrate/20130725031716_add_created_by_id_to_spree_orders.rb
-- db/migrate/20130729214043_index_completed_at_on_spree_orders.rb
-- db/migrate/20130802014537_add_tax_category_id_to_spree_line_items.rb
-- db/migrate/20130802022321_migrate_tax_categories_to_line_items.rb
-- db/migrate/20130806022521_drop_spree_mail_methods.rb
-- db/migrate/20130806145853_set_default_stock_location_on_shipments.rb
-- db/migrate/20130809164245_add_admin_name_column_to_spree_shipping_methods.rb
-- 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/migrate/20131113035136_add_channel_to_spree_orders.rb
-- db/migrate/20131118041203_add_tax_total_to_spree_orders.rb
-- db/migrate/20131118043021_add_order_id_to_spree_adjustments.rb
-- db/migrate/20131118074808_add_included_to_spree_adjustments.rb
-- db/seeds.rb
 - vendor/assets/javascripts/jquery-migrate-1.0.0.js
 - vendor/assets/javascripts/jquery.payment.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_et.js
@@ -656,17 +650,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.0
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: The bare bones necessary for Spree.