bodega 0.4.3 → 0.4.4

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/app/models/bodega/order.rb

@@ -7,7 +7,7 @@ module Bodega
     attr_accessible :order_products_attributes, :postal_code, :shipping_rate_code
 
     before_create :set_identifier
-    before_save :set_shipping_rates, if: :postal_code_changed?
+    before_save :set_shipping_rates, if: :set_shipping_rates?
     before_save :calculate_shipping, if: :shipping_rate_code_changed?
     before_save :set_total
 
@@ -21,7 +21,6 @@ module Bodega
     maintain :status do
       state :new, 1, default: true
       state :complete, 2
-
       on :enter, :complete, :mark_order_products_as_purchased
     end
 
@@ -150,6 +149,10 @@ module Bodega
       @new_shipping_rates = true
     end
 
+    def set_shipping_rates?
+      postal_code_changed? || order_products.any?(&:quantity_changed?)
+    end
+
     def set_total
       self.total = subtotal + tax + shipping
     end

data/bodega.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "bodega"
-  s.version = "0.4.3"
+  s.version = "0.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Flip Sasser"]

data/lib/bodega/shipping_method/base.rb

@@ -35,7 +35,7 @@ module Bodega
       end
 
       def location_for(location_object)
-        Location.new(zip: location_object.postal_code)
+        Location.new(country: Bodega.config.shipping.origin.country, zip: location_object.postal_code)
       end
 
       def origin
@@ -44,18 +44,20 @@ module Bodega
 
       def packages
         @packages ||= [].tap do |packages|
-          order.products.each do |product|
-            packages.push(package_for(product)) if shippable?(product)
+          order.order_products.each do |order_product|
+            packages.push(package_for(order_product)) if shippable?(order_product.product)
           end
         end
       end
 
-      def package_for(product)
-        Package.new(
-          product.weight,
-          product.dimensions,
-          units: Bodega.config.shipping.units
-        )
+      def package_for(order_product)
+        product = order_product.product
+        weight = product.weight * order_product.quantity
+
+        dimensions = product.dimensions
+        dimensions[2] = dimensions[2] * order_product.quantity
+
+        Package.new(weight, dimensions, units: Bodega.config.shipping.units)
       end
 
       def shippable?(product)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bodega
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -158,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1686414857410088116
+      hash: 272964422154723195
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: