spree_core 2.4.10 → 3.0.0.rc1

data/lib/spree/testing_support/common_rake.rb

@@ -18,7 +18,7 @@ namespace :common do
     puts "Setting up dummy database..."
     cmd = "bundle exec rake db:drop db:create db:migrate"
 
-    if RUBY_PLATFORM =~ /mswin/ #windows
+    if RUBY_PLATFORM =~ /mswin|mingw/ # windows
       cmd += " >nul"
     else
       cmd += " >/dev/null"
@@ -39,7 +39,7 @@ namespace :common do
     puts "Seeding ..."
     cmd = "bundle exec rake db:seed RAILS_ENV=test"
 
-    if RUBY_PLATFORM =~ /mswin/ #windows
+    if RUBY_PLATFORM =~ /mswin|mingw/ # windows
       cmd += " >nul"
     else
       cmd += " >/dev/null"

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

@@ -17,17 +17,6 @@ FactoryGirl.define do
       end
     end
 
-    factory :order_with_line_item_quantity do
-      transient do
-        line_items_quantity 1
-      end
-
-      after(:create) do |order, evaluator|
-        create(:line_item, order: order, price: evaluator.line_items_price, quantity: evaluator.line_items_quantity)
-        order.line_items.reload # to ensure order.line_items is accessible after
-      end
-    end
-
     factory :order_with_line_items do
       bill_address
       ship_address
@@ -35,6 +24,7 @@ FactoryGirl.define do
       transient do
         line_items_count 1
         shipment_cost 100
+        shipping_method_filter Spree::ShippingMethod::DISPLAY_ON_FRONT_END
       end
 
       after(:create) do |order, evaluator|
@@ -50,8 +40,8 @@ FactoryGirl.define do
       factory :completed_order_with_totals do
         state 'complete'
 
-        after(:create) do |order|
-          order.refresh_shipment_rates
+        after(:create) do |order, evaluator|
+          order.refresh_shipment_rates(evaluator.shipping_method_filter)
           order.update_column(:completed_at, Time.now)
         end
 

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

@@ -1,18 +1,15 @@
 FactoryGirl.define do
   factory :check_payment_method, class: Spree::PaymentMethod::Check do
     name 'Check'
-    environment 'test'
   end
 
   factory :credit_card_payment_method, class: Spree::Gateway::Bogus do
     name 'Credit Card'
-    environment 'test'
   end
 
   # authorize.net was moved to spree_gateway.
   # Leaving this factory in place with bogus in case anyone is using it.
   factory :simple_credit_card_payment_method, class: Spree::Gateway::BogusSimple do
     name 'Credit Card'
-    environment 'test'
   end
 end

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

@@ -3,4 +3,9 @@ FactoryGirl.define do
     name 'Baseball Cap'
     properties { [create(:property)] }
   end
+  factory :prototype_with_option_types, class: Spree::Prototype do
+    name 'Baseball Cap'
+    properties { [create(:property)] }
+    option_types { [create(:option_type)] }
+  end
 end

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

@@ -4,7 +4,11 @@ FactoryGirl.define do
     association(:return_authorization, factory: :return_authorization)
 
     factory :exchange_return_item do
-      association(:exchange_variant, factory: :variant)
+      after(:build) do |return_item|
+        # set track_inventory to false to ensure it passes the in_stock check
+        return_item.inventory_unit.variant.update_column(:track_inventory, false)
+        return_item.exchange_variant = return_item.inventory_unit.variant
+      end
     end
   end
 end

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

@@ -10,7 +10,7 @@ FactoryGirl.define do
 
     country  { |stock_location| Spree::Country.first || stock_location.association(:country) }
     state do |stock_location|
-      stock_location.country.states.first || stock_location.association(:state, :country => stock_location.country)
+      stock_location.country.states.first || stock_location.association(:state, country: stock_location.country)
     end
 
     factory :stock_location_with_items do
@@ -20,8 +20,8 @@ FactoryGirl.define do
         product_1 = create(:product)
         product_2 = create(:product)
 
-        stock_location.stock_items.where(:variant_id => product_1.master.id).first.adjust_count_on_hand(10)
-        stock_location.stock_items.where(:variant_id => product_2.master.id).first.adjust_count_on_hand(20)
+        stock_location.stock_items.where(variant_id: product_1.master.id).first.adjust_count_on_hand(10)
+        stock_location.stock_items.where(variant_id: product_2.master.id).first.adjust_count_on_hand(20)
       end
     end
   end

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

@@ -1,6 +1,5 @@
 FactoryGirl.define do
   factory :tracker, class: Spree::Tracker do
-    environment { Rails.env }
     analytics_id 'A100'
     active true
   end

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

@@ -14,7 +14,7 @@ FactoryGirl.define do
       spree_roles { [Spree::Role.find_by(name: 'admin') || create(:role, name: 'admin')] }
     end
 
-    factory :user_with_addreses do
+    factory :user_with_addresses, aliases: [:user_with_addreses] do
       ship_address
       bill_address
     end

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

@@ -13,5 +13,13 @@ FactoryGirl.define do
   factory :zone, class: Spree::Zone do
     name { generate(:random_string) }
     description { generate(:random_string) }
+
+    factory :zone_with_country do
+      zone_members do |proxy|
+        zone = proxy.instance_eval { @instance }
+        country = create(:country)
+        [Spree::ZoneMember.create(zoneable: country, zone: zone)]
+      end
+    end
   end
 end

data/lib/tasks/core.rake

@@ -22,7 +22,7 @@ use rake db:load_file[/absolute/path/to/sample/filename.rb]}
       ruby_files[File.basename(fixture_file, '.*')] = fixture_file
     end
     ruby_files.sort.each do |fixture , ruby_file|
-      # If file is exists within application it takes precendence.
+      # If file exists within application it takes precendence.
       if File.exists?(File.join(Rails.root, "db/default/spree", "#{fixture}.rb"))
         ruby_file = File.expand_path(File.join(Rails.root, "db/default/spree", "#{fixture}.rb"))
       end

data/lib/tasks/email.rake

@@ -1,7 +1,10 @@
 namespace :email do
   desc 'Sends test email to specified address - Example: EMAIL=spree@example.com bundle exec rake test:email'
-  task :test => :environment do
-    raise ArgumentError, "Must pass EMAIL environment variable. Example: EMAIL=spree@example.com bundle exec rake test:email" unless ENV['EMAIL'].present?
-    Spree::TestMailer.test_email(ENV['EMAIL']).deliver!
+  task test: :environment do
+    unless ENV['EMAIL'].present?
+      raise ArgumentError, "Must pass EMAIL environment variable. " \
+                           "Example: EMAIL=spree@example.com bundle exec rake test:email"
+    end
+    Spree::TestMailer.test_email(ENV['EMAIL']).deliver_now
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.4.10
+  version: 3.0.0.rc1
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2015-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
@@ -260,14 +260,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.11
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.11
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -283,33 +283,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.4.1
 - !ruby/object:Gem::Dependency
-  name: state_machine
+  name: responders
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: stringex
+  name: state_machines-activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: stringex
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: truncate_html
   requirement: !ruby/object:Gem::Requirement
@@ -367,11 +381,7 @@ files:
 - app/assets/javascripts/spree.js.coffee.erb
 - app/controllers/spree/base_controller.rb
 - app/helpers/spree/base_helper.rb
-- app/helpers/spree/checkout_helper.rb
-- app/helpers/spree/orders_helper.rb
 - app/helpers/spree/products_helper.rb
-- app/helpers/spree/store_helper.rb
-- app/helpers/spree/taxons_helper.rb
 - app/mailers/spree/base_mailer.rb
 - app/mailers/spree/order_mailer.rb
 - app/mailers/spree/reimbursement_mailer.rb
@@ -380,21 +390,22 @@ files:
 - app/models/concerns/spree/adjustment_source.rb
 - app/models/concerns/spree/calculated_adjustments.rb
 - app/models/concerns/spree/default_price.rb
+- app/models/concerns/spree/display_money.rb
 - app/models/concerns/spree/named_type.rb
-- app/models/concerns/spree/ransackable_attributes.rb
+- app/models/concerns/spree/number_generator.rb
 - app/models/concerns/spree/user_address.rb
 - app/models/concerns/spree/user_api_authentication.rb
 - app/models/concerns/spree/user_payment_source.rb
 - app/models/concerns/spree/user_reporting.rb
-- app/models/friendly_id/slug_decorator.rb
 - app/models/spree/ability.rb
 - app/models/spree/address.rb
+- app/models/spree/adjustable/adjustments_updater.rb
+- app/models/spree/adjustable/promotion_accumulator.rb
 - app/models/spree/adjustment.rb
 - app/models/spree/alert.rb
 - app/models/spree/app_configuration.rb
 - app/models/spree/asset.rb
 - app/models/spree/base.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
@@ -413,7 +424,6 @@ files:
 - app/models/spree/calculator/tiered_flat_rate.rb
 - app/models/spree/calculator/tiered_percent.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/customer_return.rb
@@ -423,7 +433,6 @@ files:
 - app/models/spree/gateway/bogus_simple.rb
 - app/models/spree/image.rb
 - app/models/spree/inventory_unit.rb
-- app/models/spree/item_adjustments.rb
 - app/models/spree/legacy_user.rb
 - app/models/spree/line_item.rb
 - app/models/spree/log_entry.rb
@@ -435,10 +444,9 @@ files:
 - app/models/spree/order/payments.rb
 - app/models/spree/order_contents.rb
 - app/models/spree/order_inventory.rb
-- app/models/spree/order_merger.rb
-- app/models/spree/order_populator.rb
 - app/models/spree/order_updater.rb
 - app/models/spree/payment.rb
+- app/models/spree/payment/gateway_options.rb
 - app/models/spree/payment/processing.rb
 - app/models/spree/payment_capture_event.rb
 - app/models/spree/payment_method.rb
@@ -454,7 +462,6 @@ files:
 - 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_item_adjustments.rb
@@ -463,6 +470,7 @@ files:
 - app/models/spree/promotion/rules/first_order.rb
 - app/models/spree/promotion/rules/item_total.rb
 - app/models/spree/promotion/rules/one_use_per_user.rb
+- app/models/spree/promotion/rules/option_value.rb
 - app/models/spree/promotion/rules/product.rb
 - app/models/spree/promotion/rules/taxon.rb
 - app/models/spree/promotion/rules/user.rb
@@ -495,6 +503,8 @@ files:
 - app/models/spree/return_item.rb
 - app/models/spree/return_item/eligibility_validator/base_validator.rb
 - app/models/spree/return_item/eligibility_validator/default.rb
+- app/models/spree/return_item/eligibility_validator/inventory_shipped.rb
+- app/models/spree/return_item/eligibility_validator/no_reimbursements.rb
 - app/models/spree/return_item/eligibility_validator/order_completed.rb
 - app/models/spree/return_item/eligibility_validator/rma_required.rb
 - app/models/spree/return_item/eligibility_validator/time_since_purchase.rb
@@ -538,7 +548,6 @@ files:
 - app/models/spree/tracker.rb
 - app/models/spree/validations/db_maximum_length_validator.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/layouts/spree/base_mailer.html.erb
@@ -744,6 +753,7 @@ files:
 - db/migrate/20140806144901_add_type_to_reimbursement_type.rb
 - db/migrate/20140808184039_create_spree_reimbursement_credits.rb
 - db/migrate/20140827170513_add_meta_title_to_spree_products.rb
+- db/migrate/20140911173301_add_kind_to_zone.rb
 - db/migrate/20140924164824_add_code_to_spree_tax_categories.rb
 - db/migrate/20140927193717_default_pre_tax_amount_should_be_zero.rb
 - db/migrate/20141002191113_add_code_to_spree_shipping_methods.rb
@@ -755,9 +765,15 @@ files:
 - db/migrate/20141101231208_fix_adjustment_order_presence.rb
 - db/migrate/20141105213646_update_classifications_positions.rb
 - db/migrate/20141120135441_add_guest_token_index_to_spree_orders.rb
-- db/migrate/20150515211137_fix_adjustment_order_id.rb
-- db/migrate/20150522181728_add_deleted_at_to_friendly_id_slugs.rb
-- db/migrate/20150707204155_enable_acts_as_paranoid_on_calculators.rb
+- db/migrate/20141215232040_remove_token_permissions_table.rb
+- db/migrate/20141215235502_remove_extra_products_slug_index.rb
+- db/migrate/20141217215630_update_product_slug_index.rb
+- db/migrate/20141218025915_rename_identifier_to_number_for_payment.rb
+- db/migrate/20150121022521_remove_environment_from_payment_method.rb
+- db/migrate/20150122145607_add_resellable_to_return_items.rb
+- db/migrate/20150122202432_add_code_to_spree_promotion_categories.rb
+- db/migrate/20150128032538_remove_environment_from_tracker.rb
+- db/migrate/20150128060325_remove_spree_configurations.rb
 - db/seeds.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
 - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt
@@ -784,7 +800,6 @@ files:
 - lib/spree/core/controller_helpers/order.rb
 - lib/spree/core/controller_helpers/respond_with.rb
 - lib/spree/core/controller_helpers/search.rb
-- lib/spree/core/controller_helpers/ssl.rb
 - lib/spree/core/controller_helpers/store.rb
 - lib/spree/core/controller_helpers/strong_parameters.rb
 - lib/spree/core/delegate_belongs_to.rb
@@ -795,7 +810,6 @@ files:
 - lib/spree/core/importer.rb
 - lib/spree/core/importer/order.rb
 - lib/spree/core/importer/product.rb
-- lib/spree/core/permalinks.rb
 - lib/spree/core/product_duplicator.rb
 - lib/spree/core/product_filters.rb
 - lib/spree/core/routes.rb
@@ -823,7 +837,6 @@ files:
 - lib/spree/testing_support/factories/address_factory.rb
 - lib/spree/testing_support/factories/adjustment_factory.rb
 - lib/spree/testing_support/factories/calculator_factory.rb
-- lib/spree/testing_support/factories/configuration_factory.rb
 - lib/spree/testing_support/factories/country_factory.rb
 - lib/spree/testing_support/factories/credit_card_factory.rb
 - lib/spree/testing_support/factories/customer_return_factory.rb
@@ -890,12 +903,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.8.23
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5

data/app/helpers/spree/checkout_helper.rb

@@ -1,31 +0,0 @@
-module Spree
-  module CheckoutHelper
-    def checkout_states
-      @order.checkout_steps
-    end
-
-    def checkout_progress
-      states = checkout_states
-      items = states.map do |state|
-        text = Spree.t("order_state.#{state}").titleize
-
-        css_classes = []
-        current_index = states.index(@order.state)
-        state_index = states.index(state)
-
-        if state_index < current_index
-          css_classes << 'completed'
-          text = link_to text, checkout_state_path(state)
-        end
-
-        css_classes << 'next' if state_index == current_index + 1
-        css_classes << 'current' if state == @order.state
-        css_classes << 'first' if state_index == 0
-        css_classes << 'last' if state_index == states.length - 1
-        # It'd be nice to have separate classes but combining them with a dash helps out for IE6 which only sees the last class
-        content_tag('li', content_tag('span', text), class: css_classes.join('-'))
-      end
-      content_tag('ol', raw(items.join("\n")), class: 'progress-steps', id: "checkout-step-#{@order.state}")
-    end
-  end
-end