spree_core 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c5bf35a8b95692aa7ff0d8680f50c4c09fca20c
-  data.tar.gz: bb49344e459351d49fd48e2f611efb632c91df74
+  metadata.gz: 1dc6551fae8388e2e554f586b98556214ddc7853
+  data.tar.gz: 172fdc171d09cf9cb196a0b1b10dc3447bc44dfb
 SHA512:
-  metadata.gz: 0cc6f3c95ba0dce27047501a44aa7434479df796de8e30349d929e24bc1566729d915d53cf5e6c7503c157829784b2070f2e37929009d497f75aeb892b3d2ba7
-  data.tar.gz: 357cfcbbe86573ef29d1611cd3260957cb5650827724626b5348d2ef38ea356b30746c317ef4f94b59d448dbfb758b2832c60f3ed5a22e4f29d8d1af45360cae
+  metadata.gz: c0bf787e475d0ac901befe43e5f800d318043e1326b42b2b66ec7bf70ca3a193d2758cbe3d8697a9f2ede3ae313ca712dcad61b4610b11eda8a7cf5a6b4ab5e7
+  data.tar.gz: 686846bad87532c1c6d0490a20e96ac8737563b0992020f3db17a9701e2288ea06630147ce81b77de564e54ac9718d45e7cb474897f0629904a7be4a2af3325d

data/app/assets/javascripts/store/product.js.coffee

@@ -21,10 +21,10 @@ show_variant_images = (variant_id) ->
   ($ 'li.tmb-' + variant_id).show()
   currentThumb = ($ '#' + ($ '#main-image').data('selectedThumbId'))
   if not currentThumb.hasClass('vtmb-' + variant_id)
-    thumb = ($ ($ 'ul.thumbnails li:visible.vtmb').eq(0))
-    thumb = ($ ($ 'ul.thumbnails li:visible').eq(0)) unless thumb.length > 0
+    thumb = ($ ($ '#product-images ul.thumbnails li:visible.vtmb').eq(0))
+    thumb = ($ ($ '#product-images ul.thumbnails li:visible').eq(0)) unless thumb.length > 0
     newImg = thumb.find('a').attr('href')
-    ($ 'ul.thumbnails li').removeClass 'selected'
+    ($ '#product-images ul.thumbnails li').removeClass 'selected'
     thumb.addClass 'selected'
     ($ '#main-image img').attr 'src', newImg
     ($ '#main-image').data 'selectedThumb', newImg

data/app/controllers/spree/orders_controller.rb

@@ -22,6 +22,7 @@ module Spree
 
       if @order.update_attributes(params[:order])
         @order.line_items = @order.line_items.select {|li| li.quantity > 0 }
+        @order.restart_checkout_flow
         fire_event('spree.order.contents_changed')
         respond_with(@order) do |format|
           format.html do

data/app/helpers/spree/base_helper.rb

@@ -155,7 +155,7 @@ module Spree
 
     def pretty_time(time)
       [I18n.l(time.to_date, :format => :long),
-        time.strftime("%H:%m %p")].join(" ")
+        time.strftime("%l:%m %p")].join(" ")
     end
 
     def method_missing(method_name, *args, &block)

data/app/models/spree/order.rb

@@ -165,7 +165,7 @@ module Spree
 
     # If true, causes the confirmation step to happen during the checkout process
     def confirmation_required?
-      payments.map(&:payment_method).any?(&:payment_profiles_supported?)
+      payments.valid.map(&:payment_method).any?(&:payment_profiles_supported?)
     end
 
     # Used by the checkout state machine to check for unprocessed payments
@@ -261,7 +261,7 @@ module Spree
     def awaiting_returns?
       return_authorizations.any? { |return_authorization| return_authorization.authorized? }
     end
-    
+
     def add_variant(variant, quantity = 1, currency = nil)
       current_item = find_line_item_by_variant(variant)
       if current_item
@@ -528,6 +528,10 @@ module Spree
       end
     end
 
+    def restart_checkout_flow
+      self.update_column(:state, checkout_steps.first) unless cart?
+    end
+
     private
       def link_by_email
         self.email = user.email if self.user

data/app/models/spree/order_populator.rb

@@ -47,6 +47,7 @@ module Spree
       if quantity > 0
         if check_stock_levels(variant, quantity)
           @order.add_variant(variant, quantity, currency)
+          @order.restart_checkout_flow
         end
       end
     end

data/app/models/spree/product.rb

@@ -127,7 +127,7 @@ module Spree
 
     def on_demand=(new_on_demand)
       raise 'cannot set on_demand of product with variants' if has_variants? && Spree::Config[:track_inventory_levels]
-      master.on_demand = on_demand
+      master.on_demand = new_on_demand
       self[:on_demand] = new_on_demand
     end
 

data/app/models/spree/variant.rb

@@ -9,7 +9,8 @@ module Spree
     attr_accessible :name, :presentation, :cost_price, :lock_version,
                     :position, :on_demand, :on_hand, :option_value_ids,
                     :product_id, :option_values_attributes, :price,
-                    :weight, :height, :width, :depth, :sku, :cost_currency
+                    :weight, :height, :width, :depth, :sku, :cost_currency,
+                    :options
 
     has_many :inventory_units
     has_many :line_items
@@ -108,6 +109,12 @@ module Spree
       deleted_at
     end
 
+    def options=(options = {})
+      options.each do |option|
+        set_option_value(option[:name], option[:value])
+      end
+    end
+
     def set_option_value(opt_name, opt_value)
       # no option values on master
       return if self.is_master

data/app/views/spree/admin/orders/customer_details/_form.html.erb

@@ -61,6 +61,6 @@
   </div>
 
   <% content_for :head do %>
-    <%= javascript_include_tag states_path, 'admin/address_states.js' %>
+    <%= javascript_include_tag 'admin/states.js', 'admin/address_states.js' %>
   <% end %>
 </fieldset>

data/app/views/spree/admin/payment_methods/_form.html.erb

@@ -1,5 +1,6 @@
 <% # Usage of old-style form helpers in this file is INTENTIONAL
-   # For reasons, see commit 3e981c7. %>
+   # For reasons, see commit 3e981c7. 
+   %>
 <div data-hook="admin_payment_method_form_fields">
 
   <div data-hook="payment_method">

data/app/views/spree/admin/shared/_report_criteria.html.erb

@@ -1,13 +1,13 @@
 <%= search_form_for @search, :url => spree.sales_total_admin_reports_path  do |s| %>
     <div class="date-range-filter field align-center">
         <%= label_tag nil, t(:start), :class => 'inline' %>
-        <%= s.text_field :created_at_gt, :class => 'datepicker datepicker-from' %>
+        <%= s.text_field :created_at_gt, :class => 'datepicker datepicker-from', :value => datepicker_field_value(params[:q][:created_at_gt]) %>
         
         <span class="range-divider">
           <i class="icon-arrow-right"></i>
         </span>
 
-        <%= s.text_field :created_at_lt, :class => 'datepicker datepicker-to' %>
+        <%= s.text_field :created_at_lt, :class => 'datepicker datepicker-to', :value => datepicker_field_value(params[:q][:created_at_lt]) %>
         <%= label_tag nil, t(:end), :class => 'inline' %>
     </div>
 

data/app/views/spree/admin/taxons/edit.html.erb

@@ -10,7 +10,7 @@
   </li>
 <% end %>
 
-<% # Because otherwise the form would attempt to use to_param of @taxon %>
+<%# Because otherwise the form would attempt to use to_param of @taxon %>
 <% form_url = admin_taxonomy_taxon_path(@taxonomy.id, @taxon.id) %>
 <%= form_for [:admin, @taxonomy, @taxon], :method => :put, :url => form_url, :html => { :multipart => true } do |f| %>
   <%= render :partial => 'form', :locals => { :f => f } %>

data/app/views/spree/checkout/_delivery.html.erb

@@ -6,7 +6,7 @@
         <% @order.rate_hash.each do |shipping_method| %>
           <label>
             <%= radio_button(:order, :shipping_method_id, shipping_method[:id]) %>
-            <%= shipping_method.name %> <%= shipping_method.display_price.to_html %>
+            <%= shipping_method.name %>&nbsp;<%= shipping_method.display_price.to_html %>
           </label>
         <% end %>
       </p>

data/db/migrate/20131113035136_add_channel_to_spree_orders.rb

@@ -0,0 +1,5 @@
+class AddChannelToSpreeOrders < ActiveRecord::Migration
+  def change
+    add_column :spree_orders, :channel, :string, default: "spree"
+  end
+end

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

@@ -26,21 +26,31 @@ 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/spree/core.rb

@@ -108,3 +108,30 @@ end
 ActiveSupport.on_load(:action_view) do
   include Spree::Core::StoreHelpers
 end
+
+# Monkey patch to give us miliseconds precision in timestamps
+module ActiveSupport
+  class TimeWithZone
+    # Coerces time to a string for JSON encoding. The default format is ISO 8601. You can get
+    # %Y/%m/%d %H:%M:%S +offset style by setting <tt>ActiveSupport::JSON::Encoding.use_standard_json_time_format</tt>
+    # to false.
+    #
+    # ==== Examples
+    #
+    #   # With ActiveSupport::JSON::Encoding.use_standard_json_time_format = true
+    #   Time.utc(2005,2,1,15,15,10).in_time_zone.to_json
+    #   # => "2005-02-01T15:15:10.001Z"
+    #
+    #   # With ActiveSupport::JSON::Encoding.use_standard_json_time_format = false
+    #   Time.utc(2005,2,1,15,15,10).in_time_zone.to_json
+    #   # => "2005/02/01 15:15:10 +0000"
+    #
+    def as_json(options = nil)
+      if ActiveSupport::JSON::Encoding.use_standard_json_time_format
+        xmlschema(3)
+      else
+        %(#{time.strftime("%Y/%m/%d %H:%M:%S")} #{formatted_offset(false)})
+      end
+    end
+  end
+end

data/lib/spree/core/engine.rb

@@ -87,6 +87,7 @@ module Spree
           admin/all.*
           admin/orders/edit_form.js
           admin/address_states.js
+          admin/states.js
           jqPlot/excanvas.min.js
           admin/images/new.js
           jquery.jstree/themes/apple/*

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "1.3.4"
+    "1.3.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2014-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -42,14 +42,14 @@ dependencies:
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.0
 - !ruby/object:Gem::Dependency
@@ -98,42 +98,42 @@ dependencies:
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.15.0
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.11.1
 - !ruby/object:Gem::Dependency
@@ -154,44 +154,44 @@ dependencies:
   name: activemerchant
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.34'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.34'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.5
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.14
+        version: 3.2.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.14
+        version: 3.2.16
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -210,28 +210,28 @@ dependencies:
   name: deface
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.2
 - !ruby/object:Gem::Dependency
@@ -280,14 +280,14 @@ dependencies:
   name: truncate_html
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.5
 description: Required dependency for Spree
@@ -471,6 +471,7 @@ files:
 - app/mailers/spree/order_mailer.rb
 - app/mailers/spree/shipment_mailer.rb
 - app/mailers/spree/test_mailer.rb
+- app/models/spree.rb
 - app/models/spree/ability.rb
 - app/models/spree/activator.rb
 - app/models/spree/address.rb
@@ -479,20 +480,20 @@ 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
 - app/models/spree/calculator/flexi_rate.rb
 - app/models/spree/calculator/per_item.rb
 - app/models/spree/calculator/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
@@ -501,22 +502,22 @@ files:
 - app/models/spree/mail_method.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_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
@@ -536,11 +537,10 @@ 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/models/spree.rb
 - app/views/spree/address/_form.html.erb
 - app/views/spree/admin/adjustments/_adjustments_table.html.erb
 - app/views/spree/admin/adjustments/_form.html.erb
@@ -766,6 +766,45 @@ 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/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/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/20130222032153_add_order_id_index_to_shipments.rb
+- db/migrate/20130226032817_change_meta_description_on_spree_products_to_text.rb
+- db/migrate/20130226054936_add_variant_id_index_to_spree_prices.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/20130328195253_add_seo_metas_to_taxons.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/20130813140619_expand_order_number_size.rb
+- db/migrate/20131113035136_add_channel_to_spree_orders.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
@@ -783,18 +822,19 @@ 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/action_callbacks.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
 - lib/spree/core/controller_helpers/respond_with.rb
-- lib/spree/core/controller_helpers.rb
 - lib/spree/core/custom_fixtures.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/ext/active_record.rb
 - lib/spree/core/gateway_error.rb
@@ -815,6 +855,7 @@ files:
 - lib/spree/core/testing_support/capybara_ext.rb
 - lib/spree/core/testing_support/common_rake.rb
 - lib/spree/core/testing_support/controller_requests.rb
+- lib/spree/core/testing_support/factories.rb
 - lib/spree/core/testing_support/factories/activator_factory.rb
 - lib/spree/core/testing_support/factories/address_factory.rb
 - lib/spree/core/testing_support/factories/adjustment_factory.rb
@@ -849,7 +890,6 @@ files:
 - lib/spree/core/testing_support/factories/user_factory.rb
 - lib/spree/core/testing_support/factories/variant_factory.rb
 - lib/spree/core/testing_support/factories/zone_factory.rb
-- lib/spree/core/testing_support/factories.rb
 - lib/spree/core/testing_support/fixtures.rb
 - lib/spree/core/testing_support/flash.rb
 - lib/spree/core/testing_support/preferences.rb
@@ -858,7 +898,6 @@ files:
 - lib/spree/core/user_banners.rb
 - lib/spree/core/validators/email.rb
 - lib/spree/core/version.rb
-- lib/spree/core.rb
 - lib/spree/money.rb
 - lib/spree/product_filters.rb
 - lib/spree/scopes/dynamic.rb
@@ -866,44 +905,6 @@ files:
 - lib/tasks/core.rake
 - lib/tasks/rake_util.rb
 - lib/tasks/taxon.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/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/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/20130222032153_add_order_id_index_to_shipments.rb
-- db/migrate/20130226032817_change_meta_description_on_spree_products_to_text.rb
-- db/migrate/20130226054936_add_variant_id_index_to_spree_prices.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/20130328195253_add_seo_metas_to_taxons.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/20130813140619_expand_order_number_size.rb
-- db/seeds.rb
 - vendor/assets/fonts/fontawesome-webfont.eot
 - vendor/assets/fonts/fontawesome-webfont.svg
 - vendor/assets/fonts/fontawesome-webfont.ttf
@@ -1194,6 +1195,7 @@ files:
 - vendor/assets/javascripts/jquery.jstree/themes/apple/style.css
 - vendor/assets/javascripts/jquery.jstree/themes/apple/throbber.gif
 - vendor/assets/javascripts/jquery.powertip.js
+- vendor/assets/javascripts/jquery.vAlign.js
 - vendor/assets/javascripts/jquery.validate/additional-methods.min.js
 - vendor/assets/javascripts/jquery.validate/jquery.validate.min.js
 - vendor/assets/javascripts/jquery.validate/localization/messages_ar.js
@@ -1248,7 +1250,6 @@ files:
 - vendor/assets/javascripts/jquery.validate/localization/methods_de.js
 - vendor/assets/javascripts/jquery.validate/localization/methods_nl.js
 - vendor/assets/javascripts/jquery.validate/localization/methods_pt.js
-- vendor/assets/javascripts/jquery.vAlign.js
 - vendor/assets/javascripts/jsuri.js
 - vendor/assets/javascripts/modernizr.js
 - vendor/assets/javascripts/responsive-tables.js
@@ -1271,18 +1272,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - none
 rubyforge_project: spree_core
-rubygems_version: 2.1.0
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Core e-commerce functionality for the Spree project.