breadmachine 0.0.2 → 0.0.3

data/lib/breadmachine/secure_trading.rb

@@ -22,6 +22,8 @@ module BreadMachine
     autoload :St3dAuthRequest, 'breadmachine/secure_trading/st_3d_auth_request'
     autoload :St3dAuthResponse, 'breadmachine/secure_trading/st_3d_auth_response'
     
+    autoload :Request, 'breadmachine/secure_trading/request'
+    
     autoload :AuthRequest, 'breadmachine/secure_trading/auth_request'
     autoload :MotoAuthRequest, 'breadmachine/secure_trading/moto_auth_request'
 

data/lib/breadmachine/secure_trading/payment_methods.rb

@@ -8,19 +8,11 @@ module BreadMachine
         return SecureTrading::XPay.exchange(request)
       end
 
-      def repeat_auth(*args)
-        auth(*args)
-      end
-      
       def moto_auth(*args)
         request = SecureTrading::MotoAuthRequest.new(*args)
         return SecureTrading::XPay.exchange(request)
       end
       
-      def repeat_moto_auth(*args)
-        moto_auth(*args)
-      end
-
       # Checks to see whether a card is enrolled in 3-D Secure. Returns a
       # ST3DCardQueryResponse which can tell us whether the card is enrolled
       # and what kind of authorisation to perform.

data/lib/breadmachine/secure_trading/request.rb

@@ -0,0 +1,23 @@
+module BreadMachine
+  module SecureTrading
+    
+    class Request
+      
+      def initialize(request)
+        @request = request
+      end
+      
+      def to_xml
+        xml = Builder::XmlMarkup.new(:indent => 2)
+        xml.instruct!(:xml, :encoding => "UTF-8")
+        xml.RequestBlock('Version' => '3.51') do |request_block|
+          request_block << @request.to_xml
+          xml.Certificate BreadMachine::SecureTrading::configuration.site_reference
+        end
+        return xml.target!
+      end
+      
+    end
+    
+  end
+end

data/lib/breadmachine/secure_trading/xpay.rb

@@ -28,13 +28,8 @@ module BreadMachine
       protected
       
       def generate_xml(request)
-        xml = Builder::XmlMarkup.new(:indent => 2)
-        xml.instruct!
-        xml.RequestBlock('Version' => '3.51') do |request_block|
-          request_block << request.to_xml
-          xml.Certificate BreadMachine::SecureTrading::configuration.site_reference
-        end
-        return xml.to_s
+        request = BreadMachine::SecureTrading::Request.new(request)
+        request.to_xml
       end
       
       def exchange_with_xpay_client(request_xml)
@@ -119,11 +114,11 @@ module BreadMachine
         if response.error?
           message = response.message
           case message.match(/\((\d+)\)/)[1].to_i
-            when 100, 101, 1000, 1100, 3000, 3010, 3330, 3350, 5000:
+            when 100, 101, 1000, 1100, 3000, 3010, 3330, 3350, 5000 then
               raise BreadMachine::GatewayConnectionError.new(message)
-            when 2100, 3100:
+            when 2100, 3100 then
               raise BreadMachine::MerchantConfigurationError.new(message)
-            when 2500, 5100, 10500:
+            when 2500, 5100, 10500 then
               raise BreadMachine::MerchantRequestError.new(message)
           end
         end

data/spec/secure_trading/request_spec.rb

@@ -0,0 +1,27 @@
+# encoding: utf-8
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe BreadMachine::SecureTrading::Request do
+  
+  describe "XML generation" do
+    
+    before(:each) do
+      @request = described_class.new(Builder::XmlMarkup.new)
+    end
+    
+    it "should set xml instruct" do
+      @request.to_xml.should match(%r{<\?xml version="1.0" encoding="UTF-8"\?>})
+    end
+    
+    it "should output xml as utf-8" do
+      xml = Builder::XmlMarkup.new
+      xml.foo "Min luftpudebåd er fyldt med ål"
+      @request = described_class.new(xml)
+      @request.to_xml.should match(/Min luftpudeb&#229;d er fyldt med &#229;l/)
+    end
+    
+    def request_xml
+      Nokogiri::XML::Document.parse(@request.to_xml)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: breadmachine
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Matt Southerden
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-22 00:00:00 +01:00
+date: 2009-10-31 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -110,6 +110,7 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE
+- README
 - README.rdoc
 files: 
 - lib/breadmachine.rb
@@ -131,6 +132,7 @@ files:
 - lib/breadmachine/secure_trading/moto_auth_request.rb
 - lib/breadmachine/secure_trading/order_info_xml.rb
 - lib/breadmachine/secure_trading/payment_methods.rb
+- lib/breadmachine/secure_trading/request.rb
 - lib/breadmachine/secure_trading/st_3d_auth_request.rb
 - lib/breadmachine/secure_trading/st_3d_auth_response.rb
 - lib/breadmachine/secure_trading/st_3d_card_query_request.rb
@@ -140,6 +142,7 @@ files:
 - lib/breadmachine/secure_trading/xpay_response.rb
 - lib/breadmachine/secure_trading/xpay_socket.rb
 - LICENSE
+- README
 - README.rdoc
 has_rdoc: true
 homepage: http://github.com/mattsoutherden/breadmachine
@@ -181,6 +184,7 @@ test_files:
 - spec/secure_trading/customer_info_enrolment_xml_spec.rb
 - spec/secure_trading/moto_auth_request_spec.rb
 - spec/secure_trading/order_info_xml_spec.rb
+- spec/secure_trading/request_spec.rb
 - spec/secure_trading/st_3d_auth_request_spec.rb
 - spec/secure_trading/st_3d_auth_response_spec.rb
 - spec/secure_trading/st_3d_card_query_request_spec.rb