FIX: NoMethodError when state wasn't supplied for US/CA country. Adde…

…d description from Wirecard to phone number regex.

CHANGELOG

@@ -1,5 +1,6 @@
 = ActiveMerchant CHANGELOG
 
+* Update Wirecard to make country and state processing more robust [Soleone]
 * Update ProTX to use the latest v2.23 protocol [Tekin]
 
 == Version 1.4.2 (April 24, 2009)

lib/active_merchant/billing/gateways/wirecard.rb

@@ -20,8 +20,14 @@ class WirecardGateway < Gateway
 
       RETURN_CODES = %w[ ACK NOK ]
 
-      # it seems that Wirecard only allows phone numbers with a format like this: +xxx(yyy)zzz-zzzz-ppp
-      VALID_PHONE_FORMAT = /\+\d{3}(\(?\d{3}\)?)?\d{3}-\d{4}-\d{3}/
+      # Wirecard only allows phone numbers with a format like this: +xxx(yyy)zzz-zzzz-ppp, where: 
+      #   xxx = Country code 
+      #   yyy = Area or city code 
+      #   zzz-zzzz = Local number 
+      #   ppp = PBX extension 
+      # For example, a typical U.S. or Canadian number would be "+1(202)555-1234-739" indicating PBX extension 739 at phone 
+      # number 5551234 within area code 202 (country code 1).
+      VALID_PHONE_FORMAT = /\+\d{1,3}(\(?\d{3}\)?)?\d{3}-\d{4}-\d{3}/
 
       # The countries the gateway supports merchants from as 2 digit ISO country codes
       # TODO: Check supported countries
@@ -205,7 +211,7 @@ def add_address(xml, address)
 	          xml.tag! 'Address2', address[:address2] if address[:address2]
 	          xml.tag! 'City', address[:city]
 	          xml.tag! 'ZipCode', address[:zip]
-	          xml.tag! 'State', address[:state].upcase if address[:country] =~ /^(us|ca)$/i
+	          xml.tag! 'State', address[:state].upcase if address[:state] && address[:country] =~ /^(us|ca)$/i
 	          xml.tag! 'Country', address[:country]
             xml.tag! 'Phone', address[:phone] if address[:phone] =~ VALID_PHONE_FORMAT
 	          xml.tag! 'Email', address[:email]

test/unit/gateways/wirecard_test.rb

@@ -17,6 +17,16 @@ def setup
       :description => 'Wirecard Purchase',
       :email => 'soleone@example.com'
     }
+
+    @address_without_state = {
+      :name     => 'Jim Smith',
+      :address1 => '1234 My Street',
+      :company  => 'Widgets Inc',
+      :city     => 'Ottawa',
+      :zip      => 'K12 P2A',
+      :country  => 'CA',
+      :state    => nil,
+    }
   end
 
   def test_successful_authorization
@@ -61,6 +71,14 @@ def test_unauthorized_capture
     assert response.message["Could not find referenced transaction for GuWID 1234567890123456789012."]  
   end
 
+  def test_doesnt_raise_an_error_if_no_state_is_provided_in_address
+    options = @options.merge(:billing_address => @address_without_state)
+    @gateway.expects(:ssl_post).returns(unauthorized_capture_response)
+    assert_nothing_raised do
+      @gateway.authorize(@amount, @credit_card, options)
+    end
+  end
+
   private
 
   # Authorization success