active_shipping 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19c7f898c4fae3541f44b1652a80084385b3b6ca
-  data.tar.gz: a7349bb2781c99c97196978e7dd378a3c2273519
+  metadata.gz: 838209b9accf6cfb537ac16786e8683d18155073
+  data.tar.gz: 75036f0188503179ddb089ee25f99dc8b9fa4538
 SHA512:
-  metadata.gz: 0714de5ac8bd86737faee62a0a31190ced5961f6124a9c429c94a1faa7560770fc96159debc8ee059a2ecdd3a875c03f6e29e674e36e5952ace60d70cc236ebd
-  data.tar.gz: d92d587f63be9ec16d81a3e43ef4e9ebf26fb599c4e99f58140e94419d64ba341270ed5441661aef525a536ae4d02f3f889f969d0e6d3694db8e1fa3310cd2a2
+  metadata.gz: 8d3e7c5b1b9cf6a46986c02725ebda6324724cd0d1c073f7fcded221314bf1ec6ebe360105f60c39e72f3612143d1749e0be36b648b135dc03eef97857098577
+  data.tar.gz: fd34ef65e9404b1255c04a4e4867e6ad1fa3e0089ddbf1e73e4ff7b43209dae66f3f9e4e71d171d117fe2718c2cff406500fc9506dc3331d478af2668384eafb

data/.gitignore

@@ -10,3 +10,4 @@ test/fixtures/live_credentials.yml
 .rbenv-version
 .yardoc/
 doc/
+.idea

data/lib/active_shipping/carriers/fedex.rb

@@ -143,7 +143,7 @@ module ActiveShipping
     end
 
     def find_rates(origin, destination, packages, options = {})
-      options = @options.update(options)
+      options = @options.merge(options)
       packages = Array(packages)
 
       rate_request = build_rate_request(origin, destination, packages, options)
@@ -154,7 +154,7 @@ module ActiveShipping
     end
 
     def find_tracking_info(tracking_number, options = {})
-      options = @options.update(options)
+      options = @options.merge(options)
 
       tracking_request = build_tracking_request(tracking_number, options)
       xml = commit(save_request(tracking_request), (options[:test] || false))
@@ -164,7 +164,7 @@ module ActiveShipping
 
     # Get Shipping labels
     def create_shipment(origin, destination, packages, options = {})
-      options = @options.update(options)
+      options = @options.merge(options)
       packages = Array(packages)
       raise Error, "Multiple packages are not supported yet." if packages.length > 1
 
@@ -298,7 +298,11 @@ module ActiveShipping
           xml.VariableOptions('SATURDAY_DELIVERY')
 
           xml.RequestedShipment do
-            xml.ShipTimestamp(ship_timestamp(options[:turn_around_time]).iso8601(0))
+            if options[:pickup_date]
+              xml.ShipTimestamp(options[:pickup_date].to_time.iso8601(0))
+            else
+              xml.ShipTimestamp(ship_timestamp(options[:turn_around_time]).iso8601(0))
+            end
 
             freight = has_freight?(options)
 
@@ -479,8 +483,7 @@ module ActiveShipping
           max_transit_time = rated_shipment.at('MaximumTransitTime').try(:text) if service_code == "FEDEX_GROUND"
 
           delivery_timestamp = rated_shipment.at('DeliveryTimestamp').try(:text)
-
-          delivery_range = delivery_range_from(transit_time, max_transit_time, delivery_timestamp, options)
+          delivery_range = delivery_range_from(transit_time, max_transit_time, delivery_timestamp, (service_code == "GROUND_HOME_DELIVERY"), options)
 
           currency = rated_shipment.at('RatedShipmentDetails/ShipmentRateDetail/TotalNetCharge/Currency').text
           RateEstimate.new(origin, destination, @@name,
@@ -503,13 +506,15 @@ module ActiveShipping
       RateResponse.new(success, message, Hash.from_xml(response), :rates => rate_estimates, :xml => response, :request => last_request, :log_xml => options[:log_xml])
     end
 
-    def delivery_range_from(transit_time, max_transit_time, delivery_timestamp, options)
+    def delivery_range_from(transit_time, max_transit_time, delivery_timestamp, is_home_delivery, options)
       delivery_range = [delivery_timestamp, delivery_timestamp]
 
       # if there's no delivery timestamp but we do have a transit time, use it
       if delivery_timestamp.blank? && transit_time.present?
         transit_range  = parse_transit_times([transit_time, max_transit_time.presence || transit_time])
-        delivery_range = transit_range.map { |days| business_days_from(ship_date(options[:turn_around_time]), days) }
+        pickup_date = options[:pickup_date] || ship_date(options[:turn_around_time])
+
+        delivery_range = transit_range.map { |days| business_days_from(pickup_date, days, is_home_delivery) }
       end
 
       delivery_range
@@ -528,22 +533,32 @@ module ActiveShipping
       LabelResponse.new(success, message, response_info, {labels: labels})
     end
 
-    def business_days_from(date, days)
+    def business_days_from(date, days, is_home_delivery=false)
       future_date = date
       count       = 0
 
       while count < days
         future_date += 1.day
-        count += 1 if business_day?(future_date)
+        if is_home_delivery
+          count += 1 if home_delivery_business_day?(future_date)
+        else
+          count += 1 if business_day?(future_date)
+        end
       end
 
       future_date
     end
 
+    #Transit times for FedEx® Ground do not include Saturdays, Sundays, or holidays.
     def business_day?(date)
       (1..5).include?(date.wday)
     end
 
+    #Transit times for FedEx® Home Delivery, do not include Sundays, Mondays, or holidays.
+    def home_delivery_business_day?(date)
+      (2..6).include?(date.wday)
+    end
+
     def parse_tracking_response(response, options)
       xml = build_document(response, 'TrackReply')
 

data/lib/active_shipping/carriers/ups.rb

@@ -93,6 +93,25 @@ module ActiveShipping
       "07" => "UPS Express"
     }
 
+    RETURN_SERVICE_CODES = {
+      "2"  => "UPS Print and Mail (PNM)",
+      "3"  => "UPS Return Service 1-Attempt (RS1)",
+      "5"  => "UPS Return Service 3-Attempt (RS3)",
+      "8"  => "UPS Electronic Return Label (ERL)",
+      "9"  => "UPS Print Return Label (PRL)",
+      "10" => "UPS Exchange Print Return Label",
+      "11" => "UPS Pack & Collect Service 1-Attempt Box 1",
+      "12" => "UPS Pack & Collect Service 1-Attempt Box 2",
+      "13" => "UPS Pack & Collect Service 1-Attempt Box 3",
+      "14" => "UPS Pack & Collect Service 1-Attempt Box 4",
+      "15" => "UPS Pack & Collect Service 1-Attempt Box 5",
+      "16" => "UPS Pack & Collect Service 3-Attempt Box 1",
+      "17" => "UPS Pack & Collect Service 3-Attempt Box 2",
+      "18" => "UPS Pack & Collect Service 3-Attempt Box 3",
+      "19" => "UPS Pack & Collect Service 3-Attempt Box 4",
+      "20" => "UPS Pack & Collect Service 3-Attempt Box 5",
+    }
+
     TRACKING_STATUS_CODES = HashWithIndifferentAccess.new(
       'I' => :in_transit,
       'D' => :delivered,
@@ -111,6 +130,7 @@ module ActiveShipping
     DEFAULT_SERVICE_NAME_TO_CODE = Hash[UPS::DEFAULT_SERVICES.to_a.map(&:reverse)]
     DEFAULT_SERVICE_NAME_TO_CODE['UPS 2nd Day Air'] = "02"
     DEFAULT_SERVICE_NAME_TO_CODE['UPS 3 Day Select'] = "12"
+    DEFAULT_SERVICE_NAME_TO_CODE['UPS Next Day Air Early'] = "14"
 
     SHIPMENT_DELIVERY_CONFIRMATION_CODES = {
       delivery_confirmation_signature_required: 1,
@@ -313,8 +333,11 @@ module ActiveShipping
     # * delivery_confirmation: Can be set to any key from SHIPMENT_DELIVERY_CONFIRMATION_CODES. Can also be set on package level via package.options
     def build_shipment_request(origin, destination, packages, options={})
       packages = Array(packages)
+      shipper = options[:shipper] || origin
       options[:international] = origin.country.name != destination.country.name
-      options[:imperial] ||= IMPERIAL_COUNTRIES.include?(origin.country_code(:alpha2))
+      options[:imperial] ||= IMPERIAL_COUNTRIES.include?(shipper.country_code(:alpha2))
+      options[:return] = options[:return_service_code].present?
+      options[:reason_for_export] ||= ("RETURN" if options[:return])
 
       if allow_package_level_reference_numbers(origin, destination)
         if options[:reference_numbers]
@@ -349,7 +372,7 @@ module ActiveShipping
             build_location_node(xml, 'ShipTo', destination, options)
             build_location_node(xml, 'ShipFrom', origin, options)
             # Required element. The company whose account is responsible for the label(s).
-            build_location_node(xml, 'Shipper', options[:shipper] || origin, options)
+            build_location_node(xml, 'Shipper', shipper, options)
 
             if options[:saturday_delivery]
               xml.ShipmentServiceOptions do
@@ -416,7 +439,9 @@ module ActiveShipping
             end
 
             if options[:international]
-              build_location_node(xml, 'SoldTo', options[:sold_to] || destination, options)
+              unless options[:return]
+                build_location_node(xml, 'SoldTo', options[:sold_to] || destination, options)
+              end
 
               if origin.country_code(:alpha2) == 'US' && ['CA', 'PR'].include?(destination.country_code(:alpha2))
                 # Required for shipments from the US to Puerto Rico or Canada
@@ -432,6 +457,12 @@ module ActiveShipping
               end
             end
 
+            if options[:return]
+              xml.ReturnService do
+                xml.Code(options[:return_service_code])
+              end
+            end
+
             xml.ShipmentServiceOptions do
               if delivery_confirmation = options[:delivery_confirmation]
                 xml.DeliveryConfirmation do
@@ -631,9 +662,13 @@ module ActiveShipping
 
     def build_package_node(xml, package, options = {})
       xml.Package do
-
         # not implemented:  * Shipment/Package/PackagingType element
-        #                   * Shipment/Package/Description element
+
+        #return requires description
+        if options[:return]
+          contents_description = package.options[:description]
+          xml.Description(contents_description) if contents_description
+        end
 
         xml.PackagingType do
           xml.Code('02')

data/lib/active_shipping/carriers/usps.rb

@@ -171,7 +171,7 @@ module ActiveShipping
     SERVICE_NAME_SUBSTITUTIONS = /#{ESCAPING_AND_SYMBOLS}|#{LEADING_USPS}|#{TRAILING_ASTERISKS}/
 
     def find_tracking_info(tracking_number, options = {})
-      options = @options.update(options)
+      options = @options.merge(options)
       tracking_request = build_tracking_request(tracking_number, options)
       response = commit(:track, tracking_request, options[:test] || false)
       parse_tracking_response(response).first

data/lib/active_shipping/version.rb

@@ -1,3 +1,3 @@
 module ActiveShipping
-  VERSION = "1.6.1"
+  VERSION = "1.6.2"
 end

data/test/remote/ups_test.rb

@@ -359,4 +359,43 @@ class RemoteUPSTest < Minitest::Test
   def test_maximum_address_field_length
     assert_equal 35, @carrier.maximum_address_field_length
   end
+
+  def test_obtain_return_label
+    response = @carrier.create_shipment(
+      location_fixtures[:beverly_hills_with_name],
+      location_fixtures[:real_google_as_commercial],
+      #package descriptions are required for returns
+      package_fixtures.values_at(:books),
+      {
+        :shipper => location_fixtures[:new_york],
+        :return_service_code => '9',
+        :test => true
+      }
+    )
+
+    assert response.success?
+
+    assert_instance_of ActiveShipping::LabelResponse, response
+  end
+
+  def test_obtain_international_return_label
+    response = @carrier.create_shipment(
+      location_fixtures[:ottawa_with_name],
+      #international return requires destination to have: phone number, name
+      location_fixtures[:real_google_with_name_phone],
+      #package descriptions are required for returns
+      package_fixtures.values_at(:books),
+      {
+        #international return requires shipper to have: phone, name
+        :shipper => location_fixtures[:new_york_with_name],
+        :service_code => '07',
+        :return_service_code => '9',
+        :test => true,
+      }
+    )
+
+    assert response.success?
+
+    assert_instance_of ActiveShipping::LabelResponse, response
+  end
 end

data/test/remote/usps_test.rb

@@ -12,11 +12,11 @@ class RemoteUSPSTest < Minitest::Test
   end
 
   def test_tracking
-    response = @carrier.find_tracking_info('LN284529912US', test: false)
+    response = @carrier.find_tracking_info('LN757696446US', test: false)
     assert response.success?, response.message
-    assert_equal 9,response.shipment_events.size
+    assert_equal 13,response.shipment_events.size
     assert_equal 'DELIVERED', response.shipment_events.last.message
-    assert_equal Time.parse('2015-06-01 13:36:00 UTC'), response.actual_delivery_date
+    assert_equal Time.parse('2015-11-30 13:02:00 UTC'), response.actual_delivery_date
   end
 
   def test_tracking_with_bad_number

data/test/test_helper.rb

@@ -152,6 +152,15 @@ module ActiveShipping::Test
                                       :address1 => '1600 Amphitheatre Parkway',
                                       :zip => '94043',
                                       :address_type => 'commercial'),
+        :real_google_with_name_phone => Location.new(
+                                      :name => 'Sergey Brin',
+                                      :country => 'US',
+                                      :city => 'Mountain View',
+                                      :state => 'CA',
+                                      :address1 => '1600 Amphitheatre Parkway',
+                                      :zip => '94043',
+                                      :phone => '1-650-253-0000',
+                                      :address_type => 'commercial'),
         :real_google_as_residential => Location.new(
                                       :country => 'US',
                                       :city => 'Mountain View',

data/test/unit/carriers/fedex_test.rb

@@ -15,19 +15,31 @@ class FedExTest < Minitest::Test
   end
 
   def test_business_days
-    today = DateTime.civil(2013, 3, 12, 0, 0, 0, "-4")
+    today = DateTime.civil(2013, 3, 12, 0, 0, 0, "-4") #Tuesday
 
     Timecop.freeze(today) do
       assert_equal DateTime.civil(2013, 3, 13, 0, 0, 0, "-4"), @carrier.send(:business_days_from, today, 1)
       assert_equal DateTime.civil(2013, 3, 15, 0, 0, 0, "-4"), @carrier.send(:business_days_from, today, 3)
+      assert_equal DateTime.civil(2013, 3, 18, 0, 0, 0, "-4"), @carrier.send(:business_days_from, today, 4)
       assert_equal DateTime.civil(2013, 3, 19, 0, 0, 0, "-4"), @carrier.send(:business_days_from, today, 5)
     end
   end
 
+  def test_home_delivery_business_days
+    today = DateTime.civil(2013, 3, 12, 0, 0, 0, "-4") #Tuesday
+
+    Timecop.freeze(today) do
+      assert_equal DateTime.civil(2013, 3, 13, 0, 0, 0, "-4"), @carrier.send(:business_days_from, today, 1, true)
+      assert_equal DateTime.civil(2013, 3, 15, 0, 0, 0, "-4"), @carrier.send(:business_days_from, today, 3, true)
+      assert_equal DateTime.civil(2013, 3, 16, 0, 0, 0, "-4"), @carrier.send(:business_days_from, today, 4, true)
+      assert_equal DateTime.civil(2013, 3, 19, 0, 0, 0, "-4"), @carrier.send(:business_days_from, today, 5, true)
+    end
+  end
+
   def test_turn_around_time_default
     mock_response = xml_fixture('fedex/ottawa_to_beverly_hills_rate_response').gsub('<v6:DeliveryTimestamp>2011-07-29</v6:DeliveryTimestamp>', '')
 
-    today = DateTime.civil(2013, 3, 11, 0, 0, 0, "-4")
+    today = DateTime.civil(2013, 3, 11, 0, 0, 0, "-4") #Monday
 
     Timecop.freeze(today) do
       delivery_date = Date.today + 7.days # FIVE_DAYS in fixture response, plus weekend
@@ -240,19 +252,39 @@ class FedExTest < Minitest::Test
 
     @carrier.expects(:commit).returns(mock_response)
 
-    today = DateTime.civil(2015, 06, 03, 0, 0, 0, "-4")
+    today = DateTime.civil(2015, 06, 04, 0, 0, 0, "-4") #Thursday
 
     Timecop.freeze(today) do
       rate_estimates = @carrier.find_rates( location_fixtures[:ottawa],
                                             location_fixtures[:beverly_hills],
                                             package_fixtures.values_at(:book, :wii), :test => true)
 
-      # the above fixture will specify a transit time of 3 days, with 2 weekend days accounted for
-      delivery_date = Date.today + 5
+      # the above fixture will specify a transit time of 3 days
+      # for ground home, sunday and monday are non-biz days
+      # so it is delivered on Tuesday
+      delivery_date = Date.today + 3 + 2
       assert_equal delivery_date, rate_estimates.rates.first.delivery_date
     end
   end
 
+  def test_delivery_date_from_ground_home_transit_time_on_saturday
+    mock_response = xml_fixture('fedex/raterequest_response_with_ground_home_delivery')
+
+    @carrier.expects(:commit).returns(mock_response)
+
+    today = DateTime.civil(2015, 06, 03, 0, 0, 0, "-4") #Wednesday
+
+    Timecop.freeze(today) do
+      rate_estimates = @carrier.find_rates( location_fixtures[:ottawa],
+                                            location_fixtures[:beverly_hills],
+                                            package_fixtures.values_at(:book, :wii), :test => true)
+
+      # the above fixture will specify a transit time of 3 days
+      # since ground home delivers on Saturday, there is no delay
+      delivery_date = Date.today + 3
+      assert_equal delivery_date, rate_estimates.rates.first.delivery_date
+    end
+  end
 
   def test_failure_to_parse_invalid_xml_results_in_a_useful_error
     mock_response = xml_fixture('fedex/invalid_fedex_reply')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_shipping
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - James MacAulay
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-11 00:00:00.000000000 Z
+date: 2015-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: quantified