active_shipping 0.11.1 → 0.11.2

data/lib/active_shipping/shipping/carriers/canada_post_pws.rb

@@ -289,7 +289,7 @@ module ActiveMerchant
         expected_date    = root_node.get_text('expected-delivery-date').to_s
         dest_postal_code = root_node.get_text('destination-postal-id').to_s
         destination      = Location.new(:postal_code => dest_postal_code)
-        origin           = Location.new({})        
+        origin           = Location.new(origin_hash_for(root_node))
         options = {
           :carrier                 => @@name,
           :service_name            => root_node.get_text('service-name').to_s,
@@ -762,6 +762,24 @@ module ActiveMerchant
         return value == 0 ? 0.01 : value.round / 100.0
       end
 
+      def origin_hash_for(root_node)
+        occurrences = root_node.get_elements('significant-events').first.get_elements('occurrence')
+        earliest = occurrences.sort_by { |occurrence| time_of_occurrence occurrence }.first
+
+        {
+          city: earliest.get_text('event-site'),
+          province: earliest.get_text('event-province'),
+          address_1: earliest.get_text('event-retail-location-id'),
+          country: 'Canada'
+        }
+      end
+
+      def time_of_occurrence(occurrence)
+        time = occurrence.get_text('event_time')
+        date = occurrence.get_text('event-date')
+        time_zone = occurrence.get_text('event-date')
+        DateTime.parse "#{date} #{time} #{time_zone}"
+      end
     end
 
     module CPPWSErrorResponse
@@ -771,20 +789,21 @@ module ActiveMerchant
       end
     end
 
-    class CPPWSRateResponse < RateResponse      
+    class CPPWSRateResponse < RateResponse
       include CPPWSErrorResponse
-      
+
       def initialize(success, message, params = {}, options = {})
         handle_error(message, options)
         super
       end
     end
-    
+
     class CPPWSTrackingResponse < TrackingResponse
+      DELIVERED_EVENT_CODES = %w(1496 1498 1499 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438)
       include CPPWSErrorResponse
 
       attr_reader :service_name, :expected_date, :changed_date, :change_reason, :customer_number
-      
+
       def initialize(success, message, params = {}, options = {})
         handle_error(message, options)
         super
@@ -794,6 +813,21 @@ module ActiveMerchant
         @change_reason   = options[:change_reason]
         @customer_number = options[:customer_number]
       end
+
+      def delivered?
+        ! delivered_event.nil?
+      end
+
+      def actual_delivery_time
+        delivered_event.time if delivered?
+      end
+
+
+      private
+
+      def delivered_event
+        @delivered_event ||= @shipment_events.detect { |event| DELIVERED_EVENT_CODES.include? event.name }
+      end
     end
 
     class CPPWSShippingResponse < ShippingResponse

data/lib/active_shipping/shipping/carriers/fedex.rb

@@ -145,7 +145,8 @@ module ActiveMerchant
         
         rate_request = build_rate_request(origin, destination, packages, options)
         
-        response = commit(save_request(rate_request), (options[:test] || false)).gsub(/<(\/)?.*?\:(.*?)>/, '<\1\2>')
+        xml = commit(save_request(rate_request), (options[:test] || false))
+        response = remove_version_prefix(xml)
 
         parse_rate_response(origin, destination, packages, response, options)
       end
@@ -154,7 +155,8 @@ module ActiveMerchant
         options = @options.update(options)
         
         tracking_request = build_tracking_request(tracking_number, options)
-        response = commit(save_request(tracking_request), (options[:test] || false)).gsub(/<(\/)?.*?\:(.*?)>/, '<\1\2>')
+        xml = commit(save_request(tracking_request), (options[:test] || false))
+        response = remove_version_prefix(xml)
         parse_tracking_response(response, options)
       end
 
@@ -480,7 +482,7 @@ module ActiveMerchant
           :actual_delivery_date => actual_delivery_time,
           :delivery_signature => delivery_signature,
           :shipment_events => shipment_events,
-          :shipper_address => shipper_address.unknown? ? nil : shipper_address,
+          :shipper_address => (shipper_address.nil? || shipper_address.unknown?) ? nil : shipper_address,
           :origin => origin,
           :destination => destination,
           :tracking_number => tracking_number
@@ -561,6 +563,14 @@ module ActiveMerchant
         end
       end
 
+      def remove_version_prefix(xml)
+        if xml =~ /xmlns:v[0-9]/
+          xml.gsub(/<(\/)?.*?\:(.*?)>/, '<\1\2>')
+        else
+          xml
+        end
+      end
+
       def build_document(xml)
         REXML::Document.new(xml)
       rescue REXML::ParseException => e

data/lib/active_shipping/shipping/carriers/shipwire.rb

@@ -161,6 +161,8 @@ module ActiveMerchant
         end
         
         response
+      rescue NoMethodError => e
+        raise ActiveMerchant::Shipping::ResponseContentError.new(e, xml)
       end
       
       def parse_child_text(parent, name)

data/lib/active_shipping/shipping/carriers/ups.rb

@@ -380,10 +380,9 @@ module ActiveMerchant
             # This adds an origin event to the shipment activity in such cases.
             if origin && !(shipment_events.count == 1 && status == :delivered)
               first_event = shipment_events[0]
-              same_country = origin.country_code(:alpha2) == first_event.location.country_code(:alpha2)
-              same_or_blank_city = first_event.location.city.blank? or first_event.location.city == origin.city
               origin_event = ShipmentEvent.new(first_event.name, first_event.time, origin)
-              if same_country and same_or_blank_city
+
+              if within_same_area?(origin, first_event.location)
                 shipment_events[0] = origin_event
               else
                 shipment_events.unshift(origin_event)
@@ -456,6 +455,12 @@ module ActiveMerchant
         ssl_post("#{test ? TEST_URL : LIVE_URL}/#{RESOURCES[action]}", request)
       end
 
+      def within_same_area?(origin, location)
+        return false unless location
+        matching_country_codes = origin.country_code(:alpha2) == location.country_code(:alpha2)
+        matching_or_blank_city = location.city.blank? || location.city == origin.city
+        matching_country_codes && matching_or_blank_city
+      end
 
       def service_name_for(origin, code)
         origin = origin.country_code(:alpha2)

data/lib/active_shipping/shipping/carriers/usps.rb

@@ -13,6 +13,11 @@ module ActiveMerchant
     # This will send a test request to the USPS test servers, which they ask you
     # to do before they put your API key in production mode.
     class USPS < Carrier
+      EventDetails = Struct.new(:description, :time, :zoneless_time, :location)
+      EVENT_MESSAGE_PATTERNS = [
+        /^(.*), (\w+ \d{1,2}, \d{4}, \d{1,2}:\d\d [ap]m), (.*), (\w\w) (\d{5})$/i,
+        /^Your item \w{2,3} (out for delivery|delivered) at (\d{1,2}:\d\d [ap]m on \w+ \d{1,2}, \d{4}) in (.*), (\w\w) (\d{5})\.$/i
+      ]
       self.retry_safe = true
 
       cattr_reader :name
@@ -199,6 +204,20 @@ module ActiveMerchant
         Mass.new(70, :pounds)
       end
 
+      def extract_event_details(message)
+        return EventDetails.new unless EVENT_MESSAGE_PATTERNS.any?{|pattern| message =~ pattern}
+        description = $1.upcase
+        timestamp = $2
+        city = $3
+        state = $4
+        zip_code = $5
+
+        time = Time.parse(timestamp)
+        zoneless_time = Time.utc(time.year, time.month, time.mday, time.hour, time.min, time.sec)
+        location = Location.new(city: city, state: state, postal_code: zip_code, country: 'USA')
+        EventDetails.new($1.upcase, time, zoneless_time, location)
+      end
+
       protected
 
       def build_tracking_request(tracking_number, options={})
@@ -492,23 +511,8 @@ module ActiveMerchant
           tracking_number = root_node.elements['TrackInfo'].attributes['ID'].to_s
 
           tracking_details.each do |event|
-            location = nil
-            timestamp = nil
-            description = nil
-            if event.get_text.to_s =~ /^(.*), (\w+ \d\d, \d{4}, \d{1,2}:\d\d [ap]m), (.*), (\w\w) (\d{5})$/i ||
-                event.get_text.to_s =~ /^Your item \w{2,3} (out for delivery|delivered) at (\d{1,2}:\d\d [ap]m on \w+ \d\d, \d{4}) in (.*), (\w\w) (\d{5})\.$/i
-              description = $1.upcase
-              timestamp   = $2
-              city        = $3
-              state       = $4
-              zip_code    = $5
-              location = Location.new(:city => city, :state => state, :postal_code => zip_code, :country => 'USA')
-            end
-            if location
-              time = Time.parse(timestamp)
-              zoneless_time = Time.utc(time.year, time.month, time.mday, time.hour, time.min, time.sec)
-              shipment_events << ShipmentEvent.new(description, zoneless_time, location)
-            end
+            details = extract_event_details(event.get_text.to_s)
+            shipment_events << ShipmentEvent.new(details.description, details.zoneless_time, details.location) if details.location
           end
 
           shipment_events = shipment_events.sort_by(&:time)

data/lib/active_shipping/version.rb

@@ -1,3 +1,3 @@
 module ActiveShipping
-  VERSION = "0.11.1"
+  VERSION = "0.11.2"
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: active_shipping
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
+  prerelease: 
 platform: ruby
 authors:
 - James MacAulay
@@ -11,81 +12,92 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-31 00:00:00.000000000 Z
+date: 2014-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.5
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: active_utils
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -93,6 +105,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -100,20 +113,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -121,6 +137,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -128,29 +145,33 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Get rates and tracking info from various shipping carriers.
@@ -212,25 +233,29 @@ files:
 - CHANGELOG
 homepage: http://github.com/shopify/active_shipping
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3769244612129544255
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: active_shipping
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Shipping API extension for Active Merchant
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 4b36c0ee1b7b2ac743a5b950a23f40f006b5fcc9
-  data.tar.gz: 4a89bf43c4fde9d06f3e34aeee258a9c1990171d
-SHA512:
-  metadata.gz: 1fe9164056568d8913f2f9230fb8a26cdb9f7ff5237c2ab4b7902fcfc1dd0e60b1615a8ccb999754c1f3349b32152fe8bb6f0503afe024452f36944d455d1517
-  data.tar.gz: 5a55bbce296ed30b42a172b4dc70519cefa409828b68d7018a537ad14ddb6cd7d5e21d8f39d494f789454a4f5049acc539f57b656ef4bcd47ae6c5956ec21bf7