cargowise 0.8.2 → 0.8.3

data/CHANGELOG

@@ -1,3 +1,9 @@
+v0.8.3 - 10th January 2011
+* transparently convert all measurements to metric
+
+v0.8.2 - 15th September 2010
+* new Shipment attribute - packings
+
 v0.8.1 - 15th September 2010
 * add explicit dependency on curb
 

data/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2007 Peter Yandell
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/cargowise/abstract_result.rb

@@ -15,7 +15,7 @@ module Cargowise
 
     def self.endpoint(name)
       @endpoints ||= {}
-      @endpoints[name] 
+      @endpoints[name]
     end
 
     def self.via(name)
@@ -54,6 +54,11 @@ module Cargowise
       node.xpath("#{path}/text()", "tns" => Cargowise::DEFAULT_NS).to_s
     end
 
+    def attribute_value(path)
+      path = path.gsub(/\/([^@])/u,'/tns:\1')
+      node.xpath(path, "tns" => Cargowise::DEFAULT_NS).to_s
+    end
+
     def time_value(path)
       val = text_value(path)
       val.nil? ? nil : DateTime.parse(val)
@@ -63,5 +68,37 @@ module Cargowise
       val = text_value(path)
       val.nil? ? nil : BigDecimal.new(val)
     end
+
+    # return a weight value in KG. Transparently handles the
+    # conversion from other units.
+    #
+    def kg_value(path)
+      val  = text_value(path)
+      type = attribute_value("#{path}/@DimensionType")
+
+      if type.to_s.downcase == "kg"
+        BigDecimal.new(val)
+      elsif type.to_s.downcase == "lbs"
+        BigDecimal.new(val) * BigDecimal.new("0.45359237")
+      else
+        nil
+      end
+    end
+
+    # return a cubic value in meters cubed. Transparently handles the
+    # conversion from other units.
+    #
+    def cubic_value(path)
+      val  = text_value(path)
+      type = attribute_value("#{path}/@DimensionType")
+
+      if type.to_s.downcase == "m3" # cubic metres
+        BigDecimal.new(val)
+      elsif type.to_s.downcase == "f3" # cubic feet
+        BigDecimal.new(val) * BigDecimal.new("0.0283168466")
+      else
+        nil
+      end
+    end
   end
 end

data/lib/cargowise/packing.rb

@@ -15,8 +15,8 @@ module Cargowise
 
       @pack_type   = text_value("./PackType")
       @line_price  = decimal_value("./LinePrice")
-      @weight      = decimal_value("./Weight")
-      @volume      = decimal_value("./Volume")
+      @weight      = kg_value("./Weight")
+      @volume      = cubic_value("./Volume")
       @description = text_value("./Description")
     end
   end

data/lib/cargowise/shipment.rb

@@ -24,6 +24,7 @@ module Cargowise
     attr_reader :number, :housebill, :goods_description, :service_level
     attr_reader :client_reference
     attr_reader :origin, :destination, :etd, :eta, :delivered_date
+    attr_reader :kg, :cubic_meters
 
     attr_reader :shipper_name
 
@@ -44,6 +45,8 @@ module Cargowise
       @etd           = time_value("./ETD")
       @eta           = time_value("./ETA")
       @delivered_date = time_value("./DeliveredDate")
+      @kg            = kg_value("./Weight")
+      @cubic_meters  = cubic_value("./Size")
 
       @shipper_name = text_value("./Shipper/OrganisationDetails/Name")
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cargowise
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: false
   segments: 
   - 0
   - 8
-  - 2
-  version: 0.8.2
+  - 3
+  version: 0.8.3
 platform: ruby
 authors: 
 - James Healy
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-15 00:00:00 +10:00
+date: 2011-01-10 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -80,7 +80,8 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 description: Retrieve tracking and status information on your shipments from entpriseEDI
-email: james@yob.id.au
+email: 
+- james@yob.id.au
 executables: []
 
 extensions: []
@@ -107,11 +108,11 @@ files:
 - CHANGELOG
 - TODO
 - COPYING
-- LICENSE
+- MIT-LICENSE
 has_rdoc: true
 homepage: http://github.com/yob/cargowise
-licenses: []
-
+licenses: 
+- mit
 post_install_message: 
 rdoc_options: 
 - --title

data/LICENSE

@@ -1,56 +0,0 @@
-Cargowise is copyrighted free software produced by James Healy along with 
-community contributions.  See git log for authorship information.
-
-Licensing terms follow (License of Ruby 1.8):
-
-You can redistribute Cargowise and/or modify it under either the terms of the GPL
-(see COPYING file), or the conditions below:
-
-  1. You may make and give away verbatim copies of the source form of the
-     software without restriction, provided that you duplicate all of the
-     original copyright notices and associated disclaimers.
-
-  2. You may modify your copy of the software in any way, provided that
-     you do at least ONE of the following:
-
-       a) place your modifications in the Public Domain or otherwise
-          make them Freely Available, such as by posting said
-    modifications to Usenet or an equivalent medium, or by allowing
-    the author to include your modifications in the software.
-
-       b) use the modified software only within your corporation or
-          organization.
-
-       c) rename any non-standard executables so the names do not conflict
-    with standard executables, which must also be provided.
-
-       d) make other distribution arrangements with the author.
-
-  3. You may distribute the software in object code or executable
-     form, provided that you do at least ONE of the following:
-
-       a) distribute the executables and library files of the software,
-    together with instructions (in the manual page or equivalent)
-    on where to get the original distribution.
-
-       b) accompany the distribution with the machine-readable source of
-    the software.
-
-       c) give non-standard executables non-standard names, with
-          instructions on where to get the original software distribution.
-
-       d) make other distribution arrangements with the author.
-
-  4. You may modify and include the part of the software into any other
-     software (possibly commercial). 
-
-  5. The scripts and library files supplied as input to or produced as 
-     output from the software do not automatically fall under the
-     copyright of the software, but belong to whomever generated them, 
-     and may be sold commercially, and may be aggregated with this
-     software.
-
-  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     PURPOSE.