spree_core 3.0.5 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9e78e82569d33a57fc77a288f4bb6478a0fdf25
-  data.tar.gz: ec9e23165c2db5df7e0d0c58aa11d243fed18bb7
+  metadata.gz: 3c0bd588d1db4f3c55793fddb2e91a17e560626a
+  data.tar.gz: 2dd3ba214df58ad7de4d0a6743e5faf2dad7b592
 SHA512:
-  metadata.gz: ff1a688974b9cc46f3f4baecdc5212e3b6eb4ec6324cf47aeb29e1d8c50a2b1872635f9b3817b27a28f7cd5368fb7c10299e35e077ff7e9c9faadf6b6e8a2a34
-  data.tar.gz: 6cec5411da47ddfaf0504c2724dc866160d1443a021c3394e7b229745a469298396992d77a2b3cbfd98987efa1397d4999f53d09f7b742ee73676099d2feb222
+  metadata.gz: 5688d90282d9ff0c1b41f64dae318c7f028bd6148aae51a26568e5f397d0031015fc4fd249c959cd335748859231d8ecac3f11f6fa9052d2ee0b0ed04f6ba500
+  data.tar.gz: ff5cf6508e0d92fcfa5855fca4e9099b18be2b94bb8ac7c4441e74e37a6c622db6fae58591032431b69d3cd62b31a56eea9bc68b7b7d5dd1ddc4faf74db63108

data/CHANGELOG.md

@@ -0,0 +1,4 @@
+## Spree 3.0.0 (unreleased) ##
+
+* Renamed ItemAdjustments to Adjustable::AdjustmentsUpdater.
+* Removed allow_ssl_in_* preferences from spree

data/Gemfile

@@ -0,0 +1,3 @@
+eval(File.read(File.dirname(__FILE__) + '/../common_spree_dependencies.rb'))
+
+gemspec

data/Rakefile

@@ -0,0 +1,30 @@
+require 'rubygems'
+require 'rake'
+require 'rake/testtask'
+require 'rake/packagetask'
+require 'rubygems/package_task'
+require 'rspec/core/rake_task'
+require 'spree/testing_support/common_rake'
+load 'lib/tasks/exchanges.rake'
+
+Bundler::GemHelper.install_tasks
+RSpec::Core::RakeTask.new
+
+spec = eval(File.read('spree_core.gemspec'))
+Gem::PackageTask.new(spec) do |p|
+  p.gem_spec = spec
+end
+
+desc "Release to gemcutter"
+task :release do
+  version = File.read(File.expand_path("../../SPREE_VERSION", __FILE__)).strip
+  cmd = "cd pkg && gem push spree_core-#{version}.gem"; puts cmd; system cmd
+end
+
+task :default => :spec
+
+desc "Generates a dummy app for testing"
+task :test_app do
+  ENV['LIB_NAME'] = 'spree/core'
+  Rake::Task['common:test_app'].invoke
+end

data/app/assets/javascripts/spree.js.coffee.erb

@@ -8,7 +8,7 @@ class window.Spree
       callback(jQuery)
 
   @mountedAt: ->
-    "<%= Rails.application.routes.url_helpers.spree_path %>"
+    "<%= Rails.application.routes.url_helpers.spree_path(trailing_slash: true) %>"
 
   @pathFor: (path) ->
     locationOrigin = "#{window.location.protocol}//#{window.location.hostname}" + (if window.location.port then ":#{window.location.port}" else "")

data/app/models/spree/ability.rb

@@ -65,7 +65,7 @@ module Spree
         @rules = rules + ability.send(:rules)
       end
 
-      # Protect admin and user roles
+      # Protect admin role
       cannot [:update, :destroy], Role, name: ['admin']
     end
   end

data/app/models/spree/base.rb

@@ -5,7 +5,9 @@ class Spree::Base < ActiveRecord::Base
   include Spree::RansackableAttributes
 
   after_initialize do
-    self.preferences = default_preferences.merge(preferences) if has_attribute?(:preferences)
+    if has_attribute?(:preferences) && !preferences.nil?
+      self.preferences = default_preferences.merge(preferences)
+    end
   end
 
   if Kaminari.config.page_method_name != :page

data/app/models/spree/order_updater.rb

@@ -41,7 +41,7 @@ module Spree
     # +item_total+         The total value of all LineItems
     # +adjustment_total+   The total value of all adjustments (promotions, credits, etc.)
     # +promo_total+        The total value of all promotion adjustments
-    # +total+              The so-called "order total."  This is equivalent to +item_total+ plus +adjustment_total+.
+    # +total+              The so-called "order total."  This is equivalent to +item_total+ plus +shipment_total+ plus +adjustment_total+.
     def update_totals
       update_payment_total
       update_item_total
@@ -154,6 +154,7 @@ module Spree
     # balance_due   when +payment_total+ is less than +total+
     # credit_owed   when +payment_total+ is greater than +total+
     # failed        when most recent payment is in the failed state
+    # void          when order is canceled and +payment_total+ is equal to zero
     #
     # The +payment_state+ value helps with reporting, etc. since it provides a quick and easy way to locate Orders needing attention.
     def update_payment_state

data/app/models/spree/price.rb

@@ -1,11 +1,16 @@
 module Spree
   class Price < Spree::Base
     acts_as_paranoid
+
+    MAXIMUM_AMOUNT = BigDecimal('99_999_999.99')
+
     belongs_to :variant, class_name: 'Spree::Variant', inverse_of: :prices, touch: true
 
     validate :check_price
-    validates :amount, numericality: { greater_than_or_equal_to: 0 }, allow_nil: true
-    validate :validate_amount_maximum
+    validates :amount, allow_nil: true, numericality: {
+      greater_than_or_equal_to: 0,
+      less_than_or_equal_to: MAXIMUM_AMOUNT
+    }
 
     extend DisplayMoney
     money_methods :amount, :price
@@ -34,15 +39,5 @@ module Spree
     def check_price
       self.currency ||= Spree::Config[:currency]
     end
-
-    def maximum_amount
-      BigDecimal '999999.99'
-    end
-
-    def validate_amount_maximum
-      if amount && amount > maximum_amount
-        errors.add :amount, I18n.t('errors.messages.less_than_or_equal_to', count: maximum_amount)
-      end
-    end
   end
 end

data/app/models/spree/product.rb

@@ -235,10 +235,11 @@ module Spree
     end
 
     def any_variants_not_track_inventory?
+      return true unless Spree::Config.track_inventory_levels
       if variants_including_master.loaded?
-        variants_including_master.any? { |v| !v.should_track_inventory? }
+        variants_including_master.any? { |v| !v.track_inventory? }
       else
-        !Spree::Config.track_inventory_levels || variants_including_master.where(track_inventory: false).any?
+        variants_including_master.where(track_inventory: false).exists?
       end
     end
 

data/app/models/spree/reimbursement.rb

@@ -26,7 +26,7 @@ module Spree
     class_attribute :reimbursement_tax_calculator
     self.reimbursement_tax_calculator = ReimbursementTaxCalculator
     # A separate attribute here allows you to use a more performant calculator for estimates
-    # and a different one (e.g. one that hits a 3rd party API) for the final caluclations.
+    # and a different one (e.g. one that hits a 3rd party API) for the final calculations.
     class_attribute :reimbursement_simulator_tax_calculator
     self.reimbursement_simulator_tax_calculator = ReimbursementTaxCalculator
 

data/app/models/spree/state.rb

@@ -13,6 +13,8 @@ module Spree
 
     validates :country, :name, presence: true
 
+    self.whitelisted_ransackable_attributes = %w(abbr)
+
     def self.find_all_by_name_or_abbr(name_or_abbr)
       where('name = ? OR abbr = ?', name_or_abbr, name_or_abbr)
     end

data/app/models/spree/zone.rb

@@ -23,7 +23,7 @@ module Spree
 
     def self.potential_matching_zones(zone)
       if zone.country?
-        # Match zones of the same kind with simialr countries
+        # Match zones of the same kind with similar countries
         joins(countries: :zones).
           where('zone_members_spree_countries_join.zone_id = ? OR ' +
                 'spree_zones.default_tax = ?', zone.id, true).

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '3.0.5'
+    '3.0.6'
   end
 end

data/lib/spree/testing_support/shoulda_matcher_configuration.rb

@@ -0,0 +1,6 @@
+Shoulda::Matchers.configure do |config|
+  config.integrate do |with|
+    with.test_framework :rspec
+    with.library :rails
+  end
+end

data/script/rails

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path('../..', __FILE__)
+ENGINE_PATH = File.expand_path('../../lib/spree/core/engine', __FILE__)
+
+require 'rails/all'
+require 'rails/engine/commands'
+

data/spec/helpers/base_helper_spec.rb

@@ -0,0 +1,137 @@
+require 'spec_helper'
+
+describe Spree::BaseHelper, type: :helper do
+  include Spree::BaseHelper
+
+  let(:current_store){ create :store }
+
+  context "available_countries" do
+    let(:country) { create(:country) }
+
+    before do
+      3.times { create(:country) }
+    end
+
+    context "with no checkout zone defined" do
+      before do
+        Spree::Config[:checkout_zone] = nil
+      end
+
+      it "return complete list of countries" do
+        expect(available_countries.count).to eq(Spree::Country.count)
+      end
+    end
+
+    context "with a checkout zone defined" do
+      context "checkout zone is of type country" do
+        before do
+          @country_zone = create(:zone, :name => "CountryZone")
+          @country_zone.members.create(:zoneable => country)
+          Spree::Config[:checkout_zone] = @country_zone.name
+        end
+
+        it "return only the countries defined by the checkout zone" do
+          expect(available_countries).to eq([country])
+        end
+      end
+
+      context "checkout zone is of type state" do
+        before do
+          state_zone = create(:zone, :name => "StateZone")
+          state = create(:state, :country => country)
+          state_zone.members.create(:zoneable => state)
+          Spree::Config[:checkout_zone] = state_zone.name
+        end
+
+        it "return complete list of countries" do
+          expect(available_countries.count).to eq(Spree::Country.count)
+        end
+      end
+    end
+  end
+
+  # Regression test for #1436
+  context "defining custom image helpers" do
+    let(:product) { mock_model(Spree::Product, :images => [], :variant_images => []) }
+    before do
+      Spree::Image.class_eval do
+        attachment_definitions[:attachment][:styles].merge!({:very_strange => '1x1'})
+      end
+    end
+
+    it "should not raise errors when style exists" do
+      expect { very_strange_image(product) }.not_to raise_error
+    end
+
+    it "should raise NoMethodError when style is not exists" do
+      expect { another_strange_image(product) }.to raise_error(NoMethodError)
+    end
+  end
+
+  context "link_to_tracking" do
+    it "returns tracking link if available" do
+      a = link_to_tracking_html(shipping_method: true, tracking: '123', tracking_url: 'http://g.c/?t=123').css('a')
+
+      expect(a.text).to eq '123'
+      expect(a.attr('href').value).to eq 'http://g.c/?t=123'
+    end
+
+    it "returns tracking without link if link unavailable" do
+      html = link_to_tracking_html(shipping_method: true, tracking: '123', tracking_url: nil)
+      expect(html.css('span').text).to eq '123'
+    end
+
+    it "returns nothing when no shipping method" do
+      html = link_to_tracking_html(shipping_method: nil, tracking: '123')
+      expect(html.css('span').text).to eq ''
+    end
+
+    it "returns nothing when no tracking" do
+      html = link_to_tracking_html(tracking: nil)
+      expect(html.css('span').text).to eq ''
+    end
+
+    def link_to_tracking_html(options = {})
+      node = link_to_tracking(double(:shipment, options))
+      Nokogiri::HTML(node.to_s)
+    end
+  end
+
+  # Regression test for #2396
+  context "meta_data_tags" do
+    it "truncates a product description to 160 characters" do
+      # Because the controller_name method returns "test"
+      # controller_name is used by this method to infer what it is supposed
+      # to be generating meta_data_tags for
+      text = Faker::Lorem.paragraphs(2).join(" ")
+      @test = Spree::Product.new(:description => text)
+      tags = Nokogiri::HTML.parse(meta_data_tags)
+      content = tags.css("meta[name=description]").first["content"]
+      assert content.length <= 160, "content length is not truncated to 160 characters"
+    end
+  end
+
+  # Regression test for #5384
+  context "custom image helpers conflict with inproper statements" do
+    let(:product) { mock_model(Spree::Product, :images => [], :variant_images => []) }
+    before do
+      Spree::Image.class_eval do
+        attachment_definitions[:attachment][:styles].merge!({:foobar => '1x1'})
+      end
+    end
+
+    it "should not raise errors when helper method called" do
+      expect { foobar_image(product) }.not_to raise_error
+    end
+
+    it "should raise NoMethodError when statement with name equal to style name called" do
+      expect { foobar(product) }.to raise_error(NoMethodError)
+    end
+  end
+
+  context "pretty_time" do
+    it "prints in a format" do
+      expect(pretty_time(DateTime.new(2012, 5, 6, 13, 33))).to eq "May 06, 2012  1:33 PM"
+    end
+  end
+end

data/spec/helpers/products_helper_spec.rb

@@ -0,0 +1,224 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+module Spree
+  describe ProductsHelper, :type => :helper do
+    include ProductsHelper
+
+    let(:product) { create(:product) }
+    let(:currency) { 'USD' }
+
+    before do
+      allow(helper).to receive(:current_currency) { currency }
+    end
+
+    context "#variant_price_diff" do
+      let(:product_price) { 10 }
+      let(:variant_price) { 10 }
+
+      before do
+        @variant = create(:variant, :product => product)
+        product.price = 15
+        @variant.price = 10
+        allow(product).to receive(:amount_in) { product_price }
+        allow(@variant).to receive(:amount_in) { variant_price }
+      end
+
+      subject { helper.variant_price(@variant) }
+
+      context "when variant is same as master" do
+        it { is_expected.to be_nil }
+      end
+
+      context "when the master has no price" do
+        let(:product_price) { nil }
+
+        it { is_expected.to be_nil }
+      end
+
+      context "when currency is default" do
+        context "when variant is more than master" do
+          let(:variant_price) { 15 }
+
+          it { is_expected.to eq("(Add: $5.00)") }
+          # Regression test for #2737
+          it { is_expected.to be_html_safe }
+        end
+
+        context "when variant is less than master" do
+          let(:product_price) { 15 }
+
+          it { is_expected.to eq("(Subtract: $5.00)") }
+        end
+      end
+
+      context "when currency is JPY" do
+        let(:variant_price) { 100 }
+        let(:product_price) { 100 }
+        let(:currency) { 'JPY' }
+
+        context "when variant is more than master" do
+          let(:variant_price) { 150 }
+
+          it { is_expected.to eq("(Add: ¥50)") }
+        end
+
+        context "when variant is less than master" do
+          let(:product_price) { 150 }
+
+          it { is_expected.to eq("(Subtract: ¥50)") }
+        end
+      end
+    end
+
+    context "#variant_price_full" do
+      before do
+        Spree::Config[:show_variant_full_price] = true
+        @variant1 = create(:variant, :product => product)
+        @variant2 = create(:variant, :product => product)
+      end
+
+      context "when currency is default" do
+        it "should return the variant price if the price is different than master" do
+          product.price = 10
+          @variant1.price = 15
+          @variant2.price = 20
+          expect(helper.variant_price(@variant1)).to eq("$15.00")
+          expect(helper.variant_price(@variant2)).to eq("$20.00")
+        end
+      end
+
+      context "when currency is JPY" do
+        let(:currency) { 'JPY' }
+
+        before do
+          product.variants.active.each do |variant|
+            variant.prices.each do |price|
+              price.currency = currency
+              price.save!
+            end
+          end
+        end
+
+        it "should return the variant price if the price is different than master" do
+          product.price = 100
+          @variant1.price = 150
+          expect(helper.variant_price(@variant1)).to eq("¥150")
+        end
+      end
+
+      it "should be nil when all variant prices are equal" do
+        product.price = 10
+        @variant1.default_price.update_column(:amount, 10)
+        @variant2.default_price.update_column(:amount, 10)
+        expect(helper.variant_price(@variant1)).to be_nil
+        expect(helper.variant_price(@variant2)).to be_nil
+      end
+    end
+
+
+    context "#product_description" do
+      # Regression test for #1607
+      it "renders a product description without excessive paragraph breaks" do
+        product.description = %Q{
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus a ligula leo. Proin eu arcu at ipsum dapibus ullamcorper. Pellentesque egestas orci nec magna condimentum luctus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Ut ac ante et mauris bibendum ultricies non sed massa. Fusce facilisis dui eget lacus scelerisque eget aliquam urna ultricies. Duis et rhoncus quam. Praesent tellus nisi, ultrices sed iaculis quis, euismod interdum ipsum.</p>
+<ul>
+<li>Lorem ipsum dolor sit amet</li>
+<li>Lorem ipsum dolor sit amet</li>
+</ul>
+        }
+        description = product_description(product)
+        expect(description.strip).to eq(product.description.strip)
+      end
+
+      it "renders a product description with automatic paragraph breaks" do
+        product.description = %Q{
+THIS IS THE BEST PRODUCT EVER!
+
+"IT CHANGED MY LIFE" - Sue, MD}
+
+        description = product_description(product)
+        expect(description.strip).to eq(%Q{<p>\nTHIS IS THE BEST PRODUCT EVER!</p>"IT CHANGED MY LIFE" - Sue, MD})
+      end
+
+      it "renders a product description without any formatting based on configuration" do
+        initialDescription = %Q{
+            <p>hello world</p>
+
+            <p>tihs is completely awesome and it works</p>
+
+            <p>why so many spaces in the code. and why some more formatting afterwards?</p>
+        }
+
+        product.description = initialDescription
+
+        Spree::Config[:show_raw_product_description] = true
+        description = product_description(product)
+        expect(description).to eq(initialDescription)
+      end
+
+    end
+
+    shared_examples_for "line item descriptions" do
+      context 'variant has a blank description' do
+        let(:description) { nil }
+        it { is_expected.to eq(Spree.t(:product_has_no_description)) }
+      end
+      context 'variant has a description' do
+        let(:description) { 'test_desc' }
+        it { is_expected.to eq(description) }
+      end
+      context 'description has nonbreaking spaces' do
+        let(:description) { 'test&nbsp;desc' }
+        it { is_expected.to eq('test desc') }
+      end
+      context 'description has line endings' do
+        let(:description) { "test\n\r\ndesc" }
+        it { is_expected.to eq('test desc') }
+      end
+    end
+
+    context "#line_item_description" do
+      let(:variant) { create(:variant, :product => product, description: description) }
+      subject { line_item_description_text(variant.product.description) }
+
+      it_should_behave_like "line item descriptions"
+    end
+
+    context '#line_item_description_text' do
+      subject { line_item_description_text description }
+
+      it_should_behave_like "line item descriptions"
+    end
+
+    context '#cache_key_for_products' do
+      subject { helper.cache_key_for_products }
+      before(:each) do
+        @products = double('products collection')
+        allow(helper).to receive(:params) { {:page => 10} }
+      end
+
+      context 'when there is a maximum updated date' do
+        let(:updated_at) { Date.new(2011, 12, 13) }
+        before :each do
+          allow(@products).to receive(:count) { 5 }
+          allow(@products).to receive(:maximum).with(:updated_at) { updated_at }
+        end
+
+        it { is_expected.to eq('en/USD/spree/products/all-10-20111213-5') }
+      end
+
+      context 'when there is no considered maximum updated date' do
+        let(:today) { Date.new(2013, 12, 11) }
+        before :each do
+          allow(@products).to receive(:count) { 1234567 }
+          allow(@products).to receive(:maximum).with(:updated_at) { nil }
+          allow(Date).to receive(:today) { today }
+        end
+
+        it { is_expected.to eq('en/USD/spree/products/all-10-20131211-1234567') }
+      end
+    end
+  end
+end