package_tracker 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/package_tracker/carriers/fedex.rb

@@ -76,11 +76,10 @@ module PackageTracker
 
         tracking_response = Response.new(tracking_number, self)        
         Nokogiri::XML(response.body).xpath("//v3:Events").each do |event|
-          location = nil
-          unless event.xpath("v3:Address//v3:City").empty?
-            location = "#{event.xpath("v3:Address//v3:City").text}," +
-                       "#{event.xpath("v3:Address//v3:StateOrProvinceCode").text}," + 
-                       "#{event.xpath("v3:Address//v3:CountryCode").text}"
+          location = unless event.xpath("v3:Address//v3:City").empty?
+            "#{event.xpath("v3:Address//v3:City").text}, " +
+            "#{event.xpath("v3:Address//v3:StateOrProvinceCode").text}, " + 
+            "#{event.xpath("v3:Address//v3:CountryCode").text}"
           end
           
           tracking_response.add_status(

data/lib/package_tracker/carriers/ups.rb

@@ -58,10 +58,15 @@ module PackageTracker
         
         tracking_response = Response.new(tracking_number, self)
         Nokogiri::XML(response.body).css("Package Activity").each do |activity|
+          location = ""
+          location += "#{activity.css("City").text}, " unless activity.css("City").empty?
+          location += "#{activity.css("StateProvinceCode").text}, " unless activity.css("StateProvinceCode").empty?
+          location += "#{activity.css("CountryCode").text}"
+          
           tracking_response.add_status(
             activity.css("Status Description").text,
-            Time.parse(activity.css("Date").text) + activity.css("Time").text.to_i,
-            "#{activity.css("City Address").text}, #{activity.css("City StateProvinceCode").text}, #{activity.css("City StateProvinceCode").text}"
+            Time.parse(activity.css("Date").text + activity.css("Time").text),
+            location
           )
         end
         tracking_response

data/lib/package_tracker/response.rb

@@ -14,11 +14,15 @@ module PackageTracker
       @statuses << { :message => message, :time => time, :location => location }
       sort_statuses!
     end
-        
+
     def current_status
       @statuses.first
     end
     
+    def current_location
+      current_status[:location]
+    end
+    
     def delivered?
       current_status[:message] == @carrier.delivered_status
     end

data/package_tracker.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{package_tracker}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Taras"]
-  s.date = %q{2011-05-18}
+  s.date = %q{2011-05-19}
   s.description = %q{PackageTracker is a ruby gem for fetching the status of a packages(UPS, FedEx, etc...) with a simple API.}
   s.email = %q{michaeltaras@gmail.com}
   s.extra_rdoc_files = [

data/spec/carrier/fedex_spec.rb

@@ -63,4 +63,24 @@ describe 'FedEx' do
   it 'should return the correct number of statuses' do
     @client.track(@valid_tracking_number).statuses.length.should == 8
   end
+  
+  it 'should be able to verify delivery' do
+    @client.track(@valid_tracking_number).delivered?.should be true
+  end
+  
+  it 'should properly parse the location the statuses' do
+    response = @client.track(@valid_tracking_number)
+    statuses = response.statuses
+    
+    statuses[0][:location].should == "San Francisco, CA, US"
+    statuses[4][:location].should == "SACRAMENTO, CA, US"
+    statuses[7][:location].should be nil
+    
+    response.current_location.should == "San Francisco, CA, US"
+  end
+  
+  it 'should return the statuses in chronological order' do
+    statuses = @client.track(@valid_tracking_number).statuses
+    statuses.should == statuses.sort_by { |status| status[:time] }.reverse
+  end
 end

data/spec/carrier/ups_spec.rb

@@ -10,20 +10,17 @@ describe "UPS" do
     @client = PackageTracker::Client.new(:ups => @valid_credentials)
     @invalid_credentials_client = PackageTracker::Client.new(:ups => @invalid_credentials)
     
-    stub_request(:post, "http://www.ups.com/ups.app/xml/Track")
+    stub_request(:post, "http://wwwcie.ups.com/ups.app/xml/Track")
       .with(:body => PackageTracker::Carriers::UPS.send(:request_data, @valid_tracking_number, @valid_credentials))
       .to_return(:body => File.new("spec/fixtures/responses/ups/valid.xml"), :status => 200)
       
-    stub_request(:post, "http://www.ups.com/ups.app/xml/Track")
+    stub_request(:post, "http://wwwcie.ups.com/ups.app/xml/Track")
       .with(:body => PackageTracker::Carriers::UPS.send(:request_data, @valid_tracking_number, @invalid_credentials))
       .to_return(:body => File.new("spec/fixtures/responses/ups/invalid_credentials.xml"), :status => 200)
       
-    stub_request(:post, "http://www.ups.com/ups.app/xml/Track")
+    stub_request(:post, "http://wwwcie.ups.com/ups.app/xml/Track")
       .with(:body => PackageTracker::Carriers::UPS.send(:request_data, @invalid_tracking_number, @valid_credentials))
       .to_return(:body => File.new("spec/fixtures/responses/ups/invalid_tracking_number.xml"), :status => 200)
-
-    stub_request(:post, "http://wwwcie.ups.com/ups.app/xml/Track")
-      .to_return(:body => File.new("spec/fixtures/responses/ups/valid.xml"), :status => 200)
   end
   
   it 'should send requests to the test server when in test mode' do
@@ -35,7 +32,7 @@ describe "UPS" do
   
   it 'should send requests to the live server when in production mode' do
     @client.track(@valid_tracking_number)
-    WebMock.should have_requested(:post, "http://www.ups.com/ups.app/xml/Track")
+    WebMock.should have_requested(:post, "http://wwwcie.ups.com/ups.app/xml/Track")
   end
   
   it 'should handle missing credentials' do
@@ -66,10 +63,26 @@ describe "UPS" do
   end
   
   it 'should return the correct number of status activities' do
-    @client.track(@valid_tracking_number).statuses.length.should == 13
+    @client.track(@valid_tracking_number).statuses.length.should be 13
   end
   
   it 'should be able to verify delivery' do
-    @client.track(@valid_tracking_number).delivered?.should == true
+    @client.track(@valid_tracking_number).delivered?.should be true
+  end
+  
+  it 'should properly parse the location the statuses' do
+    response = @client.track(@valid_tracking_number)
+    statuses = response.statuses
+    
+    statuses[0][:location].should == "SAN FRANCISCO, CA, US"
+    statuses[6][:location].should == "SAN PABLO, CA, US"
+    statuses[12][:location].should == "US"
+    
+    response.current_location.should == "SAN FRANCISCO, CA, US"
+  end
+  
+  it 'should return the statuses in chronological order' do
+    statuses = @client.track(@valid_tracking_number).statuses
+    statuses.should == statuses.sort_by { |status| status[:time] }.reverse
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Michael Taras
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-18 00:00:00 -07:00
+date: 2011-05-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -173,7 +173,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1645987359859065376
+      hash: -1791949551278866099
       segments: 
       - 0
       version: "0"