active_shipping 0.9.7 → 0.9.8

data/CHANGELOG

@@ -1,3 +1,4 @@
+* New Zealand Post [AbleTech]
 * Include address name for rate requests to Shipwire if provided [dennis]
 * Add support for address name to Location [dennis]
 * Add fix for updated USPS API to strip any encoded html and trailing asterisks from rate names [dennis]

data/README.markdown

@@ -17,6 +17,7 @@ Active Shipping is currently being used and improved in a production environment
 * [USPS](http://www.usps.com)
 * [FedEx](http://www.fedex.com)
 * [Canada Post](http://www.canadapost.ca)
+* [New Zealand Post](http://www.nzpost.co.nz)
 * more soon!
 
 ## Prerequisites

data/lib/active_shipping/shipping/carriers.rb

@@ -5,13 +5,14 @@ require 'active_shipping/shipping/carriers/fedex'
 require 'active_shipping/shipping/carriers/shipwire'
 require 'active_shipping/shipping/carriers/kunaki'
 require 'active_shipping/shipping/carriers/canada_post'
+require 'active_shipping/shipping/carriers/new_zealand_post'
 
 module ActiveMerchant
   module Shipping
     module Carriers
       class <<self
         def all
-          [BogusCarrier, UPS, USPS, FedEx, Shipwire, Kunaki, CanadaPost]
+          [BogusCarrier, UPS, USPS, FedEx, Shipwire, Kunaki, CanadaPost, NewZealandPost]
         end
       end
     end

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

@@ -122,7 +122,7 @@ module ActiveMerchant
             request << XmlNode.new('merchantCPCID', @options[:login])
             request << XmlNode.new('fromPostalCode', origin.postal_code)
             request << XmlNode.new('turnAroundTime', options[:turn_around_time] ? options[:turn_around_time] : DEFAULT_TURN_AROUND_TIME)
-            request << XmlNode.new('itemsPrice', line_items.sum(&:value))
+            request << XmlNode.new('itemsPrice', dollar_amount(line_items.sum(&:value)))
 
             #line items
             request << build_line_items(line_items)
@@ -206,8 +206,9 @@ module ActiveMerchant
       end
       
       def date_for(string)
-        return if !string
-        return Time.parse(string)
+        string && Time.parse(string)
+      rescue ArgumentError
+        nil
       end
 
       def response_success?(xml)
@@ -249,6 +250,10 @@ module ActiveMerchant
         
         xml_line_items
       end
+      
+      def dollar_amount(cents)
+        "%0.2f" % (cents / 100.0)
+      end
     end
   end
 end

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

@@ -237,11 +237,12 @@ module ActiveMerchant
           is_saturday_delivery = rated_shipment.get_text('AppliedOptions').to_s == 'SATURDAY_DELIVERY'
           service_type = is_saturday_delivery ? "#{service_code}_SATURDAY_DELIVERY" : service_code
           
+          currency = handle_uk_currency(rated_shipment.get_text('RatedShipmentDetails/ShipmentRateDetail/TotalNetCharge/Currency').to_s)
           rate_estimates << RateEstimate.new(origin, destination, @@name,
                               self.class.service_name_for_code(service_type),
                               :service_code => service_code,
                               :total_price => rated_shipment.get_text('RatedShipmentDetails/ShipmentRateDetail/TotalNetCharge/Amount').to_s.to_f,
-                              :currency => rated_shipment.get_text('RatedShipmentDetails/ShipmentRateDetail/TotalNetCharge/Currency').to_s,
+                              :currency => currency,
                               :packages => packages,
                               :delivery_date => rated_shipment.get_text('DeliveryTimestamp').to_s)
 	    end
@@ -317,7 +318,10 @@ module ActiveMerchant
       def commit(request, test = false)
         ssl_post(test ? TEST_URL : LIVE_URL, request.gsub("\n",''))        
       end
-    
+      
+      def handle_uk_currency(currency)
+        currency =~ /UKL/i ? 'GBP' : currency
+      end
     end
   end
 end

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

@@ -0,0 +1,139 @@
+module ActiveMerchant
+  module Shipping
+    class NewZealandPost < Carrier
+
+      # class NewZealandPostRateResponse < RateResponse
+      # end
+      
+      cattr_reader :name
+      @@name = "New Zealand Post"
+
+      URL = "http://workshop.nzpost.co.nz/api/v1/rate.xml"
+
+      # Override to return required keys in options hash for initialize method.
+      def requirements
+        [:key]
+      end
+
+      # Override with whatever you need to get the rates
+      def find_rates(origin, destination, packages, options = {})
+        packages = Array(packages)
+        rate_responses = []
+        packages.each do |package|
+          if package.tube?
+            request_hash = build_tube_request_params(origin, destination, package, options)
+          else
+            request_hash = build_rectangular_request_params(origin, destination, package, options)
+          end
+          url = URL + '?' + request_hash.to_param
+          response = ssl_get(url)
+          rate_responses << parse_rate_response(origin, destination, package, response, options)
+        end
+        combine_rate_responses(rate_responses, packages)
+      end
+
+      def maximum_weight
+        Mass.new(20, :kilograms)
+      end
+
+      protected
+
+      # Override in subclasses for non-U.S.-based carriers.
+      def self.default_location
+        Location.new(:postal_code => '6011')
+      end
+
+      private
+
+      def build_rectangular_request_params(origin, destination,  package, options = {})
+        params = {
+          :postcode_src => origin.postal_code,
+          :postcode_dest => destination.postal_code,
+          :api_key => @options[:key],
+          :height => "#{package.centimetres(:height) * 10}",
+          :thickness => "#{package.centimetres(:width) * 10}",
+          :length => "#{package.centimetres(:length) * 10}",
+          :weight =>"%.1f" % (package.weight.amount / 1000.0)
+        }
+      end
+
+      def build_tube_request_params(origin, destination,  package, options = {})
+        params = {
+          :postcode_src => origin.postal_code,
+          :postcode_dest => destination.postal_code,
+          :api_key => @options[:key],
+          :diameter => "#{package.centimetres(:width) * 10}",
+          :length => "#{package.centimetres(:length) * 10}",
+          :weight => "%.1f" % (package.weight.amount / 1000.0)
+        }
+      end
+
+      def parse_rate_response(origin, destination, package, response, options={})
+        xml = REXML::Document.new(response)
+        if response_success?(xml)
+          rate_estimates = []
+          xml.elements.each('hash/products/product') do |prod|
+            if( prod.get_text('packaging') == 'postage_only' )
+              rate_estimates << RateEstimate.new(origin, 
+                                                 destination,
+                                                 @@name,
+                                                 prod.get_text('service-group-description').to_s,
+                                                 :total_price => prod.get_text('cost').to_s.to_f,
+                                                 :currency => 'NZD',
+                                                 :service_code => prod.get_text('code').to_s,
+                                                 :package => package)
+            end
+          end
+          
+          RateResponse.new(true, "Success", Hash.from_xml(response), :rates => rate_estimates, :xml => response)
+        else
+          error_message = response_message(xml)
+          RateResponse.new(false, error_message, Hash.from_xml(response), :rates => rate_estimates, :xml => response)
+        end
+      end
+
+      def combine_rate_responses(rate_responses, packages)
+        #if there are any failed responses, return on that response
+        rate_responses.each do |r|
+          return r if !r.success?
+        end
+
+        #group rate estimates by delivery type so that we can exclude any incomplete delviery types
+        rate_estimate_delivery_types = {}
+        rate_responses.each do |rr|
+          rr.rate_estimates.each do |re|
+            (rate_estimate_delivery_types[re.service_code] ||= []) << re
+          end
+        end
+        rate_estimate_delivery_types.delete_if{ |type, re| re.size != packages.size }
+
+        #combine cost estimates for remaining packages
+        combined_rate_estimates = []
+        rate_estimate_delivery_types.each do |type, re|
+          total_price = re.sum(&:total_price)
+          r = re.first
+          combined_rate_estimates << RateEstimate.new(r.origin, r.destination, r.carrier,
+                                                     r.service_name,
+                                                     :total_price => total_price,
+                                                     :currency => r.currency,
+                                                     :service_code => r.service_code,
+                                                     :packages => packages)
+        end
+        RateResponse.new(true, "Success", {}, :rates => combined_rate_estimates)
+      end
+
+      def response_success?(xml)
+        xml.get_text('hash/status').to_s == 'success'
+      end
+
+      def response_message(xml)
+        if response_success?(xml)
+          'Success'
+        else
+          xml.get_text('hash/message').to_s
+        end
+      end
+
+    end
+  end
+end

data/lib/active_shipping/version.rb

@@ -1,3 +1,3 @@
 module ActiveShipping
-  VERSION = "0.9.7"
+  VERSION = "0.9.8"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_shipping
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 43
   prerelease: false
   segments: 
   - 0
   - 9
-  - 7
-  version: 0.9.7
+  - 8
+  version: 0.9.8
 platform: ruby
 authors: 
 - James MacAulay
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-14 00:00:00 +01:00
+date: 2011-02-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,6 +76,7 @@ files:
 - lib/active_shipping/shipping/carriers/canada_post.rb
 - lib/active_shipping/shipping/carriers/fedex.rb
 - lib/active_shipping/shipping/carriers/kunaki.rb
+- lib/active_shipping/shipping/carriers/new_zealand_post.rb
 - lib/active_shipping/shipping/carriers/shipwire.rb
 - lib/active_shipping/shipping/carriers/ups.rb
 - lib/active_shipping/shipping/carriers/usps.rb