activemerchant 1.5.0 → 1.5.1

data/CHANGELOG

@@ -1,5 +1,14 @@
 = ActiveMerchant CHANGELOG
 
+== Version 1.5.1 (February 14, 2010)
+
+* Cleanup Rakefile, add gemspec and prepare for 1.5.1 release [cody]
+* Update copyright dates [cody]
+* Work around SkipJack bug by reversing the order of the query params [Soleone]
+* Fix uppercase character in autoload of 2Checkout's Notification class [Edward Ocampo-Gooding]
+* Detect language used in Chronopay integration based on billing address country [Soleone]
+* Better handle international addresses in BeanstreamGateway [Soleone]
+
 == Version 1.5.0 (February 2, 2010)
 
 * Fix Gestpay notification to avoid Ruby 1.9 warnings [cody]

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2005 Tobias Luetke
+Copyright (c) 2005-2010 Tobias Luetke
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/active_merchant.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2005-2007 Tobias Luetke
+# Copyright (c) 2005-2010 Tobias Luetke
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -23,24 +23,11 @@
                     
 $:.unshift File.dirname(__FILE__)
 
-# Include rails' active support for all the core extensions we love
-begin
-  require 'active_support'
-rescue LoadError
-  require 'rubygems'
-  gem 'activesupport', ">=2.0.0"
-  require 'active_support'
-end
-
-begin
-  require 'builder'
-rescue LoadError
-  require 'rubygems'
-  require 'builder'
-end
-
+require 'active_support'
+require 'builder'
 require 'cgi'
 require 'rexml/document'
+
 require 'active_merchant/lib/utils'
 require 'active_merchant/lib/error'
 require 'active_merchant/lib/validateable'
@@ -50,17 +37,10 @@ require 'active_merchant/lib/post_data'
 require 'active_merchant/lib/requires_parameters'
 require 'active_merchant/lib/country'
 
-require 'active_merchant/billing/avs_result'
-require 'active_merchant/billing/cvv_result'
-require 'active_merchant/billing/credit_card_methods'
-require 'active_merchant/billing/credit_card_formatting'
-require 'active_merchant/billing/credit_card'
-require 'active_merchant/billing/base'
-require 'active_merchant/billing/check'
-require 'active_merchant/billing/gateways'
+require 'active_merchant/billing'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:    
-    autoload :Integrations, 'active_merchant/billing/integrations'    
+    autoload :Integrations, 'active_merchant/billing/integrations'
   end
 end

data/lib/active_merchant/billing.rb

@@ -0,0 +1,9 @@
+require 'active_merchant/billing/avs_result'
+require 'active_merchant/billing/cvv_result'
+require 'active_merchant/billing/credit_card_methods'
+require 'active_merchant/billing/credit_card_formatting'
+require 'active_merchant/billing/credit_card'
+require 'active_merchant/billing/base'
+require 'active_merchant/billing/check'
+require 'active_merchant/billing/response'
+require 'active_merchant/billing/gateways'

data/lib/active_merchant/billing/gateways/beanstream/beanstream_core.rb

@@ -105,7 +105,9 @@ module ActiveMerchant #:nodoc:
         post[:adjId] = reference
       end
       
-      def add_address(post, options)      
+      def add_address(post, options)
+        prepare_address_for_non_american_countries(options)
+        
         if billing_address = options[:billing_address] || options[:address]
           post[:ordName]          = billing_address[:name]
           post[:ordEmailAddress]  = options[:email]
@@ -132,6 +134,15 @@ module ActiveMerchant #:nodoc:
         end
       end
 
+      def prepare_address_for_non_american_countries(options)
+        [ options[:billing_address], options[:shipping_address] ].compact.each do |address|
+          unless ['US', 'CA'].include?(address[:country])
+            address[:state] = '--'
+            address[:zip]   = '000000' unless address[:zip]
+          end
+        end
+      end
+
       def add_invoice(post, options)
         post[:trnOrderNumber]   = options[:order_id]
         post[:trnComments]      = options[:description]

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

@@ -356,7 +356,8 @@ module ActiveMerchant #:nodoc:
       def post_data(action, money, params = {})
         add_credentials(params, action)
         add_amount(params, action, money)
-        params.collect { |key, value| "#{key.to_s}=#{CGI.escape(value.to_s)}" }.join("&")
+        sorted_params = params.to_a.sort{|a,b| a.to_s <=> b.to_s}.reverse
+        sorted_params.collect { |key, value| "#{key.to_s}=#{CGI.escape(value.to_s)}" }.join("&")
       end
 
       def add_transaction_id(post, transaction_id)

data/lib/active_merchant/billing/integrations/chronopay/helper.rb

@@ -3,12 +3,39 @@ module ActiveMerchant #:nodoc:
     module Integrations #:nodoc:
       module Chronopay
         class Helper < ActiveMerchant::Billing::Integrations::Helper
+          # All currently supported checkout languages:
+          #   es (Spanish)
+          #   en (English)
+          #   de (German)
+          #   pt (Portuguese)
+          #   lv (Latvian)
+          #   cn1 (Chinese Version 1)
+          #   cn2 (Chinese version 2)
+          #   nl (Dutch)
+          #   ru (Russian)
+          COUNTRIES_FOR_LANG = {
+            'ES'  => %w( AR BO CL CO CR CU DO EC SV GQ GT HN MX NI PA PY PE ES UY VE),
+            'DE'  => %w( DE AT CH LI ),
+            'PT'  => %w( AO BR CV GW MZ PT ST TL),
+            'RU'  => %w( BY KG KZ RU ),
+            'LV'  => 'LV',
+            'CN1' => 'CN',
+            'NL'  => 'NL'
+          }
+          
+          LANG_FOR_COUNTRY = COUNTRIES_FOR_LANG.inject(Hash.new("EN")) do |memo, (lang, countries)|
+            countries.each do |code|
+              memo[code] = lang
+            end
+            memo
+          end
+          
+
           self.country_format = :alpha3
           
           def initialize(order, account, options = {})
             super
             add_field('cb_type', 'p')
-            add_field('language', 'EN')
           end
 
           # product_id
@@ -56,6 +83,7 @@ module ActiveMerchant #:nodoc:
               field = mappings[:billing_address][k]
               add_field(field, v) unless field.nil?
             end 
+            add_field('language', checkout_language_from_country(country_code))
           end        
 
           # card_no
@@ -74,6 +102,17 @@ module ActiveMerchant #:nodoc:
           # cs2
           # cs3
           # decline_url
+          
+          
+          private
+          
+          def checkout_language_from_country(country_code)
+            country    = Country.find(country_code)
+            short_code = country.code(:alpha2).to_s
+            LANG_FOR_COUNTRY[short_code]
+          rescue InvalidCountryCodeError
+            'EN'
+          end
         end
       end
     end

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

@@ -5,7 +5,7 @@ module ActiveMerchant #:nodoc:
       module TwoCheckout 
         autoload 'Helper', File.dirname(__FILE__) + '/two_checkout/helper'
         autoload 'Return', File.dirname(__FILE__) + '/two_checkout/return'
-        autoload 'Notification', File.dirname(__FILE__) + '/two_Checkout/notification'        
+        autoload 'Notification', File.dirname(__FILE__) + '/two_checkout/notification'
        
         mattr_accessor :service_url
         self.service_url = 'https://www.2checkout.com/2co/buyer/purchase'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: activemerchant
 version: !ruby/object:Gem::Version 
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors: 
 - Tobias Luetke
@@ -30,7 +30,7 @@ cert_chain:
   hPaSTyVU0yCSnw==
   -----END CERTIFICATE-----
 
-date: 2010-02-02 00:00:00 -05:00
+date: 2010-02-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.0.0
     version: 
-description: 
+description: Active Merchant is a simple payment abstraction library used in and sponsored by Shopify. It is written by Tobias Luetke, Cody Fauser, and contributors. The aim of the project is to feel natural to Ruby users and to abstract as many parts as possible away from the user to offer a consistent interface across all supported gateways.
 email: tobi@leetsoft.com
 executables: []
 
@@ -62,6 +62,11 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- CHANGELOG
+- README.rdoc
+- MIT-LICENSE
+- CONTRIBUTORS
+- gem-public_cert.pem
 - lib/active_merchant/billing/avs_result.rb
 - lib/active_merchant/billing/base.rb
 - lib/active_merchant/billing/check.rb
@@ -176,6 +181,7 @@ files:
 - lib/active_merchant/billing/integrations/two_checkout.rb
 - lib/active_merchant/billing/integrations.rb
 - lib/active_merchant/billing/response.rb
+- lib/active_merchant/billing.rb
 - lib/active_merchant/lib/connection.rb
 - lib/active_merchant/lib/country.rb
 - lib/active_merchant/lib/error.rb
@@ -187,176 +193,6 @@ files:
 - lib/active_merchant.rb
 - lib/certs/cacert.pem
 - lib/support/gateway_support.rb
-- test/fixtures.yml
-- test/remote/gateways/remote_authorize_net_cim_test.rb
-- test/remote/gateways/remote_authorize_net_test.rb
-- test/remote/gateways/remote_beanstream_interac_test.rb
-- test/remote/gateways/remote_beanstream_test.rb
-- test/remote/gateways/remote_braintree_test.rb
-- test/remote/gateways/remote_card_stream_test.rb
-- test/remote/gateways/remote_cyber_source_test.rb
-- test/remote/gateways/remote_data_cash_test.rb
-- test/remote/gateways/remote_efsnet_test.rb
-- test/remote/gateways/remote_elavon_test.rb
-- test/remote/gateways/remote_eway_test.rb
-- test/remote/gateways/remote_exact_test.rb
-- test/remote/gateways/remote_first_pay_test.rb
-- test/remote/gateways/remote_instapay_test.rb
-- test/remote/gateways/remote_jetpay_test.rb
-- test/remote/gateways/remote_linkpoint_test.rb
-- test/remote/gateways/remote_merchant_e_solutions_test.rb
-- test/remote/gateways/remote_merchant_ware_test.rb
-- test/remote/gateways/remote_modern_payments_cim_test.rb
-- test/remote/gateways/remote_modern_payments_test.rb
-- test/remote/gateways/remote_moneris_test.rb
-- test/remote/gateways/remote_net_registry_test.rb
-- test/remote/gateways/remote_netbilling_test.rb
-- test/remote/gateways/remote_ogone_test.rb
-- test/remote/gateways/remote_pay_junction_test.rb
-- test/remote/gateways/remote_pay_secure_test.rb
-- test/remote/gateways/remote_payflow_express_test.rb
-- test/remote/gateways/remote_payflow_test.rb
-- test/remote/gateways/remote_payflow_uk_test.rb
-- test/remote/gateways/remote_payment_express_test.rb
-- test/remote/gateways/remote_paypal_express_test.rb
-- test/remote/gateways/remote_paypal_test.rb
-- test/remote/gateways/remote_plugnpay_test.rb
-- test/remote/gateways/remote_psigate_test.rb
-- test/remote/gateways/remote_psl_card_test.rb
-- test/remote/gateways/remote_quickpay_test.rb
-- test/remote/gateways/remote_realex_test.rb
-- test/remote/gateways/remote_sage_bankcard_test.rb
-- test/remote/gateways/remote_sage_pay_test.rb
-- test/remote/gateways/remote_sage_test.rb
-- test/remote/gateways/remote_sage_virtual_check_test.rb
-- test/remote/gateways/remote_sallie_mae_test.rb
-- test/remote/gateways/remote_secure_pay_au_test.rb
-- test/remote/gateways/remote_secure_pay_tech_test.rb
-- test/remote/gateways/remote_secure_pay_test.rb
-- test/remote/gateways/remote_skipjack_test.rb
-- test/remote/gateways/remote_trans_first_test.rb
-- test/remote/gateways/remote_transax_test.rb
-- test/remote/gateways/remote_trust_commerce_test.rb
-- test/remote/gateways/remote_usa_epay_test.rb
-- test/remote/gateways/remote_verifi_test.rb
-- test/remote/gateways/remote_viaklix_test.rb
-- test/remote/gateways/remote_wirecard_test.rb
-- test/remote/integrations/remote_gestpay_integration_test.rb
-- test/remote/integrations/remote_paypal_integration_test.rb
-- test/test_helper.rb
-- test/unit/avs_result_test.rb
-- test/unit/base_test.rb
-- test/unit/check_test.rb
-- test/unit/connection_test.rb
-- test/unit/country_code_test.rb
-- test/unit/country_test.rb
-- test/unit/credit_card_formatting_test.rb
-- test/unit/credit_card_methods_test.rb
-- test/unit/credit_card_test.rb
-- test/unit/cvv_result_test.rb
-- test/unit/expiry_date_test.rb
-- test/unit/gateways/authorize_net_cim_test.rb
-- test/unit/gateways/authorize_net_test.rb
-- test/unit/gateways/beanstream_interac_test.rb
-- test/unit/gateways/beanstream_test.rb
-- test/unit/gateways/bogus_test.rb
-- test/unit/gateways/braintree_test.rb
-- test/unit/gateways/card_stream_test.rb
-- test/unit/gateways/cyber_source_test.rb
-- test/unit/gateways/data_cash_test.rb
-- test/unit/gateways/efsnet_test.rb
-- test/unit/gateways/elavon_test.rb
-- test/unit/gateways/eway_test.rb
-- test/unit/gateways/exact_test.rb
-- test/unit/gateways/first_pay_test.rb
-- test/unit/gateways/gateway_test.rb
-- test/unit/gateways/instapay_test.rb
-- test/unit/gateways/jetpay_test.rb
-- test/unit/gateways/linkpoint_test.rb
-- test/unit/gateways/merchant_e_solutions_test.rb
-- test/unit/gateways/merchant_ware_test.rb
-- test/unit/gateways/modern_payments_cim_test.rb
-- test/unit/gateways/moneris_test.rb
-- test/unit/gateways/net_registry_test.rb
-- test/unit/gateways/netbilling_test.rb
-- test/unit/gateways/ogone_test.rb
-- test/unit/gateways/pay_junction_test.rb
-- test/unit/gateways/pay_secure_test.rb
-- test/unit/gateways/payflow_express_test.rb
-- test/unit/gateways/payflow_express_uk_test.rb
-- test/unit/gateways/payflow_test.rb
-- test/unit/gateways/payflow_uk_test.rb
-- test/unit/gateways/payment_express_test.rb
-- test/unit/gateways/paypal_express_test.rb
-- test/unit/gateways/paypal_test.rb
-- test/unit/gateways/plugnpay_test.rb
-- test/unit/gateways/psigate_test.rb
-- test/unit/gateways/psl_card_test.rb
-- test/unit/gateways/quickpay_test.rb
-- test/unit/gateways/realex_test.rb
-- test/unit/gateways/sage_bankcard_test.rb
-- test/unit/gateways/sage_pay_test.rb
-- test/unit/gateways/sage_virtual_check_test.rb
-- test/unit/gateways/sallie_mae_test.rb
-- test/unit/gateways/secure_pay_au_test.rb
-- test/unit/gateways/secure_pay_tech_test.rb
-- test/unit/gateways/secure_pay_test.rb
-- test/unit/gateways/skip_jack_test.rb
-- test/unit/gateways/trans_first_test.rb
-- test/unit/gateways/trust_commerce_test.rb
-- test/unit/gateways/usa_epay_test.rb
-- test/unit/gateways/verifi_test.rb
-- test/unit/gateways/viaklix_test.rb
-- test/unit/gateways/wirecard_test.rb
-- test/unit/generators/test_gateway_generator.rb
-- test/unit/generators/test_generator_helper.rb
-- test/unit/generators/test_integration_generator.rb
-- test/unit/integrations/action_view_helper_test.rb
-- test/unit/integrations/bogus_module_test.rb
-- test/unit/integrations/chronopay_module_test.rb
-- test/unit/integrations/gestpay_module_test.rb
-- test/unit/integrations/helpers/bogus_helper_test.rb
-- test/unit/integrations/helpers/chronopay_helper_test.rb
-- test/unit/integrations/helpers/gestpay_helper_test.rb
-- test/unit/integrations/helpers/hi_trust_helper_test.rb
-- test/unit/integrations/helpers/nochex_helper_test.rb
-- test/unit/integrations/helpers/paypal_helper_test.rb
-- test/unit/integrations/helpers/quickpay_helper_test.rb
-- test/unit/integrations/helpers/two_checkout_helper_test.rb
-- test/unit/integrations/hi_trust_module_test.rb
-- test/unit/integrations/nochex_module_test.rb
-- test/unit/integrations/notifications/chronopay_notification_test.rb
-- test/unit/integrations/notifications/gestpay_notification_test.rb
-- test/unit/integrations/notifications/hi_trust_notification_test.rb
-- test/unit/integrations/notifications/nochex_notification_test.rb
-- test/unit/integrations/notifications/notification_test.rb
-- test/unit/integrations/notifications/paypal_notification_test.rb
-- test/unit/integrations/notifications/quickpay_notification_test.rb
-- test/unit/integrations/notifications/two_checkout_notification_test.rb
-- test/unit/integrations/paypal_module_test.rb
-- test/unit/integrations/quickpay_module_test.rb
-- test/unit/integrations/returns/chronopay_return_test.rb
-- test/unit/integrations/returns/gestpay_return_test.rb
-- test/unit/integrations/returns/hi_trust_return_test.rb
-- test/unit/integrations/returns/nochex_return_test.rb
-- test/unit/integrations/returns/paypal_return_test.rb
-- test/unit/integrations/returns/return_test.rb
-- test/unit/integrations/returns/two_checkout_return_test.rb
-- test/unit/integrations/two_checkout_module_test.rb
-- test/unit/post_data_test.rb
-- test/unit/posts_data_test.rb
-- test/unit/response_test.rb
-- test/unit/utils_test.rb
-- test/unit/validateable_test.rb
-- script/destroy
-- script/generate
-- CHANGELOG
-- CONTRIBUTORS
-- gem-public_cert.pem
-- init.rb
-- MIT-LICENSE
-- Rakefile
-- README.rdoc
 has_rdoc: true
 homepage: http://activemerchant.org/
 licenses: []

data/Rakefile

@@ -1,153 +0,0 @@
-require 'rubygems'
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rake/gempackagetask'
-require 'rake/contrib/rubyforgepublisher'
-require File.join(File.dirname(__FILE__), 'lib', 'support', 'gateway_support')
-
-
-PKG_VERSION = "1.5.0"
-PKG_NAME = "activemerchant"
-PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
-
-PKG_FILES = FileList[
-    "lib/**/*", "test/**/*", "script/**/*", "[a-zA-Z]*"
-].exclude(/\.svn$/)
-
-
-desc "Default Task"
-task :default => 'test:units'
-
-# Run the unit tests
-namespace :test do
-
-  Rake::TestTask.new(:units) do |t|
-    t.pattern = 'test/unit/**/*_test.rb'
-    t.ruby_opts << '-rubygems'
-    t.libs << 'test'
-    t.verbose = true
-  end
-
-  Rake::TestTask.new(:remote) do |t|
-    t.pattern = 'test/remote/**/*_test.rb'
-    t.ruby_opts << '-rubygems'
-    t.libs << 'test'
-    t.verbose = true
-  end
-
-end
-
-# Genereate the RDoc documentation
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'doc'
-  rdoc.title    = "ActiveMerchant library"
-  rdoc.options << '--line-numbers' << '--inline-source' << '--main=README.rdoc'
-  rdoc.rdoc_files.include('README.rdoc', 'CHANGELOG')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-  rdoc.rdoc_files.exclude('lib/tasks')
-end
-
-task :install => [:package] do
-  `gem install pkg/#{PKG_FILE_NAME}.gem`
-end
-
-task :lines do
-  lines = 0
-  codelines = 0
-  Dir.foreach("lib") { |file_name| 
-    next unless file_name =~ /.*rb/
-
-    f = File.open("lib/" + file_name)
-
-    while line = f.gets
-      lines += 1
-      next if line =~ /^\s*$/
-      next if line =~ /^\s*#/
-      codelines += 1
-    end
-  }
-  puts "Lines #{lines}, LOC #{codelines}"
-end
-
-desc "Delete tar.gz / zip / rdoc"
-task :cleanup => [ :clobber_package, :clobber_rdoc ]
-
-spec = Gem::Specification.new do |s|
-  s.name = PKG_NAME
-  s.version = PKG_VERSION
-  s.summary = "Framework and tools for dealing with credit card transactions."
-  s.has_rdoc = true
-
-  s.files = PKG_FILES
-
-  s.rubyforge_project = "activemerchant"
-  s.require_path = 'lib'
-  s.author = "Tobias Luetke"
-  s.email = "tobi@leetsoft.com"
-  s.homepage = "http://activemerchant.org/"
-  
-  s.add_dependency('activesupport', '>= 2.3.2')
-  s.add_dependency('builder', '>= 2.0.0')
-  
-  s.signing_key = ENV['GEM_PRIVATE_KEY']
-  s.cert_chain  = ['gem-public_cert.pem']
-end
-
-Rake::GemPackageTask.new(spec) do |p|
-  p.gem_spec = spec
-  p.need_tar = true
-  p.need_zip = true
-end
-
-desc "Release the gems and docs to RubyForge"
-task :release => [ :publish, :upload_rdoc ]
-
-desc "Publish the release files to RubyForge."
-task :publish => [ :package ] do
-  require 'rubyforge'
-  
-  packages = %w( gem tgz zip ).collect{ |ext| "pkg/#{PKG_NAME}-#{PKG_VERSION}.#{ext}" }
-  
-  rubyforge = RubyForge.new
-  rubyforge.configure
-  rubyforge.login
-  rubyforge.add_release(PKG_NAME, PKG_NAME, "REL #{PKG_VERSION}", *packages)
-end
-
-desc 'Upload RDoc to RubyForge'
-task :upload_rdoc => :rdoc do
-  user = ENV['RUBYFORGE_USER'] 
-  project = "/var/www/gforge-projects/#{PKG_NAME}"
-  local_dir = 'doc'
-  pub = Rake::SshDirPublisher.new user, project, local_dir
-  pub.upload
-end
-
-namespace :gateways do
-  desc 'Print the currently supported gateways'
-  task :print do
-    support = GatewaySupport.new
-    support.to_s
-  end
-  
-  namespace :print do
-    desc 'Print the currently supported gateways in RDoc format'
-    task :rdoc do
-      support = GatewaySupport.new
-      support.to_rdoc
-    end
-  
-    desc 'Print the currently supported gateways in Textile format'
-    task :textile do
-      support = GatewaySupport.new
-      support.to_textile
-    end
-    
-    desc 'Print the gateway functionality supported by each gateway'
-    task :features do
-      support = GatewaySupport.new
-      support.features
-    end
-  end
-end