activemerchant 1.42.6 → 1.90.0

data/lib/active_merchant/billing/gateways/psigate.rb

@@ -35,8 +35,8 @@ module ActiveMerchant #:nodoc:
     #   :email => 'jack@yahoo.com'
     # )
     class PsigateGateway < Gateway
-      self.test_url  = 'https://dev.psigate.com:7989/Messenger/XMLMessenger'
-      self.live_url  = 'https://secure.psigate.com:7934/Messenger/XMLMessenger'
+      self.test_url  = 'https://realtimestaging.psigate.com/xml'
+      self.live_url  = 'https://realtime.psigate.com/xml'
 
       self.supported_cardtypes = [:visa, :master, :american_express]
       self.supported_countries = ['CA']
@@ -53,39 +53,50 @@ module ActiveMerchant #:nodoc:
 
       def authorize(money, creditcard, options = {})
         requires!(options, :order_id)
-        options[:CardAction] = "1"
+        options[:CardAction] = '1'
         commit(money, creditcard, options)
       end
 
       def purchase(money, creditcard, options = {})
         requires!(options, :order_id)
-        options[:CardAction] = "0"
+        options[:CardAction] = '0'
         commit(money, creditcard, options)
       end
 
       def capture(money, authorization, options = {})
-        options[:CardAction] = "2"
+        options[:CardAction] = '2'
         options[:order_id], options[:trans_ref_number] = split_authorization(authorization)
         commit(money, nil, options)
       end
 
       def credit(money, authorization, options = {})
-        deprecated CREDIT_DEPRECATION_MESSAGE
+        ActiveMerchant.deprecated CREDIT_DEPRECATION_MESSAGE
         refund(money, authorization, options)
       end
 
       def refund(money, authorization, options = {})
-        options[:CardAction] = "3"
+        options[:CardAction] = '3'
         options[:order_id], options[:trans_ref_number] = split_authorization(authorization)
         commit(money, nil, options)
       end
 
       def void(authorization, options = {})
-        options[:CardAction] = "9"
+        options[:CardAction] = '9'
         options[:order_id], options[:trans_ref_number] = split_authorization(authorization)
         commit(nil, nil, options)
       end
 
+      def supports_scrubbing?
+        true
+      end
+
+      def scrub(transcript)
+        transcript.
+          gsub(%r((<Passphrase>)[^<]*(</Passphrase>))i, '\1[FILTERED]\2').
+          gsub(%r((<CardNumber>)[^<]*(</CardNumber>))i, '\1[FILTERED]\2').
+          gsub(%r((<CardIDNumber>)[^<]*(</CardIDNumber>))i, '\1[FILTERED]\2')
+      end
+
       private
 
       def commit(money, creditcard, options = {})
@@ -93,7 +104,7 @@ module ActiveMerchant #:nodoc:
 
         Response.new(successful?(response), message_from(response), response,
           :test => test?,
-          :authorization => build_authorization(response) ,
+          :authorization => build_authorization(response),
           :avs_result => { :code => response[:avsresult] },
           :cvv_result => response[:cardidresult]
         )
@@ -104,11 +115,11 @@ module ActiveMerchant #:nodoc:
       end
 
       def successful?(response)
-        response[:approved] == "APPROVED"
+        response[:approved] == 'APPROVED'
       end
 
       def parse(xml)
-        response = {:message => "Global Error Receipt", :complete => false}
+        response = {:message => 'Global Error Receipt', :complete => false}
 
         xml = REXML::Document.new(xml)
         xml.elements.each('//Result/*') do |node|
@@ -121,7 +132,7 @@ module ActiveMerchant #:nodoc:
       def post_data(money, creditcard, options)
         xml = REXML::Document.new
         xml << REXML::XMLDecl.new
-        root = xml.add_element("Order")
+        root = xml.add_element('Order')
 
         parameters(money, creditcard, options).each do |key, value|
           root.add_element(key.to_s).text = value if value
@@ -144,7 +155,7 @@ module ActiveMerchant #:nodoc:
           :TransRefNumber => options[:trans_ref_number],
 
           # Credit Card parameters
-          :PaymentType => "CC",
+          :PaymentType => 'CC',
           :CardAction => options[:CardAction],
 
           # Financial parameters
@@ -156,9 +167,9 @@ module ActiveMerchant #:nodoc:
         }
 
         if creditcard
-          exp_month = sprintf("%.2i", creditcard.month) unless creditcard.month.blank?
-          exp_year = creditcard.year.to_s[2,2] unless creditcard.year.blank?
-          card_id_code = (creditcard.verification_value.blank? ? nil : "1")
+          exp_month = sprintf('%.2i', creditcard.month) unless creditcard.month.blank?
+          exp_year = creditcard.year.to_s[2, 2] unless creditcard.year.blank?
+          card_id_code = (creditcard.verification_value.blank? ? nil : '1')
 
           params.update(
             :CardNumber => creditcard.number,
@@ -195,22 +206,11 @@ module ActiveMerchant #:nodoc:
       end
 
       def message_from(response)
-        if response[:approved] == "APPROVED"
+        if response[:approved] == 'APPROVED'
           return SUCCESS_MESSAGE
         else
           return FAILURE_MESSAGE if response[:errmsg].blank?
-          return response[:errmsg].gsub(/[^\w]/, ' ').split.join(" ").capitalize
-        end
-      end
-
-      # Make a ruby type out of the response string
-      def normalize(field)
-        case field
-        when "true"   then true
-        when "false"  then false
-        when ""       then nil
-        when "null"   then nil
-        else field
+          return response[:errmsg].gsub(/[^\w]/, ' ').split.join(' ').capitalize
         end
       end
 
@@ -220,7 +220,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def build_authorization(response)
-        [response[:orderid], response[:transrefnumber]].join(";")
+        [response[:orderid], response[:transrefnumber]].join(';')
       end
     end
   end

data/lib/active_merchant/billing/gateways/psl_card.rb

@@ -17,11 +17,11 @@ module ActiveMerchant
       self.default_currency = 'GBP'
 
       self.supported_countries = ['GB']
-      # Visa Credit, Visa Debit, Mastercard, Maestro, Solo, Electron,
+      # Visa Credit, Visa Debit, Mastercard, Maestro, Electron,
       # American Express, Diners Club, JCB, International Maestro,
       # Style, Clydesdale Financial Services, Other
 
-      self.supported_cardtypes = [ :visa, :master, :american_express, :diners_club, :jcb, :switch, :solo, :maestro ]
+      self.supported_cardtypes = [ :visa, :master, :american_express, :diners_club, :jcb, :maestro ]
       self.homepage_url = 'http://www.paymentsolutionsltd.com/'
       self.display_name = 'PSL Payment Solutions'
 
@@ -46,38 +46,38 @@ module ActiveMerchant
         'USD' => 840
       }
 
-      #The terminal used - only for swipe transactions, so hard coded to 32 for online
+      # The terminal used - only for swipe transactions, so hard coded to 32 for online
       EMV_TERMINAL_TYPE = 32
 
-      #Different Dispatch types
+      # Different Dispatch types
       DISPATCH_LATER  = 'LATER'
       DISPATCH_NOW    = 'NOW'
 
       # Return codes
       APPROVED = '00'
 
-      #Nominal amount to authorize for a 'dispatch later' type
-      #The nominal amount is held straight away, when the goods are ready
-      #to be dispatched, PSL is informed and the full amount is the
-      #taken.
+      # Nominal amount to authorize for a 'dispatch later' type
+      # The nominal amount is held straight away, when the goods are ready
+      # to be dispatched, PSL is informed and the full amount is the
+      # taken.
       NOMINAL_AMOUNT = 101
 
       AVS_CODE = {
-        "ALL MATCH"	=> 'Y',
-        "SECURITY CODE MATCH ONLY" => 'N',
-        "ADDRESS MATCH ONLY" => 'Y',
-        "NO DATA MATCHES"	=> 'N',
-        "DATA NOT CHECKED"	=> 'R',
-        "SECURITY CHECKS NOT SUPPORTED"	=> 'X'
+        'ALL MATCH'	=> 'Y',
+        'SECURITY CODE MATCH ONLY' => 'N',
+        'ADDRESS MATCH ONLY' => 'Y',
+        'NO DATA MATCHES'	=> 'N',
+        'DATA NOT CHECKED'	=> 'R',
+        'SECURITY CHECKS NOT SUPPORTED'	=> 'X'
       }
 
       CVV_CODE = {
-        "ALL MATCH"	=> 'M',
-        "SECURITY CODE MATCH ONLY" => 'M',
-        "ADDRESS MATCH ONLY" => 'N',
-        "NO DATA MATCHES"	=> 'N',
-        "DATA NOT CHECKED"	=> 'P',
-        "SECURITY CHECKS NOT SUPPORTED"	=> 'X'
+        'ALL MATCH'	=> 'M',
+        'SECURITY CODE MATCH ONLY' => 'M',
+        'ADDRESS MATCH ONLY' => 'N',
+        'NO DATA MATCHES'	=> 'N',
+        'DATA NOT CHECKED'	=> 'P',
+        'SECURITY CHECKS NOT SUPPORTED'	=> 'X'
       }
 
       # Create a new PslCardGateway
@@ -101,7 +101,7 @@ module ActiveMerchant
       #   -options:
       #
       # Returns:
-      #   -ActiveRecord::Billing::Response object
+      #   -ActiveMerchant::Billing::Response object
       #
       def purchase(money, credit_card, options = {})
         post = {}
@@ -129,7 +129,7 @@ module ActiveMerchant
       #   -options:
       #
       # Returns:
-      #   -ActiveRecord::Billing::Response object
+      #   -ActiveMerchant::Billing::Response object
       #
       def authorize(money, credit_card, options = {})
         post = {}
@@ -153,7 +153,7 @@ module ActiveMerchant
       #   -options:
       #
       # Returns:
-      #   -ActiveRecord::Billing::Response object
+      #   -ActiveMerchant::Billing::Response object
       #
       def capture(money, authorization, options = {})
         post = {}
@@ -174,12 +174,6 @@ module ActiveMerchant
         post[:ExpMonth] = credit_card.month
         post[:ExpYear] = credit_card.year
 
-        if requires_start_date_or_issue_number?(credit_card)
-          post[:IssueNumber] = credit_card.issue_number unless credit_card.issue_number.blank?
-          post[:StartMonth] = credit_card.start_month unless credit_card.start_month.blank?
-          post[:StartYear] = credit_card.start_year unless credit_card.start_year.blank?
-        end
-
         # CV2 check
         post[:AVSCV2Check] = credit_card.verification_value? ? 'YES' : 'NO'
         post[:CV2] = credit_card.verification_value if credit_card.verification_value?
@@ -189,7 +183,7 @@ module ActiveMerchant
         address = options[:billing_address] || options[:address]
         return if address.nil?
 
-        post[:QAAddress] = [:address1, :address2, :city, :state].collect{|a| address[a]}.reject{|a| a.blank?}.join(' ')
+        post[:QAAddress] = [:address1, :address2, :city, :state].collect { |a| address[a] }.reject(&:blank?).join(' ')
         post[:QAPostcode] = address[:zip]
       end
 
@@ -246,10 +240,9 @@ module ActiveMerchant
       #   -a hash with all of the values returned in the PSL response
       #
       def parse(body)
-
         fields = {}
         for line in body.split('&')
-          key, value = *line.scan( %r{^(\w+)\=(.*)$} ).flatten
+          key, value = *line.scan(%r{^(\w+)\=(.*)$}).flatten
           fields[key] = CGI.unescape(value)
         end
         fields.symbolize_keys
@@ -264,7 +257,7 @@ module ActiveMerchant
       #   - ActiveMerchant::Billing::Response object
       #
       def commit(request)
-        response = parse( ssl_post(self.live_url, post_data(request)) )
+        response = parse(ssl_post(self.live_url, post_data(request)))
 
         Response.new(response[:ResponseCode] == APPROVED, response[:Message], response,
           :test => test?,
@@ -296,7 +289,7 @@ module ActiveMerchant
 
         post.collect { |key, value|
           "#{key}=#{CGI.escape(value.to_s.tr('&=', ' '))}"
-        }.join("&")
+        }.join('&')
       end
     end
   end

data/lib/active_merchant/billing/gateways/qbms.rb

@@ -5,8 +5,8 @@ module ActiveMerchant #:nodoc:
 
       class_attribute :test_url, :live_url
 
-      self.test_url = "https://webmerchantaccount.ptc.quickbooks.com/j/AppGateway"
-      self.live_url = "https://webmerchantaccount.quickbooks.com/j/AppGateway"
+      self.test_url = 'https://webmerchantaccount.ptc.quickbooks.com/j/AppGateway'
+      self.live_url = 'https://webmerchantaccount.quickbooks.com/j/AppGateway'
 
       self.homepage_url = 'http://payments.intuit.com/'
       self.display_name = 'QuickBooks Merchant Services'
@@ -100,8 +100,8 @@ module ActiveMerchant #:nodoc:
       #
       #
       def credit(money, identification, options = {})
-        deprecated CREDIT_DEPRECATION_MESSAGE
-        refund(money, identification, options = {})
+        ActiveMerchant.deprecated CREDIT_DEPRECATION_MESSAGE
+        refund(money, identification, {})
       end
 
       def refund(money, identification, options = {})
@@ -113,6 +113,17 @@ module ActiveMerchant #:nodoc:
         commit(:query, nil, {})
       end
 
+      def supports_scrubbing?
+        true
+      end
+
+      def scrub(transcript)
+        transcript.
+          gsub(%r((<ConnectionTicket>)[^<]*(</ConnectionTicket>))i, '\1[FILTERED]\2').
+          gsub(%r((<CreditCardNumber>)[^<]*(</CreditCardNumber>))i, '\1[FILTERED]\2').
+          gsub(%r((<CardSecurityCode>)[^<]*(</CardSecurityCode>))i, '\1[FILTERED]\2')
+      end
+
       private
 
       def hosted?
@@ -127,7 +138,7 @@ module ActiveMerchant #:nodoc:
 
         req = build_request(type, money, parameters)
 
-        data = ssl_post(url, req, "Content-Type" => "application/x-qbmsxml")
+        data = ssl_post(url, req, 'Content-Type' => 'application/x-qbmsxml')
         response = parse(type, data)
         message = (response[:status_message] || '').strip
 
@@ -152,20 +163,20 @@ module ActiveMerchant #:nodoc:
         xml = REXML::Document.new(body)
 
         signon = REXML::XPath.first(xml, "//SignonMsgsRs/#{hosted? ? 'SignonAppCertRs' : 'SignonDesktopRs'}")
-        status_code = signon.attributes["statusCode"].to_i
+        status_code = signon.attributes['statusCode'].to_i
 
         if status_code != 0
           return {
             :status_code    => status_code,
-            :status_message => signon.attributes["statusMessage"],
+            :status_message => signon.attributes['statusMessage'],
           }
         end
 
         response = REXML::XPath.first(xml, "//QBMSXMLMsgsRs/#{type}Rs")
 
         results = {
-          :status_code    => response.attributes["statusCode"].to_i,
-          :status_message => response.attributes["statusMessage"],
+          :status_code    => response.attributes['statusCode'].to_i,
+          :status_message => response.attributes['statusMessage'],
         }
 
         response.elements.each do |e|
@@ -189,16 +200,16 @@ module ActiveMerchant #:nodoc:
         xml.instruct!(:xml, :version => '1.0', :encoding => 'utf-8')
         xml.instruct!(:qbmsxml, :version => API_VERSION)
 
-        xml.tag!("QBMSXML") do
-          xml.tag!("SignonMsgsRq") do
-            xml.tag!(hosted? ? "SignonAppCertRq" : "SignonDesktopRq") do
-              xml.tag!("ClientDateTime", Time.now.xmlschema)
-              xml.tag!("ApplicationLogin", @options[:login])
-              xml.tag!("ConnectionTicket", @options[:ticket])
+        xml.tag!('QBMSXML') do
+          xml.tag!('SignonMsgsRq') do
+            xml.tag!(hosted? ? 'SignonAppCertRq' : 'SignonDesktopRq') do
+              xml.tag!('ClientDateTime', Time.now.xmlschema)
+              xml.tag!('ApplicationLogin', @options[:login])
+              xml.tag!('ConnectionTicket', @options[:ticket])
             end
           end
 
-          xml.tag!("QBMSXMLMsgsRq") do
+          xml.tag!('QBMSXMLMsgsRq') do
             xml.tag!("#{type}Rq") do
               method("build_#{type}").call(xml, money, parameters)
             end
@@ -212,47 +223,47 @@ module ActiveMerchant #:nodoc:
         cc = parameters[:credit_card]
         name = "#{cc.first_name} #{cc.last_name}"[0...30]
 
-        xml.tag!("TransRequestID", parameters[:trans_request_id])
-        xml.tag!("CreditCardNumber", cc.number)
-        xml.tag!("ExpirationMonth", cc.month)
-        xml.tag!("ExpirationYear", cc.year)
-        xml.tag!("IsECommerce", "true")
-        xml.tag!("Amount", amount(money))
-        xml.tag!("NameOnCard", name)
+        xml.tag!('TransRequestID', parameters[:trans_request_id])
+        xml.tag!('CreditCardNumber', cc.number)
+        xml.tag!('ExpirationMonth', cc.month)
+        xml.tag!('ExpirationYear', cc.year)
+        xml.tag!('IsECommerce', 'true')
+        xml.tag!('Amount', amount(money))
+        xml.tag!('NameOnCard', name)
         add_address(xml, parameters)
-        xml.tag!("CardSecurityCode", cc.verification_value) if cc.verification_value?
+        xml.tag!('CardSecurityCode', cc.verification_value) if cc.verification_value?
       end
 
       def build_CustomerCreditCardCapture(xml, money, parameters)
-        xml.tag!("TransRequestID", parameters[:trans_request_id])
-        xml.tag!("CreditCardTransID", parameters[:transaction_id])
-        xml.tag!("Amount", amount(money))
+        xml.tag!('TransRequestID', parameters[:trans_request_id])
+        xml.tag!('CreditCardTransID', parameters[:transaction_id])
+        xml.tag!('Amount', amount(money))
       end
 
       def build_CustomerCreditCardCharge(xml, money, parameters)
         cc = parameters[:credit_card]
         name = "#{cc.first_name} #{cc.last_name}"[0...30]
 
-        xml.tag!("TransRequestID", parameters[:trans_request_id])
-        xml.tag!("CreditCardNumber", cc.number)
-        xml.tag!("ExpirationMonth", cc.month)
-        xml.tag!("ExpirationYear", cc.year)
-        xml.tag!("IsECommerce", "true")
-        xml.tag!("Amount", amount(money))
-        xml.tag!("NameOnCard", name)
+        xml.tag!('TransRequestID', parameters[:trans_request_id])
+        xml.tag!('CreditCardNumber', cc.number)
+        xml.tag!('ExpirationMonth', cc.month)
+        xml.tag!('ExpirationYear', cc.year)
+        xml.tag!('IsECommerce', 'true')
+        xml.tag!('Amount', amount(money))
+        xml.tag!('NameOnCard', name)
         add_address(xml, parameters)
-        xml.tag!("CardSecurityCode", cc.verification_value) if cc.verification_value?
+        xml.tag!('CardSecurityCode', cc.verification_value) if cc.verification_value?
       end
 
       def build_CustomerCreditCardTxnVoidOrRefund(xml, money, parameters)
-        xml.tag!("TransRequestID", parameters[:trans_request_id])
-        xml.tag!("CreditCardTransID", parameters[:transaction_id])
-        xml.tag!("Amount", amount(money))
+        xml.tag!('TransRequestID', parameters[:trans_request_id])
+        xml.tag!('CreditCardTransID', parameters[:transaction_id])
+        xml.tag!('Amount', amount(money))
       end
 
       def build_CustomerCreditCardTxnVoid(xml, money, parameters)
-        xml.tag!("TransRequestID", parameters[:trans_request_id])
-        xml.tag!("CreditCardTransID", parameters[:transaction_id])
+        xml.tag!('TransRequestID', parameters[:trans_request_id])
+        xml.tag!('CreditCardTransID', parameters[:transaction_id])
       end
 
       # Called reflectively by build_request
@@ -261,30 +272,30 @@ module ActiveMerchant #:nodoc:
 
       def add_address(xml, parameters)
         if address = parameters[:billing_address] || parameters[:address]
-          xml.tag!("CreditCardAddress", (address[:address1] || "")[0...30])
-          xml.tag!("CreditCardPostalCode", (address[:zip] || "")[0...9])
+          xml.tag!('CreditCardAddress', (address[:address1] || '')[0...30])
+          xml.tag!('CreditCardPostalCode', (address[:zip] || '')[0...9])
         end
       end
 
       def cvv_result(response)
         case response[:card_security_code_match]
-        when "Pass"         then 'M'
-        when "Fail"         then 'N'
-        when "NotAvailable" then 'P'
+        when 'Pass'         then 'M'
+        when 'Fail'         then 'N'
+        when 'NotAvailable' then 'P'
         end
       end
 
       def avs_result(response)
         case "#{response[:avs_street]}|#{response[:avs_zip]}"
-        when "Pass|Pass"                 then "D"
-        when "Pass|Fail"                 then "A"
-        when "Pass|NotAvailable"         then "B"
-        when "Fail|Pass"                 then "Z"
-        when "Fail|Fail"                 then "C"
-        when "Fail|NotAvailable"         then "N"
-        when "NotAvailable|Pass"         then "P"
-        when "NotAvailable|Fail"         then "N"
-        when "NotAvailable|NotAvailable" then "U"
+        when 'Pass|Pass'                 then 'D'
+        when 'Pass|Fail'                 then 'A'
+        when 'Pass|NotAvailable'         then 'B'
+        when 'Fail|Pass'                 then 'Z'
+        when 'Fail|Fail'                 then 'C'
+        when 'Fail|NotAvailable'         then 'N'
+        when 'NotAvailable|Pass'         then 'P'
+        when 'NotAvailable|Fail'         then 'N'
+        when 'NotAvailable|NotAvailable' then 'U'
         end
       end
     end

data/lib/active_merchant/billing/gateways/quantum.rb

@@ -44,7 +44,7 @@ module ActiveMerchant #:nodoc:
       #
       def authorize(money, creditcard, options = {})
         setup_address_hash(options)
-        commit(build_auth_request(money, creditcard, options), options )
+        commit(build_auth_request(money, creditcard, options), options)
       end
 
       # Capture an authorization that has previously been requested
@@ -69,7 +69,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def credit(money, identification, options = {})
-        deprecated CREDIT_DEPRECATION_MESSAGE
+        ActiveMerchant.deprecated CREDIT_DEPRECATION_MESSAGE
         refund(money, identification, options)
       end
 
@@ -81,7 +81,7 @@ module ActiveMerchant #:nodoc:
 
       def build_auth_request(money, creditcard, options)
         xml = Builder::XmlMarkup.new
-        add_common_credit_card_info(xml,'AUTH_ONLY')
+        add_common_credit_card_info(xml, 'AUTH_ONLY')
         add_purchase_data(xml, money)
         add_creditcard(xml, creditcard)
         add_address(xml, creditcard, options[:billing_address], options)
@@ -94,7 +94,7 @@ module ActiveMerchant #:nodoc:
 
       def build_capture_request(money, authorization, options)
         xml = Builder::XmlMarkup.new
-        add_common_credit_card_info(xml,'PREVIOUS_SALE')
+        add_common_credit_card_info(xml, 'PREVIOUS_SALE')
         transaction_id, _ = authorization_parts_from(authorization)
         add_transaction_id(xml, transaction_id)
         xml.target!
@@ -115,7 +115,7 @@ module ActiveMerchant #:nodoc:
 
       def build_void_request(authorization, options)
         xml = Builder::XmlMarkup.new
-        add_common_credit_card_info(xml,'VOID')
+        add_common_credit_card_info(xml, 'VOID')
         transaction_id, _ = authorization_parts_from(authorization)
         add_transaction_id(xml, transaction_id)
         xml.target!
@@ -123,7 +123,7 @@ module ActiveMerchant #:nodoc:
 
       def build_credit_request(money, authorization, options)
         xml = Builder::XmlMarkup.new
-        add_common_credit_card_info(xml,'RETURN')
+        add_common_credit_card_info(xml, 'RETURN')
         add_purchase_data(xml, money)
         transaction_id, cc = authorization_parts_from(authorization)
         add_transaction_id(xml, transaction_id)
@@ -182,7 +182,7 @@ module ActiveMerchant #:nodoc:
         xml.tag! 'CreditCardNumber', creditcard.number
         xml.tag! 'ExpireMonth', format(creditcard.month, :two_digits)
         xml.tag! 'ExpireYear', format(creditcard.year, :four_digits)
-        xml.tag!('CVV2', creditcard.verification_value) unless (@options[:ignore_cvv] || creditcard.verification_value.blank? )
+        xml.tag!('CVV2', creditcard.verification_value) unless @options[:ignore_cvv] || creditcard.verification_value.blank?
       end
 
       # Where we actually build the full SOAP request using builder
@@ -206,7 +206,7 @@ module ActiveMerchant #:nodoc:
         headers = { 'Content-Type' => 'text/xml' }
         response = parse(ssl_post(self.live_url, build_request(request, options), headers))
 
-        success = response[:request_status] == "Success"
+        success = response[:request_status] == 'Success'
         message = response[:request_message]
 
         if success # => checking for connectivity success first
@@ -216,10 +216,10 @@ module ActiveMerchant #:nodoc:
         end
 
         Response.new(success, message, response,
-        :test => test?,
-        :authorization => authorization,
-        :avs_result => { :code => response[:AVSResponseCode] },
-        :cvv_result => response[:CVV2ResponseCode]
+          :test => test?,
+          :authorization => authorization,
+          :avs_result => { :code => response[:AVSResponseCode] },
+          :cvv_result => response[:CVV2ResponseCode]
         )
       end
 
@@ -231,19 +231,19 @@ module ActiveMerchant #:nodoc:
         begin
           xml = REXML::Document.new(xml)
 
-          root = REXML::XPath.first(xml, "//QGWRequest/ResponseSummary")
+          root = REXML::XPath.first(xml, '//QGWRequest/ResponseSummary')
           parse_element(reply, root)
           reply[:request_status] = reply[:Status]
           reply[:request_message] = "#{reply[:Status]}: #{reply[:StatusDescription]}"
 
-          if root = REXML::XPath.first(xml, "//QGWRequest/Result")
+          if root = REXML::XPath.first(xml, '//QGWRequest/Result')
             root.elements.to_a.each do |node|
               parse_element(reply, node)
             end
           end
-        rescue Exception => e
+        rescue Exception
           reply[:request_status] = 'Failure'
-          reply[:request_message] = "Failure: There was a problem parsing the response XML"
+          reply[:request_message] = 'Failure: There was a problem parsing the response XML'
         end
 
         return reply
@@ -251,10 +251,10 @@ module ActiveMerchant #:nodoc:
 
       def parse_element(reply, node)
         if node.has_elements?
-          node.elements.each{|e| parse_element(reply, e) }
+          node.elements.each { |e| parse_element(reply, e) }
         else
           if node.parent.name =~ /item/
-            parent = node.parent.name + (node.parent.attributes["id"] ? "_" + node.parent.attributes["id"] : '')
+            parent = node.parent.name + (node.parent.attributes['id'] ? '_' + node.parent.attributes['id'] : '')
             reply[(parent + '_' + node.name).to_sym] = node.text
           else
             reply[node.name.to_sym] = node.text