ruby_omx 0.0.15 → 0.0.16

data/lib/ruby_omx/connection.rb

@@ -10,10 +10,10 @@ 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}"
+      @server           = (params['server'] || RubyOmx::DEFAULT_HOST) + "?UDIAuthToken=#{@udi_auth_token}"
       @http_biz_id 			= params['http_biz_id']
 			@path = URI.parse(@server).request_uri
-        
+
       raise MissingConnectionOptions if [@udi_auth_token, @http_biz_id].any? {|option| option.nil?}
       @http = connect
     end

data/lib/ruby_omx/orders.rb

@@ -19,11 +19,7 @@ module RubyOmx
 		# Order Information
 		
 		def build_info_request(params={})
-		  if params['version'] == '2.00'
-		    OrderInformationRequest.new(params.merge({:http_biz_id=>@http_biz_id, :udi_auth_token=>@udi_auth_token, :server=>RubyOmx::ALT_HOST + "?UDIAuthToken=#{@udi_auth_token}"}))
-		  else
-		    OrderInformationRequest.new(params.merge({:http_biz_id=>@http_biz_id, :udi_auth_token=>@udi_auth_token}))
-		  end
+	    OrderInformationRequest.new(params.merge({:http_biz_id=>@http_biz_id, :udi_auth_token=>@udi_auth_token}))
 		end
 
     def send_info_request(params={})

data/lib/ruby_omx/response/purchase_order_update_response.rb

@@ -1,13 +1,4 @@
-#<PurchaseOrderUpdateResponse>
-# <Success>1</Success>
-# <PurchaseOrder PONumber="16651" SupplierID="76"/>
-# <PODate>2008-09-21 12:32:27</PODate>
-# <TotalAmount>26.50</TotalAmount>
-# <Action>New</Action> <!-- "New" if a new PO number was just assigned, "Update" if a PO number was supplied and the PO's header properties were changed, and/or a PO line was added or updated. -->
-#</PurchaseOrderUpdateResponse>
-
 #OrderInformationRequest (OIR200)	This request type provides the ShippingInformationRequest (SIR) result for the order as a whole.
-
 module RubyOmx
 
   class ErrorData < Response
@@ -19,16 +10,13 @@ module RubyOmx
     xml_accessor :message, :from=>:content
   end
 
-  class PurchaseOrderResponse < Response
-    xml_name 'PurchaseOrder'
-    xml_accessor :po_number, :from=>'@PONumber' #<PurchaseOrder PONumber="16651" SupplierID="76">
-    xml_accessor :supplier_id, :from=>'@SupplierID'
-  end
-
   class PurchaseOrderUpdateResponse < Response
     xml_name "PurchaseOrderUpdateResponse"
     xml_reader :success
-    xml_accessor :purchase_order, :as => RubyOmx::PurchaseOrderResponse
+    #xml_accessor :purchase_order, :as => RubyOmx::PurchaseOrderResponse
+    xml_accessor :po_number, :from=>'@PONumber', :in=>'PurchaseOrder' #<PurchaseOrder PONumber="16651" SupplierID="76">
+    xml_accessor :supplier_id, :from=>'@SupplierID', :in=>'PurchaseOrder'
+
     xml_accessor :po_date, :from=>'PODate', :as=>DateTime
     xml_accessor :total_amount, :as=>Float
     xml_accessor :action  

data/lib/ruby_omx/version.rb

@@ -1,3 +1,3 @@
 module RubyOmx
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end

data/test/orders_test.rb

@@ -4,6 +4,10 @@ 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)
+		
+		# Alternative connection needed for v2 of OMX API (but not for UDOA)
+		@config_alt = YAML.load_file( File.join(File.dirname(__FILE__), 'test_config.yml') )['test_alt']
+		@connection_alt = RubyOmx::Base.new(@config_alt)
   end
 
   def test_orders_request_from_xml
@@ -140,7 +144,6 @@ class OrdersTest < MiniTest::Unit::TestCase
                           { :field_id => '7', :line_number => '2', :value => 'a' }]
     }
     request = @connection.build_udoa_request(request_attrs)
-    puts request.to_xml
     request2 = RubyOmx::UDOARequest.format(xml_for('UDOARequest_(UDOA200)_request',200))
     assert_equal request.to_xml.to_s, request2.to_xml.to_s
   end
@@ -208,8 +211,8 @@ class OrdersTest < MiniTest::Unit::TestCase
   end
 
   def test_send_info_request2
-  	@connection.stubs(:post).returns(xml_for('OrderInformationResponse(2.00)',200))
-		response = @connection.send_info_request({ :order_number => '24603', :version=>'2.00' })
+  	@connection_alt.stubs(:post).returns(xml_for('OrderInformationResponse(2.00)',200))
+		response = @connection_alt.send_info_request({ :order_number => '24603', :version=>'2.00' })
 		assert_kind_of OrderInformationResponse, response
 
     assert_nil response.ship_date
@@ -237,7 +240,7 @@ class OrdersTest < MiniTest::Unit::TestCase
     assert_equal '5/31/2010 5:36:00 AM', response.line_items[0].line_status.date
 		assert_kind_of Hash, response.as_hash
 		
-		response = @connection.send_info_request({ :order_id=> 'AZ-43253-234', :store_code=>'XX01', :version=>'2.00' })
+		response = @connection_alt.send_info_request({ :order_id=> 'AZ-43253-234', :store_code=>'XX01', :version=>'2.00' })
 		assert_kind_of OrderInformationResponse, response
   end
   

data/test/purchase_orders_test.rb

@@ -25,6 +25,8 @@ class PurchaseOrdersTest < MiniTest::Unit::TestCase
   def test_send_purchase_order_update_request
   	@connection.stubs(:post).returns(xml_for('PurchaseOrderUpdateResponse(1.00)',200))
   	request = PurchaseOrderUpdateRequest.new
+  	
+  	# TODO why is this necessary
   	l1 = RubyOmx::LineItem.new(:item_code=>'WATCH-1', :quantity=>1, :price=>122.50)
   	l2 = RubyOmx::LineItem.new(:item_code=>'APPLE-12', :quantity=>31, :price=>1.50)
   	
@@ -32,10 +34,8 @@ class PurchaseOrdersTest < MiniTest::Unit::TestCase
                 :line_items => [l1, l2],
                 :supplier_id => '76'
               }
-  	          
-		
 	  r = @connection.build_purchase_order_update_request(po_data)
-    puts r.to_xml
+    assert_instance_of String, r.to_xml.to_s
 		
   	# Missing Order Options
   	begin
@@ -47,8 +47,8 @@ class PurchaseOrdersTest < MiniTest::Unit::TestCase
   	assert_kind_of PurchaseOrderUpdateResponse, response
   	assert_equal '1', response.success
   	assert_equal DateTime.parse('2008-09-21 12:32:27'), response.po_date
-  	assert_equal '16651', response.purchase_order.po_number
-  	assert_equal '76', response.purchase_order.supplier_id
+  	assert_equal '16651', response.po_number
+  	assert_equal '76', response.supplier_id
   	assert_kind_of Hash, response.as_hash
 
   	response = @connection.send_purchase_order_update_request(po_data.merge({:raw_xml => true}))
@@ -57,6 +57,6 @@ class PurchaseOrdersTest < MiniTest::Unit::TestCase
   	# old alias should still work
   	response = @connection.append_po(po_data)		
   	assert_kind_of PurchaseOrderUpdateResponse, response
-  	assert_equal '16651', response.purchase_order.po_number
+  	assert_equal '16651', response.po_number
   end
 end

data/test/test_config.yml

@@ -1,3 +1,8 @@
 test:
   udi_auth_token: 470db4004809083c0048ef983
-  http_biz_id: KbmCrvnuTESTINGTESTINGYBlggjNYxGqsujuglguAJhXeKBYD
+  http_biz_id: KbmCrvnuTESTINGTESTINGYBlggjNYxGqsujuglguAJhXeKBYD
+
+test_alt:
+  udi_auth_token: 470db4004809083c0048ef983
+  http_biz_id: KbmCrvnuTESTINGTESTINGYBlggjNYxGqsujuglguAJhXeKBYD
+  server: https://api.omx.ordermotion.com/OM2/udi.ashx

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_omx
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-07 00:00:00.000000000 Z
+date: 2012-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roxml