active_shipping 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e38b1f2643ba2b428af9627fe62638a4d4ced137
-  data.tar.gz: c42f3de2612e17488e8c2ed69991d84297dd8791
+  metadata.gz: 1135f7f33aa9294d388558606f3c8254922754b3
+  data.tar.gz: 9af9fd3e964b4039447ca04746d85f30e8ea8675
 SHA512:
-  metadata.gz: e0cb3a47d17bffddd2a54f8d82e569dd7caa95e9822a44361b33a26a96c903aaa2dda812748556dbc49bded142a45fe8fac58b2db731fd6b568a0fffb078d745
-  data.tar.gz: ac743371aa813bdbb2f880627b983a900d5fea53abb2a0c02787d014f1558bbd9eac929e01fa9e3bd03af34f9000547b2687757e707a2b10ef8420d92e039a19
+  metadata.gz: ecec436c0d80f5d2a11e0baa4274adb28d91412d23643d0c44772665a9875c258070de1d2b68fc5584e06b24d6ca1bdfa5c0512863f74a8b4383f97427d96b07
+  data.tar.gz: 7d963a5f838344b627cf26758de42e5363dad9d2873a698c43d96942acc1bc650f45b11bf8ee8c46056ac845470c9bba4c360962de927cc2b27902f12e889b2c

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # ActiveShipping CHANGELOG
 
+### v1.8.2
+- Add option for FedEx label format
+- Fix kunaki remote tests broken due to more shipping options
+
 ### v1.6.1
 - Fix FedEx ShipmentEvents to include event type
 - Skip broken Canada Post remote tests

data/lib/active_shipping/carriers/fedex.rb

@@ -136,6 +136,9 @@ module ActiveShipping
 
     DEFAULT_LABEL_STOCK_TYPE = 'PAPER_7X4.75'
 
+    # Available return formats for image data when creating labels
+    LABEL_FORMATS = ['DPL', 'EPL2', 'PDF', 'ZPLII', 'PNG'] 
+
     def self.service_name_for_code(service_code)
       SERVICE_TYPES[service_code] || "FedEx #{service_code.titleize.sub(/Fedex /, '')}"
     end
@@ -219,7 +222,7 @@ module ActiveShipping
 
             xml.LabelSpecification do
               xml.LabelFormatType('COMMON2D')
-              xml.ImageType('PNG')
+              xml.ImageType(options[:label_format] || 'PNG')
               xml.LabelStockType(options[:label_stock_type] || DEFAULT_LABEL_STOCK_TYPE)
             end
 

data/lib/active_shipping/version.rb

@@ -1,3 +1,3 @@
 module ActiveShipping
-  VERSION = "1.8.1"
+  VERSION = "1.8.2"
 end

data/test/remote/fedex_test.rb

@@ -379,4 +379,20 @@ class RemoteFedExTest < Minitest::Test
     signature_option = response.params["ProcessShipmentReply"]["CompletedShipmentDetail"]["CompletedPackageDetails"]["SignatureOption"]
     assert_equal FedEx::SIGNATURE_OPTION_CODES[:adult], signature_option
   end
+
+  def test_obtain_shipping_label_with_label_format_option
+    response = @carrier.create_shipment(
+      location_fixtures[:beverly_hills_with_name],
+      location_fixtures[:new_york_with_name],
+      package_fixtures[:wii],
+        :test => true,
+        :label_format => 'PDF'
+    )
+
+    assert response.success?
+    refute_empty response.labels
+    data = response.labels.first.img_data 
+    refute_empty data
+    assert data[0...4] == '%PDF'
+  end
 end

data/test/remote/kunaki_test.rb

@@ -19,8 +19,8 @@ class RemoteKunakiTest < Minitest::Test
                )
 
     assert response.success?
-    assert_equal 3, response.rates.size
-    assert_equal ["UPS 2nd Day Air", "UPS Ground", "UPS Next Day Air Saver"], response.rates.collect(&:service_name).sort
+    assert_equal 4, response.rates.size
+    assert_equal ["UPS 2nd Day Air", "UPS Ground", "UPS Next Day Air Saver", "USPS First Class Mail"], response.rates.collect(&:service_name).sort
   end
 
   def test_send_no_items

data/test/unit/carriers/fedex_test.rb

@@ -601,6 +601,17 @@ class FedExTest < Minitest::Test
     assert_equal result.search('RequestedPackageLineItems/CustomerReferences/Value').text, "FOO-123"
   end
 
+  def test_create_shipment_label_format_option
+    packages = package_fixtures.values_at(:chocolate_stuff)
+    result = Nokogiri::XML(@carrier.send(:build_shipment_request,
+                                         location_fixtures[:beverly_hills],
+                                         location_fixtures[:annapolis],
+                                         packages,
+                                         :label_format => 'ZPLII',
+                                         :test => true))
+    assert_equal result.search('RequestedShipment/LabelSpecification/ImageType').text, "ZPLII"
+  end
+
   def test_create_shipment_default_label_stock_type
     packages = package_fixtures.values_at(:wii)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_shipping
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - James MacAulay
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-19 00:00:00.000000000 Z
+date: 2016-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: quantified