ruby_omx 0.0.3 → 0.0.4

data/README.rdoc

@@ -1,3 +1,4 @@
 = RubyOmx
 
-This project uses MIT-LICENSE.
+This project uses MIT-LICENSE.
+

data/lib/ruby_omx/base.rb

@@ -4,14 +4,13 @@ module RubyOmx
 	class Base
   	attr_accessor :connection
 
-    def self.debug; @@debug ||= false end
-    def self.debug=(bool); @@debug = bool end
+    #def self.debug; @@debug ||= false end
+    #def self.debug=(bool); @@debug = bool end
       
     def initialize(options ={})
       @http_biz_id = options['http_biz_id']
       @udi_auth_token = options['udi_auth_token']
-      raise "Must supply udi auth token" unless @udi_auth_token
-      raise "Must supply http biz ID" unless @http_biz_id
+      raise RubyOmx::MissingAccessKey.new(['udi auth token', 'http biz id']) unless @udi_auth_token && @http_biz_id
       @connection = RubyOmx::Connection.connect(options)
     end
       
@@ -20,14 +19,14 @@ module RubyOmx
       @connection
     end
 
-    def connected?
-      !@connection.nil?
-    end
+    #def connected?
+    #  !@connection.nil?
+    #end
 
-    def disconnect
-      @connection.http.finish if @connection.persistent?
-      @connection = nil
-    end
+    #def disconnect
+    #  @connection.http.finish if @connection.persistent?
+    #  @connection = nil
+    #end
       
     # Wraps the current connection's request method and picks the appropriate response class to wrap the response in.
     # If the response is an error, it will raise that error as an exception. All such exceptions can be caught by rescuing

data/lib/ruby_omx/connection.rb

@@ -1,11 +1,9 @@
 module RubyOmx
      
   class Connection
-    # Static/Class methods
-    class << self
-      def connect(options = {})
-        new(options)
-      end
+
+    def self.connect(options = {})
+      new(options)
     end
       
     def initialize(params = {})
@@ -13,7 +11,6 @@ module RubyOmx
       # These values are essential to establishing a connection
       @udi_auth_token   = params['udi_auth_token']
       @server           = params['server'] || RubyOmx::DEFAULT_HOST + "?UDIAuthToken=#{@udi_auth_token}"
-      @persistent       = params['persistent'] || false
       @http_biz_id 			= params['http_biz_id']
 			@path = URI.parse(@server).request_uri
         

data/lib/ruby_omx/exceptions.rb

@@ -1,6 +1,6 @@
 module RubyOmx
     
-  # Abstract super class of all Amazon::MWS exceptions
+  # Abstract super class of all RubyOmx exceptions
   class RubyOmxException < StandardError
   end
     
@@ -8,14 +8,14 @@ module RubyOmx
   class InvalidOption < RubyOmxException
   end
     
-  class InvalidMessageType < RubyOmxException
-  end
+  #class InvalidMessageType < RubyOmxException
+  #end
     
-  class InvalidReportType < RubyOmxException
-  end
+  #class InvalidReportType < RubyOmxException
+  #end
     
-  class InvalidSchedule < RubyOmxException
-  end
+  #class InvalidSchedule < RubyOmxException
+  #end
     
   class MissingConnectionOptions < RubyOmxException
   end
@@ -66,7 +66,7 @@ module RubyOmx
     end
   end
     
-  # Raised if either the access key id or secret access key arguments are missing when establishing a connection.
+  # Raised if the access key arguments are missing when establishing a connection.
   class MissingAccessKey < InvalidOption
     def initialize(missing_keys)
       key_list = missing_keys.map {|key| key.to_s}.join(' and the ')
@@ -77,7 +77,7 @@ module RubyOmx
   # Raised if a request is attempted before any connections have been established.
   class NoConnectionEstablished < RubyOmxException
     def initialize
-      super("\nPlease use Amazon::MWS::Base.establish_connection! before making API calls.")
+      super("\nPlease use RubyOmx::Base.establish_connection! before making API calls.")
     end
   end
         

data/lib/ruby_omx/items.rb

@@ -6,10 +6,10 @@ module RubyOmx
 			required_fields = [
 				params[:item_code]
 			]
-			raise MissingOrderOptions if required_fields.any? {|option| option.nil?}
+			raise MissingItemOptions if required_fields.any? {|option| option.nil?}
 			item_code = params[:item_code]
-			raw_xml = params[:raw_xml] ||= 0
-					
+			raw_xml = params[:raw_xml] ||= false
+
 			doc = Nokogiri::XML::Document.new
 			root_tag = RubyOmx.add_child_helper(doc,'ItemInformationRequest','version','1.00',nil)
 			udi_parameter = RubyOmx.add_child_helper(root_tag,'UDIParameter',nil,nil,nil)
@@ -17,22 +17,22 @@ module RubyOmx
 			RubyOmx.add_child_helper(udi_parameter,'Parameter','key','ItemCode',item_code)
 			RubyOmx.add_child_helper(udi_parameter,'Parameter','key','OutputSubItemAttributes','True')
       response = post(doc.to_xml)
-      if raw_xml==1
+      if raw_xml==true || raw_xml==1
       	return response
       else
-      	ItemInfoResponse.format(response)
+      	ItemInformationResponse.format(response)
       end
     
     end
 
 		#CustomItemAttributeInformationRequest (CIAIR200)	This request type lists all the custom item attributes names and values for a given item code or list of item codes, in one or all custom item attribute groups.
-		def get_custom_item_info(params ={})
+		def get_custom_item_attribute_info(params ={})
 			required_fields = [
 				params[:item_code]
 			]
-			raise MissingOrderOptions if required_fields.any? {|option| option.nil?}
+			raise MissingItemOptions if required_fields.any? {|option| option.nil?}
 			item_code = params[:item_code]
-			raw_xml = params[:raw_xml] ||= 0
+			raw_xml = params[:raw_xml] ||= false
 		
 			doc = Nokogiri::XML::Document.new
 			root_tag = RubyOmx.add_child_helper(doc,'CustomItemAttributeInformationRequest','version','2.00',nil)
@@ -41,10 +41,10 @@ module RubyOmx
 			RubyOmx.add_child_helper(udi_parameter,'Parameter','key','ItemCode',item_code)
 			RubyOmx.add_child_helper(udi_parameter,'Parameter','key','AttributeGroupID','All')
       response = post(doc.to_xml)
-      if raw_xml==1
+      if raw_xml==true || raw_xml==1
       	return response
       else
-      	ItemInfoResponse.format(response)
+      	CustomItemAttributeInformationResponse.format(response)
       end
 		end
 		

data/lib/ruby_omx/orders.rb

@@ -1,6 +1,24 @@
 module RubyOmx
   module Orders
+    
+    def build_udoa_request(params)
+		  UDOARequest.new(params.merge({:http_biz_id=>@http_biz_id, :udi_auth_token=>@udi_auth_token}))
+		end
 		
+		def send_udoa_request(params)
+		  request = build_udoa_request(params)
+      response = post(request.to_xml)
+      if request.raw_xml==true || request.raw_xml==1
+      	return response
+      end
+      UDOAResponse.format(response)		  
+		end
+		
+		def append_order(params={})
+		  send_udoa_request(params)
+		end
+
+=begin		
 		#UniversalDirectOrderAppending (UDOA200)	This request type is used to create orders in the application.
 		def append_order(params ={})
 			
@@ -15,43 +33,68 @@ module RubyOmx
 				params[:method_code],
 				params[:total_amount]
 			]
-			#raise MissingOrderOptions if required_fields.any? {|option| option.nil?}			        
+			raise MissingOrderOptions if required_fields.any? {|option| option.nil?}			        
 			
-			raw_xml = params[:raw_xml] ||= 0
+			raw_xml = params[:raw_xml] ||= false
 
 			doc = Nokogiri::XML::Document.new
 			root_tag = RubyOmx.add_child_helper(doc,'UDOARequest','version','2.00',nil)
 			
 			udi_parameter = RubyOmx.add_child_helper(root_tag,'UDIParameter',nil,nil,nil)
-				RubyOmx.add_child_helper(udi_parameter,'Parameter','key','HTTPBizID',@http_biz_id)
-				RubyOmx.add_child_helper(udi_parameter,'Parameter','key','UDIAuthToken',@udi_auth_token)
-				RubyOmx.add_child_helper(udi_parameter,'Parameter','key','QueueFlag',params[:queue_flag] ||= 'False')		# Determines whether any orders with errors will be stored in the OrderMotion "Outside Order Queue",  to be corrected by an OrderMotion user before resubmission. If set to "True", almost all orders will be   accepted by OrderMotion, but additional order information will only be returned in the response if the order   is successfully placed. Otherwise, any order with any error (eg invalid ZIP code) will be rejected.
-				RubyOmx.add_child_helper(udi_parameter,'Parameter','key','Keycode',params[:keycode])
-				RubyOmx.add_child_helper(udi_parameter,'Parameter','key','VerifyFlag',params[:verify_flag] ||= 'True')		# Determines whether a successful order should be saved, or only verified/calculated. When set to "True", OrderMotion will behave as if the order was placed, but not return an Order Number in the response.
-				RubyOmx.add_child_helper(udi_parameter,'Parameter','key','Vendor',params[:vendor] ||= nil)
+			RubyOmx.add_child_helper(udi_parameter,'Parameter','key','HTTPBizID',@http_biz_id)
+			RubyOmx.add_child_helper(udi_parameter,'Parameter','key','UDIAuthToken',@udi_auth_token)
+			RubyOmx.add_child_helper(udi_parameter,'Parameter','key','QueueFlag',params[:queue_flag] ||= 'False')		# Determines whether any orders with errors will be stored in the OrderMotion "Outside Order Queue",  to be corrected by an OrderMotion user before resubmission. If set to "True", almost all orders will be   accepted by OrderMotion, but additional order information will only be returned in the response if the order   is successfully placed. Otherwise, any order with any error (eg invalid ZIP code) will be rejected.
+			RubyOmx.add_child_helper(udi_parameter,'Parameter','key','Keycode',params[:keycode])
+			RubyOmx.add_child_helper(udi_parameter,'Parameter','key','VerifyFlag',params[:verify_flag] ||= 'True')		# Determines whether a successful order should be saved, or only verified/calculated. When set to "True", OrderMotion will behave as if the order was placed, but not return an Order Number in the response.
+			RubyOmx.add_child_helper(udi_parameter,'Parameter','key','Vendor',params[:vendor] ||= nil)
 			
 			header = RubyOmx.add_child_helper(root_tag,'Header',nil,nil,nil)
-				RubyOmx.add_child_helper(header,'StoreCode',nil,nil,params[:store_code] ||= '')
-				RubyOmx.add_child_helper(header,'OrderID',nil,nil,params[:order_id])
-				RubyOmx.add_child_helper(header,'OrderDate',nil,nil,params[:order_date]) # Dates are almost the same as the W3C Schema "date" type, but with a space instead of the "T" separating the date from the time.
-				RubyOmx.add_child_helper(header,'OriginType',nil,nil,params[:origin_type] ||= '2') # 2 = phone order, 3 = internet order
+			RubyOmx.add_child_helper(header,'StoreCode',nil,nil,params[:store_code] ||= '')
+			RubyOmx.add_child_helper(header,'OrderID',nil,nil,params[:order_id])
+			RubyOmx.add_child_helper(header,'OrderDate',nil,nil,params[:order_date]) # Dates are almost the same as the W3C Schema "date" type, but with a space instead of the "T" separating the date from the time.
+			RubyOmx.add_child_helper(header,'OriginType',nil,nil,params[:origin_type] ||= '2') # 2 = phone order, 3 = internet order
 			
 			customer = RubyOmx.add_child_helper(root_tag,'Customer',nil,nil,nil)			
-				address = RubyOmx.add_child_helper(customer,'Address','type','BillTo',nil)
-					RubyOmx.add_child_helper(address,'TitleCode',nil,nil,params[:title_code] ||= '0')
-					RubyOmx.add_child_helper(address,'Firstname',nil,nil,params[:first_name] ||= 'Test')
-					RubyOmx.add_child_helper(address,'Lastname',nil,nil,params[:last_name] ||= 'Test')
-					RubyOmx.add_child_helper(address,'Address1',nil,nil,params[:address1] ||= nil)
-					RubyOmx.add_child_helper(address,'Address2',nil,nil,params[:address2] ||= nil)
-					RubyOmx.add_child_helper(address,'City',nil,nil,params[:city] ||=nil)
-					RubyOmx.add_child_helper(address,'State',nil,nil,params[:state] ||= nil)
-					RubyOmx.add_child_helper(address,'ZIP',nil,nil,params[:zip] ||=nil)
-					RubyOmx.add_child_helper(address,'TLD',nil,nil,params[:tld] ||=nil)
-					RubyOmx.add_child_helper(address,'PhoneNumber',nil,nil,params[:phone] ||= nil)
-					RubyOmx.add_child_helper(address,'Email',nil,nil,params[:email] ||= nil)
+			address = RubyOmx.add_child_helper(customer,'Address','type','BillTo',nil)
+			RubyOmx.add_child_helper(address,'TitleCode',nil,nil,params[:title_code] ||= '0')
+			RubyOmx.add_child_helper(address,'Firstname',nil,nil,params[:first_name] ||= 'Test')
+			RubyOmx.add_child_helper(address,'Lastname',nil,nil,params[:last_name] ||= 'Test')
+			RubyOmx.add_child_helper(address,'Address1',nil,nil,params[:address1] ||= nil)
+			RubyOmx.add_child_helper(address,'Address2',nil,nil,params[:address2] ||= nil)
+			RubyOmx.add_child_helper(address,'City',nil,nil,params[:city] ||=nil)
+			RubyOmx.add_child_helper(address,'State',nil,nil,params[:state] ||= nil)
+			RubyOmx.add_child_helper(address,'ZIP',nil,nil,params[:zip] ||=nil)
+			RubyOmx.add_child_helper(address,'TLD',nil,nil,params[:tld] ||=nil)
+			RubyOmx.add_child_helper(address,'PhoneNumber',nil,nil,params[:phone] ||= nil)
+			RubyOmx.add_child_helper(address,'Email',nil,nil,params[:email] ||= nil)
 						
 			shipping_info = RubyOmx.add_child_helper(root_tag,'ShippingInformation',nil,nil,nil)
-				RubyOmx.add_child_helper(shipping_info,'MethodCode',nil,nil,params[:method_code])
+			
+  		# Shipping Methods (numeric inputs to MethodCode)
+  		# 0	UPS Ground (1-4 Days Transit Time)	 	0.00	
+  		# 2	Drop-Ship Montague	1	40.00	
+  		# 1	UPS Free UPS Ground Shipping (US ONLY)	0	0.00	
+  		# 3	UPS Ground	003	0.00	
+  		# 4	UPS 2nd Day Air	002	0.00	
+  		# 5	UPS Next Day Air	001	0.00	
+  		# 7	UPS 3 Day Select	004	0.00	
+  		# 12	UPS Worldwide Expedited	008	0.00	
+  		# 13	UPS Worldwide Express	009	0.00	
+  		# 14	UPS Worldwide Express Plus	010	0.00	
+  		# 6	International Flat Rate via USPS Express	2	35.00
+  		# 8	USPS Express	 	29.99	
+  		# 9	USPS Priority	 	6.99	
+  		# 10	Int. Express USPS	 	0.00	
+  		# 11	Int. Priority USPS	 	0.00	
+  		# 15	USPS Domestic Priority Flat Rate	 	6.99	
+  		# 16	USPS Domestic Express Flat Rate	 	34.99	
+  		# 17	USPS International Global Priority	 	29.99	
+  		# 18	USPS International Global Express	 	39.99	
+  		# 19	Next Day Air (USA Only)	 	0.00	
+  		# 20	2nd Day Air (USA Only)	 	0.00	
+  		# 21	Priority Mail (Free $74.99 and above), 3-6 days 0.00			
+			RubyOmx.add_child_helper(shipping_info,'MethodCode',nil,nil,params[:method_code])
+			
 			#	address = RubyOmx.add_child_helper(shipping_info,'Address','type','ShipTo',nil)
 			#		RubyOmx.add_child_helper(address,'TitleCode',nil,nil,'0')
 			#		RubyOmx.add_child_helper(address,'Firstname',nil,nil,'Test') #TODO capture the first and last name for billing, not just shipping
@@ -64,11 +107,11 @@ module RubyOmx
 			#		RubyOmx.add_child_helper(address,'TLD',nil,nil,'US')
 				#	RubyOmx.add_child_helper(address,'PhoneNumber',nil,nil,nil)
 				#	RubyOmx.add_child_helper(address,'Email',nil,nil,nil)
-				RubyOmx.add_child_helper(shipping_info,'ShippingAmount',nil,nil,params[:shipping_amount] ||= '0.00')		
+			RubyOmx.add_child_helper(shipping_info,'ShippingAmount',nil,nil,params[:shipping_amount] ||= '0.00')		
 				#RubyOmx.add_child_helper(shipping_info,'HandlingAmount',nil,nil,'0')		
 				#RubyOmx.add_child_helper(shipping_info,'SpecialInstructions',nil,nil,'0')
-				RubyOmx.add_child_helper(shipping_info,'GiftWrapping',nil,nil,params[:gift_wrapping] ||= 'False')								
-				RubyOmx.add_child_helper(shipping_info,'GiftMessage',nil,nil,params[:gift_message] ||= nil)				
+			RubyOmx.add_child_helper(shipping_info,'GiftWrapping',nil,nil,params[:gift_wrapping] ||= 'False')								
+			RubyOmx.add_child_helper(shipping_info,'GiftMessage',nil,nil,params[:gift_message] ||= nil)				
 							
 			payment_type = RubyOmx.add_child_helper(root_tag,'Payment','type',params[:payment_type] ||= '6',nil) #6 for open invoice
 			#	RubyOmx.add_child_helper(payment_type,'CardNumber',nil,nil,'4111111111111111')
@@ -81,36 +124,34 @@ module RubyOmx
 				
 			order_detail = RubyOmx.add_child_helper(root_tag,'OrderDetail',nil,nil,nil)
 				
-				i=1
-				params[:line_items].each do |item|
-					raise MissingItemOptions if item[:item_code].nil?
-					line_item = RubyOmx.add_child_helper(order_detail,'LineItem','lineNumber',i.to_s,nil) 	
-						RubyOmx.add_child_helper(line_item,'ItemCode',nil,nil,item[:item_code])
-						RubyOmx.add_child_helper(line_item,'Quantity',nil,nil,item[:quantity] ||= '1')
-						if !item[:unit_price].nil?
-							RubyOmx.add_child_helper(line_item,'UnitPrice',nil,nil,item[:unit_price])
-						end
-						#RubyOmx.add_child_helper(line_item,'StandingOrder','configurationID','5',nil)
-						#customization = RubyOmx.add_child_helper(line_item,'ItemCustomizationData',nil,nil,nil)
-						#field = RubyOmx.add_child_helper(customization,'CustomizationField','fieldID','127',nil)
-						#RubyOmx.add_child_helper(field,'Value',nil,nil,'demoText')
-						i+=1
-				end
+			i=1
+			params[:line_items].each do |item|
+				raise MissingItemOptions if item[:item_code].nil?
+				line_item = RubyOmx.add_child_helper(order_detail,'LineItem','lineNumber',i.to_s,nil) 	
+					RubyOmx.add_child_helper(line_item,'ItemCode',nil,nil,item[:item_code])
+					RubyOmx.add_child_helper(line_item,'Quantity',nil,nil,item[:quantity] ||= '1')
+					if !item[:unit_price].nil?
+						RubyOmx.add_child_helper(line_item,'UnitPrice',nil,nil,item[:unit_price])
+					end
+					#RubyOmx.add_child_helper(line_item,'StandingOrder','configurationID','5',nil)
+					#customization = RubyOmx.add_child_helper(line_item,'ItemCustomizationData',nil,nil,nil)
+					#field = RubyOmx.add_child_helper(customization,'CustomizationField','fieldID','127',nil)
+					#RubyOmx.add_child_helper(field,'Value',nil,nil,'demoText')
+					i+=1
+			end
 			
 			check = RubyOmx.add_child_helper(root_tag,'Check',nil,nil,nil)
 			RubyOmx.add_child_helper(check,'TotalAmount',nil,nil,params[:total_amount])
 								    
       response = post(doc.to_xml)
-      if raw_xml==1
+      if raw_xml==true || raw_xml==1
       	return response
       else
-       	AppendOrderResponse.format(response)
+       	UDOAResponse.format(response)
       end
     end
     
     #OrderDetailUpdateRequest (ODUR100)	This request type enables you to update certain data for orders.
-    
-    
 		#CancellationHistoryRequest (CHR100)	This request type lists all the cancellations that have occurred between two dates.
 		#InvoiceProcessRequest (IPR100)	This command takes an order number, and runs the invoicing and credit memo processes against the order if there are any order lines that can be subject to an invoice or credit memo, or if there are returns on the order.
 		#OrderCancellationRequest (OCR100)	This request type enables you to cancel some or all the line items in an order.		
@@ -118,5 +159,6 @@ module RubyOmx
 		#OrderSecondaryStatusUpdateRequest (OSSUR100)	This request type enables you to set the secondary status of the OrderLines.
 		#OrderUpdateRequest (OUR200)	This request type enables you to change the Payment Plan of an order, as well as the basis date for payment plan calculation, and also update the "Alt ID 2" (a.k.a "Reference") field of the order.
 		#OrderWaitDateUpdateRequest (OWDUR100)	This request type enables you to change the Wait Date of an existing order.  
+=end
   end
 end

data/lib/ruby_omx/response/custom_item_attr_info_response.rb

@@ -0,0 +1,43 @@
+module RubyOmx
+    
+  class CustomItemAttribute < Response
+    xml_name "Attribute"
+    xml_reader :attribute_id, :from => '@attributeID'
+    xml_reader :name, :from => '@name'
+    xml_reader :value, :from => :content
+  end
+  
+  class CIAIResponseItem < Response
+    xml_name "Item"
+    xml_reader :item_code, :from => '@itemCode'
+    xml_reader :active, :from => '@active'
+    xml_reader :attributes, :as => [CustomItemAttribute]
+  end
+    
+  class CustomItemAttributeInformationResponse < Response
+    xml_name "CustomItemAttributeInformationResponse"
+         
+    xml_reader :items, :as => [CIAIResponseItem], :in => "Items"
+		xml_reader :success
+		 	
+		 	#xml_reader :item_code, :from => '@itemCode', :in => "Item"
+		 	#xml_reader :active, :from => '@active', :in => "Item"
+		 	#xml_reader :incomplete, :from => '@incomplete', :in => "Item"
+		 	#xml_reader :parent_item_code, :from => '@parentItemCode', :in => "Item"
+		 	
+		 	
+		 	#xml_reader :product_name, :in => "Item"
+		 	#xml_reader :available_inventory, :as => Integer, :in => "Item"
+		 	#xml_reader :sub_item_count, :as => Integer, :in => "Item"
+		 	#xml_reader :last_updated_date, :as => DateTime, :in => "Item"
+		 	#xml_reader :weight, :as => Float, :in => "Item"
+		 	
+		 	#xml_reader :price_type, :from => '@priceType', :in => 'Item/PriceData'
+		 	#xml_reader :price_quantity, :from => '@quantity', :in => 'Item/PriceData/Price', :as => Integer
+		 	#xml_reader :price_amount, :from => 'Amount', :in => 'Item/PriceData/Price', :as => Float
+		 	#xml_reader :price_addl_sh, :from => 'AdditionalSH', :in => 'Item/PriceData/Price', :as => Float
+		 	#xml_reader :bonus, :in => 'Item/PriceData/Price', :as => Float
+		 	
+  end
+    
+end

data/lib/ruby_omx/response/item_info_response.rb

@@ -1,28 +1,30 @@
 module RubyOmx
     
-    class ItemInfoResponse < Response
-      #xml_name "Item"
-      xml_name "ItemInformationResponse"
-      #result = "Item"
+  class ItemInformationResponse < Response
+    xml_name "ItemInformationResponse"
 
-		 	xml_reader :item_code, :from => '@itemCode', :in => "Item"
-		 	xml_reader :active, :from => '@active', :in => "Item"
-		 	xml_reader :incomplete, :from => '@incomplete', :in => "Item"
-		 	xml_reader :parent_item_code, :from => '@parentItemCode', :in => "Item"
+	 	xml_reader :item_code, :from => '@itemCode', :in => "Item"
+	 	xml_reader :active, :from => '@active', :in => "Item"
+	 	xml_reader :incomplete, :from => '@incomplete', :in => "Item"
+	 	xml_reader :parent_item_code, :from => '@parentItemCode', :in => "Item"
 		 	
 		 	
-		 	xml_reader :product_name, :in => "Item"
-		 	xml_reader :available_inventory, :as => Integer, :in => "Item"
-		 	xml_reader :sub_item_count, :as => Integer, :in => "Item"
-		 	xml_reader :last_updated_date, :as => DateTime, :in => "Item"
-		 	xml_reader :weight, :as => Float, :in => "Item"
+	 	xml_reader :product_name, :in => "Item"
+	 	xml_reader :available_inventory, :as => Integer, :in => "Item"
+	 	#xml_reader :sub_item_count, :as => Integer, :in => "Item"
+	 	#xml_reader :last_updated_date, :as => DateTime, :in => "Item"
+	 	#xml_reader :weight, :as => Float, :in => "Item"
 		 	
-		 	xml_reader :price_type, :from => '@priceType', :in => 'Item/PriceData'
-		 	xml_reader :price_quantity, :from => '@quantity', :in => 'Item/PriceData/Price', :as => Integer
-		 	xml_reader :price_amount, :from => 'Amount', :in => 'Item/PriceData/Price', :as => Float
-		 	xml_reader :price_addl_sh, :from => 'AdditionalSH', :in => 'Item/PriceData/Price', :as => Float
-		 	xml_reader :bonus, :in => 'Item/PriceData/Price', :as => Float
-		 	
-    end
+	 	xml_reader :price_type, :from => '@priceType', :in => 'Item/PriceData'
+    xml_reader :quantity_type, :from => '@quantityType', :in => 'Item/PriceData'
+	 	xml_reader :price_quantity, :from => '@quantity', :in => 'Item/PriceData/Price', :as => Integer
+    xml_reader :price_multiplier, :from => '@multiplier', :in => 'Item/PriceData/Price'
+      
+	 	xml_reader :price_amount, :from => 'Amount', :in => 'Item/PriceData/Price', :as => Float
+	 	xml_reader :price_addl_sh, :from => 'AdditionalSH', :in => 'Item/PriceData/Price', :as => Float
+	 	xml_reader :price_bonus, :from => 'Bonus', :in => 'Item/PriceData/Price', :as => Float
+	 	
+	 	xml_reader :custom_attributes, :as => [CustomItemAttribute], :in => 'Item/CustomItemAttribute'
+  end
     
 end

data/lib/ruby_omx/response/udoa_request.rb

@@ -0,0 +1,107 @@
+module RubyOmx
+
+  class UDIParameter < Response
+    xml_name "Parameter"
+    xml_accessor :key, :from => '@key'
+    xml_accessor :value, :from => :content
+  end
+    
+  class Address < Response
+    xml_name "Address"
+    xml_accessor :address_type, :from => '@type'
+    xml_accessor :title_code, :company, :firstname, :lastname, :address1, :address2, :city, :state, :phone_number, :email
+    xml_accessor :zip, :from => 'ZIP'
+    xml_accessor :tld, :from => 'TLD'
+  end
+
+  class LineItem < Response
+    xml_name "LineItem"
+    xml_accessor :line_number, :from => '@lineNumber'
+    xml_accessor :item_code
+    xml_accessor :quantity, :as => Integer
+    xml_accessor :unit_price, :as => Float
+  end
+    
+  class CustomField < Response
+    xml_name 'Field'
+    xml_accessor :field_id, :from => '@fieldID'
+    xml_accessor :line_number, :from => '@lineNumber'
+    xml_accessor :value, :from => :content
+  end
+    
+  class Flag < Response
+    xml_name 'Flag'
+    xml_accessor :name, :from => '@name'
+    xml_accessor :value, :from => :content      
+  end
+
+  class UDOARequest < Response
+    def initialize(a=nil)
+      if !a.nil?
+        http_biz_id = a.delete(:http_biz_id)
+        udi_auth_token = a.delete(:udi_auth_token)
+        
+  		  required_fields = [:keycode, :queue_flag, :verify_flag, :order_date, :order_id, :bill_to, :line_items, :method_code]
+  		  raise MissingOrderOptions if required_fields.any? { |option| a[option].nil? }
+        super
+        self.version = a[:version] ||= '2.00'
+        self.payment_type = a[:payment_type] ||= '6'  #6 for open invoice
+        self.origin_type = a[:origin_type] ||= '2'    # 2 = phone order, 3 = internet order      
+        self.udi_parameters = []
+        self.udi_parameters << UDIParameter.new({:key=>'UDIAuthToken', :value=>udi_auth_token})
+        self.udi_parameters << UDIParameter.new({:key=>'HTTPBizID', :value=>http_biz_id})
+        self.udi_parameters << UDIParameter.new({:key=>'Keycode', :value=>a[:keycode]})
+        self.udi_parameters << UDIParameter.new({:key=>'VerifyFlag', :value=>a[:verify_flag] ||= 'True' }) # Determines whether a successful order should be saved, or only verified/calculated. When set to "True", OrderMotion will behave as if the order was placed, but not return an Order Number in the response.
+        self.udi_parameters << UDIParameter.new({:key=>'QueueFlag', :value=>a[:queue_flag] ||= 'False' })  # Determines whether any orders with errors will be stored in the OrderMotion "Outside Order Queue",  to be corrected by an OrderMotion user before resubmission. If set to "True", almost all orders will be   accepted by OrderMotion, but additional order information will only be returned in the response if the order   is successfully placed. Otherwise, any order with any error (eg invalid ZIP code) will be rejected.
+        self.udi_parameters << UDIParameter.new({:key=>'Vendor', :value=>a[:vendor] }) if !a[:vendor].nil?           
+        self.bill_to = Address.new(a[:bill_to])
+        self.ship_to = Address.new(a[:ship_to])
+      
+        i = 0
+        self.line_items = a[:line_items].collect { |h|
+          i+=1
+          h[:line_number] = h[:line_number] ||= i  # Provide line numbers if they are omitted
+          LineItem.new(h)
+        }
+        
+        self.custom_fields = a[:custom_fields].collect { |h| CustomField.new(h) } if !a[:custom_fields].nil?
+        self.flags = a[:flags].collect { |h| Flag.new(h) } if !a[:flags].nil?
+      else
+        super
+      end
+    end
+      
+    attr_accessor :raw_xml, :keycode, :queue_flag, :verify_flag, :vendor
+      
+    xml_name "UDOARequest"
+    xml_accessor :version, :from => '@version'
+    xml_accessor :udi_parameters, :as => [UDIParameter], :in => 'UDIParameter'
+    xml_accessor :order_date, :in => 'Header', :as => DateTime  # Dates are almost the same as the W3C Schema "date" type, but with a space instead of the "T" separating the date from the time.
+    xml_accessor :order_id, :in => 'Header', :from => 'OrderID'
+    xml_accessor :origin_type, :in => 'Header'
+    xml_accessor :store_code, :in => 'Header'
+    xml_accessor :bill_to, :as => Address, :in => 'Customer'
+    xml_accessor :flags, :as => [Flag], :in => 'Customer/FlagData'
+    xml_accessor :ship_to, :as => Address, :in => 'ShippingInformation'
+
+    xml_accessor :method_code, :in => 'ShippingInformation', :as => Integer
+    xml_accessor :shipping_amount, :in => 'ShippingInformation', :as => Float
+    xml_accessor :handling_amount, :in => 'ShippingInformation', :as => Float
+    xml_accessor :special_instructions, :in => 'ShippingInformation'
+    xml_accessor :gift_wrapping, :in => 'ShippingInformation'
+    xml_accessor :gift_message, :in => 'ShippingInformation'            
+
+    xml_accessor :payment_type, :in => 'Payment', :from => '@type'
+  	xml_accessor :card_number, :in => 'Payment'
+  	xml_accessor :card_verification, :in => 'Payment'
+  	xml_accessor :card_exp_date_month, :in => 'Payment'
+  	xml_accessor :card_exp_date_year, :in => 'Payment'
+    xml_accessor :card_status, :in => 'Payment'
+  	xml_accessor :card_auth_code, :in => 'Payment' 	    	
+  	xml_accessor :card_transaction_id, :from => 'CardTransactionID', :in => 'Payment'
+
+    xml_accessor :line_items, :as => [LineItem], :in => 'OrderDetail'
+    xml_accessor :custom_fields, :as => [CustomField], :in => 'CustomFields/Report'
+    xml_accessor :total_amount, :in => 'Check'  
+  end
+end

data/lib/ruby_omx/response/{append_order_response.rb → udoa_response.rb}

@@ -1,6 +1,6 @@
 module RubyOmx
     
-    class AppendOrderResponse < Response
+    class UDOAResponse < Response
       xml_name "UDOAResponse"
 
 		 	xml_reader :success, :as => Integer

data/lib/ruby_omx/response.rb

@@ -3,6 +3,12 @@ module RubyOmx
   class Response
     include ROXML
     xml_convention :camelcase
+    
+    def initialize(object_attribute_hash=nil)
+      if !object_attribute_hash.nil?
+        object_attribute_hash.map { |(k, v)| send("#{k}=", v) }
+      end
+     end
 
     # This is the factoryish method that is called!, not new
     def self.format(response)
@@ -26,5 +32,17 @@ module RubyOmx
       roxml_references.map {|r| r.accessor}
     end
 
+    # render a ROXML object as a normal hash, eliminating the @ and some unneeded admin fields
+  	def as_hash
+  		obj_hash = {}
+  		self.instance_variables.each do |v|
+  			m = v.to_s.sub('@','')
+  			if m != 'roxml_references' && m!= 'promotion_ids'
+  				obj_hash[m.to_sym] = self.instance_variable_get(v)
+  			end
+  		end
+  		obj_hash
+  	end
+
   end
 end

data/lib/ruby_omx/version.rb

@@ -1,3 +1,3 @@
 module RubyOmx
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/ruby_omx.rb

@@ -28,6 +28,7 @@ module RubyOmx
 	
 end
 
+
 require 'ruby_omx/response'
 require 'ruby_omx/orders'
 require 'ruby_omx/items'

data/test/base_test.rb

@@ -0,0 +1,21 @@
+require 'test_helper'
+
+class BaseTest < MiniTest::Unit::TestCase
+  
+  def test_connection
+
+		begin
+		  @connection = RubyOmx::Base.new()
+		rescue RubyOmx::MissingAccessKey
+		end
+		
+		begin
+		  @connection = RubyOmx::Base.new(:udi_auth_token=>'asdfasdf')
+		rescue RubyOmx::MissingAccessKey
+		end
+		
+  	@config = YAML.load_file( File.join(File.dirname(__FILE__), 'test_config.yml') )['test']
+		@connection = RubyOmx::Base.new(@config)
+    
+  end
+end

data/test/items_test.rb

@@ -0,0 +1,56 @@
+require 'test_helper'
+
+class ItemsTest < MiniTest::Unit::TestCase
+  def setup
+		@config = YAML.load_file( File.join(File.dirname(__FILE__), 'test_config.yml') )['test']
+		@connection = RubyOmx::Base.new(@config)
+  end
+
+  def test_get_item_information
+    @connection.stubs(:post).returns(xml_for('ItemInformationResponse(1.00)',200))
+    begin
+      response = @connection.get_item_info()
+    rescue MissingItemOptions
+    end
+    
+    response = @connection.get_item_info(:item_code=>'01-114')
+    assert_equal '01-114', response.item_code
+    assert_equal 'True', response.active
+    assert_equal 'Driver', response.product_name
+    assert_equal 1130, response.available_inventory
+    assert_equal "Unit", response.price_type
+    assert_equal "Restricted", response.quantity_type
+    assert_equal 1, response.price_quantity
+    assert_equal "True", response.price_multiplier
+    assert_equal 2.02, response.price_amount
+    assert_equal 1.20, response.price_addl_sh
+    assert_equal 0.00, response.price_bonus
+    assert_equal 6, response.custom_attributes.length
+    assert_equal "1", response.custom_attributes.first.attribute_id
+    assert_equal "MYAttribute1", response.custom_attributes.first.value
+    
+    assert_kind_of Hash, response.as_hash
+  end
+  
+  def test_get_custom_item_attribute_information
+    @connection.stubs(:post).returns(xml_for('CustomItemAttributeInformationResponse(1.00)',200))
+    begin
+      response = @connection.get_custom_item_attribute_info()
+    rescue MissingItemOptions
+    end
+    
+    response = @connection.get_custom_item_attribute_info(:item_code=>'00001')
+    assert_kind_of Hash, response.as_hash
+    assert_equal '1', response.success
+    i = response.items.first
+    assert_equal '10100', i.item_code
+    assert_equal 'True', i.active
+    i_attrs = i.attributes
+    assert_equal 20, i_attrs.length
+    assert_equal '1', i_attrs.first.attribute_id
+    assert_equal 'Keycode', i_attrs.first.name
+    
+    assert_kind_of Hash, response.as_hash
+  end
+  
+end

data/test/orders_test.rb

@@ -0,0 +1,186 @@
+require 'test_helper'
+
+class OrdersTest < MiniTest::Unit::TestCase
+  def setup
+		@config = YAML.load_file( File.join(File.dirname(__FILE__), 'test_config.yml') )['test']
+		@connection = RubyOmx::Base.new(@config)
+  end
+
+  def test_orders_request_from_xml
+    request = RubyOmx::UDOARequest.format(xml_for('UDOARequest_(UDOA200)_request',200))
+    assert_equal '2.00', request.version
+    
+    assert_equal 'UDIAuthToken', request.udi_parameters[0].key
+    assert_equal @config['udi_auth_token'], request.udi_parameters[0].value
+
+    assert_equal 'HTTPBizID', request.udi_parameters[1].key
+    assert_equal @config['http_biz_id'], request.udi_parameters[1].value
+    
+    assert_equal 'Keycode', request.udi_parameters[2].key
+    assert_equal 'JTESTKEY', request.udi_parameters[2].value
+
+    assert_equal 'VerifyFlag', request.udi_parameters[3].key
+    assert_equal 'False', request.udi_parameters[3].value
+
+    assert_equal 'QueueFlag', request.udi_parameters[4].key
+    assert_equal 'False', request.udi_parameters[4].value
+
+
+    assert_equal DateTime.parse('2003-04-01 22:15:10'), request.order_date
+    assert_equal '3', request.origin_type
+    assert_equal 'XXX', request.store_code
+
+    assert_equal 'BillTo', request.bill_to.address_type
+    assert_equal '0', request.bill_to.title_code
+    assert_equal '', request.bill_to.company
+    assert_equal 'Bill', request.bill_to.firstname
+    assert_equal 'Thomas', request.bill_to.lastname
+    assert_equal '251 West 30th St', request.bill_to.address1
+    assert_equal '', request.bill_to.email
+
+    assert_equal 'ShipTo', request.ship_to.address_type
+    assert_equal '0', request.ship_to.title_code
+    assert_nil request.ship_to.company
+    assert_equal 'Maurice', request.ship_to.firstname
+    assert_equal 'Evans', request.ship_to.lastname
+    assert_equal '65 West 83rd St, Apt 4A', request.ship_to.address1
+    assert_nil request.ship_to.email
+
+    assert_equal 0, request.method_code
+    assert_equal 8.75, request.shipping_amount
+    assert_equal 0, request.handling_amount
+    assert_equal 'Please wrap this carefully', request.special_instructions
+    assert_equal 'True', request.gift_wrapping
+    assert_equal 'Happy Birthday Mauro!!', request.gift_message
+    
+    assert_equal '1', request.payment_type
+    assert_equal '4111111111111111', request.card_number
+    assert_equal '222', request.card_verification
+    assert_equal '09', request.card_exp_date_month
+    assert_equal '2009', request.card_exp_date_year
+    assert_equal '11', request.card_status
+    assert_equal '010101', request.card_auth_code
+    assert_equal '123456789', request.card_transaction_id
+
+    assert_equal '1', request.line_items[0].line_number
+    assert_equal 'APPLE', request.line_items[0].item_code
+    assert_equal 1, request.line_items[0].quantity
+    assert_equal 'WATCH', request.line_items[1].item_code
+    
+    assert_equal '2', request.custom_fields[0].field_id
+    assert_equal '1', request.custom_fields[0].line_number
+    assert_equal 'a', request.custom_fields[0].value
+    assert_equal 12, request.custom_fields.length
+    
+  end
+
+  def test_orders_request_to_xml    
+    request_attrs = {
+      :raw_xml => 0,
+      :keycode => 'JTESTKEY',
+      :verify_flag => 'False',
+      :queue_flag => 'False',
+      :order_date => DateTime.parse('2003-04-01 22:15:10'),
+      :order_id => '234-23423423',
+      :origin_type => '3', 
+      :store_code => 'XXX',
+      :flags => [ { :name=>'DoNotMail', :value=>'True' },
+                  { :name=>'DoNotCall', :value=>'True' },
+                  { :name=>'DoNotEmail', :value=>'True' }],
+      :bill_to => { :address_type=>'BillTo',
+                    :title_code => '0',
+                    :company => '',
+                    :firstname => 'Bill',
+                    :lastname => 'Thomas',
+                    :address1 => '251 West 30th St',
+                    :address2 => 'Apt 12E',
+                    :city => 'New York', 
+                    :state => 'NY',
+                    :zip => '10001',
+                    :tld => 'US',
+                    :phone_number => '',
+                    :email => ''},
+      :ship_to => { :address_type=>'ShipTo',
+                    :title_code=>'0',
+                    :firstname=>'Maurice',
+                    :lastname=>'Evans',
+                    :address1=>'65 West 83rd St, Apt 4A',
+                    :address2=>'',
+                    :city=>'New York',
+                    :state=>'NY',
+                    :zip => '10024', 
+                    :tld => 'US'},
+      :method_code => 0,
+      :shipping_amount => 8.75,
+      :handling_amount => 0.0,
+      :special_instructions => 'Please wrap this carefully',
+      :gift_wrapping => 'True', 
+      :gift_message => 'Happy Birthday Mauro!!',
+      :payment_type => '1',
+      :card_number => '4111111111111111',
+      :card_verification => '222',
+      :card_exp_date_month => '09',
+      :card_exp_date_year => '2009',
+      :card_status => '11',
+      :card_auth_code => '010101',
+      :card_transaction_id => '123456789',
+      :line_items => [{ :item_code => 'APPLE', :quantity => 1 },
+                      { :item_code => 'WATCH', :quantity => 1 }],
+      :custom_fields => [ { :field_id => '2', :line_number => '1', :value => 'a' },
+                          { :field_id => '3', :line_number => '1', :value => 'a' },
+                          { :field_id => '4', :line_number => '1', :value => 'a' },
+                          { :field_id => '5', :line_number => '1', :value => 'a' },
+                          { :field_id => '6', :line_number => '1', :value => 'a' },
+                          { :field_id => '7', :line_number => '1', :value => 'a' },
+                          { :field_id => '2', :line_number => '2', :value => 'a' },
+                          { :field_id => '3', :line_number => '2', :value => 'a' },
+                          { :field_id => '4', :line_number => '2', :value => 'a' },
+                          { :field_id => '5', :line_number => '2', :value => 'a' },
+                          { :field_id => '6', :line_number => '2', :value => 'a' },                                                                                                                                                                                                                                          
+                          { :field_id => '7', :line_number => '2', :value => 'a' }]
+    }
+    request = @connection.build_udoa_request(request_attrs)
+    request2 = RubyOmx::UDOARequest.format(xml_for('UDOARequest_(UDOA200)_request',200))
+    assert_equal request.to_xml.to_s, request2.to_xml.to_s
+  end
+
+  def test_send_udoa_request
+  	@connection.stubs(:post).returns(xml_for('UDOARequest_(UDOA200)_response',200))
+  	order_data = {
+		  :keycode => 'TS01',
+		  :vendor => '',
+		  :queue_flag => 'False',
+		  :verify_flag => 'True',
+		  :order_date => Time.now.to_s(:db),
+		  :order_id => '23423423423423',
+		  :bill_to => { :lastname => 'Jim Smith'},
+		  :line_items => [{ :quantity => 2, :unit_price => 5.00 }],
+		  :method_code => '9' 
+  	}
+  	
+  	# Missing Order Options
+  	begin
+  	  response = @connection.send_udoa_request(order_data)
+  	rescue MissingOrderOptions
+  	end
+    
+    # Should work
+    order_data[:line_items][0].merge!({ :item_code => 'SKU' })
+		response = @connection.send_udoa_request(order_data)
+
+		assert_kind_of UDOAResponse, response
+		assert !response.accessors.include?("code")
+		assert_equal 'OMX-ofyccytnacrtnedlldmyed', response.OMX
+		assert_equal '10512', response.order_number
+		
+		assert_kind_of Hash, response.as_hash
+
+		response = @connection.send_udoa_request(order_data.merge({:raw_xml => true}))
+		assert_kind_of Net::HTTPOK, response
+		
+		# old alias should still work
+		response = @connection.append_order(order_data)		
+		assert_kind_of UDOAResponse, response
+		assert_equal 'OMX-ofyccytnacrtnedlldmyed', response.OMX
+  end
+end

data/test/test_config.yml

@@ -0,0 +1,3 @@
+test:
+  udi_auth_token: 470db4004809083c0048ef983
+  http_biz_id: KbmCrvnuTESTINGTESTINGYBlggjNYxGqsujuglguAJhXeKBYD

data/test/test_helper.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 if RUBY_VERSION.match("1.9")
   require 'simplecov'
   SimpleCov.start do
@@ -11,9 +12,19 @@ require 'yaml'
 require 'mocha'
 require File.join(File.dirname(__FILE__), '..', 'lib', 'ruby_omx')
 
-def xml_for(name, code)
+include RubyOmx
+
+def xml_raw(name)
   file = File.open(Pathname.new(File.dirname(__FILE__)).expand_path.dirname.join("examples/xml/#{name}.xml"),'rb')
-  mock_response(code, {:content_type=>'text/xml', :body=>file.read})
+  file.read
+end
+
+def xml_for(name, code)
+  mock_response(code, {:content_type=>'text/xml', :body=>xml_raw(name)})
+end
+
+def xml_for_raw(xml, code)
+  mock_response(code, {:content_type=>'text/xml', :body=>xml})
 end
 
 def mock_response(code, options={})
@@ -24,4 +35,5 @@ def mock_response(code, options={})
   response.instance_variable_set(:@read, true)
   response.content_type = content_type
   return response
-end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_omx
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -71,16 +71,22 @@ files:
 - lib/ruby_omx/exceptions.rb
 - lib/ruby_omx/items.rb
 - lib/ruby_omx/orders.rb
-- lib/ruby_omx/response/append_order_response.rb
+- lib/ruby_omx/response/custom_item_attr_info_response.rb
+- lib/ruby_omx/response/item_info_request.rb
 - lib/ruby_omx/response/item_info_response.rb
 - lib/ruby_omx/response/response_error.rb
+- lib/ruby_omx/response/udoa_request.rb
+- lib/ruby_omx/response/udoa_response.rb
 - lib/ruby_omx/response.rb
 - lib/ruby_omx/version.rb
 - lib/ruby_omx.rb
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
-- test/ruby_omx_test.rb
+- test/base_test.rb
+- test/items_test.rb
+- test/orders_test.rb
+- test/test_config.yml
 - test/test_helper.rb
 homepage: http://github.com/aew/ruby_omx
 licenses: []
@@ -107,5 +113,8 @@ signing_key:
 specification_version: 3
 summary: Ruby wrapper for OrderMotion (OMX)
 test_files:
-- test/ruby_omx_test.rb
+- test/base_test.rb
+- test/items_test.rb
+- test/orders_test.rb
+- test/test_config.yml
 - test/test_helper.rb

data/test/ruby_omx_test.rb

@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class RubyOmxTest < MiniTest::Unit::TestCase
-  def test_truth
-    assert_kind_of Module, RubyOmx
-  end
-end