activemerchant 1.2.1 → 1.3.0

data/lib/active_merchant/billing/integrations/hi_trust/return.rb

@@ -0,0 +1,67 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module HiTrust
+        class Return < ActiveMerchant::Billing::Integrations::Return
+          SUCCESS = "00"
+          CODES = { "00"   => "Operation completed successfully",
+                    "-1"  => "Unable to initialize winsock dll.",
+                    "-2"  => "Can't create stream socket.",
+                    "-3"  => "No Request Message.", 
+                    "-4"  => "Can't connect to server.",
+                    "-5"  => "Send socket error.",
+                    "-6"  => "Couldn't receive data.", 
+                    "-7"  => "Receive Broken message.",
+                    "-8"  => "Unable to initialize Envirnment.",
+                    "-9"  => "Can't Read Server RSA File.",
+                    "-10" => "Can't Read Client RSA File.",
+                    "-11" => "Web Server error.",
+                    "-12" => "Receive Message type error.",
+                    "-13" => "No Request Message.",
+                    "-14" => "No Response Content.",
+                    "-18" => "Merchant Update URL not found.",
+                    "-19" => "Server URL not find Domain or IP.",
+                    "-20" => "Server URL only can fill http or https.",
+                    "-21" => "Server Config File open error.",
+                    "-22" => "Server RSA Key File open error.",
+                    "-23" => "Server RSA Key File read error.",
+                    "-24" => "Server Config File have some errors, Please to check it.",
+                    "-25" => "Merchant Config File open error.",
+                    "-26" => "Merchant RSA Key File open error.",
+                    "-27" => "Merchant RSA Key File read error.",
+                    "-28" => "Merchant Config File has some errors, Please to check it.",
+                    "-29" => "Server Type is unknown.",
+                    "-30" => "Comm Type is unknown.",
+                    "-31" => "Input Parameter [ORDERNO] is null or empty.",
+                    "-32" => "Input Parameter [STOREID] is null or empty.",
+                    "-33" => "Input Parameter [ORDERDESC] is null or empty.",
+                    "-34" => "Input Parameter [CURRENCY] is null or empty.",
+                    "-35" => "Input Parameter [AMOUNT] is null or empty.",
+                    "-36" => "Input Parameter [ORDERURL] is null or empty.",
+                    "-37" => "Input Parameter [RETURNURL] is null or empty.",
+                    "-38" => "Input Parameter [DEPOSIT] is null or empty.",
+                    "-39" => "Input Parameter [QUERYFLAG] is null or empty.",
+                    "-40" => "Input Parameter [UPDATEURL] is null or empty.",
+                    "-41" => "Input Parameter [MERUPDATEURL] is null or empty.",
+                    "-42" => "Input Parameter [KEY] is null or empty.",
+                    "-43" => "Input Parameter [MAC] is null or empty.",
+                    "-44" => "Input Parameter [CIPHER] is null or empty.",
+                    "-45" => "Input Parameter [TrxType] is wrong.",
+                    "-100" => "TrustLink Server is closed. Or Merchant Server IP is not consistent with TrustLink Server setting.",
+                    "-101" => "TrustLink Server receives NULL.",
+                    "-308" => "Order Number already exists.",
+                    "positive" => "Response from Bank. Please contact with Acquirer Bank Service or HiTRUST Call Center."
+                  }
+          
+          def success?
+            params['retcode'] == SUCCESS
+          end
+          
+          def message
+            CODES[ params['retcode'] ]
+          end
+	      end
+      end
+    end
+  end
+end

data/lib/active_merchant/billing/integrations/nochex.rb

@@ -1,5 +1,6 @@
 require File.dirname(__FILE__) + '/nochex/helper.rb'
 require File.dirname(__FILE__) + '/nochex/notification.rb'
+require File.dirname(__FILE__) + '/nochex/return.rb'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
@@ -76,6 +77,10 @@ module ActiveMerchant #:nodoc:
         def self.notification(post)
           Notification.new(post)
         end  
+        
+        def self.return(query_string)
+          Return.new(query_string)
+        end
       end
     end
   end

data/lib/active_merchant/billing/integrations/nochex/return.rb

@@ -0,0 +1,10 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module Nochex
+        class Return < ActiveMerchant::Billing::Integrations::Return
+	      end
+      end
+    end
+  end
+end

data/lib/active_merchant/billing/integrations/paypal.rb

@@ -1,5 +1,6 @@
 require 'active_merchant/billing/integrations/paypal/helper.rb'
 require 'active_merchant/billing/integrations/paypal/notification.rb'
+require 'active_merchant/billing/integrations/paypal/return.rb'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
@@ -29,6 +30,10 @@ module ActiveMerchant #:nodoc:
         def self.notification(post)
           Notification.new(post)
         end
+        
+        def self.return(query_string)
+          Return.new(query_string)
+        end
       end
     end
   end

data/lib/active_merchant/billing/integrations/paypal/return.rb

@@ -0,0 +1,10 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module Paypal
+        class Return < ActiveMerchant::Billing::Integrations::Return
+	      end
+      end
+    end
+  end
+end

data/lib/active_merchant/billing/integrations/return.rb

@@ -0,0 +1,35 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      class Return
+        attr_accessor :params
+      
+        def initialize(query_string)
+          @params = parse(query_string)
+        end
+      
+        # Successful by default. Overridden in the child class
+        def success?
+          true
+        end
+      
+        def message
+          
+        end
+        
+        def parse(query_string)
+          return {} if query_string.blank?
+          
+          query_string.split('&').inject({}) do |memo, chunk|
+            next if chunk.empty?
+            key, value = chunk.split('=', 2)
+            next if key.empty?
+            value = value.nil? ? nil : CGI.unescape(value)
+            memo[CGI.unescape(key)] = value
+            memo
+          end
+        end 
+      end
+    end
+  end
+end

data/lib/active_merchant/billing/integrations/two_checkout.rb

@@ -1,5 +1,6 @@
 require File.dirname(__FILE__) + '/two_checkout/helper.rb'
 require File.dirname(__FILE__) + '/two_checkout/notification.rb'
+require File.dirname(__FILE__) + '/two_checkout/return.rb'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
@@ -12,6 +13,10 @@ module ActiveMerchant #:nodoc:
         def self.notification(post)
           Notification.new(post)
         end  
+        
+        def self.return(query_string)
+          Return.new(query_string)
+        end
       end
     end
   end

data/lib/active_merchant/billing/integrations/two_checkout/return.rb

@@ -0,0 +1,17 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module TwoCheckout
+        class Return < ActiveMerchant::Billing::Integrations::Return
+          def success?
+            params['credit_card_processed'] == 'Y'
+          end
+          
+          def message
+            
+          end
+	      end
+      end
+    end
+  end
+end

data/lib/active_merchant/billing/response.rb

@@ -1,15 +1,12 @@
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
   
-    class Error < StandardError #:nodoc:
+    class Error < ActiveMerchantError #:nodoc:
     end
   
     class Response
-      attr_reader :params
-      attr_reader :message
-      attr_reader :test
-      attr_reader :authorization
-    
+      attr_reader :params, :message, :test, :authorization, :avs_result, :cvv_result
+      
       def success?
         @success
       end
@@ -17,11 +14,18 @@ module ActiveMerchant #:nodoc:
       def test?
         @test
       end
-        
+      
+      def fraud_review?
+        @fraud_review
+      end
+      
       def initialize(success, message, params = {}, options = {})
         @success, @message, @params = success, message, params.stringify_keys
         @test = options[:test] || false        
-        @authorization = options[:authorization]        
+        @authorization = options[:authorization]
+        @fraud_review = options[:fraud_review]
+        @avs_result = AVSResult.new(options[:avs_result]).to_hash
+        @cvv_result = CVVResult.new(options[:cvv_result]).to_hash
       end
     end
   end

data/lib/active_merchant/lib/posts_data.rb

@@ -2,7 +2,13 @@ module ActiveMerchant #:nodoc:
   class ConnectionError < ActiveMerchantError
   end
   
+  class RetriableConnectionError < ConnectionError
+  end
+  
   module PostsData  #:nodoc:
+    MAX_RETRIES = 3
+    OPEN_TIMEOUT = 60
+    READ_TIMEOUT = 60
     
     def self.included(base)
       base.class_inheritable_accessor :ssl_strict
@@ -10,13 +16,18 @@ module ActiveMerchant #:nodoc:
       
       base.class_inheritable_accessor :pem_password
       base.pem_password = false
+      
+      base.class_inheritable_accessor :retry_safe
+      base.retry_safe = false
     end
     
     def ssl_post(url, data, headers = {})
       uri   = URI.parse(url)
 
       http = Net::HTTP.new(uri.host, uri.port) 
-      http.use_ssl        = true
+      http.open_timeout = OPEN_TIMEOUT
+      http.read_timeout = READ_TIMEOUT
+      http.use_ssl      = true
       
       if ssl_strict
         http.verify_mode    = OpenSSL::SSL::VERIFY_PEER
@@ -36,13 +47,34 @@ module ActiveMerchant #:nodoc:
         end
       end
 
-      begin
-        http.post(uri.request_uri, data, headers).body
-      rescue EOFError => e
-        raise ConnectionError, "The remote server dropped the connection"
-      rescue Errno::ECONNREFUSED => e
-        raise ConnectionError, "The remote server refused the connection"
+      retry_exceptions do 
+        begin
+          http.post(uri.request_uri, data, headers).body
+        rescue EOFError => e
+          raise ConnectionError, "The remote server dropped the connection"
+        rescue Errno::ECONNRESET => e
+          raise ConnectionError, "The remote server reset the connection"
+        rescue Errno::ECONNREFUSED => e
+          raise RetriableConnectionError, "The remote server refused the connection"
+        rescue Timeout::Error, Errno::ETIMEDOUT => e
+          raise ConnectionError, "The connection to the remote server timed out"
+        end
       end
     end    
+    
+    def retry_exceptions
+      retries = MAX_RETRIES
+      begin
+        yield
+      rescue RetriableConnectionError => e
+        retries -= 1
+        retry unless retries.zero?
+        raise ConnectionError, e.message
+      rescue ConnectionError
+        retries -= 1
+        retry if retry_safe && !retries.zero?
+        raise
+      end
+    end
   end
 end

data/lib/active_merchant/lib/requires_parameters.rb

@@ -1,15 +1,14 @@
 module ActiveMerchant #:nodoc:
   module RequiresParameters #:nodoc:
     def requires!(hash, *params)
-      keys = hash.keys
       params.each do |param| 
         if param.is_a?(Array)
-          raise ArgumentError.new("Missing required parameter: #{param.first}") unless keys.include?(param.first) 
+          raise ArgumentError.new("Missing required parameter: #{param.first}") unless hash.has_key?(param.first) 
 
           valid_options = param[1..-1]
           raise ArgumentError.new("Parameter: #{param.first} must be one of #{valid_options.to_sentence(:connector => 'or')}") unless valid_options.include?(hash[param.first])
         else
-          raise ArgumentError.new("Missing required parameter: #{param}") unless keys.include?(param) 
+          raise ArgumentError.new("Missing required parameter: #{param}") unless hash.has_key?(param) 
         end
       end
     end    

data/lib/active_merchant/lib/utils.rb

@@ -0,0 +1,18 @@
+require 'digest/md5'
+
+module ActiveMerchant #:nodoc:
+  module Utils #:nodoc:
+    def generate_unique_id
+      md5 = Digest::MD5.new
+      now = Time.now
+      md5 << now.to_s
+      md5 << String(now.usec)
+      md5 << String(rand(0))
+      md5 << String($$)
+      md5 << self.class.name
+      md5.hexdigest
+    end
+    
+    module_function :generate_unique_id
+  end
+end

data/lib/active_merchant/lib/validateable.rb

@@ -3,8 +3,8 @@ module ActiveMerchant #:nodoc:
     def valid?
       errors.clear
 
-      before_validate if respond_to?(:before_validate)
-      validate if respond_to?(:validate)
+      before_validate if respond_to?(:before_validate, true)
+      validate if respond_to?(:validate, true)
 
       errors.empty?
     end  
@@ -62,7 +62,7 @@ module ActiveMerchant #:nodoc:
         result = []
 
         self.each do |key, messages| 
-          if key == :base
+          if key == 'base'
             result << "#{messages.first}"
           else
             result << "#{key.to_s.humanize} #{messages.first}"

data/lib/support/gateway_support.rb

@@ -3,25 +3,38 @@ require 'active_support'
 require 'lib/active_merchant'
 
 
-class GatewaySupport
+class GatewaySupport #:nodoc:
+  ACTIONS = [:purchase, :authorize, :capture, :void, :credit, :recurring]
+  
+  include ActiveMerchant::Billing
+
   attr_reader :gateways
   
   def initialize
-    @gateways = []
-    ObjectSpace.each_object(Class) do |c|  
-      if c.name =~ /Gateway/ && c.ancestors.reject{|a| a == c}.include?(ActiveMerchant::Billing::Gateway)
-        gateways << c
-      end
-    end
-    
+    @gateways = Gateway.implementations.sort_by(&:name)
     @gateways.delete(ActiveMerchant::Billing::BogusGateway)
-    @gateways = @gateways.sort_by(&:name)
   end
   
   def each_gateway
     @gateways.each{|g| yield g }
   end
   
+  def features
+    width = 15
+    
+    print "Name".center(width + 20)
+    ACTIONS.each{|f| print "#{f.to_s.capitalize.center(width)}" }
+    puts
+    
+    each_gateway do |g|
+      print "#{g.display_name.ljust(width + 20)}"
+      ACTIONS.each do |f|
+        print "#{(g.instance_methods.include?(f.to_s) ? "Y" : "N").center(width)}"
+      end
+      puts
+    end
+  end
+  
   def to_rdoc
     each_gateway do |g|
       puts "* {#{g.display_name}}[#{g.homepage_url}] - #{g.supported_countries.join(', ')}"

data/script/destroy

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+APP_ROOT = File.join(File.dirname(__FILE__), '..')
+
+begin
+  require 'rubigen'
+rescue LoadError
+  require 'rubygems'
+  require 'rubigen'
+end
+require 'rubigen/scripts/destroy'
+
+ARGV.shift if ['--help', '-h'].include?(ARGV[0])
+RubiGen::Base.use_component_sources! [:activemerchant, :rubygems, :test_unit]
+RubiGen::Scripts::Destroy.new.run(ARGV)

data/script/generate

@@ -1,14 +1,14 @@
 #!/usr/bin/env ruby
+APP_ROOT = File.join(File.dirname(__FILE__), '..')
 
 begin
-  require 'active_support'
+  require 'rubigen'
 rescue LoadError
   require 'rubygems'
-  require 'active_support'
+  require 'rubigen'
 end
+require 'rubigen/scripts/generate'
 
-require 'erb'
-require 'script/generator/generator'
-
-ActiveMerchant::Generator::Generator.run(ARGV)
-
+ARGV.shift if ['--help', '-h'].include?(ARGV[0])
+RubiGen::Base.use_component_sources! [:activemerchant, :rubygems, :test_unit]
+RubiGen::Scripts::Generate.new.run(ARGV)