google4r-checkout 0.1.0 → 1.0.0

data/lib/google4r/checkout/shared.rb

@@ -262,7 +262,7 @@ module Google4R #:nodoc:
         end
 
         unit_price = (element.elements['unit-price'].text.to_f * 100).to_i
-        unit_price_currency = element.elements['unit-price/@currency'].value
+        unit_price_currency = element.elements['unit-price'].attributes['currency']
         result.unit_price = Money.new(unit_price, unit_price_currency)
         
         return result
@@ -516,7 +516,7 @@ module Google4R #:nodoc:
       # with the Area as the only parameter. The created area is returned in any case.
       #
       # The area to be created depends on the given parameter clazz. It can be one
-      # of { UsCountryArea, UsStateArea, UsZipArea }.
+      # of { PostalArea, UsCountryArea, UsStateArea, UsZipArea, WorldArea }.
       #
       # Raises a RuntimeError if the parameter clazz is invalid.
       #
@@ -527,7 +527,7 @@ module Google4R #:nodoc:
       #       area.area = UsCountryArea::ALL
       #    end
       def create_excluded_area(clazz, &block)
-        raise "Invalid Area class: #{clazz}!" unless [ UsCountryArea, UsStateArea, UsZipArea ].include?(clazz)
+        raise "Invalid Area class: #{clazz}!" unless [ PostalArea, UsCountryArea, UsStateArea, UsZipArea, WorldArea ].include?(clazz)
 
         area = clazz.new
         @excluded_areas << area

data/lib/google4r/checkout/xml_generation.rb

@@ -32,6 +32,62 @@ require 'rexml/document'
 
 module Google4R #:nodoc:
   module Checkout #:nodoc:
+    
+    # Abstract super class for all CommandXmlGenerators
+    # It should never be instantiated directly
+    class CommandXmlGenerator
+      
+      # The list of command tag names
+      COMMAND_TO_TAG =
+      {
+        ChargeOrderCommand => "charge-order",
+        RefundOrderCommand => "refund-order",
+        CancelOrderCommand => "cancel-order",
+        AuthorizeOrderCommand => "authorize-order",
+        ProcessOrderCommand => "process-order",
+        AddMerchantOrderNumberCommand => "add-merchant-order-number",
+        DeliverOrderCommand  => "deliver-order",
+        AddTrackingDataCommand => "add-tracking-data",
+        SendBuyerMessageCommand => "send-buyer-message",
+        ArchiveOrderCommand => "archive-order",
+        UnarchiveOrderCommand => "unarchive-order"
+      }
+      
+      def initialize(command)
+        @command = command
+      end
+
+      # Base method to generate the XML for a particular command
+      def generate
+        @document = REXML::Document.new
+        
+        declaration = REXML::XMLDecl.new
+        declaration.encoding = 'utf-8'
+        @document << declaration
+        
+        self.process_command(@command)
+        
+        io = StringIO.new
+        @document.write(io, 0) # TODO: Maybe replace 0 by -1 so no spaces are inserted?
+        return io.string
+      end
+
+      def tag_name_for_command(klass)
+        COMMAND_TO_TAG[klass]
+      end
+      
+      protected
+      
+      # Base method to generate root tag of a command
+      def process_command(command)
+        tag_name = self.tag_name_for_command(command.class)
+        root = @document.add_element(tag_name)
+        root.add_attribute('google-order-number', command.google_order_number)
+        root.add_attribute('xmlns', 'http://checkout.google.com/schema/2')
+        return root;
+      end
+    end
+    
     # Use the CheckoutXmlGenerator to create an XML document from a CheckoutCommand
     # object.
     #
@@ -46,268 +102,416 @@ module Google4R #:nodoc:
     #--
     # TODO: Refactor the big, monolitic generator into smaller, easier testable ones. One for each major part of the resulting XML document. This will also reduce the overhead in generating other types of XML documents.
     #++
-    class CheckoutCommandXmlGenerator
-      # Initializes the CheckoutCommandXmlGenerator with the CheckoutCommand it is
-      # to conver to XML.
-      def initialize(checkout_command)
-        @checkout_command = checkout_command
-      end
+    class CheckoutCommandXmlGenerator < CommandXmlGenerator
       
-      # Creates an XML document from the checkout_command passed into the constructor. Returns
-      # the resulting XML string.
-      def generate
-        @document = REXML::Document.new
+      protected
+      
+      def process_command(command)
+        root = @document.add_element("checkout-shopping-cart" , { 'xmlns' => 'http://checkout.google.com/schema/2' })
         
-        declaration = REXML::XMLDecl.new
-        declaration.encoding = 'utf-8'
-        @document << declaration
+        self.process_shopping_shopping_cart(root, command.shopping_cart)
         
-        self.process_checkout_command(@checkout_command)
+        # <merchant-checkout-flow-support>
+        flow_element = root.add_element('checkout-flow-support').add_element('merchant-checkout-flow-support')
+
+        # <tax-tables>
+        if command.tax_tables then
+          self.process_tax_tables(command.tax_tables, flow_element)
+        end
+
+        # <continue-shopping-url>
+        if not command.continue_shopping_url.nil? then
+          flow_element.add_element('continue-shopping-url').text = command.continue_shopping_url
+        end
         
-        io = StringIO.new
-        @document.write(io, 0) # TODO: Maybe replace 0 by -1 so no spaces are inserted?
-        return io.string
+        # <edit-cart-url>
+        if not command.edit_cart_url.nil? then
+          flow_element.add_element('edit-cart-url').text = command.edit_cart_url
+        end
+        
+        # <request-buyer-phone-number>
+        if not command.request_buyer_phone_number.nil? then
+          flow_element.add_element('request-buyer-phone-number').text =
+            if command.request_buyer_phone_number then
+              "true"
+            else
+              "false"
+            end
+        end
+        
+        # <shipping-methods>
+        shippings_element = flow_element.add_element('shipping-methods')
+        command.shipping_methods.each do |shipping_method|
+          self.process_shipping_method(shippings_element, shipping_method)
+        end
       end
       
-      protected
-      
-        def process_checkout_command(command)
-          root = @document.add_element('checkout-shopping-cart', { 'xmlns' => 'http://checkout.google.com/schema/2' })
-          
-          self.process_shopping_shopping_cart(root, command.shopping_cart)
-          
-          # <merchant-checkout-flow-support>
-          flow_element = root.add_element('checkout-flow-support').add_element('merchant-checkout-flow-support')
+      # adds the tax-tables to the parent xml element
+      # assumes that the first member of the tax_tables array is the default tax rule table
+      # and that all others are alternate tax rules
+      def process_tax_tables(tax_tables, parent)
+        tax_tables_element = parent.add_element('tax-tables')
 
-          # <tax-tables>
-          if command.tax_tables then
-            self.process_tax_tables(command.tax_tables, flow_element)
-          end
+        # assumes that the first tax table is the default
+        default_table = tax_tables.first
+        
+        default_table_element = tax_tables_element.add_element('default-tax-table')
+        rules_element = default_table_element.add_element('tax-rules')
 
-          # <continue-shopping-url>
-          if not command.continue_shopping_url.nil? then
-            flow_element.add_element('continue-shopping-url').text = command.continue_shopping_url
-          end
-          
-          # <edit-cart-url>
-          if not command.edit_cart_url.nil? then
-            flow_element.add_element('edit-cart-url').text = command.edit_cart_url
-          end
-          
-          # <request-buyer-phone-number>
-          if not command.request_buyer_phone_number.nil? then
-            flow_element.add_element('request-buyer-phone-number').text =
-              if command.request_buyer_phone_number then
-                "true"
-              else
-                "false"
-              end
-          end
-          
-          # <shipping-methods>
-          shippings_element = flow_element.add_element('shipping-methods')
-          command.shipping_methods.each do |shipping_method|
-            self.process_shipping_method(shippings_element, shipping_method)
-          end
+        default_table.rules.each do |rule|
+          default_rule_element = rules_element.add_element('default-tax-rule')
+          default_rule_element.add_element('shipping-taxed').text=rule.shipping_taxed.to_s
+          default_rule_element.add_element('rate').text=rule.rate.to_s
+          self.process_area(default_rule_element.add_element('tax-area'), rule.area)
         end
-        
-        # adds the tax-tables to the parent xml element
-        # assumes that the first member of the tax_tables array is the default tax rule table
-        # and that all others are alternate tax rules
-        def process_tax_tables(tax_tables, parent)
-          tax_tables_element = parent.add_element('tax-tables')
-
-          # assumes that the first tax table is the default
-          default_table = tax_tables.first
-          
-          default_table_element = tax_tables_element.add_element('default-tax-table')
-          rules_element = default_table_element.add_element('tax-rules')
-
-          default_table.rules.each do |rule|
-            default_rule_element = rules_element.add_element('default-tax-rule')
-            default_rule_element.add_element('shipping-taxed').text=rule.shipping_taxed.to_s
-            default_rule_element.add_element('rate').text=rule.rate.to_s
-            self.process_area(default_rule_element.add_element('tax-area'), rule.area)
-          end
 
-          # populate alternate tax tables
-          alt_tables = tax_tables.last(tax_tables.length-1)
-          alt_tables_element = tax_tables_element.add_element('alternate-tax-tables')
+        # populate alternate tax tables
+        alt_tables = tax_tables.last(tax_tables.length-1)
+        alt_tables_element = tax_tables_element.add_element('alternate-tax-tables')
 
-          alt_tables.each do |table|
-            table_element = alt_tables_element.add_element('alternate-tax-table')
-            table_element.add_attribute('name', table.name)
-            table_element.add_attribute('standalone', table.standalone.to_s)
+        alt_tables.each do |table|
+          table_element = alt_tables_element.add_element('alternate-tax-table')
+          table_element.add_attribute('name', table.name)
+          table_element.add_attribute('standalone', table.standalone.to_s)
 
-            rules_element = table_element.add_element('alternate-tax-rules')
-            table.rules.each do |rule|
-              alt_rule_element = rules_element.add_element('alternate-tax-rule')
-              alt_rule_element.add_element('rate').text=rule.rate.to_s
+          rules_element = table_element.add_element('alternate-tax-rules')
+          table.rules.each do |rule|
+            alt_rule_element = rules_element.add_element('alternate-tax-rule')
+            alt_rule_element.add_element('rate').text=rule.rate.to_s
 
-              self.process_area(alt_rule_element.add_element('tax-area'), rule.area)
-            end
-          end         
-        end
+            self.process_area(alt_rule_element.add_element('tax-area'), rule.area)
+          end
+        end         
+      end
 
 
-        def process_shopping_shopping_cart(parent, shopping_cart)
-          cart_element = parent.add_element('shopping-cart')
-          
-          # add <cart-expiration> tag to the cart if a time has been added to the cart
-          if not shopping_cart.expires_at.nil? then
-            cart_element.add_element('cart-expiration').add_element('good-until-date').text =
-              shopping_cart.expires_at.iso8601
-          end
-          
-          # add <merchant-private-data> to the cart if any has been set
-          if not shopping_cart.private_data.nil? then
-            self.process_hash(cart_element.add_element('merchant-private-data'), shopping_cart.private_data)
-          end
-          
-          # process the items in the cart
-          items_element = cart_element.add_element('items')
-          shopping_cart.items.each do |item|
-            self.process_item(items_element, item)
-          end
+      def process_shopping_shopping_cart(parent, shopping_cart)
+        cart_element = parent.add_element('shopping-cart')
+        
+        # add <cart-expiration> tag to the cart if a time has been added to the cart
+        if not shopping_cart.expires_at.nil? then
+          cart_element.add_element('cart-expiration').add_element('good-until-date').text =
+            shopping_cart.expires_at.iso8601
         end
         
-        # Adds an <item> tag to the tag parent with the appropriate values.
-        def process_item(parent, item)
-          item_element = parent.add_element('item')
-          
-          item_element.add_element('item-name').text = item.name
-          item_element.add_element('item-description').text = item.description
-          
-          item_element.add_element('unit-price', { 'currency' => item.unit_price.currency }).text = item.unit_price.to_s
-          item_element.add_element('quantity').text = item.quantity.to_i
-          
-          if not item.id.nil? then
-            item_element.add_element('merchant-item-id').text = item.id 
-          end
-          
-          if not item.private_data.nil? then
-            self.process_hash(item_element.add_element('merchant-private-item-data'), item.private_data)
-          end
-          
-          # The above was easy; now we need to get the appropriate tax table for this
-          # item. The Item class makes sure that the table exists.
-          if not item.tax_table.nil? then
-            item_element.add_element('tax-table-selector').text = item.tax_table.name
-          end
+        # add <merchant-private-data> to the cart if any has been set
+        if not shopping_cart.private_data.nil? then
+          self.process_hash(cart_element.add_element('merchant-private-data'), shopping_cart.private_data)
         end
         
-        # Adds an item for the given shipping method.
-        def process_shipping_method(parent, shipping_method)
-          if shipping_method.kind_of? PickupShipping then
-            process_pickup_shipping(parent, shipping_method)
-          elsif shipping_method.kind_of? FlatRateShipping then
-            process_flat_rate_shipping(parent, shipping_method)
-          else
-            raise "Unknown ShippingMethod type of #{shipping_method.inspect}!"
-          end
+        # process the items in the cart
+        items_element = cart_element.add_element('items')
+        shopping_cart.items.each do |item|
+          self.process_item(items_element, item)
+        end
+      end
+      
+      # Adds an <item> tag to the tag parent with the appropriate values.
+      def process_item(parent, item)
+        item_element = parent.add_element('item')
+        
+        item_element.add_element('item-name').text = item.name
+        item_element.add_element('item-description').text = item.description
+        
+        item_element.add_element('unit-price', { 'currency' => item.unit_price.currency }).text = item.unit_price.to_s
+        item_element.add_element('quantity').text = item.quantity.to_i
+        
+        if not item.id.nil? then
+          item_element.add_element('merchant-item-id').text = item.id 
+        end
+        
+        if not item.private_data.nil? then
+          self.process_hash(item_element.add_element('merchant-private-item-data'), item.private_data)
+        end
+        
+        # The above was easy; now we need to get the appropriate tax table for this
+        # item. The Item class makes sure that the table exists.
+        if not item.tax_table.nil? then
+          item_element.add_element('tax-table-selector').text = item.tax_table.name
+        end
+      end
+      
+      # Adds an item for the given shipping method.
+      def process_shipping_method(parent, shipping_method)
+        if shipping_method.kind_of? PickupShipping then
+          process_pickup_shipping(parent, shipping_method)
+        elsif shipping_method.kind_of? FlatRateShipping then
+          process_flat_rate_shipping(parent, shipping_method)
+        else
+          raise "Unknown ShippingMethod type of #{shipping_method.inspect}!"
         end
+      end
+      
+      def process_flat_rate_shipping(parent, shipping)
+        element = parent.add_element('flat-rate-shipping')
+        element.add_attribute('name', shipping.name)
+        element.add_element('price', { 'currency' => shipping.price.currency }).text = shipping.price.to_s
         
-        def process_flat_rate_shipping(parent, shipping)
-          element = parent.add_element('flat-rate-shipping')
-          element.add_attribute('name', shipping.name)
-          element.add_element('price', { 'currency' => shipping.price.currency }).text = shipping.price.to_s
+        if shipping.excluded_areas.length + shipping.allowed_areas.length > 0 then
+          restrictions_tag = element.add_element('shipping-restrictions')
           
-          if shipping.excluded_areas.length + shipping.allowed_areas.length > 0 then
-            restrictions_tag = element.add_element('shipping-restrictions')
+          if shipping.allowed_areas.length > 0 then
+            allowed_tag = restrictions_tag.add_element('allowed-areas')
             
-            if shipping.allowed_areas.length > 0 then
-              allowed_tag = restrictions_tag.add_element('allowed-areas')
-              
-              shipping.allowed_areas.each do |area|
-                self.process_area(allowed_tag, area)
-              end
+            shipping.allowed_areas.each do |area|
+              self.process_area(allowed_tag, area)
             end
-          
-            if shipping.excluded_areas.length > 0 then
-              excluded_tag = restrictions_tag.add_element('excluded-areas')
+          end
+        
+          if shipping.excluded_areas.length > 0 then
+            excluded_tag = restrictions_tag.add_element('excluded-areas')
 
-              shipping.excluded_areas.each do |area|
-                self.process_area(excluded_tag, area)
-              end
+            shipping.excluded_areas.each do |area|
+              self.process_area(excluded_tag, area)
             end
           end
         end
-        
-        def process_pickup_shipping(parent, shipping)
-          element = parent.add_element('pickup')
-          element.add_attribute('name', shipping.name)
-          element.add_element('price', { 'currency' => shipping.price.currency }).text = shipping.price.to_s
-        end
-        
-        # Adds an appropriate tag for the given Area subclass instance to the parent Element.
-        def process_area(parent, area)
-          if area.kind_of? UsZipArea then
-            parent.add_element('us-zip-area').add_element('zip-pattern').text = area.pattern
-          elsif area.kind_of? UsCountryArea then
-            parent.add_element('us-country-area', { 'country-area' => area.area })
-          elsif area.kind_of? UsStateArea then
-            parent.add_element('us-state-area').add_element('state').text = area.state
-          elsif area.kind_of? WorldArea then
-            parent.add_element('world-area')
-          elsif area.kind_of? PostalArea then
-            postal_area_element = parent.add_element('postal-area')
-            postal_area_element.add_element('country-code').text = area.country_code
+      end
+      
+      def process_pickup_shipping(parent, shipping)
+        element = parent.add_element('pickup')
+        element.add_attribute('name', shipping.name)
+        element.add_element('price', { 'currency' => shipping.price.currency }).text = shipping.price.to_s
+      end
+      
+      # Adds an appropriate tag for the given Area subclass instance to the parent Element.
+      def process_area(parent, area)
+        if area.kind_of? UsZipArea then
+          parent.add_element('us-zip-area').add_element('zip-pattern').text = area.pattern
+        elsif area.kind_of? UsCountryArea then
+          parent.add_element('us-country-area', { 'country-area' => area.area })
+        elsif area.kind_of? UsStateArea then
+          parent.add_element('us-state-area').add_element('state').text = area.state
+        elsif area.kind_of? WorldArea then
+          parent.add_element('world-area')
+        elsif area.kind_of? PostalArea then
+          postal_area_element = parent.add_element('postal-area')
+          postal_area_element.add_element('country-code').text = area.country_code
+          if area.postal_code_pattern then
             postal_area_element.add_element('postal-code-pattern').text = area.postal_code_pattern
-          else
-            raise "Area of unknown type: #{area.inspect}."
           end
+        else
+          raise "Area of unknown type: #{area.inspect}."
         end
-        
-        # Converts a Hash into an XML structure. The keys are converted to tag names. If
-        # the values are Hashs themselves then process_hash is called upon them. If the
-        # values are Arrays then a new element with the key's name will be created.
-        #
-        # If a value is an Array then this array will be flattened before it is processed.
-        # Thus, nested arrays are not allowed.
-        #
-        # === Example
-        #
-        #   process_hash(parent, { 'foo' => { 'bar' => 'baz' } })
-        #   
-        #   # will produce a structure that is equivalent to.
-        #
-        #   <foo>
-        #     <bar>baz</bar>
-        #   </foo>
-        #
-        #
-        #   process_hash(parent, { 'foo' => [ { 'bar' => 'baz' }, "d'oh", 2 ] })
-        #   
-        #   # will produce a structure that is equivalent to.
-        #
-        #   <foo>
-        #     <bar>baz</bar>
-        #   </foo>
-        #   <foo>d&amp;</foo>
-        #   <foo>2</foo>
-        def process_hash(parent, hash)
-          hash.each do |key, value|
-            if value.kind_of? Array then
-              value.flatten.each do |arr_entry|
-                if arr_entry.kind_of? Hash then
-                  self.process_hash(parent.add_element(self.str2tag_name(key.to_s)), arr_entry)
-                else
-                  parent.add_element(self.str2tag_name(key.to_s)).text = arr_entry.to_s
-                end
+      end
+      
+      # Converts a Hash into an XML structure. The keys are converted to tag names. If
+      # the values are Hashs themselves then process_hash is called upon them. If the
+      # values are Arrays then a new element with the key's name will be created.
+      #
+      # If a value is an Array then this array will be flattened before it is processed.
+      # Thus, nested arrays are not allowed.
+      #
+      # === Example
+      #
+      #   process_hash(parent, { 'foo' => { 'bar' => 'baz' } })
+      #   
+      #   # will produce a structure that is equivalent to.
+      #
+      #   <foo>
+      #     <bar>baz</bar>
+      #   </foo>
+      #
+      #
+      #   process_hash(parent, { 'foo' => [ { 'bar' => 'baz' }, "d'oh", 2 ] })
+      #   
+      #   # will produce a structure that is equivalent to.
+      #
+      #   <foo>
+      #     <bar>baz</bar>
+      #   </foo>
+      #   <foo>d&amp;</foo>
+      #   <foo>2</foo>
+      def process_hash(parent, hash)
+        hash.each do |key, value|
+          if value.kind_of? Array then
+            value.flatten.each do |arr_entry|
+              if arr_entry.kind_of? Hash then
+                self.process_hash(parent.add_element(self.str2tag_name(key.to_s)), arr_entry)
+              else
+                parent.add_element(self.str2tag_name(key.to_s)).text = arr_entry.to_s
               end
-            elsif value.kind_of? Hash then
-              process_hash(parent.add_element(self.str2tag_name(key.to_s)), value)
-            else
-              parent.add_element(self.str2tag_name(key.to_s)).text = value.to_s
             end
+          elsif value.kind_of? Hash then
+            process_hash(parent.add_element(self.str2tag_name(key.to_s)), value)
+          else
+            parent.add_element(self.str2tag_name(key.to_s)).text = value.to_s
           end
         end
+      end
+      
+      # Converts a string to a valid XML tag name. Whitespace will be converted into a dash/minus
+      # sign, non alphanumeric characters that are neither "-" nor "_" nor ":" will be stripped.
+      def str2tag_name(str)
+        str.gsub(%r{\s}, '-').gsub(%r{[^a-zA-Z0-9\-\_:]}, '')
+      end
+    end
+
+    class ChargeOrderCommandXmlGenerator < CommandXmlGenerator
+      
+      protected
+
+      def process_command(command)
+        root = super
+        process_money(root, command.amount) if command.amount
+      end
+
+      # add the amount element to the charge command
+      def process_money(parent, money)
+        amount_element = parent.add_element('amount')
+        amount_element.text = money.to_s
+        amount_element.add_attribute('currency', money.currency)
+      end
+    end
+
+    class RefundOrderCommandXmlGenerator < CommandXmlGenerator
+
+      protected
+
+      def process_command(command)
+        root = super
+        process_money(root, command.amount) if command.amount
+        process_comment(root, command.comment) if command.comment
+        process_reason(root, command.reason)
+      end
+
+      # add the amount element to the refund command
+      def process_money(parent, money)
+        amount_element = parent.add_element('amount')
+        amount_element.text = money.to_s
+        amount_element.add_attribute('currency', money.currency)
+      end
+      
+      # add the comment element to the refund command
+      def process_comment(parent, comment)
+        comment_element = parent.add_element('comment')
+        comment_element.text = comment
+      end
+      
+      # add the reason element to the refund command
+      def process_reason(parent, reason)
+        reason_element = parent.add_element('reason')
+        reason_element.text = reason
+      end
+    end
+    
+    class CancelOrderCommandXmlGenerator < CommandXmlGenerator
+
+      protected
+
+      def process_command(command)
+        root = super
+        root.add_element('reason').text = command.reason
         
-        # Converts a string to a valid XML tag name. Whitespace will be converted into a dash/minus
-        # sign, non alphanumeric characters that are neither "-" nor "_" nor ":" will be stripped.
-        def str2tag_name(str)
-          str.gsub(%r{\s}, '-').gsub(%r{[^a-zA-Z0-9\-\_:]}, '')
+        if command.comment then
+          root.add_element('comment').text = command.comment
+        end        
+      end
+
+    end
+
+    class AuthorizeOrderCommandXmlGenerator < CommandXmlGenerator
+
+      protected
+
+      def process_command(command)        
+        super
+      end
+    end
+ 
+    class ProcessOrderCommandXmlGenerator < CommandXmlGenerator
+
+      protected
+
+      def process_command(command)        
+        super
+      end
+    end
+
+    class AddMerchantOrderNumberCommandXmlGenerator < CommandXmlGenerator
+
+      protected
+
+      def process_command(command)        
+        root = super
+        process_merchant_order_number(root, command.merchant_order_number)
+      end
+      
+      def process_merchant_order_number(parent, merchant_order_number)
+        merchant_order_number_element = parent.add_element('merchant-order-number')
+        merchant_order_number_element.text = merchant_order_number
+      end
+    end
+    
+    class DeliverOrderCommandXmlGenerator < CommandXmlGenerator
+
+      protected
+
+      def process_command(command)        
+        root = super
+        # Add tracking info
+        process_tracking_data(root, command.carrier, command.tracking_number)
+        root.add_element('send-email').text = command.send_email.to_s
+      end
+
+      def process_tracking_data(parent, carrier, tracking_number)
+        if carrier and tracking_number then
+          element = parent.add_element('tracking-data')
+          element.add_element('carrier').text = carrier
+          element.add_element('tracking-number').text = tracking_number
         end
+      end
+    end
+    
+    class AddTrackingDataCommandXmlGenerator < CommandXmlGenerator
+      
+      protected
+      
+      def process_command(command)
+        root = super
+        # Add tracking info
+        process_tracking_data(root, command.carrier, command.tracking_number)
+      end
+      
+      def process_tracking_data(parent, carrier, tracking_number)
+        if carrier and tracking_number then
+          element = parent.add_element('tracking-data')
+          element.add_element('carrier').text = carrier
+          element.add_element('tracking-number').text = tracking_number
+        end
+      end
+    end
+    
+    class SendBuyerMessageCommandXmlGenerator < CommandXmlGenerator
+
+      protected
+
+      def process_command(command)        
+        root = super
+        root.add_element('message').text = command.message
+        if not command.send_email.nil? then
+          root.add_element('send-email').text = command.send_email.to_s
+        end
+      end
+    end
+    
+    class ArchiveOrderCommandXmlGenerator < CommandXmlGenerator
+
+      protected
+
+      def process_command(command)        
+        super
+      end
+    end
+    
+    class UnarchiveOrderCommandXmlGenerator < CommandXmlGenerator
+
+      protected
+
+      def process_command(command)        
+        super
+      end
     end
+    
   end
 end