g4s_client 0.1.4 → 0.1.6

data/lib/g4s/g4s.rb

@@ -1,3 +1,4 @@
+require "g4s_client"
 
 class G4s
 
@@ -12,27 +13,33 @@ class G4s
 
   def initialize
     if g4s_env == ::G4s::TEST
-      @shipping_client  = G4sClient::ShippingTest.new
-      @utilities_client = G4sClient::UtilitiesTest.new
-      @tracking_client  = G4sClient::TrackingTest.new
+      @shipping_class  = ::G4sClient::ShippingTest
+      @utilities_class = ::G4sClient::UtilitiesTest
+      @tracking_class  = ::G4sClient::TrackingTest
     else
-      @shipping_client  = G4sClient::ShippingLive.new
-      @utilities_client = G4sClient::UtilitiesLive.new
-      @tracking_client  = G4sClient::TrackingLive.new
+      @shipping_class  = ::G4sClient::ShippingLive
+      @utilities_class = ::G4sClient::UtilitiesLive
+      @tracking_class  = ::G4sClient::TrackingLive
     end
   end
   
-  def shipping; @shipping_client; end
-  def utilities; @utilities_client; end
-  def tracking; @tracking_client; end
+  def shipping
+    @shipping_class.new  # do not cache these between requests!  need to clear-out headers!
+  end
+  def utilities
+    @utilities_class.new
+  end
+  def tracking
+    @tracking_class.new
+  end
 
   protected
 
   def g4s_env
-    if (defined?(Rails) && Rails.env.development?) && !ENV['G4S_TEST_MODE']==false
-      G4s::TEST
+    if (defined?(Rails) && Rails.env.development?) && !(ENV['G4S_TEST_MODE']==false)
+      ::G4s::TEST
     else
-      G4s::LIVE
+      ::G4s::LIVE
     end
   end
 

data/lib/g4s/headers/custom_header.rb

@@ -0,0 +1,39 @@
+require 'soap/header/simplehandler'
+
+class CustomHeader < SOAP::Header::SimpleHandler
+
+  NAMESPACE  = 'http://tempuri.org'
+
+#  def initialize(shipment_request)
+#    @shipment_request = shipment_request
+#    super(XSD::QName.new(NAMESPACE, 'ShipmentRequest'))
+#  end
+#
+#  def on_simple_outbound
+#    to_hash(@shipment_request)
+#    # {"Username" => @username, "Password" => @password, "AccessKey"=>@accessKey}
+#  end
+
+  protected
+
+  # Transform a object into a hash of its instance variables
+  def to_hash(object)
+    return {} unless object
+    result = {}
+    object.instance_variables.each do |var|
+      value =  object.instance_variable_get(var)
+      var.gsub!('@','')
+      var = capitalize_first_letter(var)
+      result[var] = value
+      #TODO: NESTING:  some things like Address will need to     result[var] = to_hash(object.instance_variable_get(var))
+    end
+    result
+  end
+
+  def capitalize_first_letter(string)
+    return nil unless string.is_a?(String)
+    string[0].chr.capitalize + string[1, string.size]
+  end
+
+
+end

data/lib/g4s/headers/g4s_namespace_filter.rb

@@ -0,0 +1,25 @@
+# http://dev.ctor.org/soap4r/ticket/449
+
+require 'soap/rpc/driver'
+require 'soap/header/handler'
+
+# ignore the warning.
+#::SOAP::EnvelopeNamespace = 'http://www.w3.org/2003/05/soap-envelope'
+
+# replaces 'env:' with 'soap12:'
+class G4sNamespaceFilter < SOAP::Filter::Handler
+  def on_outbound(envelope, opt)
+    opt[:default_ns] = @default_ns
+    envelope
+  end
+
+  def initialize
+    @default_ns = SOAP::NS.new
+    @default_ns.assign(SOAP::EnvelopeNamespace,"soap12")
+    #@default_ns.assign('http://www.w3.org/2003/05/soap-envelope',"soap12")  # adding this in breaks soap12, makes it become env again.
+    #@default_ns.assign('http://wstest._2organize.nl','tms')
+    #@default_ns.assign('http://schemas.xmlsoap.org/soap/encoding/','soapenc')
+    @default_ns.assign('http://www.w3.org/2001/XMLSchema','xsd')
+    @default_ns.assign('http://www.w3.org/2001/XMLSchema-instance','xsi')
+  end
+end

data/lib/g4s/{g4si_auth_header.rb → headers/g4si_auth_header.rb}

@@ -4,9 +4,9 @@
 
 require 'soap/header/simplehandler'
 
-class G4SIAuthHeader <  SOAP::Header::SimpleHandler
+class G4SIAuthHeader < CustomHeader
   
-  NAMESPACE  = 'http://tempuri.org'
+  NAMESPACE  = 'http://WS.G4SI.COM/'
 
   def initialize(username, password, accessKey)
     @username, @password, @accessKey = username, password, accessKey

data/lib/g4s/headers/shipment_request_header.rb

@@ -0,0 +1,20 @@
+require 'soap/header/simplehandler'
+
+class ShipmentRequestHeader <  CustomHeader
+
+  NAMESPACE  = 'http://tempuri.org'
+
+  def initialize(shipment_request)
+    @shipment_request = shipment_request
+    super(XSD::QName.new(NAMESPACE, 'ShipmentRequest'))
+  end
+
+  def on_simple_outbound
+    to_hash(@shipment_request)
+    
+    #{"Username" => @username, "Password" => @password, "AccessKey"=>@accessKey}
+  end
+
+
+  
+end

data/lib/g4s/insured_ship.rb

@@ -0,0 +1,26 @@
+
+
+class InsuredShip
+
+  def initialize
+  end
+
+  def calculateEstimatedPrice(shipment_request = ShipmentRequest.new)
+    reset_service_instance
+    @service.headerhandler <<   ShipmentRequestHeader.new(shipment_request)   # add new headers.
+    @service.calculateEstimatedPrice(CalculateEstimatedPrice.new())
+
+    puts ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> #{@service.filterchain }"
+  end
+
+  protected
+
+  def reset_service_instance
+    @service = G4s.instance.shipping.service  # must make a new instance each time.
+    @service.wiredump_dev=STDERR
+    @service.options['protocol.http.ssl_config.verify_mode'] = OpenSSL::SSL::VERIFY_NONE
+    @service.filterchain << G4sNamespaceFilter.new
+    puts "gogogo"
+  end
+ 
+end

data/lib/g4s/shipping/default.rb

@@ -220,6 +220,9 @@ require 'xsd/qname'
     end
   end
 
+
+# Namespacing to avoid collision. 
+module G4sShipping
   # {http://WS.G4SI.COM/}Address
   #   name - SOAP::SOAPString
   #   company - SOAP::SOAPString
@@ -256,6 +259,8 @@ require 'xsd/qname'
       @email = email
     end
   end
+end
+
 
   # {http://WS.G4SI.COM/}SchedulePickup
   #   contactName - SOAP::SOAPString

data/lib/g4s/shipping/defaultMappingRegistry.rb

@@ -52,9 +52,9 @@ module DefaultMappingRegistry
       ["thermalPrinter", ["SOAP::SOAPBoolean", XSD::QName.new(NsWSG4SICOM, "ThermalPrinter")]],
       ["sEDNumber", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "SEDNumber")], [0, 1]],
       ["dutiesPayorType", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "DutiesPayorType")], [0, 1]],
-      ["recipientAddress", ["Address", XSD::QName.new(NsWSG4SICOM, "RecipientAddress")], [0, 1]],
+      ["recipientAddress", ["G4sTracking::Address", XSD::QName.new(NsWSG4SICOM, "RecipientAddress")], [0, 1]],
       ["saveNewRecipientAddress", ["SOAP::SOAPBoolean", XSD::QName.new(NsWSG4SICOM, "SaveNewRecipientAddress")]],
-      ["shipperAddress", ["Address", XSD::QName.new(NsWSG4SICOM, "ShipperAddress")], [0, 1]],
+      ["shipperAddress", ["G4sTracking::Address", XSD::QName.new(NsWSG4SICOM, "ShipperAddress")], [0, 1]],
       ["cODAmount", ["SOAP::SOAPDouble", XSD::QName.new(NsWSG4SICOM, "CODAmount")]],
       ["holdAtLocation", ["SOAP::SOAPBoolean", XSD::QName.new(NsWSG4SICOM, "HoldAtLocation")]],
       ["schedulePickup", ["SOAP::SOAPBoolean", XSD::QName.new(NsWSG4SICOM, "SchedulePickup")]],
@@ -106,7 +106,7 @@ module DefaultMappingRegistry
 
   EncodedRegistry.register(
     :class => Address,
-    :schema_type => XSD::QName.new(NsWSG4SICOM, "Address"),
+    :schema_type => XSD::QName.new(NsWSG4SICOM, "G4sTracking::Address"),
     :schema_element => [
       ["name", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "Name")], [0, 1]],
       ["company", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "Company")], [0, 1]],
@@ -153,7 +153,7 @@ module DefaultMappingRegistry
       ["name", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "Name")], [0, 1]],
       ["company", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "Company")], [0, 1]],
       ["country", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "Country")], [0, 1]],
-      ["address", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "Address")], [0, 1]],
+      ["G4sTracking::Address", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "G4sTracking::Address")], [0, 1]],
       ["city", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "City")], [0, 1]],
       ["state", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "State")], [0, 1]],
       ["countryCode", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "CountryCode")], [0, 1]],
@@ -168,7 +168,7 @@ module DefaultMappingRegistry
     :schema_element => [
       ["name", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "Name")], [0, 1]],
       ["company", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "Company")], [0, 1]],
-      ["address", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "Address")], [0, 1]],
+      ["G4sTracking::Address", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "G4sTracking::Address")], [0, 1]],
       ["city", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "City")], [0, 1]],
       ["state", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "State")], [0, 1]],
       ["countryCode", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "CountryCode")], [0, 1]],
@@ -276,9 +276,9 @@ module DefaultMappingRegistry
       ["thermalPrinter", ["SOAP::SOAPBoolean", XSD::QName.new(NsWSG4SICOM, "ThermalPrinter")]],
       ["sEDNumber", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "SEDNumber")], [0, 1]],
       ["dutiesPayorType", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "DutiesPayorType")], [0, 1]],
-      ["recipientAddress", ["Address", XSD::QName.new(NsWSG4SICOM, "RecipientAddress")], [0, 1]],
+      ["recipientAddress", ["G4sTracking::Address", XSD::QName.new(NsWSG4SICOM, "RecipientAddress")], [0, 1]],
       ["saveNewRecipientAddress", ["SOAP::SOAPBoolean", XSD::QName.new(NsWSG4SICOM, "SaveNewRecipientAddress")]],
-      ["shipperAddress", ["Address", XSD::QName.new(NsWSG4SICOM, "ShipperAddress")], [0, 1]],
+      ["shipperAddress", ["G4sTracking::Address", XSD::QName.new(NsWSG4SICOM, "ShipperAddress")], [0, 1]],
       ["cODAmount", ["SOAP::SOAPDouble", XSD::QName.new(NsWSG4SICOM, "CODAmount")]],
       ["holdAtLocation", ["SOAP::SOAPBoolean", XSD::QName.new(NsWSG4SICOM, "HoldAtLocation")]],
       ["schedulePickup", ["SOAP::SOAPBoolean", XSD::QName.new(NsWSG4SICOM, "SchedulePickup")]],
@@ -330,7 +330,7 @@ module DefaultMappingRegistry
 
   LiteralRegistry.register(
     :class => Address,
-    :schema_type => XSD::QName.new(NsWSG4SICOM, "Address"),
+    :schema_type => XSD::QName.new(NsWSG4SICOM, "G4sTracking::Address"),
     :schema_element => [
       ["name", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "Name")], [0, 1]],
       ["company", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "Company")], [0, 1]],
@@ -377,7 +377,7 @@ module DefaultMappingRegistry
       ["name", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "Name")], [0, 1]],
       ["company", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "Company")], [0, 1]],
       ["country", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "Country")], [0, 1]],
-      ["address", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "Address")], [0, 1]],
+      ["G4sTracking::Address", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "G4sTracking::Address")], [0, 1]],
       ["city", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "City")], [0, 1]],
       ["state", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "State")], [0, 1]],
       ["countryCode", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "CountryCode")], [0, 1]],
@@ -392,7 +392,7 @@ module DefaultMappingRegistry
     :schema_element => [
       ["name", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "Name")], [0, 1]],
       ["company", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "Company")], [0, 1]],
-      ["address", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "Address")], [0, 1]],
+      ["G4sTracking::Address", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "G4sTracking::Address")], [0, 1]],
       ["city", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "City")], [0, 1]],
       ["state", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "State")], [0, 1]],
       ["countryCode", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "CountryCode")], [0, 1]],
@@ -497,9 +497,9 @@ module DefaultMappingRegistry
       ["thermalPrinter", ["SOAP::SOAPBoolean", XSD::QName.new(NsWSG4SICOM, "ThermalPrinter")]],
       ["sEDNumber", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "SEDNumber")], [0, 1]],
       ["dutiesPayorType", ["SOAP::SOAPString", XSD::QName.new(NsWSG4SICOM, "DutiesPayorType")], [0, 1]],
-      ["recipientAddress", ["Address", XSD::QName.new(NsWSG4SICOM, "RecipientAddress")], [0, 1]],
+      ["recipientAddress", ["G4sTracking::Address", XSD::QName.new(NsWSG4SICOM, "RecipientAddress")], [0, 1]],
       ["saveNewRecipientAddress", ["SOAP::SOAPBoolean", XSD::QName.new(NsWSG4SICOM, "SaveNewRecipientAddress")]],
-      ["shipperAddress", ["Address", XSD::QName.new(NsWSG4SICOM, "ShipperAddress")], [0, 1]],
+      ["shipperAddress", ["G4sTracking::Address", XSD::QName.new(NsWSG4SICOM, "ShipperAddress")], [0, 1]],
       ["cODAmount", ["SOAP::SOAPDouble", XSD::QName.new(NsWSG4SICOM, "CODAmount")]],
       ["holdAtLocation", ["SOAP::SOAPBoolean", XSD::QName.new(NsWSG4SICOM, "HoldAtLocation")]],
       ["schedulePickup", ["SOAP::SOAPBoolean", XSD::QName.new(NsWSG4SICOM, "SchedulePickup")]],

data/lib/g4s/tracking/default.rb

@@ -3,7 +3,7 @@
 require 'xsd/qname'
 
 
-#module DefaultMappingRegistry
+
   # {http://tempuri.org/}ShipmentTrackingResponse
   #   trackingResponse - TrackingResponse
   #   trackingResponseErrorCode - SOAP::SOAPString
@@ -315,6 +315,8 @@ require 'xsd/qname'
     end
   end
 
+# Namespacing to avoid collision. 
+module G4sTracking
   # {http://tempuri.org/}Address
   #   name - SOAP::SOAPString
   #   company - SOAP::SOAPString
@@ -351,6 +353,8 @@ require 'xsd/qname'
       @email = email
     end
   end
+end
+
 
   # {http://tempuri.org/}SchedulePickup
   #   contactName - SOAP::SOAPString
@@ -833,4 +837,3 @@ require 'xsd/qname'
       @getShipmentStatusResult = getShipmentStatusResult
     end
   end
-#end

data/lib/g4s/tracking/defaultMappingRegistry.rb

@@ -39,9 +39,9 @@ module DefaultMappingRegistry
       ["thermalPrinter", ["SOAP::SOAPBoolean", XSD::QName.new(NsTempuriOrg, "ThermalPrinter")]],
       ["sEDNumber", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "SEDNumber")], [0, 1]],
       ["dutiesPayorType", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "DutiesPayorType")], [0, 1]],
-      ["recipientAddress", ["Address", XSD::QName.new(NsTempuriOrg, "RecipientAddress")], [0, 1]],
+      ["recipientAddress", ["G4sTracking::Address", XSD::QName.new(NsTempuriOrg, "RecipientAddress")], [0, 1]],
       ["saveNewRecipientAddress", ["SOAP::SOAPBoolean", XSD::QName.new(NsTempuriOrg, "SaveNewRecipientAddress")]],
-      ["shipperAddress", ["Address", XSD::QName.new(NsTempuriOrg, "ShipperAddress")], [0, 1]],
+      ["shipperAddress", ["G4sTracking::Address", XSD::QName.new(NsTempuriOrg, "ShipperAddress")], [0, 1]],
       ["cODAmount", ["SOAP::SOAPDouble", XSD::QName.new(NsTempuriOrg, "CODAmount")]],
       ["holdAtLocation", ["SOAP::SOAPBoolean", XSD::QName.new(NsTempuriOrg, "HoldAtLocation")]],
       ["schedulePickup", ["SOAP::SOAPBoolean", XSD::QName.new(NsTempuriOrg, "SchedulePickup")]],
@@ -87,9 +87,9 @@ module DefaultMappingRegistry
       ["thermalPrinter", ["SOAP::SOAPBoolean", XSD::QName.new(NsTempuriOrg, "ThermalPrinter")]],
       ["sEDNumber", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "SEDNumber")], [0, 1]],
       ["dutiesPayorType", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "DutiesPayorType")], [0, 1]],
-      ["recipientAddress", ["Address", XSD::QName.new(NsTempuriOrg, "RecipientAddress")], [0, 1]],
+      ["recipientAddress", ["G4sTracking::Address", XSD::QName.new(NsTempuriOrg, "RecipientAddress")], [0, 1]],
       ["saveNewRecipientAddress", ["SOAP::SOAPBoolean", XSD::QName.new(NsTempuriOrg, "SaveNewRecipientAddress")]],
-      ["shipperAddress", ["Address", XSD::QName.new(NsTempuriOrg, "ShipperAddress")], [0, 1]],
+      ["shipperAddress", ["G4sTracking::Address", XSD::QName.new(NsTempuriOrg, "ShipperAddress")], [0, 1]],
       ["cODAmount", ["SOAP::SOAPDouble", XSD::QName.new(NsTempuriOrg, "CODAmount")]],
       ["holdAtLocation", ["SOAP::SOAPBoolean", XSD::QName.new(NsTempuriOrg, "HoldAtLocation")]],
       ["schedulePickup", ["SOAP::SOAPBoolean", XSD::QName.new(NsTempuriOrg, "SchedulePickup")]],
@@ -141,7 +141,7 @@ module DefaultMappingRegistry
 
   EncodedRegistry.register(
     :class => Address,
-    :schema_type => XSD::QName.new(NsTempuriOrg, "Address"),
+    :schema_type => XSD::QName.new(NsTempuriOrg, "G4sTracking::Address"),
     :schema_element => [
       ["name", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "Name")], [0, 1]],
       ["company", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "Company")], [0, 1]],
@@ -188,7 +188,7 @@ module DefaultMappingRegistry
       ["name", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "Name")], [0, 1]],
       ["company", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "Company")], [0, 1]],
       ["country", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "Country")], [0, 1]],
-      ["address", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "Address")], [0, 1]],
+      ["G4sTracking::Address", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "G4sTracking::Address")], [0, 1]],
       ["city", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "City")], [0, 1]],
       ["state", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "State")], [0, 1]],
       ["countryCode", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "CountryCode")], [0, 1]],
@@ -203,7 +203,7 @@ module DefaultMappingRegistry
     :schema_element => [
       ["name", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "Name")], [0, 1]],
       ["company", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "Company")], [0, 1]],
-      ["address", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "Address")], [0, 1]],
+      ["G4sTracking::Address", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "G4sTracking::Address")], [0, 1]],
       ["city", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "City")], [0, 1]],
       ["state", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "State")], [0, 1]],
       ["countryCode", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "CountryCode")], [0, 1]],
@@ -410,9 +410,9 @@ module DefaultMappingRegistry
       ["thermalPrinter", ["SOAP::SOAPBoolean", XSD::QName.new(NsTempuriOrg, "ThermalPrinter")]],
       ["sEDNumber", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "SEDNumber")], [0, 1]],
       ["dutiesPayorType", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "DutiesPayorType")], [0, 1]],
-      ["recipientAddress", ["Address", XSD::QName.new(NsTempuriOrg, "RecipientAddress")], [0, 1]],
+      ["recipientAddress", ["G4sTracking::Address", XSD::QName.new(NsTempuriOrg, "RecipientAddress")], [0, 1]],
       ["saveNewRecipientAddress", ["SOAP::SOAPBoolean", XSD::QName.new(NsTempuriOrg, "SaveNewRecipientAddress")]],
-      ["shipperAddress", ["Address", XSD::QName.new(NsTempuriOrg, "ShipperAddress")], [0, 1]],
+      ["shipperAddress", ["G4sTracking::Address", XSD::QName.new(NsTempuriOrg, "ShipperAddress")], [0, 1]],
       ["cODAmount", ["SOAP::SOAPDouble", XSD::QName.new(NsTempuriOrg, "CODAmount")]],
       ["holdAtLocation", ["SOAP::SOAPBoolean", XSD::QName.new(NsTempuriOrg, "HoldAtLocation")]],
       ["schedulePickup", ["SOAP::SOAPBoolean", XSD::QName.new(NsTempuriOrg, "SchedulePickup")]],
@@ -458,9 +458,9 @@ module DefaultMappingRegistry
       ["thermalPrinter", ["SOAP::SOAPBoolean", XSD::QName.new(NsTempuriOrg, "ThermalPrinter")]],
       ["sEDNumber", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "SEDNumber")], [0, 1]],
       ["dutiesPayorType", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "DutiesPayorType")], [0, 1]],
-      ["recipientAddress", ["Address", XSD::QName.new(NsTempuriOrg, "RecipientAddress")], [0, 1]],
+      ["recipientAddress", ["G4sTracking::Address", XSD::QName.new(NsTempuriOrg, "RecipientAddress")], [0, 1]],
       ["saveNewRecipientAddress", ["SOAP::SOAPBoolean", XSD::QName.new(NsTempuriOrg, "SaveNewRecipientAddress")]],
-      ["shipperAddress", ["Address", XSD::QName.new(NsTempuriOrg, "ShipperAddress")], [0, 1]],
+      ["shipperAddress", ["G4sTracking::Address", XSD::QName.new(NsTempuriOrg, "ShipperAddress")], [0, 1]],
       ["cODAmount", ["SOAP::SOAPDouble", XSD::QName.new(NsTempuriOrg, "CODAmount")]],
       ["holdAtLocation", ["SOAP::SOAPBoolean", XSD::QName.new(NsTempuriOrg, "HoldAtLocation")]],
       ["schedulePickup", ["SOAP::SOAPBoolean", XSD::QName.new(NsTempuriOrg, "SchedulePickup")]],
@@ -512,7 +512,7 @@ module DefaultMappingRegistry
 
   LiteralRegistry.register(
     :class => Address,
-    :schema_type => XSD::QName.new(NsTempuriOrg, "Address"),
+    :schema_type => XSD::QName.new(NsTempuriOrg, "G4sTracking::Address"),
     :schema_element => [
       ["name", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "Name")], [0, 1]],
       ["company", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "Company")], [0, 1]],
@@ -559,7 +559,7 @@ module DefaultMappingRegistry
       ["name", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "Name")], [0, 1]],
       ["company", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "Company")], [0, 1]],
       ["country", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "Country")], [0, 1]],
-      ["address", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "Address")], [0, 1]],
+      ["G4sTracking::Address", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "G4sTracking::Address")], [0, 1]],
       ["city", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "City")], [0, 1]],
       ["state", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "State")], [0, 1]],
       ["countryCode", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "CountryCode")], [0, 1]],
@@ -574,7 +574,7 @@ module DefaultMappingRegistry
     :schema_element => [
       ["name", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "Name")], [0, 1]],
       ["company", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "Company")], [0, 1]],
-      ["address", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "Address")], [0, 1]],
+      ["G4sTracking::Address", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "G4sTracking::Address")], [0, 1]],
       ["city", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "City")], [0, 1]],
       ["state", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "State")], [0, 1]],
       ["countryCode", ["SOAP::SOAPString", XSD::QName.new(NsTempuriOrg, "CountryCode")], [0, 1]],

data/lib/g4s_client.rb

@@ -1,20 +1,23 @@
+# soap headers are put on the driver, and not changed per request in soap4r.  this page offers a workaround:
+#  http://emphaticsolutions.com/2008/05/06/soap-headers-per-request-in-ruby.html
 
 #puts "REQUIRING: #{Dir[__FILE__]}"
 
 [ "g4s/shipping/default",
   "g4s/shipping/defaultDriver",
   "g4s/shipping/defaultMappingRegistry",
-  #"g4s/shipping/IPSShippingClient",
   "g4s/tracking/default",
   "g4s/tracking/defaultDriver",
-  #"g4s/tracking/IPSTrackingClient",
   "g4s/tracking/defaultMappingRegistry",
   "g4s/utilities/default",
   "g4s/utilities/defaultDriver",
-  #"g4s/utilities/IPSUtilitiesClient",
   "g4s/utilities/defaultMappingRegistry",
   "g4s/g4s",
-  "g4s/g4si_auth_header",
+  "g4s/insured_ship",
+  "g4s/headers/custom_header",
+  "g4s/headers/g4si_auth_header",
+  "g4s/headers/shipment_request_header",
+  "g4s/headers/g4s_namespace_filter",
   "version"].each{|f| require f}  
 
 module G4sClient
@@ -31,12 +34,12 @@ module G4sClient
   end
 
   class ShippingTest < G4sClient::Shipping
-    def initialize; super("https://wsuat.g4si.com/IPSutilities.asmx"); end
+    def initialize; super("https://wsuat.g4si.com/IPSshipping.asmx"); end
     def auth;  @authentication ||= G4SIAuthentication.new(CONFIG['test']['username'], CONFIG['test']['password'], CONFIG['test']['access_key']); end  #TODO: dry
   end
 
   class ShippingLive < G4sClient::Shipping
-    def initialize; super("https://ws.g4si.com/IPSutilities.asmx"); end
+    def initialize; super("https://ws.g4si.com/IPSshipping.asmx"); end
     def auth;  @authentication ||= G4SIAuthentication.new(CONFIG['live']['username'], CONFIG['live']['password'], CONFIG['live']['access_key']); end
   end
 

data/lib/version.rb

@@ -1,5 +1,5 @@
 #puts "REQUIRING: #{Dir[__FILE__]}"
 
 module G4sClient
-  VERSION = '0.1.4'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: g4s_client
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Rob Tierney
@@ -34,7 +35,11 @@ files:
 - Rakefile
 - g4s_client.gemspec
 - lib/g4s/g4s.rb
-- lib/g4s/g4si_auth_header.rb
+- lib/g4s/headers/custom_header.rb
+- lib/g4s/headers/g4s_namespace_filter.rb
+- lib/g4s/headers/g4si_auth_header.rb
+- lib/g4s/headers/shipment_request_header.rb
+- lib/g4s/insured_ship.rb
 - lib/g4s/shipping/IPSShippingClient.rb
 - lib/g4s/shipping/default.rb
 - lib/g4s/shipping/defaultDriver.rb
@@ -64,23 +69,27 @@ require_paths:
 - lib/g4s/tracking
 - lib/g4s/utilities
 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: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: G4S SOAP Client