active_shipping 0.0.2 → 0.1.0

data/.gitignore

@@ -1,5 +1,6 @@
 .DS_Store
 test.xml
+test/fixtures.yml
 sample.rb
 *.orig
 *.swp

data/CHANGELOG

@@ -1,3 +1,4 @@
+* Require active_support instead of activesupport to avoid deprecation warning in Rails 2.3.5 [cody]
 * Remove ftools for Rails 1.9 compatibility and remove xml logging, as logging is now included in the connection [cody]
 * Update connection code from ActiveMerchant [cody]
 * Fix space-ridden USPS usernames when validating credentials [james]

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.1.0

data/active_shipping.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{active_shipping}
-  s.version = "0.0.2"
+  s.version = "0.1.0"
 
   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.date = %q{2010-01-21}
   s.description = %q{Shipping API extension for Active Merchant.}
   s.email = %q{jmacaulay@gmail.com}
   s.extra_rdoc_files = [
@@ -41,11 +41,16 @@ Gem::Specification.new do |s|
      "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/location.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_shipment.rb",
+     "lib/active_shipping/shipping/shipment.rb",
      "lib/active_shipping/shipping/shipment_event.rb",
      "lib/active_shipping/shipping/tracking_response.rb",
      "lib/certs/cacert.pem",
@@ -68,7 +73,7 @@ Gem::Specification.new do |s|
      "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.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",
@@ -86,10 +91,12 @@ Gem::Specification.new do |s|
      "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",
@@ -98,7 +105,9 @@ Gem::Specification.new do |s|
      "test/unit/carriers/usps_test.rb",
      "test/unit/location_test.rb",
      "test/unit/package_test.rb",
-     "test/unit/response_test.rb"
+     "test/unit/party_test.rb",
+     "test/unit/response_test.rb",
+     "test/unit/shipment_test.rb"
   ]
   s.homepage = %q{http://github.com/Shopify/active_shipping}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -106,10 +115,12 @@ Gem::Specification.new do |s|
   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/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",
@@ -118,7 +129,9 @@ Gem::Specification.new do |s|
      "test/unit/carriers/usps_test.rb",
      "test/unit/location_test.rb",
      "test/unit/package_test.rb",
-     "test/unit/response_test.rb"
+     "test/unit/party_test.rb",
+     "test/unit/response_test.rb",
+     "test/unit/shipment_test.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -134,3 +147,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activesupport>, [">= 0"])
   end
 end
+

data/lib/active_shipping.rb

@@ -45,6 +45,15 @@ require 'active_shipping/shipping/tracking_response'
 require 'active_shipping/shipping/package'
 require 'active_shipping/shipping/location'
 require 'active_shipping/shipping/rate_estimate'
+
+require 'active_shipping/shipping/contact'
+require 'active_shipping/shipping/party'
+require 'active_shipping/shipping/label'
+
+require 'active_shipping/shipping/shipment'
+require 'active_shipping/shipping/return_shipment'
+
 require 'active_shipping/shipping/shipment_event'
 require 'active_shipping/shipping/carrier'
 require 'active_shipping/shipping/carriers'
+

data/lib/active_shipping/shipping/base.rb

@@ -4,11 +4,8 @@ module ActiveMerchant
       mattr_accessor :mode
       self.mode = :production
       
-      ALLCAPS_NAMES = ['ups','usps','dhl'] # is the class name allcaps like USPS or camelcase like FedEx?
-      
       def self.carrier(name)
-        name = name.to_s.downcase
-        ActiveMerchant::Shipping.const_get(ALLCAPS_NAMES.include?(name) ? name.upcase : name.camelize)
+        ActiveMerchant::Shipping::Carriers.all.find {|c| c.name.downcase == name}
       end
     end
   end

data/lib/active_shipping/shipping/carrier.rb

@@ -32,7 +32,7 @@ module ActiveMerchant
       # alternate functionality, such as checking for test_mode to use test servers, etc.
       def valid_credentials?
         location = self.class.default_location
-        find_rates(location,location,Package.new(100, [5,15,30]))
+        find_rates(location,location,Package.new(100, [5,15,30]), :test => test_mode)
       rescue ActiveMerchant::Shipping::ResponseError
         false
       else

data/lib/active_shipping/shipping/carriers.rb

@@ -9,7 +9,7 @@ module ActiveMerchant
     module Carriers
       class <<self
         def all
-          [BogusCarrier, UPS, USPS, FedEx]
+          [BogusCarrier, UPS, USPS, FedEx, Shipwire]
         end
       end
     end

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

@@ -106,8 +106,145 @@ module ActiveMerchant
         response = commit(save_request(tracking_request), (options[:test] || false)).gsub(/<(\/)?.*?\:(.*?)>/, '<\1\2>')
         parse_tracking_response(response, options)
       end
-      
+
+      def get_return_label(shipment, options = {})
+        req = build_return_label_request(shipment)
+        response = commit(save_request(req), (options[:test] || false)).gsub(/<(\/)?.*?\:(.*?)>/, '<\1\2>')
+
+        parse_return_label_response(response, shipment)
+      end
+
+      def validate_location(location, options = {})
+        req = build_location_validation_request(location)
+        response = commit(save_request(req), (options[:test] || false)).gsub(/<(\/)?.*?\:(.*?)>/, '<\1\2>')
+
+        parse_location_validation_request(response, location)
+        response
+      end
+
       protected
+      def build_location_validation_request(location)
+        xml_request = XmlNode.new('AddressValidationRequest',
+          'xmlns' => 'http://fedex.com/ws/addressvalidation/v2') do |root_node|
+
+          root_node << build_request_header
+          root_node << XmlNode.new('Version') do |version_node|
+            version_node << XmlNode.new('ServiceId', 'aval')
+            version_node << XmlNode.new('Major', '2')
+            version_node << XmlNode.new('Intermediate', '0')
+            version_node << XmlNode.new('Minor', '0')
+          end
+
+          root_node << XmlNode.new('RequestTimestamp', Time.now)
+          root_node << XmlNode.new('Options', '')
+          root_node << XmlNode.new('AddressesToValidate') do |v|
+            v << build_party_location_node('Address', location)
+          end
+        end
+
+        xml_request.to_s
+      end
+
+      def parse_location_validation_request(response, location)
+        xml = REXML::Document.new(response)
+        success = response_success?(xml)
+        message = response_message(xml)
+
+        if success
+          parent = xml.elements.first
+          location.valid = parent.elements['//DeliveryPointValidation'][0] == 'CONFIRMED'
+          location.score = parent.elements['//Score'][0].to_s.to_i
+        else
+          location.valid = false
+          location.score = 0
+          message
+        end
+      end
+
+      def parse_return_label_response(response, shipment)
+        xml = REXML::Document.new(response)
+        success = response_success?(xml)
+        message = response_message(xml)
+        
+        if success
+          parent = xml.elements.first
+          shipment.label.image = Base64.decode64(parent.elements['//Image'][0].to_s)
+          shipment.tracking_number = parent.elements['//TrackingNumber'][0].to_s
+          shipment.transit_time = parent.elements['//TransitTime'][0].to_s
+          
+          shipment
+        else
+          message
+        end
+      end
+
+      def build_return_label_request(shipment)
+        xml_request = XmlNode.new('ProcessShipmentRequest', 
+          'xmlns' => 'http://fedex.com/ws/ship/v7') do |root_node|
+          root_node << build_request_header
+          root_node << XmlNode.new('Version') do |version_node|
+            version_node << XmlNode.new('ServiceId', 'ship')
+            version_node << XmlNode.new('Major', '7')
+            version_node << XmlNode.new('Intermediate', '0')
+            version_node << XmlNode.new('Minor', '0')
+          end
+          
+          root_node << XmlNode.new('RequestedShipment') do |rs|
+            rs << XmlNode.new('ShipTimestamp', shipment.ship_at || Time.now)
+            rs << XmlNode.new('DropoffType', shipment.dropoff_type)
+            rs << XmlNode.new('ServiceType', shipment.service)
+            rs << XmlNode.new('PackagingType', shipment.packaging_type)
+            rs << XmlNode.new('TotalWeight') do |t|
+              t << XmlNode.new('Units', shipment.total_weight_units)
+              t << XmlNode.new('Value', shipment.total_weight_value)
+            end
+            if shipment.total_insured_amount
+              rs << XmlNode.new('TotalInsuredValue') do |ins|
+                ins << XmlNode.new('Currency', shipment.total_insured_currency)
+                ins << XmlNode.new('Amount', shipment.total_insured_amount)
+              end
+            end
+            rs << build_party_node('Shipper', shipment.shipper)
+            rs << build_party_node('Recipient', shipment.recipient)
+            rs << XmlNode.new('ShippingChargesPayment') do |payment|
+              payment << XmlNode.new('PaymentType', shipment.payment_type)
+              payment << XmlNode.new('Payor') do |payor|
+                payor << XmlNode.new('AccountNumber', shipment.payor_account_number)
+                payor << XmlNode.new('CountryCode', shipment.payor_account_country.code(:alpha2))
+              end 
+            end
+
+            rs << XmlNode.new('SpecialServicesRequested') do |s|
+              s << XmlNode.new('SpecialServiceTypes', 'RETURN_SHIPMENT')
+              s << XmlNode.new('ReturnShipmentDetail') do |d| 
+                d << XmlNode.new('ReturnType', shipment.return_type)
+                d << XmlNode.new('Rma') do |rma|
+                  rma << XmlNode.new('Number', shipment.rma_number)
+                end
+              end
+            end
+
+            rs << XmlNode.new('LabelSpecification') do |spec|
+              spec << XmlNode.new('LabelFormatType', 
+                shipment.label.format_type || 'COMMON2D')
+              spec << XmlNode.new('ImageType', shipment.label.image_type)
+              spec << XmlNode.new('LabelStockType', 'PAPER_4X6')
+            end
+            rs << XmlNode.new('RateRequestTypes', shipment.rate_request_type)
+            rs << XmlNode.new('PackageCount', shipment.package_count)
+            rs << XmlNode.new('PackageDetail', 'PACKAGE_SUMMARY')
+            (1..shipment.package_count).each do |package_index|
+              rs << XmlNode.new('RequestedPackageLineItems') do |p|
+                p << XmlNode.new('SequenceNumber', package_index)
+              end 
+            end
+          end
+        end
+
+        xml_request.to_s
+      end
+
+
       def build_rate_request(origin, destination, packages, options={})
         imperial = ['US','LR','MM'].include?(origin.country_code(:alpha2))
 
@@ -205,6 +342,47 @@ module ActiveMerchant
         [web_authentication_detail, client_detail, trasaction_detail]
       end
             
+      def build_party_node(name, party)
+        XmlNode.new(name) do |xml_node|
+          if party.account_number
+            xml_node << XmlNode.new('AccountNumber', party.account_number)
+          end
+
+          if party.contact
+            xml_node << XmlNode.new('Contact') do |c|
+              c << XmlNode.new('PersonName', party.contact.name)
+              c << XmlNode.new('Title', party.contact.title)
+              c << XmlNode.new('CompanyName', party.contact.company_name)
+              c << XmlNode.new('PhoneNumber', party.contact.phone_number)
+              c << XmlNode.new('FaxNumber', party.contact.fax_number)
+              c << XmlNode.new('EMailAddress', party.contact.email_address)
+            end
+          end
+
+          
+          if party.location
+            xml_node << build_party_location_node('Address', party.location)
+          end
+        end
+      end
+
+      def build_party_location_node(name, location)
+        XmlNode.new(name) do |a|
+          if location.address1
+            a << XmlNode.new('StreetLines', location.address1) 
+          end
+
+          if location.address2
+            a << XmlNode.new('StreetLines', location.address2)
+          end
+
+          a << XmlNode.new('City', location.city)
+          a << XmlNode.new('StateOrProvinceCode', location.state)
+          a << XmlNode.new('PostalCode', location.zip)
+          a << XmlNode.new('CountryCode', location.country.code(:alpha2))
+        end
+      end
+
       def build_location_node(name, location)
         location_node = XmlNode.new(name) do |xml_node|
           xml_node << XmlNode.new('Address') do |address_node|

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

@@ -17,7 +17,7 @@ module ActiveMerchant
         :track => 'ups.app/xml/Track'
       }
       
-      PICKUP_CODES = {
+      PICKUP_CODES = HashWithIndifferentAccess.new({
         :daily_pickup => "01",
         :customer_counter => "03", 
         :one_time_pickup => "06",
@@ -25,7 +25,25 @@ module ActiveMerchant
         :suggested_retail_rates => "11",
         :letter_center => "19",
         :air_service_center => "20"
-      }
+      })
+      
+      CUSTOMER_CLASSIFICATIONS = HashWithIndifferentAccess.new({
+        :wholesale => "01",
+        :occasional => "03", 
+        :retail => "04"
+      })
+      
+      # these are the defaults described in the UPS API docs,
+      # but they don't seem to apply them under all circumstances,
+      # so we need to take matters into our own hands
+      DEFAULT_CUSTOMER_CLASSIFICATIONS = Hash.new do |hash,key|
+        hash[key] = case key.to_sym
+        when :daily_pickup then :wholesale
+        when :customer_counter then :retail
+        else
+          :occasional
+        end
+      end
       
       DEFAULT_SERVICES = {
         "01" => "UPS Next Day Air",
@@ -127,11 +145,18 @@ module ActiveMerchant
             # not implemented: 'Rate' RequestOption to specify a single service query
             # request << XmlNode.new('RequestOption', ((options[:service].nil? or options[:service] == :all) ? 'Shop' : 'Rate'))
           end
-          root_node << XmlNode.new('PickupType') do |pickup_type|
-            pickup_type << XmlNode.new('Code', PICKUP_CODES[options[:pickup_type] || :daily_pickup])
+          
+          pickup_type = options[:pickup_type] || :daily_pickup
+          
+          root_node << XmlNode.new('PickupType') do |pickup_type_node|
+            pickup_type_node << XmlNode.new('Code', PICKUP_CODES[pickup_type])
             # not implemented: PickupType/PickupDetails element
           end
-          # not implemented: CustomerClassification element
+          cc = options[:customer_classification] || DEFAULT_CUSTOMER_CLASSIFICATIONS[pickup_type]
+          root_node << XmlNode.new('CustomerClassification') do |cc_node|
+            cc_node << XmlNode.new('Code', CUSTOMER_CLASSIFICATIONS[cc])
+          end
+          
           root_node << XmlNode.new('Shipment') do |shipment|
             # not implemented: Shipment/Description element
             shipment << build_location_node('Shipper', (options[:shipper] || origin), options)
@@ -150,7 +175,6 @@ module ActiveMerchant
             #                   * Shipment/DocumentsOnly element                      
             
             packages.each do |package|
-              debugger if package.nil?
               
               
               imperial = ['US','LR','MM'].include?(origin.country_code(:alpha2))
@@ -342,7 +366,7 @@ module ActiveMerchant
       end
       
       def response_message(xml)
-        xml.get_text('/*/Response/ResponseStatusDescription | /*/Response/Error/ErrorDescription').to_s
+        xml.get_text('/*/Response/Error/ErrorDescription | /*/Response/ResponseStatusDescription').to_s
       end
       
       def commit(action, request, test = false)

data/lib/active_shipping/shipping/contact.rb

@@ -0,0 +1,18 @@
+module ActiveMerchant
+  module Shipping
+    class Contact
+      attr_accessor :name
+      attr_accessor :title
+      attr_accessor :company_name
+      attr_accessor :phone_number
+      attr_accessor :fax_number
+      attr_accessor :email_address
+
+      def initialize(attrs = {})
+        attrs.each do |key, value|
+          self.send("#{key}=", value) if self.respond_to?("#{key}=")
+        end
+      end
+    end
+  end
+end

data/lib/active_shipping/shipping/label.rb

@@ -0,0 +1,31 @@
+module ActiveMerchant
+  module Shipping
+    class Label
+      FEDEX_FORMATS = [
+        'COMMON2D',
+        'LABEL_DATA_ONLY'
+      ]
+
+      FEDEX_IMAGE_TYPES = [
+        'DPL',
+        'EPL2',
+        'PDF',
+        'PNG',
+        'ZPLII'
+      ]
+
+      attr_accessor :format_type
+      attr_accessor :image_type
+      attr_accessor :image
+
+      def initialize(attrs = {})
+        attrs.each do |key, value|
+          self.send("#{key}=", value) if self.respond_to?("#{key}=")
+        end
+
+        self.image_type ||= 'PNG'
+      end
+
+    end
+  end
+end

data/lib/active_shipping/shipping/location.rb

@@ -19,6 +19,9 @@ 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)) ?
@@ -97,4 +100,4 @@ module ActiveMerchant #:nodoc:
     end
       
   end
-end
+end

data/lib/active_shipping/shipping/party.rb

@@ -0,0 +1,15 @@
+module ActiveMerchant
+  module Shipping
+    class Party
+      attr_accessor :location
+      attr_accessor :contact
+      attr_accessor :account_number
+
+      def initialize(attrs = {})
+        attrs.each do |key, value|
+          self.send("#{key}=", value) if self.respond_to?("#{key}=")
+        end
+      end
+    end
+  end
+end

data/lib/active_shipping/shipping/return_shipment.rb

@@ -0,0 +1,14 @@
+module ActiveMerchant
+  module Shipping
+    class ReturnShipment < Shipment
+      attr_accessor :rma_number
+      attr_reader :return_type
+      def initialize(opts = {})
+        super
+        self.rma_number = opts[:rma_number]
+        self.payment_type ||= 'RECIPIENT'
+        @return_type = opts[:return_type] || 'PRINT_RETURN_LABEL'
+      end
+    end
+  end
+end

data/lib/active_shipping/shipping/shipment.rb

@@ -0,0 +1,73 @@
+module ActiveMerchant
+  module Shipping
+    class Shipment
+      include ActiveMerchant::Shipping
+
+      FEDEX_PAYMENT_TYPES = [
+        'COLLECT',
+        'RECIPIENT',
+        'SENDER',
+        'THIRD_PARTY' 
+      ]
+
+      FEDEX_DROPOFF_TYPES = [
+        "REGULAR_PICKUP",
+        "REQUEST_COURIER",
+        "DROP_BOX",
+        "BUSINESS_SERVICE_CENTER",
+        "STATION"
+      ]
+
+      FEDEX_RATE_REQUEST_TYPES = [
+        "ACCOUNT",
+        "LIST"
+      ]
+
+      attr_accessor :ship_at
+      attr_accessor :service
+      attr_accessor :packaging_type
+      attr_accessor :shipper
+      attr_accessor :total_insured_amount
+      attr_accessor :total_insured_currency
+      attr_accessor :recipient
+      attr_accessor :payment_type
+      attr_accessor :special_services
+      attr_accessor :label
+      attr_accessor :requested_packages
+      attr_accessor :dropoff_type
+      attr_accessor :rate_request_type
+      attr_accessor :package_count
+      attr_accessor :total_weight_value
+      attr_accessor :total_weight_units
+      attr_accessor :payor_account_number
+
+      attr_accessor :tracking_number
+      attr_accessor :transit_time
+
+      attr_reader :payor_account_country
+
+      def initialize(attrs = {})
+        attrs.each do |key, value|
+          self.send("#{key}=", value) if self.respond_to?("#{key}=")
+        end
+
+        self.label ||= Label.new(:format_type => 'COMMON2D')
+        self.requested_packages ||= 1
+        self.dropoff_type ||= 'REGULAR_PICKUP' 
+        self.service ||= 'FEDEX_GROUND'
+        self.packaging_type ||= 'YOUR_PACKAGING'
+        self.ship_at ||= Time.now
+        self.package_count ||= 1
+        self.rate_request_type ||= 'ACCOUNT'
+        self.total_insured_currency ||= 'USD' if self.total_insured_amount
+        self.total_weight_units ||= 'LB' if self.total_weight_value
+      end
+    end
+
+    def payor_account_country=(c)
+      @payor_account_country = (c.nil? || c.is_a?(ActiveMerchant::Country)) ?
+        c : ActiveMerchant::Country.find(c)
+      @payor_account_country
+    end
+  end
+end

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

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

data/test/{fixtures.yml → fixtures.example.yml}

@@ -5,8 +5,8 @@ ups:
   login: UPSDotComLogin
   password: UPSDotComPassword
 fedex:
-  login: FedExAccountNumber
-  password: FedExMeterNumber
+  login: FEDEXAccountNumber
+  password: FEDEXMeterNumber
   test: true
 shipwire:
   login: EmailAddress

data/test/party_factory.rb

@@ -0,0 +1,29 @@
+class PartyFactory
+  include ActiveMerchant::Shipping
+  def self.build(carrier = :fedex, attrs = {})
+    default_location = Location.new(
+      :country  => 'US',
+      :state    => 'MA',
+      :address1 => '4 Yawkey Way',
+      :city     => 'Boston',
+      :state    => 'MA',
+      :zip      => '02215'
+    )
+
+    default_contact = Contact.new(
+      :name => 'John Smith',
+      :company => 'Red Sox',
+      :phone_number => '1-555-867-5309',
+      :fax_number => '1-555-867-5310',
+      :email_address => 'user@example.com'
+    )
+
+    default_attrs = {
+      :location => default_location,
+      :contact => default_contact,
+      :account_number => '5555555'
+    }
+
+    Party.new(default_attrs.merge(attrs))
+  end
+end

data/test/remote/fedex_test.rb

@@ -5,8 +5,12 @@ class FedExTest < Test::Unit::TestCase
   def setup
     @packages  = TestFixtures.packages
     @locations = TestFixtures.locations
-    @carrier   = FedEx.new(fixtures(:fedex))
-    FedEx.logger = Logger.new('/Users/james/.active_merchant/fedex.log')
+    @carrier   = FedEx.new(fixtures(:fedex).merge(:test => true))
+    #FedEx.logger = Logger.new('/Users/james/.active_merchant/fedex.log')
+  end
+    
+  def test_valid_credentials
+    assert @carrier.valid_credentials?
   end
     
   def test_us_to_canada
@@ -15,8 +19,7 @@ class FedExTest < Test::Unit::TestCase
       response = @carrier.find_rates(
                    @locations[:beverly_hills],
                    @locations[:ottawa],
-                   @packages.values_at(:wii),
-                   :test => true
+                   @packages.values_at(:wii)
                  )
       assert !response.rates.blank?
       response.rates.each do |rate|
@@ -31,8 +34,7 @@ class FedExTest < Test::Unit::TestCase
       @carrier.find_rates(
         Location.new(:zip => 40524),
         Location.new(:zip => 40515),
-        @packages[:wii],
-                   :test => true
+        @packages[:wii]
       )
     rescue ResponseError => e
       assert_match /country\s?code/i, e.message
@@ -45,8 +47,7 @@ class FedExTest < Test::Unit::TestCase
     response = @carrier.find_rates(
                  @locations[:bare_beverly_hills],
                  @locations[:bare_ottawa],
-                 @packages.values_at(:wii),
-                   :test => true
+                 @packages.values_at(:wii)
                )
 
     assert response.rates.size > 0
@@ -57,8 +58,7 @@ class FedExTest < Test::Unit::TestCase
       response = @carrier.find_rates(
                    @locations[:bare_beverly_hills],
                    Location.new(:country => 'CA'),
-                   @packages.values_at(:wii),
-                   :test => true
+                   @packages.values_at(:wii)
                  )
     rescue ResponseError => e
       assert_match /postal code/i, e.message
@@ -71,8 +71,7 @@ class FedExTest < Test::Unit::TestCase
       response = @carrier.find_rates(
                    @locations[:bare_beverly_hills],
                    Location.new(:country => 'JP', :zip => '108-8361'),
-                   @packages.values_at(:wii),
-                   :test => true
+                   @packages.values_at(:wii)
                  )
     rescue ResponseError => e
       assert_match /postal code/i, e.message
@@ -86,8 +85,7 @@ class FedExTest < Test::Unit::TestCase
       response = @carrier.find_rates(
                    @locations[:ottawa],
                    @locations[:beverly_hills],
-                   @packages.values_at(:book, :wii),
-                   :test => true
+                   @packages.values_at(:book, :wii)
                  )
       assert !response.rates.blank?
       response.rates.each do |rate|
@@ -103,8 +101,7 @@ class FedExTest < Test::Unit::TestCase
       response = @carrier.find_rates(
                    @locations[:ottawa],
                    @locations[:london],
-                   @packages.values_at(:book, :wii),
-                   :test => true
+                   @packages.values_at(:book, :wii)
                  )
       assert !response.rates.blank?
       response.rates.each do |rate|
@@ -120,8 +117,7 @@ class FedExTest < Test::Unit::TestCase
       response = @carrier.find_rates(
                    @locations[:beverly_hills],
                    @locations[:london],
-                   @packages.values_at(:book, :wii),
-                   :test => true
+                   @packages.values_at(:book, :wii)
                  )
       assert !response.rates.blank?
       response.rates.each do |rate|
@@ -137,4 +133,28 @@ class FedExTest < Test::Unit::TestCase
     end
   end
   
-end
+  def test_return_label
+    shipment = ShipmentFactory.build
+    shipment.shipper.account_number = fixtures(:fedex)[:account]
+    shipment.payor_account_number = fixtures(:fedex)[:account]
+    shipment.payor_account_country = 'US'
+    shipment.label.image_type = 'PDF'
+    @carrier.get_return_label(shipment, :test => true)   
+    assert_not_nil shipment.label.image
+    assert_not_nil shipment.tracking_number
+  end
+
+  def test_address_validation
+    party = PartyFactory.build
+    @carrier.validate_location(party.location, :test => true)
+    assert party.location.valid
+    assert_equal 100, party.location.score 
+  end
+
+  def test_address_validation_with_bunk_address
+    party = PartyFactory.build
+    party.location.stubs(:address1).returns('44 Foeawrfsadfasd Street')
+    @carrier.validate_location(party.location, :test => true)
+    assert !party.location.valid
+  end
+end

data/test/remote/ups_test.rb

@@ -114,6 +114,26 @@ class UPSTest < Test::Unit::TestCase
     end
   end
   
+  def test_us_to_uk_with_different_pickup_types
+    assert_nothing_raised do
+      daily_response = @carrier.find_rates(
+        @locations[:beverly_hills],
+        @locations[:london],
+        @packages.values_at(:book, :wii),
+        :pickup_type => :daily_pickup,
+        :test => true
+      )
+      one_time_response = @carrier.find_rates(
+        @locations[:beverly_hills],
+        @locations[:london],
+        @packages.values_at(:book, :wii),
+        :pickup_type => :one_time_pickup,
+        :test => true
+      )
+      assert_not_equal daily_response.rates.map(&:price), one_time_response.rates.map(&:price)
+    end
+  end
+  
   def test_bare_packages
     response = nil
     p = Package.new(0,0)

data/test/shipment_factory.rb

@@ -0,0 +1,27 @@
+class ShipmentFactory
+  include ActiveMerchant::Shipping
+
+  def self.build(carrier = :fedex)
+    shipment = ReturnShipment.new
+    if carrier == :fedex
+      shipment.ship_at = Time.now
+      shipment.service = 'FEDEX_GROUND'
+      shipment.payment_type = 'RECIPIENT'
+      shipment.packaging_type = FedEx::PackageTypes['your_packaging']
+      shipment.recipient = PartyFactory.build(:fedex)
+      jillians_boston = Location.new(
+        :address1 => '145 Ipswitch Street',
+        :city => 'Boston',
+        :state => 'MA',
+        :zip => '02215',
+        :country => 'US'
+      )
+      shipment.shipper = PartyFactory.build(:fedex, :location => jillians_boston)
+      shipment.total_weight_value = 10
+      shipment.payment_type = 'SENDER'
+      shipment.total_weight_units = 'LB'
+    end
+    
+    shipment
+  end
+end

data/test/test_helper.rb

@@ -1,10 +1,14 @@
 #!/usr/bin/env ruby
 $:.unshift(File.dirname(__FILE__) + '/../lib')
+$:.unshift(File.dirname(__FILE__))
 
 require 'test/unit'
 require 'active_shipping'
 require 'mocha'
 
+require 'shipment_factory'
+require 'party_factory'
+
 module Test
   module Unit
     class TestCase
@@ -164,4 +168,4 @@ module ActiveMerchant
       
     end
   end
-end
+end

data/test/unit/party_test.rb

@@ -0,0 +1,20 @@
+require 'test_helper'
+
+class ActiveMerchant::Shipping::PartyTest < Test::Unit::TestCase
+  include ActiveMerchant::Shipping
+  def setup
+    @party = PartyFactory.build(:fedex)
+  end
+
+  def test_has_location
+    assert_not_nil @party.location
+  end
+
+  def test_has_contact
+    assert_not_nil @party.contact
+  end
+
+  def test_has_account_number
+    assert_not_nil @party.account_number
+  end
+end

data/test/unit/shipment_test.rb

@@ -0,0 +1,43 @@
+require 'test_helper'
+
+class ShipmentTest < Test::Unit::TestCase
+  def setup
+    @shipment = ShipmentFactory.build(:fedex)
+  end
+
+  def test_should_have_ship_at
+    assert_not_nil @shipment.ship_at 
+  end
+
+  def test_should_have_service
+    assert_not_nil @shipment.service
+  end
+
+  def test_should_have_valid_service
+  end
+
+  def test_should_have_packaging_type
+    assert_not_nil @shipment.packaging_type
+  end
+
+  def test_should_have_shipper
+    assert_not_nil @shipment.shipper
+  end
+
+  def test_should_have_recipient
+    assert_not_nil @shipment.recipient
+  end
+
+  def test_should_have_payment_type
+    assert_not_nil @shipment.payment_type
+  end
+
+  def test_should_have_label
+    assert_not_nil @shipment.label
+  end
+
+  def test_should_have_requested_packages
+    assert_not_nil @shipment.requested_packages
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: active_shipping
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - James MacAulay
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-11 00:00:00 -05:00
+date: 2010-01-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,11 +59,16 @@ files:
 - 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/location.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_shipment.rb
+- lib/active_shipping/shipping/shipment.rb
 - lib/active_shipping/shipping/shipment_event.rb
 - lib/active_shipping/shipping/tracking_response.rb
 - lib/certs/cacert.pem
@@ -86,7 +91,7 @@ files:
 - 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.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
@@ -104,10 +109,12 @@ files:
 - 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
@@ -116,7 +123,9 @@ files:
 - 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
 has_rdoc: true
 homepage: http://github.com/Shopify/active_shipping
 licenses: []
@@ -146,10 +155,12 @@ 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
@@ -158,4 +169,6 @@ test_files:
 - 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