spree_zaez_correios 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61ae0c0c9884577fa417290e0f39c6b3a72b9b86
-  data.tar.gz: fdf8b78e672d0fc650b957d0ba423d5a2740a8d1
+  metadata.gz: 8e91f8fcf0ed0b9cc3a0887d65fbe8f0127553ac
+  data.tar.gz: 3416cc8d1fcf7a14c64cae51dce7355707fb6952
 SHA512:
-  metadata.gz: abc07cf546ad3a9cd1360ef1f42c63b937a0961f4e52bf38a5964da270856789c22238117c324969296e21b1eff4f73fe4ec725affce69b761e8c7ed24bc8171
-  data.tar.gz: 52183607d0dbbcd2642529090345dbd1bf8d48f88e279246aba704b1dbe9bdae4fd5771c98aac9340312d55552045039dbe74889e919d3d01e53fadbe1547713
+  metadata.gz: 9bb71a124c0ce79ebf6a2c35bf01a8264fda66c6dffaa2f23f408e257ff65738e8988a2ef9e6d7c0e88c4bd03d3606a498d6b3f6b097a61d80b6d60504a223a2
+  data.tar.gz: 78a0167704e884c350d7e0dd0d62cdaf3c92365477dfde6a79efeb632a65a8d51eafe49769c03988f4bc4715e5f9b508fa6da54d2b5b78d1969235909cf813be

data/.gitignore

@@ -12,3 +12,4 @@ nbproject
 pkg
 *.swp
 spec/dummy
+*.gem

data/app/models/spree/stock/estimator_decorator.rb

@@ -1,11 +1,16 @@
 Spree::Stock::Estimator.class_eval do
 
-  # Override no metodo para poder salvar o tempo de entrega
+  # Override to save the delivery time
   def calculate_shipping_rates(package, ui_filter)
     shipping_methods(package, ui_filter).map do |shipping_method|
       response = shipping_method.calculator.compute(package)
-      cost = response[:cost]
-      delivery_time = response[:delivery_time]
+      if response.is_a? Hash
+        cost = response[:cost]
+        delivery_time = response[:delivery_time]
+      elsif %w(Float BigDecimal).include? response.class.to_s
+        cost = response
+        delivery_time = nil
+      end
 
       tax_category = shipping_method.tax_category
       if tax_category

data/spec/models/spree/stock/estimator_decorator_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+module Spree
+  module Stock
+    describe Estimator do
+      let!(:shipping_method) { create(:shipping_method) }
+      let(:package) { build(:stock_package, contents: inventory_units.map { |i| ContentItem.new(inventory_unit) }) }
+      let(:order) { build(:order_with_line_items) }
+      let(:inventory_units) { order.inventory_units }
+
+      subject { Estimator.new(order) }
+
+      context '#shipping rates' do
+        before(:each) do
+          shipping_method.zones.first.members.create(:zoneable => order.ship_address.country)
+          allow_any_instance_of(ShippingMethod).to receive_message_chain(:calculator, :available?).and_return(true)
+          allow_any_instance_of(ShippingMethod).to receive_message_chain(:calculator, :compute).and_return({cost: 4.00, delivery_time: 1})
+          allow_any_instance_of(ShippingMethod).to receive_message_chain(:calculator, :preferences).and_return({:currency => currency})
+          allow_any_instance_of(ShippingMethod).to receive_message_chain(:calculator, :marked_for_destruction?)
+
+          allow(package).to receive_messages(:shipping_methods => [shipping_method])
+        end
+
+        let(:currency) { 'USD' }
+
+        it 'should save the delivery time on shipping rate' do
+          shipping_rates = subject.shipping_rates(package)
+          expect(shipping_rates.first.delivery_time).to eq 1
+        end
+      end
+    end
+  end
+end

data/spree_zaez_correios.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_zaez_correios'
-  s.version     = '3.0.3'
+  s.version     = '3.0.4'
   s.summary     = "Implements diverse functions in order to enable the use of services from Brazil's Correios in Spree Commerce"
   s.description = s.summary
   s.required_ruby_version = '>= 2.0.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_zaez_correios
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Zaez Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-25 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -254,12 +254,7 @@ files:
 - app/assets/stylesheets/spree/backend/spree_zaez_correios.css
 - app/assets/stylesheets/spree/frontend/spree_zaez_correios.css
 - app/models/spree/calculator/shipping/correios_base_calculator.rb
-- app/models/spree/calculator/shipping/flat_percent_item_total_decorator.rb
-- app/models/spree/calculator/shipping/flat_rate_decorator.rb
-- app/models/spree/calculator/shipping/flexi_rate_decorator.rb
 - app/models/spree/calculator/shipping/pac.rb
-- app/models/spree/calculator/shipping/per_item_decorator.rb
-- app/models/spree/calculator/shipping/price_sack_decorator.rb
 - app/models/spree/calculator/shipping/sedex.rb
 - app/models/spree/calculator/shipping/sedex10.rb
 - app/models/spree/stock/estimator_decorator.rb
@@ -276,6 +271,7 @@ files:
 - spec/models/spree/calculator/shipping/pac_spec.rb
 - spec/models/spree/calculator/shipping/sedex10_spec.rb
 - spec/models/spree/calculator/shipping/sedex_spec.rb
+- spec/models/spree/stock/estimator_decorator_spec.rb
 - spec/spec_helper.rb
 - spec/support/correios_shared_examples.rb
 - spree_zaez_correios.gemspec
@@ -309,5 +305,6 @@ test_files:
 - spec/models/spree/calculator/shipping/pac_spec.rb
 - spec/models/spree/calculator/shipping/sedex10_spec.rb
 - spec/models/spree/calculator/shipping/sedex_spec.rb
+- spec/models/spree/stock/estimator_decorator_spec.rb
 - spec/spec_helper.rb
 - spec/support/correios_shared_examples.rb

data/app/models/spree/calculator/shipping/flat_percent_item_total_decorator.rb

@@ -1,7 +0,0 @@
-Spree::Calculator::Shipping::FlatPercentItemTotal.class_eval do
-
-  def compute_package(package)
-    response = compute_from_price(total(package.contents))
-    {cost: response, delivery_time: nil}
-  end
-end

data/app/models/spree/calculator/shipping/flat_rate_decorator.rb

@@ -1,6 +0,0 @@
-Spree::Calculator::Shipping::FlatRate.class_eval do
-
-  def compute_package(package)
-    {cost: self.preferred_amount, delivery_time: nil}
-  end
-end

data/app/models/spree/calculator/shipping/flexi_rate_decorator.rb

@@ -1,7 +0,0 @@
-Spree::Calculator::Shipping::FlexiRate.class_eval do
-
-  def compute_package(package)
-    response = compute_from_quantity(package.contents.sum(&:quantity))
-    {cost: response, delivery_time: nil}
-  end
-end

data/app/models/spree/calculator/shipping/per_item_decorator.rb

@@ -1,7 +0,0 @@
-Spree::Calculator::Shipping::PerItem.class_eval do
-
-  def compute_package(package)
-    response = compute_from_quantity(package.contents.sum(&:quantity))
-    {cost: response, delivery_time: nil}
-  end
-end

data/app/models/spree/calculator/shipping/price_sack_decorator.rb

@@ -1,7 +0,0 @@
-Spree::Calculator::Shipping::PriceSack.class_eval do
-
-  def compute_package(package)
-    response = compute_from_price(total(package.contents))
-    {cost: response, delivery_time: nil}
-  end
-end