activemerchant 1.35.1 → 1.36.0

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

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/hash/slice'
+
 module ActiveMerchant #:nodoc:
   module Billing #:nodoc:
     class StripeGateway < Gateway
@@ -30,15 +32,15 @@ module ActiveMerchant #:nodoc:
       def initialize(options = {})
         requires!(options, :login)
         @api_key = options[:login]
+        @fee_refund_api_key = options[:fee_refund_login]
         super
       end
 
       def authorize(money, creditcard, options = {})
         post = create_post_for_auth_or_purchase(money, creditcard, options)
         post[:capture] = "false"
-        meta = generate_meta(options)
 
-        commit(:post, 'charges', post, meta)
+        commit(:post, 'charges', post, generate_meta(options))
       end
 
       # To create a charge on a card or a token, call
@@ -50,14 +52,12 @@ module ActiveMerchant #:nodoc:
       #   purchase(money, nil, { :customer => id, ... })
       def purchase(money, creditcard, options = {})
         post = create_post_for_auth_or_purchase(money, creditcard, options)
-        meta = generate_meta(options)
 
-        commit(:post, 'charges', post, meta)
+        commit(:post, 'charges', post, generate_meta(options))
       end
 
       def capture(money, authorization, options = {})
-        post = {}
-        post[:amount] = amount(money)
+        post = {:amount => amount(money)}
         add_application_fee(post, options)
 
         commit(:post, "charges/#{CGI.escape(authorization)}/capture", post)
@@ -68,13 +68,33 @@ module ActiveMerchant #:nodoc:
       end
 
       def refund(money, identification, options = {})
-        meta = generate_meta(options)
-        post = {}
+        post = {:amount => amount(money)}
+        commit_options = generate_meta(options)
+
+        MultiResponse.run do |r|
+          r.process { commit(:post, "charges/#{CGI.escape(identification)}/refund", post, commit_options) }
+
+          return r unless options[:refund_fee_amount]
+
+          r.process { fetch_application_fees(identification, commit_options) }
+          r.process { refund_application_fee(options[:refund_fee_amount], application_fee_from_response(r), commit_options) }
+        end
+      end
 
-        post[:amount] = amount(money) if money
-        post[:refund_application_fee] = true if options[:refund_application_fee]
+      def application_fee_from_response(response)
+        return unless response.success?
 
-        commit(:post, "charges/#{CGI.escape(identification)}/refund", post, meta)
+        application_fees = response.params["data"].select { |fee| fee["object"] == "application_fee" }
+        application_fees.first["id"] unless application_fees.empty?
+      end
+
+      def refund_application_fee(money, identification, options = {})
+        return Response.new(false, "Application fee id could not be found") unless identification
+
+        post = {:amount => amount(money)}
+        options.merge!(:key => @fee_refund_api_key)
+
+        commit(:post, "application_fees/#{CGI.escape(identification)}/refund", post, options)
       end
 
       def store(creditcard, options = {})
@@ -83,14 +103,13 @@ module ActiveMerchant #:nodoc:
         post[:description] = options[:description]
         post[:email] = options[:email]
 
-        meta = generate_meta(options)
         path = if options[:customer]
           "customers/#{CGI.escape(options[:customer])}"
         else
           'customers'
         end
 
-        commit(:post, path, post, meta)
+        commit(:post, path, post, generate_meta(options))
       end
 
       def update(customer_id, creditcard, options = {})
@@ -99,8 +118,7 @@ module ActiveMerchant #:nodoc:
       end
 
       def unstore(customer_id, options = {})
-        meta = generate_meta(options)
-        commit(:delete, "customers/#{CGI.escape(customer_id)}", nil, meta)
+        commit(:delete, "customers/#{CGI.escape(customer_id)}", nil, generate_meta(options))
       end
 
       private
@@ -179,6 +197,12 @@ module ActiveMerchant #:nodoc:
         post[:uncaptured] = true if options[:uncaptured]
       end
 
+      def fetch_application_fees(identification, options = {})
+        options.merge!(:key => @fee_refund_api_key)
+
+        commit(:get, "application_fees?charge=#{identification}", nil, options)
+      end
+
       def parse(body)
         JSON.parse(body)
       end
@@ -201,10 +225,10 @@ module ActiveMerchant #:nodoc:
       end
 
       def generate_meta(options)
-        {:ip => options[:ip]}
+        {:meta => {:ip => options[:ip]}}
       end
 
-      def headers(meta={})
+      def headers(options = {})
         @@ua ||= JSON.dump({
           :bindings_version => ActiveMerchant::VERSION,
           :lang => 'ruby',
@@ -214,19 +238,21 @@ module ActiveMerchant #:nodoc:
           :uname => (RUBY_PLATFORM =~ /linux|darwin/i ? `uname -a 2>/dev/null`.strip : nil)
         })
 
+        key = options[:key] || @api_key
+
         {
-          "Authorization" => "Basic " + Base64.encode64(@api_key.to_s + ":").strip,
+          "Authorization" => "Basic " + Base64.encode64(key.to_s + ":").strip,
           "User-Agent" => "Stripe/v1 ActiveMerchantBindings/#{ActiveMerchant::VERSION}",
           "X-Stripe-Client-User-Agent" => @@ua,
-          "X-Stripe-Client-User-Metadata" => meta.to_json
+          "X-Stripe-Client-User-Metadata" => options[:meta].to_json
         }
       end
 
-      def commit(method, url, parameters=nil, meta={})
+      def commit(method, url, parameters=nil, options = {})
         raw_response = response = nil
         success = false
         begin
-          raw_response = ssl_request(method, self.live_url + url, post_data(parameters), headers(meta))
+          raw_response = ssl_request(method, self.live_url + url, post_data(parameters), headers(options))
           response = parse(raw_response)
           success = !response.key?("error")
         rescue ResponseError => e

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

@@ -21,6 +21,10 @@ module ActiveMerchant #:nodoc:
         raise NotImplementedError.new
       end
 
+      def refund_fee(identification, options, meta)
+        raise NotImplementedError.new
+      end
+
       def json_error(raw_response)
         msg = 'Invalid response received from the WebPay API.  Please contact support@webpay.jp if you continue to receive this message.'
         msg += "  (The raw response returned by the API was #{raw_response.inspect})"
@@ -31,7 +35,7 @@ module ActiveMerchant #:nodoc:
         }
       end
 
-      def headers(meta={})
+      def headers(options = {})
         @@ua ||= JSON.dump({
           :bindings_version => ActiveMerchant::VERSION,
           :lang => 'ruby',
@@ -45,7 +49,7 @@ module ActiveMerchant #:nodoc:
           "Authorization" => "Basic " + Base64.encode64(@api_key.to_s + ":").strip,
           "User-Agent" => "Webpay/v1 ActiveMerchantBindings/#{ActiveMerchant::VERSION}",
           "X-Webpay-Client-User-Agent" => @@ua,
-          "X-Webpay-Client-User-Metadata" => meta.to_json
+          "X-Webpay-Client-User-Metadata" => options[:meta].to_json
         }
       end
     end

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

@@ -0,0 +1,28 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      # Platron API: www.platron.ru/PlatronAPI.pdf‎
+      module Platron
+        autoload :Helper, File.dirname(__FILE__) + '/platron/helper.rb'
+        autoload :Notification, File.dirname(__FILE__) + '/platron/notification.rb'
+        autoload :Common, File.dirname(__FILE__) + '/platron/common.rb'
+
+        mattr_accessor :service_url
+        self.service_url = 'https://www.platron.ru/payment.php'
+
+        def self.notification(raw_post)
+          Notification.new(raw_post)
+        end
+
+        def self.generate_signature_string(params, path, secret)
+          sorted_params = params.sort_by{|k,v| k.to_s}.collect{|k,v| v}
+          [path, sorted_params, secret].flatten.compact.join(';')
+        end
+
+        def self.generate_signature(params, path, secret)
+          Digest::MD5.hexdigest(generate_signature_string(params, path, secret))
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module Platron
+        class Helper < ActiveMerchant::Billing::Integrations::Helper
+          def initialize(order, account, options = {})
+            @secret_key = options.delete(:secret)
+            @path = options.delete(:path)
+            description = options.delete(:description)
+            super
+            self.add_field('pg_salt', rand(36**15).to_s(36))
+            self.add_field('pg_description', description)
+          end
+
+          def form_fields
+            @fields.merge('pg_sig' => Common.generate_signature(@fields, @path, @secret_key))
+          end
+
+          def params
+            @fields
+          end
+
+          mapping :account, 'pg_merchant_id'
+          mapping :amount, 'pg_amount'
+          mapping :order, 'pg_order_id'
+          mapping :description, 'pg_description'
+          mapping :currency, 'pg_currency'
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,113 @@
+require 'builder'
+
+module ActiveMerchant #:nodoc:
+  module Billing #:nodoc:
+    module Integrations #:nodoc:
+      module Platron
+        class Notification < ActiveMerchant::Billing::Integrations::Notification
+          def initialize(*args)
+            super
+            @signature = params.delete('pg_sig')
+          end
+
+          def complete?
+            params['pg_result']
+          end
+
+          def order_id
+            params['pg_order_id']
+          end
+
+          def platron_payment_id
+            params['pg_payment_id']
+          end
+
+          def currency
+            params['pg_ps_currency']
+          end
+
+          def payment_system
+            params['pg_payment_system']
+          end
+
+          def user_phone
+            params['pg_user_phone']
+          end
+
+          def card_brand
+            params['pg_card_brand']
+          end
+
+          def captured
+            params['pg_captured']
+          end
+
+          def overpayment
+            params['pg_overpayment']
+          end
+
+          def failure_code
+            params['pg_failure_code']
+          end
+
+          def failure_description
+            params['pg_failure_description']
+          end
+
+          def payment_date
+            params['pg_payment_date']
+          end
+
+          def salt
+            params['pg_salt']
+          end
+
+          def signature
+            @signature
+          end
+
+          def net_amount
+            params['pg_net_amount']
+          end
+
+          def ps_amount
+            params['pg_ps_amount']
+          end
+
+          def ps_full_amount
+            params['pg_ps_full_amount']
+          end
+
+          def amount
+            params['pg_amount']
+          end
+
+          def secret
+            @options[:secret]
+          end
+
+          def path
+            @options[:path]
+          end
+
+          def acknowledge
+            signature == Platron.generate_signature(params, path, secret)
+          end
+
+          def success_response(path,secret)
+            salt = rand(36**15).to_s(36)
+            xml = ""
+            doc = Builder::XmlMarkup.new(:target => xml)
+            sign = Platron.generate_signature({:pg_status => 'ok', :pg_salt => salt}, path, secret)
+            doc.response do
+              doc.pg_status 'ok'
+              doc.pg_salt salt
+              doc.pg_sig sign
+            end
+            xml
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -32,6 +32,7 @@ module ActiveMerchant #:nodoc:
           mapping :fail_url, 'LMI_FAIL_URL'
           mapping :success_url, 'LMI_SUCCESS_URL'
           mapping :result_url, 'LMI_RESULT_URL'
+          mapping :debug, 'LMI_SIM_MODE'
         end
       end
     end

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

@@ -36,6 +36,10 @@ module ActiveMerchant #:nodoc:
           def acknowledge
             (security_key == generate_signature)
           end
+
+          def success_response(*args)
+            {:nothing => true}
+          end
         end
       end
     end

data/lib/active_merchant/version.rb

@@ -1,3 +1,3 @@
 module ActiveMerchant
-  VERSION = "1.35.1"
+  VERSION = "1.36.0"
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: activemerchant
 version: !ruby/object:Gem::Version
+  version: 1.36.0
   prerelease: 
-  version: 1.35.1
 platform: ruby
 authors:
 - Tobias Luetke
@@ -37,184 +37,184 @@ cert_chain:
   Z1BvU1BxN25rK3MyRlFVQko5VVpGSzFsZ016aG8vNGZaZ3pKd2J1K2NPOFNO
   dWFMUy9iagpoUGFTVHlWVTB5Q1Nudz09Ci0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-07-22 00:00:00.000000000 Z
+date: 2013-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.14
-    none: false
-  name: activesupport
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.14
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: i18n
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: money
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: money
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: builder
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
-    none: false
-  name: builder
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.1
-    none: false
-  name: json
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.1
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: active_utils
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.2
-    none: false
-  name: active_utils
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.2
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - <
       - !ruby/object:Gem::Version
         version: 1.6.0
-    none: false
-  name: nokogiri
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - <
       - !ruby/object:Gem::Version
         version: 1.6.0
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: rake
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.13.0
-    none: false
-  name: mocha
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.13.0
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.14
-    none: false
-  name: rails
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.3.14
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  name: thor
   type: :development
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
 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
@@ -469,6 +469,9 @@ files:
 - lib/active_merchant/billing/integrations/payu_in/notification.rb
 - lib/active_merchant/billing/integrations/payu_in/return.rb
 - lib/active_merchant/billing/integrations/payu_in.rb
+- lib/active_merchant/billing/integrations/platron/helper.rb
+- lib/active_merchant/billing/integrations/platron/notification.rb
+- lib/active_merchant/billing/integrations/platron.rb
 - lib/active_merchant/billing/integrations/pxpay/helper.rb
 - lib/active_merchant/billing/integrations/pxpay/notification.rb
 - lib/active_merchant/billing/integrations/pxpay/return.rb
@@ -529,17 +532,17 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: activemerchant
 rubygems_version: 1.8.23