g4s_client 0.1.6 → 0.1.7

data/lib/g4s/headers/commodity_list_header.rb

@@ -0,0 +1,16 @@
+require 'soap/header/simplehandler'
+
+class CommodityListHeader <  CustomHeader
+
+  NAMESPACE  = 'http://WS.G4SI.COM/'
+
+  def initialize(commodity_list)
+    @commodity_list = commodity_list
+    super(XSD::QName.new(NAMESPACE, 'CommodityList'))
+  end
+
+  def on_simple_outbound
+    to_hash(@commodity_list)
+  end
+
+end

data/lib/g4s/headers/custom_header.rb

@@ -2,7 +2,7 @@ require 'soap/header/simplehandler'
 
 class CustomHeader < SOAP::Header::SimpleHandler
 
-  NAMESPACE  = 'http://tempuri.org'
+  NAMESPACE  = 'http://WS.G4SI.COM/'
 
 #  def initialize(shipment_request)
 #    @shipment_request = shipment_request
@@ -16,16 +16,20 @@ class CustomHeader < SOAP::Header::SimpleHandler
 
   protected
 
+  def primitive_types
+    [ NilClass, TrueClass, FalseClass, Numeric, Time, Date, DateTime, String, Symbol ]
+  end
+
   # Transform a object into a hash of its instance variables
   def to_hash(object)
     return {} unless object
     result = {}
+    #puts "to_hash #{object.class}:#{object}"
+    #puts "#{y object.instance_variables.sort}"
     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))
+      result[instance_var_name_to_tag(var)] = format_value(value)
+      #TODO: NESTING
     end
     result
   end
@@ -35,5 +39,23 @@ class CustomHeader < SOAP::Header::SimpleHandler
     string[0].chr.capitalize + string[1, string.size]
   end
 
+  def instance_var_name_to_tag(var)
+    var.gsub!('@','')
+    var = capitalize_first_letter(var)
+    var
+  end
+
+  def format_value(value)
+    if primitive_types.any?{|type| value.is_a?(type)}
+      if value.is_a?(Time)
+        return value.strftime("%Y-%m-%dT%H:%M:%S")  # YYYY-MM-DDTHH:MM:SS
+      end
+      return value
+    else
+      #puts "non primitive value found: #{value.class}:#{value}"
+      return to_hash(value)  # recurse for non-"primitive" types such as Address.
+    end
+  end
+
 
 end

data/lib/g4s/headers/shipment_request_header.rb

@@ -2,7 +2,7 @@ require 'soap/header/simplehandler'
 
 class ShipmentRequestHeader <  CustomHeader
 
-  NAMESPACE  = 'http://tempuri.org'
+  NAMESPACE  = 'http://WS.G4SI.COM/'
 
   def initialize(shipment_request)
     @shipment_request = shipment_request

data/lib/g4s/insured_ship.rb

@@ -9,8 +9,13 @@ class InsuredShip
     reset_service_instance
     @service.headerhandler <<   ShipmentRequestHeader.new(shipment_request)   # add new headers.
     @service.calculateEstimatedPrice(CalculateEstimatedPrice.new())
+  end
 
-    puts ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> #{@service.filterchain }"
+  def createShipment(shipment_request = ShipmentRequest.new, commodity_list = CommodityList.new)
+    reset_service_instance
+    @service.headerhandler <<   ShipmentRequestHeader.new(shipment_request)   # add new headers.
+    @service.headerhandler <<   CommodityListHeader.new(commodity_list)   # add new headers.
+    @service.createShipment(CreateShipment.new())
   end
 
   protected
@@ -20,7 +25,6 @@ class InsuredShip
     @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/insured_utilities.rb

@@ -0,0 +1,23 @@
+
+
+class InsuredUtilities
+
+  def initialize
+  end
+
+  def getPackageTypes()
+    reset_service_instance
+    #@service.headerhandler <<   ShipmentRequestHeader.new(shipment_request)   # add new headers.
+    @service.getPackageTypes(GetPackageTypes.new())
+  end
+
+  protected
+
+  def reset_service_instance
+    @service = G4s.instance.utilities.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
+  end
+
+end

data/lib/g4s_client.rb

@@ -14,10 +14,12 @@
   "g4s/utilities/defaultMappingRegistry",
   "g4s/g4s",
   "g4s/insured_ship",
+  "g4s/insured_utilities",
   "g4s/headers/custom_header",
   "g4s/headers/g4si_auth_header",
   "g4s/headers/shipment_request_header",
   "g4s/headers/g4s_namespace_filter",
+  "g4s/headers/commodity_list_header",
   "version"].each{|f| require f}  
 
 module G4sClient

data/lib/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: g4s_client
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Rob Tierney
@@ -35,11 +35,13 @@ files:
 - Rakefile
 - g4s_client.gemspec
 - lib/g4s/g4s.rb
+- lib/g4s/headers/commodity_list_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/insured_utilities.rb
 - lib/g4s/shipping/IPSShippingClient.rb
 - lib/g4s/shipping/default.rb
 - lib/g4s/shipping/defaultDriver.rb