active_shipping 0.12.3 → 0.12.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. checksums.yaml.gz.sig +0 -0
  3. data.tar.gz.sig +0 -0
  4. data/lib/active_shipping/shipping/shipment_packer.rb +7 -2
  5. data/lib/active_shipping/version.rb +1 -1
  6. metadata +3 -3
  7. metadata.gz.sig +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 73e0fba97cd5cd42c21ff4514c561dadb29d0471
4
- data.tar.gz: 4c1385b493c6228d2794acaf6fd790bd8318cc8c
3
+ metadata.gz: f283611b274ba965863f5320de5a30dda94bffc9
4
+ data.tar.gz: e770521d4940a107e28fe80ffdf4ce2b1c2f5838
5
5
  SHA512:
6
- metadata.gz: ba4a1826778a5b2bdea786620381ffa45cbed38fef43944c410231e815640c264f8927f7bbc2b73b3e9caba7c991e9cf2947b3cfdc5197827e3e9f7bb7580260
7
- data.tar.gz: e721b3788fd41dec0fc49ec410e73c01b40e8aad8e2bbea92c6da6ce0335fd73d9d17d635a2d0867a1c4b73fe220db8d2b6a92e76f1a4a5feb98493ccd68e1b3
6
+ metadata.gz: 20b52260419ce6a9ffcd2b67229af8303430bedb36fdabb21126cfb3b4dcb48df65868c7a4e3380947b8087b16ff790e102b5c7f7dbcd6afe920105701903d72
7
+ data.tar.gz: 0546189f408a9b687b584d90600cf20c420f68cc2e9cd381180ad4794be44ee322ea338424b4f38c5fca11489560dda22f0da5be1fa1e0c19006b05a1b8b8db0
checksums.yaml.gz.sig CHANGED
Binary file
data.tar.gz.sig CHANGED
Binary file
data/lib/active_shipping/shipping/shipment_packer.rb CHANGED
@@ -17,7 +17,13 @@ module ActiveMerchant
17
17
 
18
18
  return packages if items.empty?
19
19
 
20
- items = items.map(&:symbolize_keys).map { |item| [item] * item[:quantity].to_i }.flatten
20
+ items.map!(&:symbolize_keys)
21
+
22
+ if items.sum { |item| item[:quantity].to_i } >= EXCESS_PACKAGE_QUANTITY_THRESHOLD
23
+ raise ExcessPackageQuantity, "Unable to pack more than #{EXCESS_PACKAGE_QUANTITY_THRESHOLD} packages"
24
+ end
25
+
26
+ items = items.map { |item| [item] * item[:quantity].to_i }.flatten
21
27
  state = :package_empty
22
28
 
23
29
  while state != :packing_finished
@@ -42,7 +48,6 @@ module ActiveMerchant
42
48
  state = :package_full
43
49
  end
44
50
  when :package_full
45
- raise ExcessPackageQuantity, "Unable to pack more than #{EXCESS_PACKAGE_QUANTITY_THRESHOLD} packages" if packages.length >= EXCESS_PACKAGE_QUANTITY_THRESHOLD
46
51
  packages << ActiveMerchant::Shipping::Package.new(package_weight, dimensions, :value => package_value, :currency => currency)
47
52
  state = items.any? ? :package_empty : :packing_finished
48
53
  end
data/lib/active_shipping/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ActiveShipping
2
- VERSION = "0.12.3"
2
+ VERSION = "0.12.4"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: active_shipping
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.12.3
4
+ version: 0.12.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - James MacAulay
@@ -33,7 +33,7 @@ cert_chain:
33
33
  fl3hbtVFTqbOlwL9vy1fudXcolIE/ZTcxQ+er07ZFZdKCXayR9PPs64heamfn0fp
34
34
  TConQSX2BnZdhIEYW+cKzEC/bLc=
35
35
  -----END CERTIFICATE-----
36
- date: 2014-06-03 00:00:00.000000000 Z
36
+ date: 2014-07-07 00:00:00.000000000 Z
37
37
  dependencies:
38
38
  - !ruby/object:Gem::Dependency
39
39
  name: activesupport
@@ -250,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
250
250
  version: 1.3.6
251
251
  requirements: []
252
252
  rubyforge_project: active_shipping
253
- rubygems_version: 2.2.0
253
+ rubygems_version: 2.2.2
254
254
  signing_key:
255
255
  specification_version: 4
256
256
  summary: Shipping API extension for Active Merchant
metadata.gz.sig CHANGED
Binary file