shipping 1.0.0 → 1.1.0

data/lib/shipping/ups.rb

@@ -24,6 +24,8 @@ module Shipping
             
       API_VERSION = "1.0001"
       
+      # For current implementation docs, see http://www.ec.ups.com/ecommerce/techdocs/pdf/RatesandServiceHTML.pdf
+      # For upcoming XML implementation docs, see http://www.ups.com/gec/techdocs/pdf/dtk_RateXML_V1.zip
    	def price
    		@required = [:zip, :country, :sender_zip, :weight]
    		
@@ -42,38 +44,41 @@ module Shipping
    		return price.to_f
    	end
       
+      # See http://www.ups.com/gec/techdocs/pdf/dtk_AddrValidateXML_V1.zip for API info
+      
       def valid_address?( delta = 1.0 )
          @required = [:ups_account, :ups_user, :ups_password]
          
          state = STATES.has_value?(@state.downcase) ? STATES.index(@state.downcase) : @state
          
-      	@data = "<?xml version=\"1.0\"?>
-      	<AccessRequest>
-      		<AccessLicenseNumber>#{@ups_account}</AccessLicenseNumber>
-      		<UserId>#{@ups_user}</UserId>
-      		<Password>#{@ups_password}</Password>
-      	</AccessRequest>
-      	<?xml version=\"1.0\"?>
-      	<AddressValidationRequest xml:lang=\"en-US\">
-      		<Request>
-      			<TransactionReference>
-      				<CustomerContext>#{@city}, #{state} #{@zip}</CustomerContext>
-      				<XpciVersion>#{API_VERSION}</XpciVersion>
-      			</TransactionReference>
-      			<RequestAction>AV</RequestAction>
-      		</Request>
-      		<Address>
-      			<City>#{@city}</City>
-      			<StateProvinceCode>#{state}</StateProvinceCode>
-      			<PostalCode>#{@zip}</PostalCode>
-      		</Address>
-      	</AddressValidationRequest>"
-
+         @data = String.new
+         b = Builder::XmlMarkup.new :target => @data
+         
+         b.instruct!
+         b.AccessRequest {|b|
+            b.AccessLicenseNumber @ups_account
+            b.UserId @ups_user
+            b.Password @ups_password
+         }
+         b.instruct!
+         b.AddressValidationRequest {|b|
+            b.Request {|b|
+               b.RequestAction "AV"
+               b.TransactionReference {|b|
+                  b.CustomerContext "#{@city}, #{state} #{@zip}"
+                  b.XpciVersion API_VERSION
+               }
+            }
+            b.Address {|b|
+               b.City @city
+               b.StateProvinceCode state
+               b.PostalCode @zip
+            }
+         }
+         
    	   get_response "https://wwwcie.ups.com/ups.app/xml/AV"
-
-   		doc = REXML::Document.new(@response)
-
-   		if doc.root.elements["Response"].elements["ResponseStatusCode"].text == "1" && doc.root.elements["AddressValidationResult"].elements["Quality"].text.to_f >= delta
+         
+   		if REXML::XPath.first(@response, "//AddressValidationResponse/Response/ResponseStatusCode").text == "1" && REXML::XPath.first(@response, "//AddressValidationResponse/AddressValidationResult/Quality").text.to_f >= delta
    		   return true
    		else
    		   return false

data/lib/shipping.rb

@@ -24,6 +24,13 @@
 # Copyright:: Copyright (c) 2005 Lucas Carlson
 # License::   LGPL
 
+begin
+   require 'rubygems'
+   require_gem 'builder', '~> 1.2'
+rescue LoadError
+   require 'builder'
+end
+
 require 'yaml'
 require 'rexml/document'
 require 'net/http'

data/test/fedex/fedex_test.rb

@@ -5,6 +5,33 @@ class FedExTest < Test::Unit::TestCase
 	end
 	
 	def test_price
-	   assert_equal 5.17, @ship.price
+	   assert_equal 4.67, @ship.price
+	end
+	
+	def test_base_price
+	   assert_equal 5.07, @ship.base_price
+	end
+	
+	def test_fails
+	   ship = Shipping::FedEx.new :zip => 97202, :weight => 2
+	   assert_raise(Shipping::ShippingError) { ship.price }
+	end
+	
+	def test_label
+	   @ship.name = "Package Receiver"
+	   @ship.phone = "555-555-5555"
+	   @ship.email = "lucas@rufy.com"
+	   @ship.address = "Some address"
+	   @ship.city = "Portland"
+
+	   @ship.sender_name = "Package Sender"
+	   @ship.sender_phone = "333-333-3333"
+	   @ship.sender_email = "john@doe.com"
+	   @ship.sender_address = "Ok old address"
+	   @ship.sender_city = "New York"
+	   
+	   response = nil
+#	   assert_nothing_raised { response = @ship.label }
+#	   assert_equal 'PackageSen', response.image_userid
 	end
 end

data/test/ups/ups_test.rb

@@ -5,7 +5,7 @@ class UpsTest < Test::Unit::TestCase
 	end
 	
 	def test_price
-	   assert_equal 8.77, @ship.price
+	   assert_equal 8.82, @ship.price
 	end
 	
 	def test_valid_address

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.6
+rubygems_version: 0.8.10
 specification_version: 1
 name: shipping
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
-date: 2005-04-27
+  version: 1.1.0
+date: 2005-06-02
 summary: A general shipping module to find out the shipping prices via UPS or FedEx.
 require_paths: 
   - lib
@@ -39,6 +39,7 @@ files:
   - test/base/base_test.rb
   - test/fedex/fedex_test.rb
   - test/ups/ups_test.rb
+  - LICENSE
   - Rakefile
   - README
   - doc/classes
@@ -58,11 +59,14 @@ files:
   - doc/classes/Shipping/ShippingError.html
   - doc/classes/Shipping/UPS.html
   - doc/classes/Shipping/UPS.src
-  - doc/classes/Shipping/Base.src/M000005.html
-  - doc/classes/Shipping/Base.src/M000006.html
-  - doc/classes/Shipping/Base.src/M000007.html
+  - doc/classes/Shipping/Base.src/M000008.html
+  - doc/classes/Shipping/Base.src/M000009.html
+  - doc/classes/Shipping/Base.src/M000010.html
   - doc/classes/Shipping/FedEx.src/M000003.html
   - doc/classes/Shipping/FedEx.src/M000004.html
+  - doc/classes/Shipping/FedEx.src/M000005.html
+  - doc/classes/Shipping/FedEx.src/M000006.html
+  - doc/classes/Shipping/FedEx.src/M000007.html
   - doc/classes/Shipping/UPS.src/M000001.html
   - doc/classes/Shipping/UPS.src/M000002.html
   - doc/files/lib
@@ -77,5 +81,16 @@ rdoc_options: []
 extra_rdoc_files: []
 executables: []
 extensions: []
-requirements: []
-dependencies: []
+requirements: 
+  - An xml-builder library.
+dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: builder
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Version::Requirement 
+      requirements: 
+        - 
+          - ">="
+          - !ruby/object:Gem::Version 
+            version: 1.2.0
+      version: