authorizenet 1.9.4 → 1.9.5

data/lib/authorize_net/sim/transaction.rb

@@ -1,37 +1,35 @@
 module AuthorizeNet::SIM
-
   # The SIM transaction class. Handles building the transaction payload and
   # generating a set of hidden form fields to be POSTed to the gateway.
   class Transaction < AuthorizeNet::KeyValueTransaction
-    
     RANDOM_SEQUENCE_MAX = (1 << 32) - 1
-    
+
     # Our MD5 digest generator.
-    @@digest  = OpenSSL::Digest.new('md5')
+    @@digest = OpenSSL::Digest.new('md5')
 
     # The default options for the constructor.
     @@option_defaults = {
-      :sequence => nil,
-      :timestamp => nil,
-      :test => false,
-      :hosted_payment_form => false,
-      :relay_response => true,
-      :relay_url => nil,
-      :transaction_type => Type::AUTHORIZE_AND_CAPTURE
+      sequence: nil,
+      timestamp: nil,
+      test: false,
+      hosted_payment_form: false,
+      relay_response: true,
+      relay_url: nil,
+      transaction_type: Type::AUTHORIZE_AND_CAPTURE
     }
-    
+
     # Constructs a SIM transaction. You can use the new SIM transaction object
     # to build the hidden field payload needed to process a SIM transaction with
     # the gateway. In particular, this class handles generating the MD5 fingerprint
     # used to authenticate transactions at the gateway. Since the fingerprint includes
     # the amount to charge, you should not construct this object until you know EXACTLY
     # how much you want to charge (or authorize).
-    # 
+    #
     # +api_login_id+:: Your API login ID, as a string.
     # +api_transaction_key+:: Your API transaction key, as a string.
     # +amount+:: The amount of the transaction, as a string, Float or BigDecimal.
     # +options+:: A hash of options. See below for values.
-    # 
+    #
     # Options
     # +sequence+:: The sequence number of the transaction as a string or Integer. This is usually something like an invoice number. If none is provided, the SDK generates one at random.
     # +timestamp+:: The time the transaction was initiated as a string or Integer. This needs to be within 15 minutes of when the gateway receives the transaction. If no value is provided, the SDK defaults it to Time.now().
@@ -40,8 +38,9 @@ module AuthorizeNet::SIM
     # +relay_response+:: A boolean indicating if the transaction should use the relay response feature to return a receipt to the customer (defaults to true). Direct Post Method requires using a relay response.
     # +relay_url+:: A string of the URL that the gateway should hit to get the relay response (defaults to nil).
     # +transaction_type+:: The type of transaction to perform. Defaults to AuthorizeNet::Type::AUTHORIZE_AND_CAPTURE. This value is only used if run is called directly.
-    # 
+    #
     def initialize(api_login_id, api_transaction_key, amount, options = {})
+      ActiveSupport::Deprecation.warn "use AuthorizeNet::API::Transaction"
       super()
       @api_transaction_key = api_transaction_key
       @api_login_id = api_login_id
@@ -53,52 +52,46 @@ module AuthorizeNet::SIM
       @hosted_payment_form = options[:hosted_payment_form]
       @relay_url = options[:relay_url]
       @type = options[:transaction_type]
-      unless @relay_url.nil?
-        @relay_response = true
-      else
+      if @relay_url.nil?
         @relay_response = !!options[:relay_response]
+      else
+        @relay_response = true
       end
       @delim_data = !@relay_response
     end
-    
+
     # Calculates and returns the HMAC-MD5 fingerprint needed to authenticate the transaction
     # with the SIM gateway.
     def fingerprint
-      if @timestamp.nil?
-        @timestamp = Time.now.to_i
-      end
-      
-      if @sequence.nil?
-        @sequence = rand(RANDOM_SEQUENCE_MAX)
-      end
+      @timestamp = Time.now.to_i if @timestamp.nil?
+
+      @sequence = rand(RANDOM_SEQUENCE_MAX) if @sequence.nil?
       OpenSSL::HMAC.hexdigest(@@digest, @api_transaction_key, "#{@api_login_id.to_s.rstrip}^#{@sequence.to_s.rstrip}^#{@timestamp.to_s.rstrip}^#{@amount.to_s.rstrip}^")
     end
-    
+
     # Returns all the fields needed for the fingerprint. These must all be passed to the SIM
     # exactly as returned. And these values are time sensitive.
     def fingerprint_fields
       {
-        :login => @api_login_id,
-        :fp_hash => fingerprint,
-        :fp_sequence => @sequence,
-        :fp_timestamp => @timestamp,
-        :amount => @amount
+        login: @api_login_id,
+        fp_hash: fingerprint,
+        fp_sequence: @sequence,
+        fp_timestamp: @timestamp,
+        amount: @amount
       }
     end
-    
+
     # Returns all the fields (including custom) exactly as they should be named
     # in the SIM form. Fields with multiple values are returned with an array
     # for the key's value.
     def form_fields
       form_fields = {}
       form_fields[:x_test_request] = boolean_to_value(@test_mode)
-      if @hosted_payment_form
-        form_fields[:x_show_form] = 'PAYMENT_FORM'
-      end
+      form_fields[:x_show_form] = 'PAYMENT_FORM' if @hosted_payment_form
       if @relay_response && !@relay_url.nil?
         form_fields[:x_relay_url] = @relay_url
       end
-      fields.merge(:type => @type, :version => @version, :delim_data => boolean_to_value(@delim_data), :relay_response => boolean_to_value(@relay_response)).each do |k, v|
+      fields.merge(type: @type, version: @version, delim_data: boolean_to_value(@delim_data), relay_response: boolean_to_value(@relay_response)).each do |k, v|
         form_fields[to_external_field(k)] = v
       end
       fingerprint_fields.each do |k, v|
@@ -106,8 +99,7 @@ module AuthorizeNet::SIM
       end
       form_fields.merge(custom_fields)
     end
-    
-    
+
     # Takes an instance of AuthorizeNet::SIM::HostedPaymentForm and adds it to the transaction. Note that
     # many of the fields in AuthorizeNet::SIM::HostedPaymentForm are shared with those in
     # AuthorizeNet::SIM::HostedReceiptPage. For the duplicate fields, which ever value
@@ -116,7 +108,7 @@ module AuthorizeNet::SIM
       @fields.merge!(form.to_hash)
       @hosted_payment_form = true
     end
-    
+
     # Takes an instance of AuthorizeNet::SIM::HostedReceiptPage and adds it to the transaction. Note that
     # many of the fields in AuthorizeNet::SIM::HostedReceiptPage are shared with those in
     # AuthorizeNet::SIM::HostedPaymentForm. For the duplicate fields, which ever value
@@ -127,12 +119,10 @@ module AuthorizeNet::SIM
       @relay_response = false
       @delim_data = true
     end
-    
+
     # An alias for form_fields.
     def run
       form_fields
     end
-  
   end
-
 end

data/lib/authorize_net/transaction.rb

@@ -1,24 +1,22 @@
 module AuthorizeNet
-  
   # The core, API agnostic transaction class. You shouldn't instantiate this one.
   # Instead you should use AuthorizeNet::AIM::Transaction,
   # AuthorizeNet::SIM::Transaction or AuthorizeNet::ARB::Transaction.
   class Transaction
-    
     include AuthorizeNet::TypeConversions
-    
+
     # Fields to convert to/from booleans.
     @@boolean_fields = []
-    
+
     # Fields to convert to/from BigDecimal.
     @@decimal_fields = []
-    
+
     # DO NOT USE. Instantiate AuthorizeNet::AIM::Transaction,
     # AuthorizeNet::SIM::Transaction or AuthorizeNet::ARB::Transaction instead.
-    def initialize()
+    def initialize
       @fields ||= {}
     end
-    
+
     # Sets arbitrary API fields, overwriting existing values if they exist.
     # Takes a hash of key/value pairs, where the keys are the field names
     # without the "x_" prefix. You can set a field to Nil to unset it. If the
@@ -29,44 +27,40 @@ module AuthorizeNet
     # each value in the array.
     def set_fields(fields = {})
       @fields.merge!(fields)
-      @fields.reject! {|k, v| v.nil?}
+      @fields.reject! { |_k, v| v.nil? }
       @fields
     end
-    
+
     # Returns the current hash of API fields.
-    def fields
-      @fields
-    end
-        
+    attr_reader :fields
+
     # Takes an instance of AuthorizeNet::Address and adds it to the transaction.
     def set_address(address)
       @fields.merge!(address.to_hash)
     end
-    
+
     # Takes an instance of AuthorizeNet::ShippingAddress and adds it to the
     # transaction.
     def set_shipping_address(address)
       @fields.merge!(address.to_hash)
     end
-    
+
     # Takes an instance of AuthorizeNet::Customer and adds it to the transaction.
     def set_customer(customer)
       @fields.merge!(customer.to_hash)
     end
-    
+
     #:enddoc:
     protected
-    
+
     # Internal method to handle multiple types of payment arguments.
     def handle_payment_argument(payment)
       case payment
       when AuthorizeNet::CreditCard, AuthorizeNet::ECheck
         set_fields(payment.to_hash)
       else
-        set_fields(:card_num => payment)
+        set_fields(card_num: payment)
       end
     end
-    
   end
-  
-end
+end

data/lib/authorize_net/xml_response.rb

@@ -1,9 +1,7 @@
 module AuthorizeNet
-
   # The core, xml response class. You shouldn't instantiate this one.
   # Instead you should use AuthorizeNet::ARB::Response.
   class XmlResponse < AuthorizeNet::Response
-    
     # DO NOT USE. Instantiate AuthorizeNet::ARB::Response or AuthorizeNet::CIM::Response instead.
     def initialize(raw_response, transaction)
       @raw_response = raw_response
@@ -19,23 +17,23 @@ module AuthorizeNet
           @message_code = node_content_unless_nil(@root.at_css('messages message code'))
           @message_text = node_content_unless_nil(@root.at_css('messages message text'))
           @reference_id = node_content_unless_nil(@root.at_css('refId'))
-        rescue
-          @raw_response = $!
+        rescue StandardError
+          @raw_response = $ERROR_INFO
         end
       end
     end
-    
+
     # Check to see if the response indicated success. Success is defined as a 200 OK response with a resultCode
     # of 'Ok'.
     def success?
       !connection_failure? && @result_code == 'Ok'
     end
-    
+
     # Returns true if we failed to open a connection to the gateway or got back a non-200 OK HTTP response.
     def connection_failure?
-      !@raw_response.kind_of?(Net::HTTPOK)
+      !@raw_response.is_a?(Net::HTTPOK)
     end
-    
+
     # Returns the underlying Net::HTTPResponse object. This has the original response body along with
     # headers and such. Note that if an exception is generated while making the request (which happens
     # if there is no internet connection for example), you will get the exception object here instead of
@@ -43,51 +41,43 @@ module AuthorizeNet
     def raw
       @raw_response
     end
-    
+
     # Returns a deep-copy of the XML object received from the payment gateway. Or nil if there was no XML payload.
     def xml
       @root.dup unless @root.nil?
     end
-    
+
     # Returns the resultCode from the XML response. resultCode will be either 'Ok' or 'Error'.
-    def result_code
-      @result_code
-    end
-    
+    attr_reader :result_code
+
     # Returns the messageCode from the XML response. This is a code indicating the details of an error
     # or success.
-    def message_code
-      @message_code
-    end
-    
+    attr_reader :message_code
+
     # Returns the messageText from the XML response. This is a text description of the message_code.
-    def message_text
-      @message_text
-    end
-    
+    attr_reader :message_text
+
     # Alias for result_code.
     def response_code
       result_code
     end
-    
+
     # Alias for message_code.
     def response_reason_code
       message_code
     end
-    
+
     # Alias for message_text.
     def response_reason_text
       message_text
     end
-    
+
     # Returns the refId from the response if there is one. Otherwise returns nil.
-    def reference_id
-      @reference_id
-    end
-    
+    attr_reader :reference_id
+
     #:enddoc:
     protected
-    
+
     def node_content_unless_nil(node)
       if node.nil?
         nil
@@ -95,31 +85,25 @@ module AuthorizeNet
         node.content
       end
     end
-    
+
     def node_child_content_unless_nil(node)
       if node.nil?
         nil
       else
-        if node.children.length > 0
-          node.children.collect(&:content)
-        else
-          nil
-        end
+        node.children.collect(&:content) unless node.children.empty?
       end
     end
-    
+
     # Transforms a block of XML into a model Object defined by entity_desc.
     def build_entity(xml, entity_desc)
       args = {}
       entity_desc.node_structure.each do |node_desc|
-        node_name = (node_desc.keys.reject {|k| k.to_s[0..0] == '_' }).first
+        node_name = (node_desc.keys.reject { |k| k.to_s[0..0] == '_' }).first
         args.merge!(handle_node_type(xml, node_desc, node_name, args, ''))
       end
-      
-      if args.length == 0
-        return nil
-      end
-      
+
+      return nil if args.empty?
+
       if entity_desc.arg_mapping.nil?
         return entity_desc.entity_class.new(args)
       else
@@ -132,7 +116,7 @@ module AuthorizeNet
         return entity_desc.entity_class.new(*args_list)
       end
     end
-    
+
     # Parses an XML fragment into an internal representation.
     def handle_node_type(xml, node_desc, node_name, args, base_name)
       case node_desc[node_name]
@@ -144,29 +128,27 @@ module AuthorizeNet
           when Method, Proc
             content = node_desc[:_converter].call(content)
           when Symbol
-            content = self.send(node_desc[:_converter], content)
+            content = send(node_desc[:_converter], content)
           end
           args[node_desc[node_name]] = content unless content.nil?
         end
       when AuthorizeNet::EntityDescription
-        unless node_desc[:_multivalue].nil?
+        if node_desc[:_multivalue].nil?
+          entity = build_entity(xml.css(base_name + node_name.to_s), node_desc[node_name])
+          args[node_desc[:_value]] = entity unless entity.nil?
+        else
           xml.css(base_name + node_name.to_s).each do |node|
             entity = build_entity(node, node_desc[node_name])
             args[node_desc[:_multivalue]] = args[node_desc[:_multivalue]].to_a + entity.to_a unless entity.nil?
           end
-        else
-          entity = build_entity(xml.css(base_name + node_name.to_s), node_desc[node_name])
-          args[node_desc[:_value]] = entity unless entity.nil?
         end
       when Array
         node_desc[node_name].each do |inner_node|
-          inner_node_name = (inner_node.keys.reject {|k| k.to_s[0..0] == '_' }).first
+          inner_node_name = (inner_node.keys.reject { |k| k.to_s[0..0] == '_' }).first
           args.merge!(handle_node_type(xml, inner_node, inner_node_name, args, node_name.to_s + ' '))
         end
       end
-      return args
+      args
     end
-      
   end
-  
-end
+end

data/lib/authorize_net/xml_transaction.rb

@@ -1,163 +1,151 @@
 module AuthorizeNet
-
   # The ARB transaction class.
   class XmlTransaction < AuthorizeNet::Transaction
-    
     # The XML namespace used by the ARB API.
-    XML_NAMESPACE = 'AnetApi/xml/v1/schema/AnetApiSchema.xsd'
-    
+    XML_NAMESPACE = 'AnetApi/xml/v1/schema/AnetApiSchema.xsd'.freeze
+
     # Constants for both the various Authorize.Net subscription gateways are defined here.
     module Gateway
-      LIVE = 'https://api2.authorize.net/xml/v1/request.api'
-      TEST = 'https://apitest.authorize.net/xml/v1/request.api'
+      LIVE = 'https://api2.authorize.net/xml/v1/request.api'.freeze
+      TEST = 'https://apitest.authorize.net/xml/v1/request.api'.freeze
     end
-    
+
     # Constants for both the various Authorize.Net transaction types are defined here.
     module Type
-      ARB_CREATE = "ARBCreateSubscriptionRequest"
-      ARB_UPDATE = "ARBUpdateSubscriptionRequest"
-      ARB_GET_STATUS = "ARBGetSubscriptionStatusRequest"
-      ARB_CANCEL = "ARBCancelSubscriptionRequest"
-      ARB_GET_SUBSCRIPTION_LIST = "ARBGetSubscriptionListRequest"
-      CIM_CREATE_PROFILE = "createCustomerProfileRequest"
-      CIM_CREATE_PAYMENT = "createCustomerPaymentProfileRequest"
-      CIM_CREATE_ADDRESS = "createCustomerShippingAddressRequest"
-      CIM_CREATE_TRANSACTION = "createCustomerProfileTransactionRequest"
-      CIM_DELETE_PROFILE = "deleteCustomerProfileRequest"
-      CIM_DELETE_PAYMENT = "deleteCustomerPaymentProfileRequest"
-      CIM_DELETE_ADDRESS = "deleteCustomerShippingAddressRequest"
-      CIM_GET_PROFILE_IDS = "getCustomerProfileIdsRequest"
-      CIM_GET_PROFILE = "getCustomerProfileRequest"
-      CIM_GET_PAYMENT = "getCustomerPaymentProfileRequest"
-      CIM_GET_ADDRESS = "getCustomerShippingAddressRequest"
-      CIM_GET_HOSTED_PROFILE = "getHostedProfilePageRequest"
-      CIM_UPDATE_PROFILE = "updateCustomerProfileRequest"
-      CIM_UPDATE_PAYMENT = "updateCustomerPaymentProfileRequest"
-      CIM_UPDATE_ADDRESS = "updateCustomerShippingAddressRequest"
-      CIM_UPDATE_SPLIT = "updateSplitTenderGroupRequest"
-      CIM_VALIDATE_PAYMENT = "validateCustomerPaymentProfileRequest"
-      REPORT_GET_BATCH_LIST = "getSettledBatchListRequest"
-      REPORT_GET_TRANSACTION_LIST = "getTransactionListRequest"
-      REPORT_GET_UNSETTLED_TRANSACTION_LIST = "getUnsettledTransactionListRequest"
-      REPORT_GET_TRANSACTION_DETAILS = "getTransactionDetailsRequest"
+      ARB_CREATE = "ARBCreateSubscriptionRequest".freeze
+      ARB_UPDATE = "ARBUpdateSubscriptionRequest".freeze
+      ARB_GET_STATUS = "ARBGetSubscriptionStatusRequest".freeze
+      ARB_CANCEL = "ARBCancelSubscriptionRequest".freeze
+      ARB_GET_SUBSCRIPTION_LIST = "ARBGetSubscriptionListRequest".freeze
+      CIM_CREATE_PROFILE = "createCustomerProfileRequest".freeze
+      CIM_CREATE_PAYMENT = "createCustomerPaymentProfileRequest".freeze
+      CIM_CREATE_ADDRESS = "createCustomerShippingAddressRequest".freeze
+      CIM_CREATE_TRANSACTION = "createCustomerProfileTransactionRequest".freeze
+      CIM_DELETE_PROFILE = "deleteCustomerProfileRequest".freeze
+      CIM_DELETE_PAYMENT = "deleteCustomerPaymentProfileRequest".freeze
+      CIM_DELETE_ADDRESS = "deleteCustomerShippingAddressRequest".freeze
+      CIM_GET_PROFILE_IDS = "getCustomerProfileIdsRequest".freeze
+      CIM_GET_PROFILE = "getCustomerProfileRequest".freeze
+      CIM_GET_PAYMENT = "getCustomerPaymentProfileRequest".freeze
+      CIM_GET_ADDRESS = "getCustomerShippingAddressRequest".freeze
+      CIM_GET_HOSTED_PROFILE = "getHostedProfilePageRequest".freeze
+      CIM_UPDATE_PROFILE = "updateCustomerProfileRequest".freeze
+      CIM_UPDATE_PAYMENT = "updateCustomerPaymentProfileRequest".freeze
+      CIM_UPDATE_ADDRESS = "updateCustomerShippingAddressRequest".freeze
+      CIM_UPDATE_SPLIT = "updateSplitTenderGroupRequest".freeze
+      CIM_VALIDATE_PAYMENT = "validateCustomerPaymentProfileRequest".freeze
+      REPORT_GET_BATCH_LIST = "getSettledBatchListRequest".freeze
+      REPORT_GET_TRANSACTION_LIST = "getTransactionListRequest".freeze
+      REPORT_GET_UNSETTLED_TRANSACTION_LIST = "getUnsettledTransactionListRequest".freeze
+      REPORT_GET_TRANSACTION_DETAILS = "getTransactionDetailsRequest".freeze
     end
-    
+
     # Fields to convert to/from booleans.
     @@boolean_fields = []
-    
+
     # Fields to convert to/from BigDecimal.
     @@decimal_fields = []
-    
+
     # Fields to convert to/from Date.
     @@date_fields = []
-    
+
     # Fields to convert to/from DateTime.
     @@datetime_fields = []
-    
+
     # The class to wrap our response in.
     @response_class = AuthorizeNet::XmlResponse
-    
+
     # The default options for the constructor.
     @@option_defaults = {
-      :gateway => :production,
-      :verify_ssl => true,
-      :reference_id => nil
+      gateway: :production,
+      verify_ssl: true,
+      reference_id: nil
     }
-    
+
     # DO NOT USE. Instantiate AuthorizeNet::ARB::Transaction or AuthorizeNet::CIM::Transaction instead.
     def initialize(api_login_id, api_transaction_key, options = {})
       super()
       @api_login_id = api_login_id
       @api_transaction_key = api_transaction_key
-      
+
       @response ||= nil
       @type ||= nil
-      
+
       options = @@option_defaults.merge(options)
       @verify_ssl = options[:verify_ssl]
       @reference_id = options[:reference_id]
       @gateway = case options[:gateway].to_s
-      when 'sandbox', 'test'
-        Gateway::TEST
-      when 'production', 'live'
-        Gateway::LIVE
-      else
-        @gateway = options[:gateway]
-        options[:gateway]
+                 when 'sandbox', 'test'
+                   Gateway::TEST
+                 when 'production', 'live'
+                   Gateway::LIVE
+                 else
+                   @gateway = options[:gateway]
+                   options[:gateway]
       end
     end
-    
-	def setOAuthOptions()
-		if !@options_OAuth.blank?
-			@options_OAuth = @@option_defaults.merge(@options_OAuth)
-			@verify_ssl = options_OAuth[:verify_ssl]
-			@reference_id = options_OAuth[:reference_id]
-			
-			@gateway = case options_OAuth[:gateway].to_s
-			when 'sandbox', 'test'
-				Gateway::TEST
-			when 'production', 'live'
-				Gateway::LIVE
-			else
-				@gateway = options_OAuth[:gateway]
-				options_OAuth[:gateway]
-			end
-		end
-	end
-	
+
+    def setOAuthOptions
+      unless @options_OAuth.blank?
+        @options_OAuth = @@option_defaults.merge(@options_OAuth)
+        @verify_ssl = options_OAuth[:verify_ssl]
+        @reference_id = options_OAuth[:reference_id]
+
+        @gateway = case options_OAuth[:gateway].to_s
+                   when 'sandbox', 'test'
+                     Gateway::TEST
+                   when 'production', 'live'
+                     Gateway::LIVE
+                   else
+                     @gateway = options_OAuth[:gateway]
+                     options_OAuth[:gateway]
+        end
+       end
+    end
+
     # Checks if the transaction has been configured for the sandbox or not. Return FALSE if the
     # transaction is running against the production, TRUE otherwise.
     def test?
       @gateway != Gateway::LIVE
     end
-        
+
     # Checks to see if the transaction has a response (meaning it has been submitted to the gateway).
     # Returns TRUE if a response is present, FALSE otherwise.
     def has_response?
       !@response.nil?
     end
-    
+
     # Retrieve the response object (or Nil if transaction hasn't been sent to the gateway).
-    def response
-      @response
-    end
-    
+    attr_reader :response
+
     # Submits the transaction to the gateway for processing. Returns a response object. If the transaction
     # has already been run, it will return nil.
     def run
       make_request
     end
-    
+
     # Returns a deep-copy of the XML object sent to the payment gateway. Or nil if there was no XML payload.
-    def xml
-      @xml
-    end
-    
+    attr_reader :xml
+
     #:enddoc:
     protected
-    
+
     # Takes a list of nodes (a Hash is a node, and Array is a list) and returns True if any nodes
     # would be built by build_nodes. False if no new nodes would be generated.
     def has_content(nodeList, data)
       nodeList.each do |node|
-        nodeName = (node.keys.reject {|k| nodeName.to_s[0..0] == '_' }).first
+        nodeName = (node.keys.reject { |_k| nodeName.to_s[0..0] == '_' }).first
         multivalue = node[:_multivalue]
         conditional = node[:_conditional]
         value = node[nodeName]
-        unless conditional.nil?
-          value = self.send(conditional, nodeName)
-        end
+        value = send(conditional, nodeName) unless conditional.nil?
         case value
         when Array
           if multivalue.nil?
-            if has_content(value, data)
-              return true
-            end
+            return true if has_content(value, data)
           else
             data[multivalue].each do |v|
-              if has_content(value, v)
-                return true
-              end
+              return true if has_content(value, v)
             end
           end
         when Symbol
@@ -169,33 +157,31 @@ module AuthorizeNet
       end
       false
     end
-    
+
     # Takes a list of nodes (a Hash is a node, and Array is a list) and recursively builds the XML by pulling
     # values as needed from data.
     def build_nodes(builder, nodeList, data)
       nodeList.each do |node|
-        # TODO - ADD COMMENTS HERE
-        nodeName = (node.keys.reject {|k| k.to_s[0..0] == '_' }).first
+        # TODO: - ADD COMMENTS HERE
+        nodeName = (node.keys.reject { |k| k.to_s[0..0] == '_' }).first
         multivalue = node[:_multivalue]
         conditional = node[:_conditional]
         value = node[nodeName]
 
-        unless conditional.nil?
-          value = self.send(conditional, nodeName)
-        end
+        value = send(conditional, nodeName) unless conditional.nil?
         case value
         when Array # node containing other nodes
           if multivalue.nil?
-            proc = Proc.new { build_nodes(builder, value, data) }
+            proc = proc { build_nodes(builder, value, data) }
             builder.send(nodeName, &proc) if has_content(value, data)
           else
             data[multivalue].to_a.each do |v|
-              proc = Proc.new { build_nodes(builder, value, v) }
+              proc = proc { build_nodes(builder, value, v) }
               builder.send(nodeName, &proc) if has_content(value, v)
             end
           end
         when Symbol # node containing actual data
-          if data[value].kind_of?(Array)
+          if data[value].is_a?(Array)
             data[value].each do |v|
               converted = convert_field(value, v)
               builder.send(nodeName, converted) unless converted.nil?
@@ -209,32 +195,30 @@ module AuthorizeNet
         end
       end
     end
-    
+
     def convert_field(field, value)
-      if @@boolean_fields.include?(field) and !value.nil?
+      if @@boolean_fields.include?(field) && !value.nil?
         return boolean_to_value(value)
-      elsif @@decimal_fields.include?(field) and !value.nil?
+      elsif @@decimal_fields.include?(field) && !value.nil?
         return decimal_to_value(value)
-      elsif @@date_fields.include?(field) and !value.nil?
+      elsif @@date_fields.include?(field) && !value.nil?
         return date_to_value(value)
-      elsif @@datetime_fields.include?(field) and !value.nil?
+      elsif @@datetime_fields.include?(field) && !value.nil?
         return datetime_to_value(value)
       elsif field == :extra_options
         # handle converting extra options
         options = []
-        unless value.nil?
-          value.each_pair{|k,v| options <<= self.to_param(k, v)}
-        end
+        value.each_pair { |k, v| options <<= to_param(k, v) } unless value.nil?
         unless @custom_fields.nil?
           # special sort to maintain compatibility with AIM custom field ordering
           # FIXME - This should be DRY'd up.
           custom_field_keys = @custom_fields.keys.collect(&:to_s).sort.collect(&:to_sym)
           for key in custom_field_keys
-            options <<= self.to_param(key, @custom_fields[key.to_sym], '')
+            options <<= to_param(key, @custom_fields[key.to_sym], '')
           end
         end
-        
-        if options.length > 0
+
+        if !options.empty?
           return options.join('&')
         else
           return nil
@@ -243,38 +227,36 @@ module AuthorizeNet
         # convert MMYY expiration dates into the XML equivalent
         unless value.nil?
           begin
-            return value.to_s.downcase == 'xxxx' ? 'XXXX' : Date.strptime(value.to_s, '%m%y').strftime('%Y-%m')
-          rescue
+            return value.to_s.casecmp('xxxx').zero? ? 'XXXX' : Date.strptime(value.to_s, '%m%y').strftime('%Y-%m')
+          rescue StandardError
             # If we didn't get the exp_date in MMYY format, try our best to convert it
             return Date.parse(value.to_s).strftime('%Y-%m')
           end
         end
       end
-      
+
       value
     end
-    
+
     # An internal method that builds the POST body, submits it to the gateway, and constructs a Response object with the response.
     def make_request
-      if has_response?
-        return nil
-      end
-      
+      return nil if has_response?
+
       fields = @fields
-  
-      builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |x|
-        x.send(@type.to_sym, :xmlns => XML_NAMESPACE) {
-          x.merchantAuthentication {
+
+      builder = Nokogiri::XML::Builder.new(encoding: 'utf-8') do |x|
+        x.send(@type.to_sym, xmlns: XML_NAMESPACE) do
+          x.merchantAuthentication do
             x.name @api_login_id
             x.transactionKey @api_transaction_key
-          }
+          end
           build_nodes(x, self.class.const_get(:FIELDS)[@type], fields)
-        }
+        end
       end
-      @xml = builder.to_xml 
+      @xml = builder.to_xml
 
       url = URI.parse(@gateway)
-      
+
       request = Net::HTTP::Post.new(url.path)
       request.content_type = 'text/xml'
       request.body = @xml
@@ -285,14 +267,13 @@ module AuthorizeNet
       else
         connection.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
-      
+
       # Use our Class's @response_class variable to find the Response class we are supposed to use.
       begin
-        @response = self.class.instance_variable_get(:@response_class).new((connection.start {|http| http.request(request)}), self)
-      rescue
-        @response = self.class.instance_variable_get(:@response_class).new($!, self)
+        @response = self.class.instance_variable_get(:@response_class).new((connection.start { |http| http.request(request) }), self)
+      rescue StandardError
+        @response = self.class.instance_variable_get(:@response_class).new($ERROR_INFO, self)
       end
     end
-    
   end
 end