activemerchant 1.15.0 → 1.16.0

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

@@ -7,7 +7,7 @@ module ActiveMerchant #:nodoc:
       self.default_currency = 'GBP'
       self.money_format = :cents
       self.supported_countries = ['HK', 'US', 'GB', 'AU']
-      self.supported_cardtypes = [:visa, :master, :american_express, :discover]
+      self.supported_cardtypes = [:visa, :master, :american_express, :discover, :jcb, :maestro]
       self.homepage_url = 'http://www.worldpay.com/'
       self.display_name = 'WorldPay'
 

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

@@ -1,4 +1,4 @@
-require_library_or_gem 'action_pack'
+require 'action_pack'
 
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
@@ -21,7 +21,7 @@ module ActiveMerchant #:nodoc:
         #    <% service.customer :first_name => 'Cody',
         #                       :last_name => 'Fauser',
         #                       :phone => '(555)555-5555',
-        #                       :email => 'codyfauser@gmail.com' %>
+        #                       :email => 'cody@example.com' %>
         #
         #    <% service.billing_address :city => 'Ottawa',
         #                              :address1 => '21 Snowy Brook Lane',

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

@@ -0,0 +1,48 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module EPaymentPlans
+        autoload :Helper, File.dirname(__FILE__) + '/e_payment_plans/helper.rb'
+        autoload :Notification, File.dirname(__FILE__) + '/e_payment_plans/notification.rb'
+
+        mattr_accessor :production_url
+        self.production_url = 'https://www.epaymentplans.com'
+
+        mattr_accessor :test_url
+        self.test_url = 'https://test.epaymentplans.com'
+
+        def self.service_url
+          mode = ActiveMerchant::Billing::Base.integration_mode
+          case mode
+          when :production
+            "#{production_url}/order/purchase"
+          when :test
+            "#{test_url}/order/purchase"
+          else
+            raise StandardError, "Integration mode set to an invalid value: #{mode}"
+          end
+        end
+
+        def self.notification_confirmation_url
+          mode = ActiveMerchant::Billing::Base.integration_mode
+          case mode
+          when :production
+            "#{production_url}/order/confirmation"
+          when :test
+            "#{test_url}/order/confirmation"
+          else
+            raise StandardError, "Integration mode set to an invalid value: #{mode}"
+          end
+        end
+
+        def self.notification(post, options = {})
+          Notification.new(post, options)
+        end
+
+        def self.return(query_string, options = {})
+          Return.new(query_string, options)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module EPaymentPlans
+        class Helper < ActiveMerchant::Billing::Integrations::Helper
+          mapping :account, 'order[account]'
+          mapping :amount, 'order[amount]'
+
+          mapping :order, 'order[num]'
+
+          mapping :customer, :first_name => 'order[first_name]',
+                             :last_name  => 'order[last_name]',
+                             :email      => 'order[email]',
+                             :phone      => 'order[phone]'
+
+          mapping :billing_address, :city     => 'order[city]',
+                                    :address1 => 'order[address1]',
+                                    :address2 => 'order[address2]',
+                                    :company  => 'order[company]',
+                                    :state    => 'order[state]',
+                                    :zip      => 'order[zip]',
+                                    :country  => 'order[country]'
+
+          mapping :notify_url, 'order[notify_url]'
+          mapping :return_url, 'order[return_url]'
+          mapping :cancel_return_url, 'order[cancel_return_url]'
+          mapping :description, 'order[description]'
+          mapping :tax, 'order[tax]'
+          mapping :shipping, 'order[shipping]'
+        end
+      end
+    end
+  end
+end

data/lib/active_merchant/billing/integrations/e_payment_plans/notification.rb

@@ -0,0 +1,84 @@
+require 'net/http'
+
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module EPaymentPlans
+        class Notification < ActiveMerchant::Billing::Integrations::Notification
+          include ActiveMerchant::PostsData
+          def complete?
+            status == "Completed"
+          end
+
+          def transaction_id
+            params['transaction_id']
+          end
+
+          def item_id
+            params['item_id']
+          end
+
+          # When was this payment received by the client.
+          def received_at
+            Time.parse(params['received_at'].to_s).utc
+          end
+
+          def gross
+            params['gross']
+          end
+
+          def currency
+            params['currency']
+          end
+
+          def security_key
+            params['security_key']
+          end
+
+          # Was this a test transaction?
+          def test?
+            params['test'] == 'test'
+          end
+
+          def status
+            params['status'].capitalize
+          end
+
+          # Acknowledge the transaction to EPaymentPlans. This method has to be called after a new
+          # apc arrives. EPaymentPlans will verify that all the information we received are correct 
+          # and will return ok or a fail.
+          #
+          # Example:
+          #
+          #   def ipn
+          #     notify = EPaymentPlans.notification(request.raw_post)
+          #
+          #     if notify.acknowledge
+          #       ... process order ... if notify.complete?
+          #     else
+          #       ... log possible hacking attempt ...
+          #     end
+          def acknowledge
+            payload = raw
+
+            response = ssl_post(EPaymentPlans.notification_confirmation_url, payload)
+
+            # Replace with the appropriate codes
+            raise StandardError.new("Faulty EPaymentPlans result: #{response}") unless ["AUTHORISED", "DECLINED"].include?(response)
+            response == "AUTHORISED"
+          end
+
+          private
+          # Take the posted data and move the relevant data into a hash
+          def parse(post)
+            @raw = post
+            for line in post.split('&')
+              key, value = *line.scan( %r{^(\w+)\=(.*)$} ).flatten
+              params[key] = value
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -14,7 +14,7 @@ module ActiveMerchant #:nodoc:
         self.application_id = 'ActiveMerchant'
 
         def initialize(order, account, options = {})
-          options.assert_valid_keys([:amount, :currency, :test, :credential2, :credential3, :credential4])
+          options.assert_valid_keys([:amount, :currency, :test, :credential2, :credential3, :credential4, :country, :account_name])
           @fields = {}
           self.order       = order
           self.account     = account
@@ -64,9 +64,9 @@ module ActiveMerchant #:nodoc:
           add_fields(key, params)
         end
         
-        def lookup_country_code(name_or_code)
+        def lookup_country_code(name_or_code, format = country_format)
           country = Country.find(name_or_code)
-          country.code(country_format).to_s
+          country.code(format).to_s
         rescue InvalidCountryCodeError
           name_or_code
         end

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

@@ -30,6 +30,8 @@ module ActiveMerchant #:nodoc:
           def initialize(order, account, options = {})
             super
             add_tracking_token
+            add_default_parameters
+            add_seller_details(options)
           end
 
 
@@ -41,6 +43,15 @@ module ActiveMerchant #:nodoc:
             add_field('merchant_fields', 'platform')
             add_field('platform', application_id)
           end
+          
+          def add_default_parameters
+            add_field('hide_login', 1)
+          end
+          
+          def add_seller_details(options)
+            add_field('recipient_description', options[:account_name]) if options[:account_name]
+            add_field('country', lookup_country_code(options[:country], :alpha3)) if options[:country]
+          end
         end
       end
     end

data/lib/active_merchant/billing/integrations/valitor/response_fields.rb

@@ -6,7 +6,7 @@ module ActiveMerchant #:nodoc:
       module Valitor
         module ResponseFields
           def success?
-            acknowledge
+            status == 'Completed'
           end
           alias :complete? :success?
           
@@ -14,20 +14,29 @@ module ActiveMerchant #:nodoc:
             @options[:test]
           end
           
-          def order
+          def item_id
             params['Tilvisunarnumer']
           end
-          
-          def received_at
-            params['Dagsetning']
-          end
+          alias :order :item_id
           
           def transaction_id
             params['VefverslunSalaID']
           end
           
+          def currency
+            nil
+          end
+          
           def status
-            "OK"
+            "Completed" if acknowledge
+          end
+
+          def received_at
+            Time.parse(params['Dagsetning'].to_s)
+          end
+          
+          def gross
+            "%0.2f" % params['Upphaed'].to_s
           end
           
           def card_type

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

@@ -6,23 +6,12 @@ module ActiveMerchant #:nodoc:
     module Integrations #:nodoc:
       module WorldPay 
        
+        # production and test have the same endpoint
         mattr_accessor :production_url
-        self.production_url = 'https://select.worldpay.com/wcc/purchase'
-
-        mattr_accessor :test_url
-        self.test_url = 'https://select-test.worldpay.com/wcc/purchase'
-
-
+        self.production_url = 'https://secure.wp3.rbsworldpay.com/wcc/purchase'
+        
         def self.service_url
-          mode = ActiveMerchant::Billing::Base.integration_mode
-          case mode
-          when :production
-            production_url
-          when :test
-            test_url
-          else
-            raise StandardError, "Integration mode set to an invalid value: #{mode}"
-          end
+          production_url
         end
 
         def self.notification(post, options = {})

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.15.0"
+  VERSION = "1.16.0"
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activemerchant
 version: !ruby/object:Gem::Version 
+  hash: 87
   prerelease: false
   segments: 
   - 1
-  - 15
+  - 16
   - 0
-  version: 1.15.0
+  version: 1.16.0
 platform: ruby
 authors: 
 - Tobias Luetke
@@ -35,54 +36,73 @@ cert_chain:
   hPaSTyVU0yCSnw==
   -----END CERTIFICATE-----
 
-date: 2011-05-12 00:00:00 -04:00
+date: 2011-07-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activesupport
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 2
         - 3
-        - 8
-        version: 2.3.8
-  type: :runtime
-  prerelease: false
-  version_requirements: *id001
+        - 11
+        version: 2.3.11
+  requirement: *id001
+  name: activesupport
 - !ruby/object:Gem::Dependency 
-  name: builder
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :runtime
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 2
         - 0
         - 0
         version: 2.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *id002
+  requirement: *id002
+  name: builder
 - !ruby/object:Gem::Dependency 
-  name: braintree
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :runtime
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 2
         - 0
         - 0
         version: 2.0.0
-  type: :runtime
+  requirement: *id003
+  name: braintree
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: *id003
+  type: :runtime
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 5
+        - 1
+        version: 1.5.1
+  requirement: *id004
+  name: json
 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: []
@@ -93,7 +113,6 @@ extra_rdoc_files: []
 
 files: 
 - CHANGELOG
-- README.rdoc
 - MIT-LICENSE
 - CONTRIBUTORS
 - gem-public_cert.pem
@@ -168,6 +187,7 @@ files:
 - lib/active_merchant/billing/gateways/paypal_ca.rb
 - lib/active_merchant/billing/gateways/paypal_express.rb
 - lib/active_merchant/billing/gateways/paypal_express_common.rb
+- lib/active_merchant/billing/gateways/paystation.rb
 - lib/active_merchant/billing/gateways/plugnpay.rb
 - lib/active_merchant/billing/gateways/psigate.rb
 - lib/active_merchant/billing/gateways/psl_card.rb
@@ -187,6 +207,7 @@ files:
 - lib/active_merchant/billing/gateways/secure_pay_tech.rb
 - lib/active_merchant/billing/gateways/skip_jack.rb
 - lib/active_merchant/billing/gateways/smart_ps.rb
+- lib/active_merchant/billing/gateways/stripe.rb
 - lib/active_merchant/billing/gateways/trans_first.rb
 - lib/active_merchant/billing/gateways/transax.rb
 - lib/active_merchant/billing/gateways/trust_commerce.rb
@@ -214,6 +235,9 @@ files:
 - lib/active_merchant/billing/integrations/directebanking/notification.rb
 - lib/active_merchant/billing/integrations/directebanking/return.rb
 - lib/active_merchant/billing/integrations/directebanking.rb
+- lib/active_merchant/billing/integrations/e_payment_plans/helper.rb
+- lib/active_merchant/billing/integrations/e_payment_plans/notification.rb
+- lib/active_merchant/billing/integrations/e_payment_plans.rb
 - lib/active_merchant/billing/integrations/gestpay/common.rb
 - lib/active_merchant/billing/integrations/gestpay/helper.rb
 - lib/active_merchant/billing/integrations/gestpay/notification.rb
@@ -289,7 +313,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 407104905764746451
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -298,6 +322,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"