active_shipping 0.0.1 → 0.0.2

data/.gitignore

@@ -3,4 +3,5 @@ test.xml
 sample.rb
 *.orig
 *.swp
-.dotest
+.dotest
+pkg

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/active_shipping.gemspec

@@ -0,0 +1,136 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{active_shipping}
+  s.version = "0.0.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["James MacAulay", "Tobias Luetke", "Cody Fauser", "Jimmy Baker"]
+  s.date = %q{2009-11-11}
+  s.description = %q{Shipping API extension for Active Merchant.}
+  s.email = %q{jmacaulay@gmail.com}
+  s.extra_rdoc_files = [
+    "README.markdown"
+  ]
+  s.files = [
+    ".gitignore",
+     "CHANGELOG",
+     "MIT-LICENSE",
+     "README.markdown",
+     "Rakefile",
+     "VERSION",
+     "active_shipping.gemspec",
+     "init.rb",
+     "lib/active_shipping.rb",
+     "lib/active_shipping/lib/connection.rb",
+     "lib/active_shipping/lib/country.rb",
+     "lib/active_shipping/lib/error.rb",
+     "lib/active_shipping/lib/post_data.rb",
+     "lib/active_shipping/lib/posts_data.rb",
+     "lib/active_shipping/lib/requires_parameters.rb",
+     "lib/active_shipping/lib/utils.rb",
+     "lib/active_shipping/lib/validateable.rb",
+     "lib/active_shipping/shipping/base.rb",
+     "lib/active_shipping/shipping/carrier.rb",
+     "lib/active_shipping/shipping/carriers.rb",
+     "lib/active_shipping/shipping/carriers/bogus_carrier.rb",
+     "lib/active_shipping/shipping/carriers/fedex.rb",
+     "lib/active_shipping/shipping/carriers/shipwire.rb",
+     "lib/active_shipping/shipping/carriers/ups.rb",
+     "lib/active_shipping/shipping/carriers/usps.rb",
+     "lib/active_shipping/shipping/location.rb",
+     "lib/active_shipping/shipping/package.rb",
+     "lib/active_shipping/shipping/rate_estimate.rb",
+     "lib/active_shipping/shipping/rate_response.rb",
+     "lib/active_shipping/shipping/response.rb",
+     "lib/active_shipping/shipping/shipment_event.rb",
+     "lib/active_shipping/shipping/tracking_response.rb",
+     "lib/certs/cacert.pem",
+     "lib/vendor/quantified/MIT-LICENSE",
+     "lib/vendor/quantified/README.markdown",
+     "lib/vendor/quantified/Rakefile",
+     "lib/vendor/quantified/init.rb",
+     "lib/vendor/quantified/lib/quantified.rb",
+     "lib/vendor/quantified/lib/quantified/attribute.rb",
+     "lib/vendor/quantified/lib/quantified/length.rb",
+     "lib/vendor/quantified/lib/quantified/mass.rb",
+     "lib/vendor/quantified/test/length_test.rb",
+     "lib/vendor/quantified/test/mass_test.rb",
+     "lib/vendor/quantified/test/test_helper.rb",
+     "lib/vendor/test_helper.rb",
+     "lib/vendor/xml_node/README",
+     "lib/vendor/xml_node/Rakefile",
+     "lib/vendor/xml_node/benchmark/bench_generation.rb",
+     "lib/vendor/xml_node/init.rb",
+     "lib/vendor/xml_node/lib/xml_node.rb",
+     "lib/vendor/xml_node/test/test_generating.rb",
+     "lib/vendor/xml_node/test/test_parsing.rb",
+     "test/fixtures.yml",
+     "test/fixtures/xml/fedex/ottawa_to_beverly_hills_rate_request.xml",
+     "test/fixtures/xml/fedex/ottawa_to_beverly_hills_rate_response.xml",
+     "test/fixtures/xml/fedex/tracking_request.xml",
+     "test/fixtures/xml/fedex/tracking_response.xml",
+     "test/fixtures/xml/shipwire/international_rates_response.xml",
+     "test/fixtures/xml/shipwire/invalid_credentials_response.xml",
+     "test/fixtures/xml/shipwire/new_carrier_rate_response.xml",
+     "test/fixtures/xml/shipwire/no_rates_response.xml",
+     "test/fixtures/xml/shipwire/rates_response.xml",
+     "test/fixtures/xml/ups/example_tracking_response.xml",
+     "test/fixtures/xml/ups/shipment_from_tiger_direct.xml",
+     "test/fixtures/xml/ups/test_real_home_as_residential_destination_response.xml",
+     "test/fixtures/xml/usps/beverly_hills_to_ottawa_book_rate_response.xml",
+     "test/fixtures/xml/usps/beverly_hills_to_ottawa_book_wii_rate_response.xml",
+     "test/fixtures/xml/usps/beverly_hills_to_ottawa_wii_rate_response.xml",
+     "test/fixtures/xml/usps/example_tracking_response.xml",
+     "test/fixtures/xml/usps/multi_tracking_example.xml",
+     "test/remote/fedex_test.rb",
+     "test/remote/shipwire_test.rb",
+     "test/remote/ups_test.rb",
+     "test/remote/usps_test.rb",
+     "test/test_helper.rb",
+     "test/unit/base_test.rb",
+     "test/unit/carriers/fedex_test.rb",
+     "test/unit/carriers/shipwire_test.rb",
+     "test/unit/carriers/ups_test.rb",
+     "test/unit/carriers/usps_test.rb",
+     "test/unit/location_test.rb",
+     "test/unit/package_test.rb",
+     "test/unit/response_test.rb"
+  ]
+  s.homepage = %q{http://github.com/Shopify/active_shipping}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Shipping API extension for Active Merchant.}
+  s.test_files = [
+    "test/remote/fedex_test.rb",
+     "test/remote/shipwire_test.rb",
+     "test/remote/ups_test.rb",
+     "test/remote/usps_test.rb",
+     "test/test_helper.rb",
+     "test/unit/base_test.rb",
+     "test/unit/carriers/fedex_test.rb",
+     "test/unit/carriers/shipwire_test.rb",
+     "test/unit/carriers/ups_test.rb",
+     "test/unit/carriers/usps_test.rb",
+     "test/unit/location_test.rb",
+     "test/unit/package_test.rb",
+     "test/unit/response_test.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+    else
+      s.add_dependency(%q<activesupport>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<activesupport>, [">= 0"])
+  end
+end

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

@@ -290,24 +290,15 @@ module ActiveMerchant
               track_details = i.get_elements('TrackDetail')
               unless track_details.empty?
                 shipment_events = track_details.map do |track_detail|
-                  name = track_detail.get_text('Event').to_s
-                  if (time = track_detail.get_text('EventTime')) && 
-                    (date = track_detail.get_text('EventDate'))
-                    
-                    event_time = Time.parse("#{date} #{time}")
-                  end
-
-                  location = Location.new(
-                    :city => node_string_or_nil(track_detail.elements['EventCity']),
-                    :state => node_string_or_nil(track_detail.elements['EventState']),
-                    :postal_code => node_string_or_nil(track_detail.elements['EventZIPCode']),
-                    :country => node_string_or_nil(track_detail.elements['EventCountry'])
-                  )
-                  
-                  ShipmentEvent.new(name, event_time, location)
-                  
+                  parse_shipment_event(track_detail)                 
                 end
               end
+
+              track_summary = i.get_elements('TrackSummary')[0]
+              unless track_summary.nil?
+                shipment_events ||= []
+                shipment_events << parse_shipment_event(track_summary)
+              end
               TrackingResponse.new(success, response_message(xml), 
                 Hash.from_xml(response).values.first,
                 :xml => response,
@@ -320,6 +311,24 @@ module ActiveMerchant
         end
       end
 
+      def parse_shipment_event(track_detail)
+        name = track_detail.get_text('Event').to_s
+        if (time = track_detail.get_text('EventTime')) && 
+          (date = track_detail.get_text('EventDate'))
+          
+          event_time = Time.parse("#{date} #{time}")
+        end
+
+        location = Location.new(
+          :city => node_string_or_nil(track_detail.elements['EventCity']),
+          :state => node_string_or_nil(track_detail.elements['EventState']),
+          :postal_code => node_string_or_nil(track_detail.elements['EventZIPCode']),
+          :country => node_string_or_nil(track_detail.elements['EventCountry'])
+        )
+        
+        ShipmentEvent.new(name, event_time, location)
+      end
+
         
 
       def response_success?(xml)

data/test/fixtures/xml/usps/example_tracking_response.xml

@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<TrackResponse>
+
+     <TrackInfo ID="EJ958083578US">
+
+        <TrackSummary>
+
+          <EventTime>8:10 am</EventTime>
+
+          <EventDate>June 1, 2001</EventDate>
+
+          <Event>DELIVERED</Event>
+
+          <EventCity>WILMINGTON</EventCity>
+
+          <EventState>DE</EventState>
+
+          <EventZIPCode>19801</EventZIPCode>
+
+          <EventCountry/>
+
+          <FirmName></FirmName>
+
+          <Name></Name>
+
+          <AuthorizedAgent></AuthorizedAgent>
+
+        </TrackSummary>
+
+       <TrackDetail>
+
+          <EventTime>11:07 am</EventTime>
+
+          <EventDate>May 30, 2001</EventDate>
+
+          <Event>NOTICE LEFT</Event>
+
+          <EventCity>WILMINGTON</EventCity>
+
+          <EventState>DE</EventState>
+
+          <EventZIPCode>19801</EventZIPCode>
+
+          <EventCountry/>
+
+          <FirmName/>
+
+          <Name/>
+
+          <AuthorizedAgent/>
+
+      </TrackDetail>
+
+      <TrackDetail>
+
+          <EventTime>10:08 am</EventTime>
+
+          <EventDate>May 30, 2001</EventDate>
+
+          <Event>ARRIVAL AT UNIT</Event>
+
+          <EventCity>WILMINGTON</EventCity>
+
+          <EventState>DE</EventState>
+
+          <EventZIPCode>19850</EventZIPCode>
+
+          <EventCountry/>
+
+          <FirmName/>
+
+          <Name/>
+
+          <AuthorizedAgent/>
+
+      </TrackDetail>
+
+        <TrackDetail>
+
+          <EventTime>9:55 pm</EventTime>
+
+          <EventDate>May 29, 2001</EventDate>
+
+          <Event>ACCEPTANCE</Event>
+
+          <EventCity>EDGEWATER</EventCity>
+
+          <EventState>NJ</EventState>
+
+          <EventZIPCode>07020</EventZIPCode>
+
+          <EventCountry/>
+
+          <FirmName/>
+
+          <Name/>
+
+          <AuthorizedAgent/>
+
+      </TrackDetail>
+
+     </TrackInfo>
+
+</TrackResponse>

data/test/fixtures/xml/usps/multi_tracking_example.xml

@@ -0,0 +1,105 @@
+<?xml version="1.0"?>
+<TrackResponse>
+
+     <TrackInfo ID="EJ958083578US">
+
+        <TrackSummary>
+
+          <EventTime>8:10 am</EventTime>
+
+          <EventDate>June 1, 2001</EventDate>
+
+          <Event>DELIVERED</Event>
+
+          <EventCity>WILMINGTON</EventCity>
+
+          <EventState>DE</EventState>
+
+          <EventZIPCode>19801</EventZIPCode>
+
+          <EventCountry/>
+
+          <FirmName></FirmName>
+
+          <Name></Name>
+
+          <AuthorizedAgent></AuthorizedAgent>
+
+        </TrackSummary>
+
+       <TrackDetail>
+
+          <EventTime>11:07 am</EventTime>
+
+          <EventDate>May 30, 2001</EventDate>
+
+          <Event>NOTICE LEFT</Event>
+
+          <EventCity>WILMINGTON</EventCity>
+
+          <EventState>DE</EventState>
+
+          <EventZIPCode>19801</EventZIPCode>
+
+          <EventCountry/>
+
+          <FirmName/>
+
+          <Name/>
+
+          <AuthorizedAgent/>
+
+      </TrackDetail>
+
+      <TrackDetail>
+
+          <EventTime>10:08 am</EventTime>
+
+          <EventDate>May 30, 2001</EventDate>
+
+          <Event>ARRIVAL AT UNIT</Event>
+
+          <EventCity>WILMINGTON</EventCity>
+
+          <EventState>DE</EventState>
+
+          <EventZIPCode>19850</EventZIPCode>
+
+          <EventCountry/>
+
+          <FirmName/>
+
+          <Name/>
+
+          <AuthorizedAgent/>
+
+      </TrackDetail>
+
+        <TrackDetail>
+
+          <EventTime>9:55 pm</EventTime>
+
+          <EventDate>May 29, 2001</EventDate>
+
+          <Event>ACCEPTANCE</Event>
+
+          <EventCity>EDGEWATER</EventCity>
+
+          <EventState>NJ</EventState>
+
+          <EventZIPCode>07020</EventZIPCode>
+
+          <EventCountry/>
+
+          <FirmName/>
+
+          <Name/>
+
+          <AuthorizedAgent/>
+
+      </TrackDetail>
+
+     </TrackInfo>
+
+     <TrackInfo ID="EJ958088694US"><TrackSummary><EventTime>1:39 pm</EventTime><EventDate>June 1, 2001</EventDate><Event>DELIVERED</Event><EventCity>WOBURN</EventCity><EventState>MA</EventState><EventZIPCode>01815</EventZIPCode><EventCountry/><FirmName></FirmName><Name></Name><AuthorizedAgent></AuthorizedAgent></TrackSummary><TrackDetail><EventTime>7:44 am</EventTime><EventDate>May 30, 2001</EventDate><Event>NOTICE LEFT</Event><EventCity>WOBURN</EventCity><EventState>MA</EventState><EventZIPCode>01815</EventZIPCode><EventCountry/><FirmName/><Name/><AuthorizedAgent/></TrackDetail><TrackDetail><EventTime>7:36 am</EventTime><EventDate>May 30, 2001</EventDate><Event>ARRIVAL AT UNIT</Event><EventCity>NORTH READING</EventCity><EventState>MA</EventState><EventZIPCode>01889</EventZIPCode><EventCountry/><FirmName/><Name/><AuthorizedAgent/></TrackDetail><TrackDetail><EventTime>6:00 pm</EventTime><EventDate>May 29, 2001</EventDate><Event>ACCEPTANCE</Event><EventCity>PORTSMOUTH</EventCity><EventState>NH</EventState><EventZIPCode>03801</EventZIPCode><EventCountry/><FirmName/><Name/><AuthorizedAgent/></TrackDetail></TrackInfo>
+</TrackResponse>

data/test/unit/carriers/usps_test.rb

@@ -24,29 +24,29 @@ class USPSTest < Test::Unit::TestCase
   def test_find_tracking_info_should_return_a_tracking_response
     @carrier.expects(:commit).returns(xml_fixture('usps/example_tracking_response'))
     assert_instance_of ActiveMerchant::Shipping::TrackingResponse, 
-      @carrier.find_tracking_info(['EJ958083578US'], :test => true)
+      @carrier.find_tracking_info(['EJ958083578US'], :test => true)[0]
   end
 
   def test_find_tracking_info_should_return_a_tracking_number
     @carrier.expects(:commit).returns(xml_fixture('usps/example_tracking_response'))
-    info = @carrier.find_tracking_info(['EJ958083578US'], :test => true)
+    info = @carrier.find_tracking_info(['EJ958083578US'], :test => true)[0]
     
     assert_equal 'EJ958083578US', info.tracking_number
   end
 
   def test_find_tracking_info_should_return_correct_number_of_shipment_events
     @carrier.expects(:commit).returns(xml_fixture('usps/example_tracking_response'))
-    info = @carrier.find_tracking_info(['EJ958083578US'], :test => true)
+    info = @carrier.find_tracking_info(['EJ958083578US'], :test => true)[0]
 
-    assert_equal 3, info.shipment_events.size
+    assert_equal 4, info.shipment_events.size
   end
 
   def test_find_tracking_info_should_return_proper_order
     @carrier.expects(:commit).returns(xml_fixture('usps/example_tracking_response'))
-    info = @carrier.find_tracking_info(['EJ958083578US'], :test => true)
+    info = @carrier.find_tracking_info(['EJ958083578US'], :test => true)[0]
 
     assert_equal "NOTICE LEFT", info.shipment_events.first.name
-    assert_equal "ACCEPTANCE", info.shipment_events.last.name
+    assert_equal "DELIVERED", info.shipment_events.last.name
   end
 
   def test_find_multiple_returns_two_seperate_tracking_responses

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: active_shipping
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - James MacAulay
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-26 00:00:00 -04:00
+date: 2009-11-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,6 +40,7 @@ files:
 - README.markdown
 - Rakefile
 - VERSION
+- active_shipping.gemspec
 - init.rb
 - lib/active_shipping.rb
 - lib/active_shipping/lib/connection.rb
@@ -101,6 +102,8 @@ files:
 - test/fixtures/xml/usps/beverly_hills_to_ottawa_book_rate_response.xml
 - test/fixtures/xml/usps/beverly_hills_to_ottawa_book_wii_rate_response.xml
 - test/fixtures/xml/usps/beverly_hills_to_ottawa_wii_rate_response.xml
+- test/fixtures/xml/usps/example_tracking_response.xml
+- test/fixtures/xml/usps/multi_tracking_example.xml
 - test/remote/fedex_test.rb
 - test/remote/shipwire_test.rb
 - test/remote/ups_test.rb