payjp 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e14e02760f0aad2a6a5e7b0f8e23084d88a044fb
-  data.tar.gz: 01accdf3cccabf88b3484cca056e024e3956787f
+  metadata.gz: 73a26dcd390d3d68c2fba6c82f17ca3dee4c629d
+  data.tar.gz: 1c5731750ab0c3aeb61db20af7dbdb78206d95fd
 SHA512:
-  metadata.gz: 036359620d0da877df8d36be0d7a0a3c9d76796cd768f9928737f0e571d9d866d4050f8b829146f63904ba44fe14a7bb86c78fa25ac5374e5b38d3061b1ff94f
-  data.tar.gz: 3db817dd60fdd2c82dbf68f7d1328f2d68e7fc7417915c5678f6dd18aa49dce7d608946b32633cd947527b906859f04565062ceea9ca48f40b2e3b49cf215608
+  metadata.gz: 4906c39eb253dc0b2361c8752354c91c5c6e52c734f7a54bebbc188c7d3042901bd68e1abec0f0cce44280c374e4143f8023b0b7b8c2271a65950b549efbb6d9
+  data.tar.gz: c2455852728ca0bfadd8fcf3328788f3fbf5f90148660ac9427d528f56801bc51808b90fb04e92bc60ff68128570c997634fc69cd79f49c76d091499bee3b73c

data/.travis.yml

@@ -1,7 +1,6 @@
 language: ruby
 
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
   - 2.0.0

data/README.rdoc

@@ -2,7 +2,7 @@
 
 == Documentation
 
-{PAY.JP API Docs}[http://pay.readme.io/v1.0/docs]
+{PAY.JP API Docs}[https://pay.jp/docs/api/]
 
 == Installation
 
@@ -17,13 +17,7 @@ If you want to build the gem from source:
 
 == Requirements
 
-* Ruby 1.8.7 or above. (Ruby 1.8.6 may work if you load
-  ActiveSupport.) For Ruby versions before 1.9.2, you'll need to add this to your Gemfile:
-
-    if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('1.9.2')
-      gem 'rest-client', '~> 1.6.8'
-    end
-
+* Ruby 1.9.3 or above.
 
 * rest-client, json
 

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/payjp.rb

@@ -45,17 +45,28 @@ require 'payjp/errors/authentication_error'
 
 module Payjp
   @api_base = 'https://api.pay.jp'
+  @open_timeout = 30
+  @read_timeout = 80
+  @ssl_ca_file = nil
+  @ssl_ca_path = nil
+  @ssl_cert_store = nil
 
   class << self
-    attr_accessor :api_key, :api_base, :api_version, :connect_base, :uploads_base
+    attr_accessor :api_key, :api_base, :api_version, :connect_base, :uploads_base,
+                  :open_timeout, :read_timeout, :ssl_ca_file, :ssl_ca_path, :ssl_cert_store
   end
 
   def self.api_url(url = '', api_base_url = nil)
     (api_base_url || @api_base) + url
   end
 
-  def self.request(method, url, api_key, params = {}, headers = {}, api_base_url = nil)
+  def self.request(method, url, api_key, params = {}, headers = {}, api_base_url = nil, open_timeout = nil, read_timeout = nil, ssl_ca_file = nil, ssl_ca_path = nil, ssl_cert_store = nil)
     api_base_url ||= @api_base
+    open_timeout ||= @open_timeout
+    read_timeout ||= @read_timeout
+    ssl_ca_file ||= @ssl_ca_file
+    ssl_ca_path ||= @ssl_ca_path
+    ssl_cert_store ||= @ssl_cert_store
 
     unless api_key ||= @api_key
       raise AuthenticationError.new('No API key provided. ' \
@@ -91,8 +102,10 @@ module Payjp
     end
 
     request_opts.update(:headers => request_headers(api_key).update(headers),
-                        :method => method, :open_timeout => 30,
-                        :payload => payload, :url => url, :timeout => 80)
+                        :method => method, :payload => payload, :url => url,
+                        :open_timeout => open_timeout, :read_timeout => read_timeout,
+                        :ssl_ca_file => ssl_ca_file, :ssl_ca_path => ssl_ca_path,
+                        :ssl_cert_store => ssl_cert_store)
 
     begin
       # $stderr.puts request_opts
@@ -174,7 +187,7 @@ module Payjp
   def self.request_headers(api_key)
     headers = {
       :user_agent => "Payjp/v1 RubyBindings/#{Payjp::VERSION}",
-      :authorization => "Basic #{Base64.encode64("#{api_key}:")}",
+      :authorization => "Basic #{Base64.strict_encode64("#{api_key}:")}",
       :content_type => 'application/x-www-form-urlencoded'
     }
 

data/lib/payjp/version.rb

@@ -1,3 +1,3 @@
 module Payjp
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/test/test_helper.rb

@@ -29,7 +29,7 @@ class Test::Unit::TestCase
   include Mocha
 
   def encode_credentials(user_name)
-    "Basic #{Base64.encode64("#{user_name}:")}"
+    "Basic #{Base64.strict_encode64("#{user_name}:")}"
   end
 
   setup do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: payjp
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - PAY.JP
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -178,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for the Payjp API