cargowise 0.7.1 → 0.7.2

data/lib/cargowise/consol.rb

@@ -15,7 +15,7 @@ module Cargowise
     def initialize(node)
       @node = node
 
-      @master         = text_value("./MasterBill")
+      @master_bill    = text_value("./MasterBill")
       @console_mode   = text_value("./ConsolMode")
       @transport_mode = text_value("./TransportMode")
       @vessel_name    = text_value("./VesselName")

data/lib/cargowise/shipment.rb

@@ -85,5 +85,21 @@ module Cargowise
       @orders ||= Cargowise::Order.via(via).by_shipment_number(self.number)
     end
 
+    # lookup related Cargowise::Shipment objects. These are usually "child" shipments
+    # grouped under a parent. Think a consolidated pallet (the parent) with cartons from
+    # multiple suppliers (the children).
+    #
+    # 'via' is a symbol indicating which API endpoint to lookup.
+    #
+    def related_shipments(via)
+      @related ||= @consols.map { |consol|
+        consol.master_bill
+      }.compact.map { |master_bill|
+        Cargowise::Shipment.via(via).by_masterbill_number(master_bill)
+      }.flatten.select { |shipment|
+        shipment.number != self.number
+      }.compact
+    end
+
   end
 end

data/lib/cargowise/shipment_search.rb

@@ -4,19 +4,16 @@ module Cargowise
 
   class ShipmentSearch < AbstractSearch
 
+    # find all shipments with a MasterBillNumber that matches ref
+    #
+    def by_masterbill_number(ref)
+      by_number("MasterBillNumber", ref)
+    end
+
     # find all shipments with a ShipmentNumber that matches ref
     #
     def by_shipment_number(ref)
-      filter_hash = {
-        "tns:Filter" => {
-          "tns:Number" => {
-            "tns:NumberSearchField" => "ShipmentNumber",
-            "tns:NumberValue" => ref
-          }
-        }
-      }
-      ShipmentsClient.endpoint(endpoint_hash) # probably not threadsafe. oops.
-      ShipmentsClient.get_shipments_list(ep.code, ep.user, ep.password, filter_hash)
+      by_number("ShipmentNumber", ref)
     end
 
     # find all shipments that haven't been delivered yet.
@@ -67,6 +64,20 @@ module Cargowise
       ShipmentsClient.get_shipments_list(ep.code, ep.user, ep.password, filter_hash)
     end
 
+    private
+
+    def by_number(field, ref)
+      filter_hash = {
+        "tns:Filter" => {
+          "tns:Number" => {
+            "tns:NumberSearchField" => field,
+            "tns:NumberValue" => ref
+          }
+        }
+      }
+      ShipmentsClient.endpoint(endpoint_hash) # probably not threadsafe. oops.
+      ShipmentsClient.get_shipments_list(ep.code, ep.user, ep.password, filter_hash)
+    end
 
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cargowise
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 7
-  - 1
-  version: 0.7.1
+  - 2
+  version: 0.7.2
 platform: ruby
 authors: 
 - James Healy
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-01 00:00:00 +10:00
+date: 2010-09-07 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency