hushed 0.0.8 → 0.0.9

data/lib/hushed/documents/request/shipment_order.rb

@@ -19,6 +19,8 @@ module Hushed
         def initialize(options = {})
           @order = options[:order] || raise(MissingOrderError.new("order cannot be missing"))
           @client = options[:client] || raise(MissingClientError.new("client cannot be missing"))
+          @carrier = options[:carrier]
+          @service_level = options[:service_level]
         end
 
         def to_xml
@@ -26,21 +28,29 @@ module Hushed
             xml.ShipOrderDocument(xmlns: NAMESPACE) do
               xml.ClientID client_id
               xml.BusinessUnit business_unit
-              xml.OrderHeader(order_header_attributes) do
-                xml.Comments @order.note
-                xml.ShipMode(shipping_attributes(@order.shipping_lines.first))
-                xml.ShipTo(address_attributes(@order.shipping_address))
-                xml.BillTo(address_attributes(@order.billing_address))
-                xml.DeclaredValue @order.total_price
-                @order.line_items.each.with_index(1) do |line_item, index|
-                  xml.OrderDetails(line_item_attributes(line_item, index))
-                end
-              end
+              attach_order_header(xml, order_header_attributes, @order)
+              attach_order_details(xml, @order.line_items)
             end
           end
           builder.to_xml
         end
 
+        def attach_order_header(xml, header_attributes, order)
+          xml.OrderHeader(order_header_attributes) do
+            xml.Comments order.note
+            xml.ShipMode(shipping_attributes(order.shipping_lines.first))
+            xml.ShipTo(address_attributes(order.shipping_address))
+            xml.BillTo(address_attributes(order.billing_address))
+            xml.DeclaredValue order.total_price
+          end
+        end
+
+        def attach_order_details(xml, line_items)
+          line_items.each.with_index(1) do |line_item, index|
+            xml.OrderDetails(line_item_attributes(line_item, index))
+          end
+        end
+
         def type
           'ShipmentOrder'
         end
@@ -66,11 +76,11 @@ module Hushed
         end
 
         def order_header_attributes
-          {OrderNumber: document_number, OrderType: order_type, OrderDate: date, ShipDate: date}
+          {OrderNumber: document_number, OrderType: order_type, OrderDate: date.iso8601, ShipDate: date.iso8601}
         end
 
         def shipping_attributes(shipping_line)
-          {Carrier: shipping_line.carrier, ServiceLevel: shipping_line.service_level}
+          {Carrier: @carrier || shipping_line.carrier, ServiceLevel: @service_level || shipping_line.service_level}
         end
 
         def address_attributes(address)

data/lib/hushed/message.rb

@@ -42,7 +42,7 @@ module Hushed
       {
         ClientId: @client.client_id, BusinessUnit: @client.business_unit,
         DocumentName: @document.filename, DocumentType: @document.type,
-        Warehouse: @document.warehouse, MessageDate: @document.date.utc,
+        Warehouse: @document.warehouse, MessageDate: @document.date.utc.iso8601,
         MessageId: @document.message_id, xmlns: NAMESPACE
       }
     end

data/lib/hushed/version.rb

@@ -1,3 +1,3 @@
 module Hushed
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/unit/documents/request/shipment_order_spec.rb

@@ -54,8 +54,8 @@ module Hushed
         private
         def assert_header(header)
           assert_equal "#{@order.id}", header['OrderNumber']
-          assert_equal @order.created_at.utc.to_s, header['OrderDate']
-          assert_equal @order.created_at.utc.to_s, header['ShipDate']
+          assert_equal @order.created_at.utc.iso8601, header['OrderDate']
+          assert_equal @order.created_at.utc.iso8601, header['ShipDate']
           assert_equal @order.type, header['OrderType']
         end
 

data/spec/unit/message_spec.rb

@@ -46,7 +46,7 @@ module Hushed
       assert_equal @document.type, node['DocumentType']
       assert_equal @document.filename, node['DocumentName']
       assert_equal @document.warehouse, node['Warehouse']
-      assert_equal @document.date.utc.to_s, node['MessageDate']
+      assert_equal @document.date.utc.iso8601, node['MessageDate']
       assert_equal @document.message_id, node['MessageId']
 
       assert_equal @client.client_id, node['ClientId']

metadata

@@ -2,14 +2,14 @@
 name: hushed
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Chris Saunders
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   prerelease: false
@@ -272,7 +272,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 2857053908953534475
+      hash: 1901725543110324787
       version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -281,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 2857053908953534475
+      hash: 1901725543110324787
       version: '0'
   none: false
 requirements: []