active_shipping 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/active_shipping.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_shipping}
-  s.version = "0.1.1"
+  s.version = "0.1.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{2010-01-21}
+  s.date = %q{2010-03-29}
   s.description = %q{Shipping API extension for Active Merchant.}
   s.email = %q{jmacaulay@gmail.com}
   s.extra_rdoc_files = [
@@ -112,7 +112,7 @@ Gem::Specification.new do |s|
   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.rubygems_version = %q{1.3.6}
   s.summary = %q{Shipping API extension for Active Merchant.}
   s.test_files = [
     "test/party_factory.rb",

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

@@ -453,11 +453,9 @@ module ActiveMerchant
               :country => event.elements['Address'].get_text('CountryCode').to_s)
             description = event.get_text('EventDescription').to_s
             
-            # for now, just assume UTC, even though it probably isn't
-            time = Time.parse("#{event.get_text('Timestamp').to_s}")
-            zoneless_time = Time.utc(time.year, time.month, time.mday, time.hour, time.min, time.sec)
+            time = Time.parse(event.get_text('Timestamp').to_s)
             
-            shipment_events << ShipmentEvent.new(description, zoneless_time, location)
+            shipment_events << ShipmentEvent.new(description, time, location)
           end
           shipment_events = shipment_events.sort_by(&:time)
         end

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

@@ -314,7 +314,7 @@ module ActiveMerchant
                 time, date = time.to_s, date.to_s
                 hour, minute, second = time.scan(/\d{2}/)
                 year, month, day = date[0..3], date[4..5], date[6..7]
-                Time.utc(year, month, day, hour, minute, second)
+                Time.parse("#{date} {time} EST")
               end
               location = location_from_address_node(activity.elements['ActivityLocation/Address'])
               ShipmentEvent.new(description, zoneless_time, location)

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

@@ -316,7 +316,7 @@ module ActiveMerchant
         if (time = track_detail.get_text('EventTime')) && 
           (date = track_detail.get_text('EventDate'))
           
-          event_time = Time.parse("#{date} #{time}")
+          event_time = Time.parse("#{date} #{time} EST")
         end
 
         location = Location.new(

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: active_shipping
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - James MacAulay
@@ -12,19 +17,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-21 00:00:00 -05:00
+date: 2010-03-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: Shipping API extension for Active Merchant.
 email: jmacaulay@gmail.com
 executables: []
@@ -139,18 +146,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Shipping API extension for Active Merchant.