spree_core 2.4.10 → 3.0.0.rc1

data/db/migrate/20130418125341_create_spree_stock_transfers.rb

@@ -5,7 +5,7 @@ class CreateSpreeStockTransfers < ActiveRecord::Migration
       t.string :reference_number
       t.integer :source_location_id
       t.integer :destination_location_id
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :spree_stock_transfers, :source_location_id

data/db/migrate/20140205120320_create_spree_payment_capture_events.rb

@@ -4,7 +4,7 @@ class CreateSpreePaymentCaptureEvents < ActiveRecord::Migration
       t.decimal :amount, precision: 10, scale: 2, default: 0.0
       t.integer :payment_id
 
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :spree_payment_capture_events, :payment_id

data/db/migrate/20140309024355_create_spree_stores.rb

@@ -18,7 +18,7 @@ class CreateSpreeStores < ActiveRecord::Migration
         t.string :code
         t.boolean :default, default: false, null: false
 
-        t.timestamps
+        t.timestamps null: false
       end
     end
   end

data/db/migrate/20140309033438_create_store_from_preferences.rb

@@ -1,12 +1,5 @@
 class CreateStoreFromPreferences < ActiveRecord::Migration
   def change
-    # workaround for spree_i18n and Store translations
-    Spree::Store.class_eval do
-      def self.translated?(name)
-        false
-      end
-    end
-    
     preference_store = Spree::Preferences::Store.instance
     if store = Spree::Store.where(default: true).first
       store.meta_description = preference_store.get('spree/app_configuration/default_meta_description') {}

data/db/migrate/20140625214618_create_spree_refunds.rb

@@ -6,7 +6,7 @@ class CreateSpreeRefunds < ActiveRecord::Migration
       t.decimal :amount, precision: 10, scale: 2, default: 0.0, null: false
       t.string :transaction_id
 
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end

data/db/migrate/20140702140656_create_spree_return_authorization_inventory_unit.rb

@@ -6,7 +6,7 @@ class CreateSpreeReturnAuthorizationInventoryUnit < ActiveRecord::Migration
       t.integer :exchange_variant_id
       t.datetime :received_at
 
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end

data/db/migrate/20140713140455_create_spree_return_authorization_reasons.rb

@@ -5,7 +5,7 @@ class CreateSpreeReturnAuthorizationReasons < ActiveRecord::Migration
       t.boolean :active, default: true
       t.boolean :mutable, default: true
 
-      t.timestamps
+      t.timestamps null: false
     end
 
     reversible do |direction|

data/db/migrate/20140713140527_create_spree_refund_reasons.rb

@@ -5,7 +5,7 @@ class CreateSpreeRefundReasons < ActiveRecord::Migration
       t.boolean :active, default: true
       t.boolean :mutable, default: true
 
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_column :spree_refunds, :refund_reason_id, :integer

data/db/migrate/20140715182625_create_spree_promotion_categories.rb

@@ -2,7 +2,7 @@ class CreateSpreePromotionCategories < ActiveRecord::Migration
   def change
     create_table :spree_promotion_categories do |t|
       t.string :name
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_column :spree_promotions, :promotion_category_id, :integer

data/db/migrate/20140718133010_create_spree_customer_returns.rb

@@ -3,7 +3,7 @@ class CreateSpreeCustomerReturns < ActiveRecord::Migration
     create_table :spree_customer_returns do |t|
       t.string :number
       t.integer :stock_location_id
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end

data/db/migrate/20140725131539_create_spree_reimbursements.rb

@@ -7,7 +7,7 @@ class CreateSpreeReimbursements < ActiveRecord::Migration
       t.integer :order_id
       t.decimal :total, precision: 10, scale: 2
 
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :spree_reimbursements, :customer_return_id

data/db/migrate/20140731150017_create_spree_reimbursement_types.rb

@@ -5,7 +5,7 @@ class CreateSpreeReimbursementTypes < ActiveRecord::Migration
       t.boolean :active, default: true
       t.boolean :mutable, default: true
 
-      t.timestamps
+      t.timestamps null: false
     end
 
     reversible do |direction|

data/db/migrate/20140911173301_add_kind_to_zone.rb

@@ -0,0 +1,11 @@
+class AddKindToZone < ActiveRecord::Migration
+  def change
+    add_column :spree_zones, :kind, :string
+    add_index :spree_zones, :kind
+
+    Spree::Zone.find_each do |zone|
+      last_type = zone.members.where.not(zoneable_type: nil).pluck(:zoneable_type).last
+      zone.update_column :kind, last_type.demodulize.underscore if last_type
+    end
+  end
+end

data/db/migrate/20141215232040_remove_token_permissions_table.rb

@@ -0,0 +1,6 @@
+class RemoveTokenPermissionsTable < ActiveRecord::Migration
+  def change
+    # The MoveOrderTokenFromTokenizedPermission migration never dropped this.
+    drop_table :spree_tokenized_permissions
+  end
+end

data/db/migrate/20141215235502_remove_extra_products_slug_index.rb

@@ -0,0 +1,5 @@
+class RemoveExtraProductsSlugIndex < ActiveRecord::Migration
+  def change
+    remove_index :spree_products, name: :permalink_idx_unique
+  end
+end

data/db/migrate/20141217215630_update_product_slug_index.rb

@@ -0,0 +1,6 @@
+class UpdateProductSlugIndex < ActiveRecord::Migration
+  def change
+    remove_index :spree_products, :slug
+    add_index :spree_products, :slug, unique: true
+  end
+end

data/db/migrate/20141218025915_rename_identifier_to_number_for_payment.rb

@@ -0,0 +1,5 @@
+class RenameIdentifierToNumberForPayment < ActiveRecord::Migration
+  def change
+    rename_column :spree_payments, :identifier, :number
+  end
+end

data/db/migrate/20150121022521_remove_environment_from_payment_method.rb

@@ -0,0 +1,6 @@
+class RemoveEnvironmentFromPaymentMethod < ActiveRecord::Migration
+  def up
+    Spree::PaymentMethod.where('environment != ?', Rails.env).update_all(active: false)
+    remove_column :spree_payment_methods, :environment
+  end
+end

data/db/migrate/20150122145607_add_resellable_to_return_items.rb

@@ -0,0 +1,5 @@
+class AddResellableToReturnItems < ActiveRecord::Migration
+  def change
+    add_column :spree_return_items, :resellable, :boolean, default: true, null: false
+  end
+end

data/db/migrate/20150122202432_add_code_to_spree_promotion_categories.rb

@@ -0,0 +1,5 @@
+class AddCodeToSpreePromotionCategories < ActiveRecord::Migration
+  def change
+    add_column :spree_promotion_categories, :code, :string
+  end
+end

data/db/migrate/20150128032538_remove_environment_from_tracker.rb

@@ -0,0 +1,6 @@
+class RemoveEnvironmentFromTracker < ActiveRecord::Migration
+  def up
+    Spree::Tracker.where('environment != ?', Rails.env).update_all(active: false)
+    remove_column :spree_trackers, :environment
+  end
+end

data/db/migrate/20150128060325_remove_spree_configurations.rb

@@ -0,0 +1,16 @@
+class RemoveSpreeConfigurations < ActiveRecord::Migration
+  def up
+    drop_table "spree_configurations"
+  end
+
+  def down
+    create_table "spree_configurations", force: true do |t|
+      t.string   "name"
+      t.string   "type",       limit: 50
+      t.datetime "created_at"
+      t.datetime "updated_at"
+    end
+
+    add_index "spree_configurations", ["name", "type"], name: "index_spree_configurations_on_name_and_type"
+  end
+end

data/lib/generators/spree/dummy/templates/rails/test.rb

@@ -8,7 +8,7 @@ Dummy::Application.configure do
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
+  config.serve_static_files = true
   config.static_cache_control = "public, max-age=3600"
 
   # Show full error reports and disable caching

data/lib/generators/spree/install/templates/config/initializers/spree.rb

@@ -3,6 +3,10 @@
 # Note: Initializing preferences available within the Admin will overwrite any changes that were made through the user interface when you restart.
 #       If you would like users to be able to update a setting with the Admin it should NOT be set here.
 #
+# Note: If a preference is set here it will be stored within the cache & database upon initialization.
+#       Just removing an entry from this initializer will not make the preference value go away.
+#       Instead you must either set a new value or remove entry, clear cache, and remove database entry.
+#
 # In order to initialize a setting do:
 # config.setting_name = 'new value'
 Spree.config do |config|

data/lib/spree/core.rb

@@ -12,7 +12,8 @@ require 'paperclip'
 require 'paranoia'
 require 'premailer/rails'
 require 'ransack'
-require 'state_machine'
+require 'responders'
+require 'state_machines-activerecord'
 
 module Spree
 
@@ -64,22 +65,11 @@ require 'spree/permitted_attributes'
 
 require 'spree/core/delegate_belongs_to'
 require 'spree/core/importer'
-require 'spree/core/permalinks'
 require 'spree/core/product_duplicator'
 require 'spree/core/controller_helpers/auth'
 require 'spree/core/controller_helpers/common'
 require 'spree/core/controller_helpers/order'
 require 'spree/core/controller_helpers/respond_with'
 require 'spree/core/controller_helpers/search'
-require 'spree/core/controller_helpers/ssl'
 require 'spree/core/controller_helpers/store'
 require 'spree/core/controller_helpers/strong_parameters'
-
-# Hack waiting on https://github.com/pluginaweek/state_machine/pull/275
-module StateMachine
-  module Integrations
-    module ActiveModel
-      public :around_validation
-    end
-  end
-end

data/lib/spree/core/controller_helpers/respond_with.rb

@@ -3,26 +3,17 @@ require 'spree/responder'
 module ActionController
   class Base
     def respond_with(*resources, &block)
-      raise "In order to use respond_with, first you need to declare the formats your " <<
-            "controller responds to in the class level" if self.class.mimes_for_respond_to.empty?
-
-      if collector = retrieve_collector_from_mimes(&block)
-        options = resources.size == 1 ? {} : resources.extract_options!
-
-        if defined_response = collector.response and !Spree::BaseController.spree_responders.keys.include?(self.class.to_s.to_sym)
-          if action = options.delete(:action)
-            render :action => action
-          else
-            defined_response.call
-          end
+      if Spree::BaseController.spree_responders.keys.include?(self.class.to_s.to_sym)
+        # Checkout AS Array#extract_options! and original respond_with
+        # implementation for a better picture of this hack
+        if resources.last.is_a? Hash
+          resources.last.merge! action_name: action_name.to_sym
         else
-          # The action name is needed for processing
-          options.merge!(:action_name => action_name.to_sym)
-          # If responder is not specified then pass in Spree::Responder
-          responder = options.delete(:responder) || self.responder
-          responder.call(self, resources, options)
+          resources.push action_name: action_name.to_sym
         end
       end
+
+      super
     end
   end
 end
@@ -36,7 +27,6 @@ module Spree
         included do
           cattr_accessor :spree_responders
           self.spree_responders = {}
-
           self.responder = Spree::Responder
         end
 

data/lib/spree/core/engine.rb

@@ -78,6 +78,7 @@ module Spree
           Spree::Promotion::Rules::UserLoggedIn,
           Spree::Promotion::Rules::OneUsePerUser,
           Spree::Promotion::Rules::Taxon,
+          Spree::Promotion::Rules::OptionValue
         ]
       end
 
@@ -101,13 +102,6 @@ module Spree
       initializer "spree.core.checking_migrations" do |app|
         Migrations.new(config, engine_name).check
       end
-
-      config.to_prepare do
-        # Load application's model / class decorators
-        Dir.glob(File.join(File.dirname(__FILE__), '../../../app/**/*_decorator*.rb')) do |c|
-          Rails.configuration.cache_classes ? require(c) : load(c)
-        end
-      end
     end
   end
 end

data/lib/spree/core/routes.rb

@@ -39,7 +39,7 @@ module Spree
       end
 
       def eval_block(&block)
-        Spree::Core::Engine.routes.eval_block(block)
+        Spree::Core::Engine.routes.send :eval_block, block
       end
     end
   end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '2.4.10'
+    "3.0.0.rc1"
   end
 end

data/lib/spree/money.rb

@@ -4,22 +4,22 @@ require 'money'
 
 module Spree
   class Money
+    class <<self
+      attr_accessor :default_formatting_rules
+    end
+    self.default_formatting_rules = {
+      # Ruby money currently has this as false, which is wrong for the vast
+      # majority of locales.
+      sign_before_symbol: true
+    }
+
     attr_reader :money
 
     delegate :cents, to: :money
 
     def initialize(amount, options={})
       @money = Monetize.parse([amount, (options[:currency] || Spree::Config[:currency])].join)
-      @options = {}
-      @options[:with_currency] = Spree::Config[:display_currency]
-      @options[:symbol_position] = Spree::Config[:currency_symbol_position].to_sym
-      @options[:no_cents] = Spree::Config[:hide_cents]
-      @options[:decimal_mark] = Spree::Config[:currency_decimal_mark]
-      @options[:thousands_separator] = Spree::Config[:currency_thousands_separator]
-      @options[:sign_before_symbol] = Spree::Config[:currency_sign_before_symbol]
-      @options.merge!(options)
-      # Must be a symbol because the Money gem doesn't do the conversion
-      @options[:symbol_position] = @options[:symbol_position].to_sym
+      @options = Spree::Money.default_formatting_rules.merge(options)
     end
 
     def to_s

data/lib/spree/permitted_attributes.rb

@@ -40,7 +40,7 @@ module Spree
       :coupon_code, :email, :shipping_method_id, :special_instructions, :use_billing
     ]
 
-    @@customer_return_attributes = [:stock_location_id, return_items_attributes: [:id, :inventory_unit_id, :return_authorization_id, :returned, :pre_tax_amount, :acceptance_status, :exchange_variant_id]]
+    @@customer_return_attributes = [:stock_location_id, return_items_attributes: [:id, :inventory_unit_id, :return_authorization_id, :returned, :pre_tax_amount, :acceptance_status, :exchange_variant_id, :resellable]]
 
     @@image_attributes = [:alt, :attachment, :position, :viewable_type, :viewable_id]
 
@@ -61,9 +61,7 @@ module Spree
       :meta_keywords, :price, :sku, :deleted_at, :prototype_id,
       :option_values_hash, :weight, :height, :width, :depth,
       :shipping_category_id, :tax_category_id,
-      :taxon_ids, :cost_currency, :cost_price,
-      option_type_ids: []
-    ]
+      :taxon_ids, :option_type_ids, :cost_currency, :cost_price]
 
     @@property_attributes = [:name, :presentation]
 
@@ -103,10 +101,8 @@ module Spree
 
     @@variant_attributes = [
       :name, :presentation, :cost_price, :lock_version,
-      :position, :track_inventory,
+      :position, :option_value_ids, :track_inventory,
       :product_id, :product, :option_values_attributes, :price,
-      :weight, :height, :width, :depth, :sku, :cost_currency,
-      options: [:name, :value], option_value_ids: []
-    ]
+      :weight, :height, :width, :depth, :sku, :cost_currency, options: [ :name, :value ]]
   end
 end

data/lib/spree/testing_support/authorization_helpers.rb

@@ -37,9 +37,7 @@ module Spree
           end
 
           before do
-            allow(Spree.user_class).to receive(:find_by).
-                                         with(hash_including(:spree_api_key)).
-                                         and_return(Spree.user_class.new)
+            allow_any_instance_of(Api::BaseController).to receive(:try_spree_current_user).and_return(Spree.user_class.new)
           end
         end
 
@@ -58,6 +56,6 @@ module Spree
 end
 
 RSpec.configure do |config|
-  config.extend Spree::TestingSupport::AuthorizationHelpers::Controller, type: :controller
-  config.extend Spree::TestingSupport::AuthorizationHelpers::Request, type: :feature
+  config.extend Spree::TestingSupport::AuthorizationHelpers::Controller, :type => :controller
+  config.extend Spree::TestingSupport::AuthorizationHelpers::Request, :type => :feature
 end

data/lib/spree/testing_support/capybara_ext.rb

@@ -4,7 +4,7 @@ module CapybaraExt
   end
 
   def click_icon(type)
-    find(".fa-#{type}").click
+    find(".icon-#{type}").click
   end
 
   def eventually_fill_in(field, options={})
@@ -14,9 +14,9 @@ module CapybaraExt
 
   def within_row(num, &block)
     if RSpec.current_example.metadata[:js]
-      within("table.index tbody tr:nth-child(#{num})", &block)
+      within("table.table tbody tr:nth-child(#{num})", &block)
     else
-      within(:xpath, all("table.index tbody tr")[num-1].path, &block)
+      within(:xpath, all("table.table tbody tr")[num-1].path, &block)
     end
   end