paymentrails 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c53c6a60f6f1f794c3e9b9c00622e3784775ec4f248a533da5fa1eed7a90d6eb
-  data.tar.gz: 5c862b9b691ec0307978832b94b2be2d9b0ce404a1c1dc3955bacb7fc8b7c6fe
+  metadata.gz: 44ac83f800a214ab670b0f896817785b08c17a7991c1a9bd709eecefbea624f9
+  data.tar.gz: 8645750959fe8071d3d07e155473a4eb29ded347f44d25ea7bf12b92a71ec46b
 SHA512:
-  metadata.gz: '098a1fdc46f93f41d788bd1f9786c104ad352c39d541bea990021462a888fb32eb24519dcdb5f6f5939a18ac285789c26412c47e3bdcbf66c187ed88970e3849'
-  data.tar.gz: 7ea00ca85505bcfc89f6d75cc8408362a31ef845275c0b6231119bc10ccc2b4e302592e4399ffe5974ff84dcd240a6dc892f762e00f2e88f3e886458fd538555
+  metadata.gz: 17135435e18bda035813a88c3ad821add0a85cdf519e853e49c93ada53f24cd15a0432f5dbba439b7b25ae41bbcc621c7f032ae69ad7f9c4caaba63451d3086b
+  data.tar.gz: 86b59823d94e9d096d13580658b076d5548ac33ec4af4e8f6b6ca7de659c9038a5535f65b72ee0b20721a4e5ba17170af24c4dd21d7b2119a92952ceaf7e4943

data/lib/paymentrails.rb

@@ -18,8 +18,7 @@ require 'paymentrails/RecipientAccount'
 require 'paymentrails/OfflinePayment'
 
 module PaymentRails
-  def self.client(key, secret, environment = 'production')
-    client = Gateway.new(Configuration.new(key, secret, environment))
-    return client
+  def self.client(key, secret, environment = 'production', **optionals)
+    Gateway.new(Configuration.new(key, secret, environment, optionals))
   end
 end

data/lib/paymentrails/Client.rb

@@ -2,7 +2,6 @@
 require 'digest'
 require 'net/http'
 require 'openssl'
-require 'rest-client'
 require 'uri'
 require 'json'
 
@@ -34,7 +33,10 @@ module PaymentRails
 
     def send_request(endPoint, method, body = '')
       uri = URI.parse(@config.apiBase + endPoint)
-      http = Net::HTTP.new(uri.host, uri.port)
+      http = Net::HTTP.new(
+        uri.host, uri.port,
+        @config.proxy&.host, @config.proxy&.port, @config.proxy&.user, @config.proxy&.password
+      )
       http.use_ssl = @config.useSsl?
 
       time = Time.now.to_i

data/lib/paymentrails/Configuration.rb

@@ -1,12 +1,19 @@
 module PaymentRails
   class Configuration
+    class InvalidProxyAddress < StandardError; end
 
-    def initialize(publicKey, privateKey, environment = 'production')
+    def initialize(publicKey, privateKey, environment = 'production', proxy_uri: nil)
       raise ArgumentError, 'Both key/secret must be a nonempty string' if publicKey.to_s&.empty? || privateKey.to_s&.empty?
 
       @publicKey = publicKey
       @privateKey = privateKey
       @environment = environment
+      # failfast on a bad proxy
+      begin
+        @proxy = proxy_uri.nil? ? nil : URI.parse(proxy_uri)
+      rescue URI::InvalidURIError
+        raise InvalidProxyAddress, "Invalid proxy provided to configuration: #{proxy_uri}"
+      end
     end
 
     def apiBase
@@ -26,6 +33,8 @@ module PaymentRails
       apiBase.start_with? 'https'
     end
 
+    attr_reader :proxy
+
     attr_reader :publicKey
 
     attr_writer :publicKey

data/lib/paymentrails/Payment.rb

@@ -21,6 +21,7 @@ module PaymentRails
       :merchantFees,
       :compliance,
       :payoutMethod,
+      :estimatedDeliveryAt,
       :recipient,
       :withholdingAmount,
       :withholdingCurrency,

data/paymentrails.gemspec

@@ -4,14 +4,14 @@ Gem::Specification.new do |s|
   s.name = "paymentrails"
   s.summary = "PaymentRails Ruby SDK"
   s.description = "Ruby SDK for interacting with the PaymentRails API"
-  s.version = '0.2.3'
+  s.version = '0.2.4'
   s.homepage = 'https://www.paymentrails.com/'
   s.email = ['joshua@paymentrails.com']
   s.license = "MIT"
   s.author = "PaymentRails"
   s.files = Dir.glob ["README.rdoc", "LICENSE", "lib/**/*.{rb,crt}", "spec/**/*", "*.gemspec"]
   s.required_ruby_version = '>= 2.4'
-  s.add_dependency "rest-client", ">= 2.0.0"
+  s.add_development_dependency 'dotenv', '~> 2'
   s.add_development_dependency 'rake', '~> 12'
   s.add_development_dependency "rubocop", '~> 0.77'
   s.add_development_dependency 'test-unit', '~> 3'

data/spec/integration/BatchTest.rb

@@ -1,10 +1,13 @@
-require_relative '../../lib/paymentrails'
-require 'test/unit'
-require 'securerandom'
+require_relative 'helper'
 
 class BatchTest < Test::Unit::TestCase
   def setup
-    @client = PaymentRails::Gateway.new(PaymentRails::Configuration.new('YOUR-API-KEY', 'YOUR-SECRET-KEY'))
+    @client = PaymentRails.client(
+      ENV.fetch('SANDBOX_API_KEY'),
+      ENV.fetch('SANDBOX_SECRET_KEY'),
+      'production',
+      proxy_uri: ENV['PROXY_URI']
+    )
   end
 
   def create_recipient

data/spec/integration/RecipientTest.rb

@@ -1,10 +1,13 @@
-require_relative '../../lib/paymentrails'
-require 'test/unit'
-require 'securerandom'
+require_relative 'helper'
 
 class RecipientTest < Test::Unit::TestCase
   def setup
-    @client = PaymentRails::Gateway.new(PaymentRails::Configuration.new('YOUR-API-KEY', 'YOUR-SECRET-KEY'))
+    @client = PaymentRails.client(
+      ENV.fetch('SANDBOX_API_KEY'),
+      ENV.fetch('SANDBOX_SECRET_KEY'),
+      'production',
+      proxy_uri: ENV['PROXY_URI']
+    )
   end
 
   def test_create

data/spec/integration/helper.rb

@@ -0,0 +1,4 @@
+require 'dotenv/load'
+require_relative '../../lib/paymentrails'
+require 'test/unit'
+require 'securerandom'

data/spec/unit/ConfigurationTest.rb

@@ -33,4 +33,19 @@ class ConfigurationTest < Test::Unit::TestCase
     assert_equal true, PaymentRails::Configuration.new('key', 'secret', 'development').useSsl?
     assert_equal true, PaymentRails::Configuration.new('key', 'secret', 'non_standard_environment').useSsl?
   end
+
+  def test_invalid_proxy_uri
+    proxy_uri = 'not_://*a_valid_proxy'
+    assert_raise PaymentRails::Configuration::InvalidProxyAddress.new("Invalid proxy provided to configuration: #{proxy_uri}") do
+      PaymentRails::Configuration.new('k', 's', 'production', proxy_uri: proxy_uri).proxy
+    end
+  end
+
+  def test_vaid_proxy_uri
+    config = PaymentRails::Configuration.new('k', 's', 'production', proxy_uri: 'http://user:pass@gimmeproxy.com:80')
+    assert_equal 'gimmeproxy.com', config.proxy.host
+    assert_equal 80, config.proxy.port
+    assert_equal 'user', config.proxy.user
+    assert_equal 'pass', config.proxy.password
+  end
 end

data/spec/unit/PaymentRailsTest.rb

@@ -3,6 +3,13 @@ require 'test/unit'
 
 class PaymentRailsTest < Test::Unit::TestCase
   def test_client
-    PaymentRails.client('key', 'secret', 'environment')
+    PaymentRails.client('key', 'secret', 'environment', proxy_uri: 'http://user:pass@gimmeproxy.com:80')
+  end
+
+  def test_client_invalid_proxy_uri
+    proxy_uri = 'not_://*a_valid_proxy'
+    assert_raise PaymentRails::Configuration::InvalidProxyAddress.new("Invalid proxy provided to configuration: #{proxy_uri}") do
+      PaymentRails.client('k', 's', 'production', proxy_uri: proxy_uri)
+    end
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: paymentrails
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - PaymentRails
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-18 00:00:00.000000000 Z
+date: 2020-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :runtime
+        version: '2'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -95,6 +95,7 @@ files:
 - paymentrails.gemspec
 - spec/integration/BatchTest.rb
 - spec/integration/RecipientTest.rb
+- spec/integration/helper.rb
 - spec/unit/ConfigurationTest.rb
 - spec/unit/PaymentRailsTest.rb
 homepage: https://www.paymentrails.com/