active_shipping 0.12.3 → 0.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73e0fba97cd5cd42c21ff4514c561dadb29d0471
-  data.tar.gz: 4c1385b493c6228d2794acaf6fd790bd8318cc8c
+  metadata.gz: f283611b274ba965863f5320de5a30dda94bffc9
+  data.tar.gz: e770521d4940a107e28fe80ffdf4ce2b1c2f5838
 SHA512:
-  metadata.gz: ba4a1826778a5b2bdea786620381ffa45cbed38fef43944c410231e815640c264f8927f7bbc2b73b3e9caba7c991e9cf2947b3cfdc5197827e3e9f7bb7580260
-  data.tar.gz: e721b3788fd41dec0fc49ec410e73c01b40e8aad8e2bbea92c6da6ce0335fd73d9d17d635a2d0867a1c4b73fe220db8d2b6a92e76f1a4a5feb98493ccd68e1b3
+  metadata.gz: 20b52260419ce6a9ffcd2b67229af8303430bedb36fdabb21126cfb3b4dcb48df65868c7a4e3380947b8087b16ff790e102b5c7f7dbcd6afe920105701903d72
+  data.tar.gz: 0546189f408a9b687b584d90600cf20c420f68cc2e9cd381180ad4794be44ee322ea338424b4f38c5fca11489560dda22f0da5be1fa1e0c19006b05a1b8b8db0

data/lib/active_shipping/shipping/shipment_packer.rb

@@ -17,7 +17,13 @@ module ActiveMerchant
 
         return packages if items.empty?
 
-        items = items.map(&:symbolize_keys).map { |item| [item] * item[:quantity].to_i }.flatten
+        items.map!(&:symbolize_keys)
+
+        if items.sum { |item| item[:quantity].to_i } >= EXCESS_PACKAGE_QUANTITY_THRESHOLD
+          raise ExcessPackageQuantity, "Unable to pack more than #{EXCESS_PACKAGE_QUANTITY_THRESHOLD} packages"
+        end
+
+        items = items.map { |item| [item] * item[:quantity].to_i }.flatten
         state = :package_empty
 
         while state != :packing_finished
@@ -42,7 +48,6 @@ module ActiveMerchant
               state = :package_full
             end
           when :package_full
-            raise ExcessPackageQuantity, "Unable to pack more than #{EXCESS_PACKAGE_QUANTITY_THRESHOLD} packages" if packages.length >= EXCESS_PACKAGE_QUANTITY_THRESHOLD
             packages << ActiveMerchant::Shipping::Package.new(package_weight, dimensions, :value => package_value, :currency => currency)
             state = items.any? ? :package_empty : :packing_finished
           end

data/lib/active_shipping/version.rb

@@ -1,3 +1,3 @@
 module ActiveShipping
-  VERSION = "0.12.3"
+  VERSION = "0.12.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_shipping
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.12.4
 platform: ruby
 authors:
 - James MacAulay
@@ -33,7 +33,7 @@ cert_chain:
   fl3hbtVFTqbOlwL9vy1fudXcolIE/ZTcxQ+er07ZFZdKCXayR9PPs64heamfn0fp
   TConQSX2BnZdhIEYW+cKzEC/bLc=
   -----END CERTIFICATE-----
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -250,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: active_shipping
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Shipping API extension for Active Merchant