spree_core 2.0.3 → 2.0.4

data/db/migrate/20130718042445_add_cost_price_to_line_item.rb

@@ -0,0 +1,5 @@
+class AddCostPriceToLineItem < ActiveRecord::Migration
+  def change
+    add_column :spree_line_items, :cost_price, :decimal, :precision => 8, :scale => 2
+  end
+end

data/db/migrate/20130718233855_set_backorderable_to_default_to_false.rb

@@ -0,0 +1,6 @@
+class SetBackorderableToDefaultToFalse < ActiveRecord::Migration
+  def change
+    change_column :spree_stock_items, :backorderable, :boolean, :default => false
+    change_column :spree_stock_locations, :backorderable_default, :boolean, :default => false
+  end
+end

data/db/migrate/20130725031716_add_created_by_id_to_spree_orders.rb

@@ -0,0 +1,5 @@
+class AddCreatedByIdToSpreeOrders < ActiveRecord::Migration
+  def change
+    add_column :spree_orders, :created_by_id, :integer
+  end
+end

data/db/migrate/20130729214043_index_completed_at_on_spree_orders.rb

@@ -0,0 +1,5 @@
+class IndexCompletedAtOnSpreeOrders < ActiveRecord::Migration
+  def change
+    add_index :spree_orders, :completed_at
+  end
+end

data/db/migrate/20130802014537_add_tax_category_id_to_spree_line_items.rb

@@ -0,0 +1,5 @@
+class AddTaxCategoryIdToSpreeLineItems < ActiveRecord::Migration
+  def change
+    add_column :spree_line_items, :tax_category_id, :integer
+  end
+end

data/db/migrate/20130802022321_migrate_tax_categories_to_line_items.rb

@@ -0,0 +1,9 @@
+class MigrateTaxCategoriesToLineItems < ActiveRecord::Migration
+  def change
+  	Spree::LineItem.includes(:variant => { :product => :tax_category }).find_in_batches do |line_items|
+  	  line_items.each do |line_item|
+        line_item.update_column(:tax_category_id, line_item.product.tax_category.id)
+      end
+    end
+  end
+end

data/db/migrate/20130805043440_create_spree_new_adjustments.rb

@@ -0,0 +1,8 @@
+class CreateSpreeNewAdjustments < ActiveRecord::Migration
+  def change
+    create_table :spree_new_adjustments do |t|
+
+      t.timestamps
+    end
+  end
+end

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

@@ -1,17 +1,18 @@
 <% if agent_number = ENV['TC_AGENT_NUMBER']
-database_prefix = agent_number + "_"
+database_prefix = agent_number + '_'
 end %>
 <% case ENV['DB']
   when 'sqlite' %>
 development:
   adapter: sqlite3
-  database: "db/spree_development.sqlite3"
+  database: db/spree_development.sqlite3
 test:
   adapter: sqlite3
-  database: "db/spree_test.sqlite3"
+  database: db/spree_test.sqlite3
+  timeout: 10000
 production:
   adapter: sqlite3
-  database: "db/spree_production.sqlite3"
+  database: db/spree_production.sqlite3
 <% when 'mysql' %>
 development:
   adapter: mysql2
@@ -47,11 +48,11 @@ production:
 <% else %>
 development:
   adapter: sqlite3
-  database: "db/spree_development.sqlite3"
+  database: db/spree_development.sqlite3
 test:
   adapter: sqlite3
-  database: "db/spree_test.sqlite3"
+  database: db/spree_test.sqlite3
 production:
   adapter: sqlite3
-  database: "db/spree_production.sqlite3"
+  database: db/spree_production.sqlite3
 <% end %>

data/lib/generators/spree/install/install_generator.rb

@@ -100,7 +100,7 @@ Disallow: /account
     end
       APP
 
-      append_file "config/environment.rb", "\nActiveRecord::Base.include_root_in_json = true\n"
+      append_file "config/environment.rb", "\nActiveRecord::Base.include_root_in_json = false\n"
     end
 
     def include_seed_data

data/lib/spree/core/calculated_adjustments.rb

@@ -25,10 +25,16 @@ module Spree
           # sets amount based on the calculator as applied to the calculable argument (Order, LineItems[], Shipment, etc.)
           # By default the adjustment will not be considered mandatory
           def create_adjustment(label, target, calculable, mandatory=false, state="closed")
+            # Adjustment calculations done on Spree::Shipment objects MUST
+            # be done on their to_package'd variants instead
+            # It's only the package that contains the correct information.
+            # See https://github.com/spree/spree_active_shipping/pull/96 et. al
+            old_calculable = calculable
+            calculable = calculable.to_package if calculable.is_a?(Spree::Shipment)
             amount = compute_amount(calculable)
             return if amount == 0 && !mandatory
             target.adjustments.create({ :amount => amount,
-                                        :source => calculable,
+                                        :source => old_calculable,
                                         :originator => self,
                                         :label => label,
                                         :mandatory => mandatory,
@@ -38,6 +44,11 @@ module Spree
           # Updates the amount of the adjustment using our Calculator and calling the +compute+ method with the +calculable+
           # referenced passed to the method.
           def update_adjustment(adjustment, calculable)
+            # Adjustment calculations done on Spree::Shipment objects MUST
+            # be done on their to_package'd variants instead
+            # It's only the package that contains the correct information.
+            # See https://github.com/spree/spree_active_shipping/pull/96 et. al
+            calculable = calculable.to_package if calculable.is_a?(Spree::Shipment)
             adjustment.update_attribute_without_callbacks(:amount, compute_amount(calculable))
           end
 

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

@@ -20,6 +20,8 @@ module Spree
           if create_order_if_necessary and (@current_order.nil? or @current_order.completed?)
             @current_order = Spree::Order.new(:currency => current_currency)
             @current_order.user ||= try_spree_current_user
+            # See issue #3346 for reasons why this line is here
+            @current_order.created_by ||= try_spree_current_user
             @current_order.save!
 
             # make sure the user has permission to access the order (if they are a guest)
@@ -45,12 +47,12 @@ module Spree
           # This will trigger any "first order" promotions to be triggered
           # Assuming of course that this session variable was set correctly in
           # the authentication provider's registrations controller
-          if session[:spree_user_signup]
-            fire_event('spree.user.signup', :user => try_spree_current_user, :order => current_order(true))
+          if session[:spree_user_signup] && @order
+            fire_event('spree.user.signup', :user => try_spree_current_user, :order => @order)
+            session[:spree_user_signup] = nil
           end
 
           session[:guest_token] = nil
-          session[:spree_user_signup] = nil
         end
 
         def set_current_order

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

@@ -0,0 +1,14 @@
+module Spree
+  module Core
+    module ControllerHelpers
+      module Search
+        def build_searcher params
+          Spree::Config.searcher_class.new(params).tap do |searcher|
+            searcher.current_user = try_spree_current_user
+            searcher.current_currency = current_currency
+          end
+        end
+      end
+    end
+  end
+end

data/lib/spree/core/permalinks.rb

@@ -14,8 +14,6 @@ module Spree
           options[:field] ||= :permalink
           self.permalink_options = options
 
-          validates permalink_options[:field], :uniqueness => true
-
           if self.table_exists? && self.column_names.include?(permalink_options[:field].to_s)
             before_validation(:on => :create) { save_permalink }
           end
@@ -48,18 +46,20 @@ module Spree
       end
 
       def save_permalink(permalink_value=self.to_param)
-        permalink_value ||= generate_permalink
+        self.with_lock do
+          permalink_value ||= generate_permalink
 
-        field = self.class.permalink_field
-          # Do other links exist with this permalink?
-          other = self.class.where("#{self.class.table_name}.#{field} LIKE ?", "#{permalink_value}%")
-          if other.any?
-            # Find the existing permalink with the highest number, and increment that number.
-            # (If none of the existing permalinks have a number, this will evaluate to 1.)
-            number = other.map { |o| o.send(field)[/-(\d+)$/, 1].to_i }.max + 1
-            permalink_value += "-#{number.to_s}"
-          end
-        write_attribute(field, permalink_value)
+          field = self.class.permalink_field
+            # Do other links exist with this permalink?
+            other = self.class.where("#{self.class.table_name}.#{field} LIKE ?", "#{permalink_value}%")
+            if other.any?
+              # Find the existing permalink with the highest number, and increment that number.
+              # (If none of the existing permalinks have a number, this will evaluate to 1.)
+              number = other.map { |o| o.send(field)[/-(\d+)$/, 1].to_i }.max + 1
+              permalink_value += "-#{number.to_s}"
+            end
+          write_attribute(field, permalink_value)
+        end
       end
     end
   end

data/lib/spree/core/s3_support.rb

@@ -15,7 +15,7 @@ module Spree
             self.attachment_definitions[field][:s3_credentials] = s3_creds
             self.attachment_definitions[field][:s3_headers] = ActiveSupport::JSON.decode(config[:s3_headers])
             self.attachment_definitions[field][:bucket] = config[:s3_bucket]
-            self.attachment_definitions[field][:s3_protocol] = config[:s3_protocol] unless config[:s3_protocol].blank?
+            self.attachment_definitions[field][:s3_protocol] = config[:s3_protocol].downcase unless config[:s3_protocol].blank?
             self.attachment_definitions[field][:s3_host_alias] = config[:s3_host_alias] unless config[:s3_host_alias].blank?
           end
         end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "2.0.3"
+    "2.0.4"
   end
 end

data/lib/spree/core.rb

@@ -1,12 +1,14 @@
 require 'rails/all'
+require 'active_merchant'
+require 'acts_as_list'
+require 'awesome_nested_set'
 require 'cancan'
-require 'state_machine'
-require 'paperclip'
 require 'kaminari'
-require 'awesome_nested_set'
-require 'acts_as_list'
-require 'active_merchant'
+require 'mail'
+require 'paperclip'
+require 'paranoia'
 require 'ransack'
+require 'state_machine'
 
 module Spree
 

data/lib/spree/i18n/base.rb

@@ -0,0 +1,17 @@
+module Spree
+  module ViewContext
+    def self.context=(context)
+      @context = context
+    end
+
+    def self.context
+      @context
+    end
+
+    def view_context
+      super.tap do |context|
+        Spree::ViewContext.context = context
+      end
+    end
+  end
+end

data/lib/spree/i18n/initializer.rb

@@ -0,0 +1 @@
+Spree::BaseController.send(:include, Spree::ViewContext)

data/lib/spree/i18n.rb

@@ -1,15 +1,36 @@
 require 'i18n'
 require 'active_support/core_ext/array/extract_options'
+require 'spree/i18n/base'
 
 module Spree
   extend ActionView::Helpers::TranslationHelper
 
-  # Add spree namespace and delegate to Rails TranslationHelper for some nice
-  # extra functionality. e.g return reasonable strings for missing translations
-  def self.t(*args)
-    options = args.extract_options!
-    options[:scope] = [*options[:scope]].unshift(:spree)
-    args << options
-    super(*args)
+  class << self
+    # Add spree namespace and delegate to Rails TranslationHelper for some nice
+    # extra functionality. e.g return reasonable strings for missing translations
+    def translate(*args)
+      @virtual_path = virtual_path
+
+      options = args.extract_options!
+      options[:scope] = [*options[:scope]].unshift(:spree)
+      args << options
+      super(*args)
+    end
+
+    alias_method :t, :translate
+
+    def context
+      Spree::ViewContext.context
+    end
+
+    def virtual_path
+      if context
+        path = context.instance_variable_get("@virtual_path")
+
+        if path
+          path.gsub(/spree/, '')
+        end
+      end
+    end
   end
 end

data/lib/spree/money.rb

@@ -4,6 +4,8 @@ module Spree
   class Money
     attr_reader :money
 
+    delegate :cents, :to => :money
+
     def initialize(amount, options={})
       @money = ::Money.parse([amount, (options[:currency] || Spree::Config[:currency])].join)
       @options = {}

data/lib/spree/testing_support/authorization_helpers.rb

@@ -10,17 +10,6 @@ module Spree
       end
 
       module Request
-        class BarAbility
-          include CanCan::Ability
-
-          def initialize(user)
-            # allow dispatch to :admin, :index, and :edit on Spree::Order
-            can [:admin, :edit, :index, :read], Spree::Order
-            # allow dispatch to :index, :show, :create and :update shipments on the admin
-            can [:admin, :manage, :read, :ship], Spree::Shipment
-          end
-        end
-
         class SuperAbility
           include CanCan::Ability
 
@@ -41,13 +30,15 @@ module Spree
           end
         end
 
-        def stub_bar_authorization!
+        def custom_authorization!(&block)
+          ability = Class.new do
+            include CanCan::Ability
+            define_method(:initialize, block)
+          end
           after(:all) do
-            ability = Spree::TestingSupport::AuthorizationHelpers::Request::BarAbility
             Spree::Ability.remove_ability(ability)
           end
           before(:all) do
-            ability = Spree::TestingSupport::AuthorizationHelpers::Request::BarAbility
             Spree::Ability.register_ability(ability)
           end
         end
@@ -58,5 +49,5 @@ end
 
 RSpec.configure do |config|
   config.extend Spree::TestingSupport::AuthorizationHelpers::Controller, :type => :controller
-  config.extend Spree::TestingSupport::AuthorizationHelpers::Request, :type => :request
+  config.extend Spree::TestingSupport::AuthorizationHelpers::Request, :type => :feature
 end

data/lib/spree/testing_support/capybara_ext.rb

@@ -8,9 +8,7 @@ module CapybaraExt
   end
 
   def eventually_fill_in(field, options={})
-    Capybara.wait_until do
-      find_field field
-    end
+    page.should have_css('#' + field)
     fill_in field, options
   end
 
@@ -27,9 +25,11 @@ module CapybaraExt
   end
 
   def select2_search(value, options)
-    id = find_label_by_text(options[:from])
-    options[:from] = "#s2id_#{id}"
-    targetted_select2_search(value, options)
+    label = find_label_by_text(options[:from])
+    within label.first(:xpath,".//..") do
+      options[:from] = "##{find(".select2-container")["id"]}"
+      targetted_select2_search(value, options)
+    end
   end
 
   def targetted_select2_search(value, options)
@@ -39,11 +39,12 @@ module CapybaraExt
   end
 
   def select2(value, options)
-    id = find_label_by_text(options[:from])
+    label = find_label_by_text(options[:from])
 
-    # generate select2 id
-    options[:from] = "#s2id_#{id}"
-    targetted_select2(value, options)
+    within label.first(:xpath,".//..") do
+      options[:from] = "##{find(".select2-container")["id"]}"
+      targetted_select2(value, options)
+    end
   end
 
   def select2_no_label value, options={}
@@ -84,13 +85,21 @@ module CapybaraExt
       raise "Could not find label by text #{text}"
     end
 
-    label ? label['for'] : text
+    label
   end
 
   def find_label(text)
     first(:xpath, "//label[text()[contains(.,'#{text}')]]")
   end
 
+  def wait_for_ajax
+    counter = 0
+    while page.execute_script("return $.active").to_i > 0
+      counter += 1
+      sleep(0.1)
+      raise "AJAX request took longer than 5 seconds." if counter >= 50
+    end
+  end
 end
 
 RSpec::Matchers.define :have_meta do |name, expected|

data/lib/spree/testing_support/common_rake.rb

@@ -32,4 +32,17 @@ namespace :common do
       puts 'Skipping installation no generator to run...'
     end
   end
+
+  task :seed do |t, args|
+    puts "Seeding ..."
+    cmd = "bundle exec rake db:seed RAILS_ENV=test"
+
+    if RUBY_PLATFORM =~ /mswin/ #windows
+      cmd += " >nul"
+    else
+      cmd += " >/dev/null"
+    end
+
+    system(cmd)
+  end
 end

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

@@ -1,7 +1,7 @@
 FactoryGirl.define do
   factory :country, class: Spree::Country do
     iso_name 'UNITED STATES'
-    name 'United States of Foo'
+    name 'United States of America'
     iso 'US'
     iso3 'USA'
     numcode 840

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

@@ -3,8 +3,6 @@ FactoryGirl.define do
     user
     bill_address
     completed_at nil
-    bill_address_id nil
-    ship_address_id nil
     email { user.email }
 
     factory :order_with_totals do

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

@@ -11,7 +11,7 @@ FactoryGirl.define do
 
   # authorize.net was moved to spree_gateway.
   # Leaving this factory in place with bogus in case anyone is using it.
-  factory :authorize_net_payment_method, class: Spree::Gateway::BogusSimple do
+  factory :bogus_simple_payment_method, class: Spree::Gateway::BogusSimple do
     name 'Credit Card'
     environment 'test'
   end

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

@@ -7,34 +7,24 @@ FactoryGirl.define do
     sku 'ABC'
     available_on { 1.year.ago }
     deleted_at nil
+    shipping_category { |r| Spree::ShippingCategory.first || r.association(:shipping_category) }
 
     # ensure stock item will be created for this products master
     before(:create) { create(:stock_location) if Spree::StockLocation.count == 0 }
 
+    factory :custom_product do
+      name 'Custom Product'
+      price 17.99
+
+      tax_category { |r| Spree::TaxCategory.first || r.association(:tax_category) }
+    end
+
     factory :product do
       tax_category { |r| Spree::TaxCategory.first || r.association(:tax_category) }
-      shipping_category { |r| Spree::ShippingCategory.first || r.association(:shipping_category) }
 
       factory :product_with_option_types do
         after(:create) { |product| create(:product_option_type, product: product) }
       end
     end
   end
-
-  factory :custom_product, class: Spree::Product do
-    name 'Custom Product'
-    description { generate(:random_description) }
-    price 17.99
-    sku 'ABC'
-    available_on { 1.year.ago }
-    deleted_at nil
-
-    tax_category { |r| Spree::TaxCategory.first || r.association(:tax_category) }
-    shipping_category { |r| Spree::ShippingCategory.first || r.association(:shipping_category) }
-
-    # association :taxons
-
-    # ensure stock item will be created for this products master
-    before(:create) { create(:stock_location) if Spree::StockLocation.count == 0 }
-  end
 end

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

@@ -6,4 +6,8 @@ FactoryGirl.define do
     reason 'no particular reason'
     state 'received'
   end
+
+  factory :new_return_authorization, class: Spree::ReturnAuthorization do
+    association(:order, factory: :shipped_order)
+  end
 end

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

@@ -12,7 +12,7 @@ FactoryGirl.define do
       shipment.add_shipping_method(create(:shipping_method), true)
 
       shipment.order.line_items.each do |line_item|
-        line_item.quantity.times { shipment.inventory_units.create(variant_id: line_item.variant) }
+        line_item.quantity.times { shipment.inventory_units.create(variant_id: line_item.variant_id) }
       end
     end
   end

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

@@ -1,7 +1,8 @@
 FactoryGirl.define do
   factory :stock_item, class: Spree::StockItem do
-    variant
+    backorderable true
     stock_location
+    variant
 
     after(:create) { |object| object.adjust_count_on_hand(10) }
   end

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

@@ -6,9 +6,12 @@ FactoryGirl.define do
     zipcode '20500'
     phone '(202) 456-1111'
     active true
+    backorderable_default true
 
-    state  { |stock_location| stock_location.association(:state) }
-    country  { |stock_location| stock_location.association(:country) }
+    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)
+    end
 
     factory :stock_location_with_items do
       after(:create) do |stock_location, evaluator|

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

@@ -4,7 +4,7 @@ FactoryGirl.define do
   factory :base_variant, class: Spree::Variant do
     price 19.99
     cost_price 17.00
-    sku    { generate(:random_string) }
+    sku    { SecureRandom.hex }
     weight { generate(:random_float) }
     height { generate(:random_float) }
     width  { generate(:random_float) }

data/lib/spree/testing_support/order_walkthrough.rb

@@ -5,7 +5,20 @@ class OrderWalkthrough
       FactoryGirl.create(:payment_method)
     end
 
-    # A payment method must exist for an order to proceed through the Address state
+    # Need to create a valid zone too...
+    zone = FactoryGirl.create(:zone)
+    country = FactoryGirl.create(:country)
+    zone.members << Spree::ZoneMember.create(:zoneable => country)
+    country.states << FactoryGirl.create(:state, :country => country)
+
+    # A shipping method must exist for rates to be displayed on checkout page
+    unless Spree::ShippingMethod.exists?
+      FactoryGirl.create(:shipping_method).tap do |sm|
+        sm.calculator.preferred_amount = 10
+        sm.calculator.preferred_currency = Spree::Config[:currency]
+        sm.calculator.save
+      end
+    end
 
     order = Spree::Order.create!(:email => "spree@example.com")
     add_line_item!(order)

data/vendor/assets/javascripts/jquery.validate/localization/messages_et.js

@@ -0,0 +1,23 @@
+/*
+ * Translated default messages for the jQuery validation plugin.
+ * Locale: ET (Estonian; eesti, eesti keel)
+ */
+(function ($) {
+	$.extend($.validator.messages, {
+		required: "See väli peab olema täidetud.",
+		maxlength: $.validator.format("Palun sisestage vähem kui {0} tähemärki."),
+		minlength: $.validator.format("Palun sisestage vähemalt {0} tähemärki."),
+		rangelength: $.validator.format("Palun sisestage väärtus vahemikus {0} kuni {1} tähemärki."),
+		email: "Palun sisestage korrektne e-maili aadress.",
+		url: "Palun sisestage korrektne URL.",
+		date: "Palun sisestage korrektne kuupäev.",
+		dateISO: "Palun sisestage korrektne kuupäev (YYYY-MM-DD).",
+		number: "Palun sisestage korrektne number.",
+		digits: "Palun sisestage ainult numbreid.",
+		equalTo: "Palun sisestage sama väärtus uuesti.",
+		range: $.validator.format("Palun sisestage väärtus vahemikus {0} kuni {1}."),
+		max: $.validator.format("Palun sisestage väärtus, mis on väiksem või võrdne arvuga {0}."),
+		min: $.validator.format("Palun sisestage väärtus, mis on suurem või võrdne arvuga {0}."),
+		creditcard: "Palun sisestage korrektne krediitkaardi number."
+	});
+}(jQuery));