active_shipping 0.1.4 → 0.9.1

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

@@ -175,6 +175,7 @@ module ActiveMerchant
             #                   * Shipment/DocumentsOnly element                      
             
             packages.each do |package|
+              debugger if package.nil?
               
               
               imperial = ['US','LR','MM'].include?(origin.country_code(:alpha2))
@@ -314,7 +315,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.parse("#{date} {time} EST")
+                Time.utc(year, month, day, hour, minute, second)
               end
               location = location_from_address_node(activity.elements['ActivityLocation/Address'])
               ShipmentEvent.new(description, zoneless_time, location)

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

@@ -30,14 +30,12 @@ module ActiveMerchant
       
       API_CODES = {
         :us_rates => 'RateV3',
-        :track => 'TrackV2',
         :world_rates => 'IntlRate',
         :test => 'CarrierPickupAvailability'
       }
       USE_SSL = {
         :us_rates => false,
         :world_rates => false,
-        :track => false,
         :test => true
       }
       CONTAINERS = {
@@ -164,14 +162,6 @@ module ActiveMerchant
         end
       end
       
-      def find_tracking_info(tracking_numbers, options={})
-        options = @options.update(options)
-        tracking_numbers = [tracking_numbers] unless tracking_numbers.is_a?(Array)
-        tracking_request = build_tracking_request(tracking_numbers)
-        response = commit(:track, save_request(tracking_request), (options[:test] || false))
-        parse_tracking_response(response, options)
-      end
-      
       def valid_credentials?
         # Cannot test with find_rates because USPS doesn't allow that in test mode
         test_mode? ? canned_address_verification_works? : super
@@ -204,14 +194,6 @@ module ActiveMerchant
         xml.get_text('/CarrierPickupAvailabilityResponse/Address2').to_s == '1390 Market Street'
       end
       
-      def build_tracking_request(tracking_numbers)
-        request = XmlNode.new('TrackFieldRequest', :USERID => @options[:login]) do |tracking_request|
-          tracking_numbers.each { |i| tracking_request << XmlNode.new('TrackID', :ID => i)  }
-        end
-        
-        URI.encode(save_request(request.to_s))
-      end
-      
       # options[:service] --    One of [:first_class, :priority, :express, :bpm, :parcel,
       #                          :media, :library, :all]. defaults to :all.
       # options[:container] --  One of [:envelope, :box]. defaults to neither (this field has
@@ -278,73 +260,6 @@ module ActiveMerchant
         URI.encode(save_request(request.to_s))
       end
       
-      def parse_tracking_response(response, options = {})
-        xml = REXML::Document.new(response)
-        shipment_events = []
-        if success = response_success?(xml)
-          info = xml.root.get_elements('TrackInfo')
-          unless info.empty?
-            responses = info.map do |i|
-              tracking_number = i.attributes['ID']
-
-              track_details = i.get_elements('TrackDetail')
-              unless track_details.empty?
-                shipment_events = track_details.map do |track_detail|
-                  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,
-                :request => last_request,
-                :shipment_events => shipment_events,
-                :tracking_number => tracking_number
-              )
-            end
-          end
-        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} EST")
-        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)
-        xml.elements['/Error'].nil?
-      end
-
-      def response_message(xml)
-        if error = xml.elements['/Error']
-          message = error.elements['Description'].text
-        else
-          message = ''
-        end
-
-        message
-      end
-
       def parse_rate_response(origin, destination, packages, response, options={})
         success = true
         message = ''

data/lib/active_shipping/shipping/location.rb

@@ -19,9 +19,6 @@ module ActiveMerchant #:nodoc:
       alias_method :state, :province
       alias_method :territory, :province
       alias_method :region, :province
-
-      attr_accessor :valid
-      attr_accessor :score
       
       def initialize(options = {})
         @country = (options[:country].nil? or options[:country].is_a?(ActiveMerchant::Country)) ?
@@ -100,4 +97,4 @@ module ActiveMerchant #:nodoc:
     end
       
   end
-end
+end

data/lib/active_shipping/shipping/response.rb

@@ -1,8 +1,5 @@
 module ActiveMerchant #:nodoc:
-  
-  class ActiveMerchantError < StandardError #:nodoc:
-  end
-  
+    
   module Shipping #:nodoc:
     
     class Error < ActiveMerchant::ActiveMerchantError

data/lib/active_shipping/version.rb

@@ -0,0 +1,3 @@
+module ActiveShipping
+  VERSION = "0.9.1"
+end

data/lib/vendor/quantified/lib/quantified.rb

@@ -1,6 +1,8 @@
 $: << File.dirname(__FILE__)
-require 'rubygems'
-require 'active_support'
+
+require 'active_support/all'
 require 'bigdecimal'
 
-require 'quantified/attribute'
+require 'quantified/attribute'
+require 'quantified/mass'
+require 'quantified/length'

metadata

@@ -1,185 +1,151 @@
 --- !ruby/object:Gem::Specification 
 name: active_shipping
 version: !ruby/object:Gem::Version 
+  hash: 57
   prerelease: false
   segments: 
   - 0
+  - 9
   - 1
-  - 4
-  version: 0.1.4
+  version: 0.9.1
 platform: ruby
 authors: 
 - James MacAulay
-- Tobias Luetke
+- Tobi Lutke
 - Cody Fauser
 - Jimmy Baker
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-04-20 00:00:00 -04:00
+date: 2010-07-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 3
+        - 5
+        version: 2.3.5
   type: :runtime
   version_requirements: *id001
-description: Shipping API extension for Active Merchant.
-email: jmacaulay@gmail.com
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+description: Get rates and tracking info from various shipping carriers.
+email: 
+- james@shopify.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.markdown
+extra_rdoc_files: []
+
 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_merchant/common/connection.rb
+- lib/active_merchant/common/country.rb
+- lib/active_merchant/common/error.rb
+- lib/active_merchant/common/post_data.rb
+- lib/active_merchant/common/posts_data.rb
+- lib/active_merchant/common/requires_parameters.rb
+- lib/active_merchant/common/utils.rb
+- lib/active_merchant/common/validateable.rb
+- lib/active_merchant/common.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/kunaki.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/contact.rb
-- lib/active_shipping/shipping/label.rb
+- lib/active_shipping/shipping/carriers.rb
 - lib/active_shipping/shipping/location.rb
-- lib/active_shipping/shipping/location_response.rb
 - lib/active_shipping/shipping/package.rb
-- lib/active_shipping/shipping/party.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/return_label_response.rb
-- lib/active_shipping/shipping/return_shipment.rb
-- lib/active_shipping/shipping/shipment.rb
 - lib/active_shipping/shipping/shipment_event.rb
 - lib/active_shipping/shipping/tracking_response.rb
+- lib/active_shipping/version.rb
+- lib/active_shipping.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/lib/quantified.rb
+- lib/vendor/quantified/MIT-LICENSE
+- lib/vendor/quantified/Rakefile
+- lib/vendor/quantified/README.markdown
 - 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/Rakefile
+- lib/vendor/xml_node/README
 - lib/vendor/xml_node/test/test_generating.rb
 - lib/vendor/xml_node/test/test_parsing.rb
-- test/fixtures.example.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/party_factory.rb
-- test/remote/fedex_test.rb
-- test/remote/shipwire_test.rb
-- test/remote/ups_test.rb
-- test/remote/usps_test.rb
-- test/shipment_factory.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/party_test.rb
-- test/unit/response_test.rb
-- test/unit/shipment_test.rb
+- MIT-LICENSE
+- README.markdown
+- CHANGELOG
 has_rdoc: true
-homepage: http://github.com/Shopify/active_shipping
+homepage: http://github.com/shopify/active_shipping
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.6
+rubyforge_project: active_shipping
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Shipping API extension for Active Merchant.
-test_files: 
-- test/party_factory.rb
-- test/remote/fedex_test.rb
-- test/remote/shipwire_test.rb
-- test/remote/ups_test.rb
-- test/remote/usps_test.rb
-- test/shipment_factory.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/party_test.rb
-- test/unit/response_test.rb
-- test/unit/shipment_test.rb
+summary: Shipping API extension for Active Merchant
+test_files: []
+

data/.gitignore

@@ -1,8 +0,0 @@
-.DS_Store
-test.xml
-test/fixtures.yml
-sample.rb
-*.orig
-*.swp
-.dotest
-pkg

data/Rakefile

@@ -1,51 +0,0 @@
-require 'rubygems'
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rake/gempackagetask'
-require 'rake/contrib/rubyforgepublisher'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "active_shipping"
-    gem.summary = %Q{Shipping API extension for Active Merchant.}
-    gem.description = %Q{Shipping API extension for Active Merchant.}
-    gem.email = "jmacaulay@gmail.com"
-    gem.homepage = "http://github.com/Shopify/active_shipping"
-    gem.authors = ["James MacAulay", "Tobias Luetke", "Cody Fauser", "Jimmy Baker"]
-    gem.add_dependency "activesupport"
-  end
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
-
-
-desc "Default Task"
-task :default => 'test:units'
-task :test => ['test:units','test:remote']
-
-# Run the unit tests
-
-namespace :test do
-  Rake::TestTask.new(:units) do |t|
-    t.pattern = 'test/unit/**/*_test.rb'
-    t.ruby_opts << '-rubygems'
-    t.verbose = true
-  end
-
-  Rake::TestTask.new(:remote) do |t|
-    t.pattern = 'test/remote/*_test.rb'
-    t.ruby_opts << '-rubygems'
-    t.verbose = true
-  end
-end
-
-# Genereate the RDoc documentation
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'doc'
-  rdoc.title    = "ActiveShipping library"
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README', 'CHANGELOG')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end