payjp 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4894124d5ba9c96bcf0d10613cb90b7b6ee33927
-  data.tar.gz: 612f883bc15553c9c2551fed5df636e7d936f78d
+  metadata.gz: ebc7ca3b834edcac9e21591f4276ab0565f2737b
+  data.tar.gz: a33c549105cf8879e36f2138b2c25c354e470960
 SHA512:
-  metadata.gz: ec9130790d73529bfe759c9198b3613db623f0fb5df87cfece9e6ea9aeb78356bd3a88bd7b7b1e6fcf15e20325c1b40e64a29c803d6cadab794052588b189267
-  data.tar.gz: 7f89a815d3a03162c94fb2bab7a797367f9c9323f1f737243494d1666cd76de9f1854b924e924c163adaff9bd63b4ad0a8ab4c720af2fd35fc7d1a32f3df9aca
+  metadata.gz: 3eee26dfe4f02da8e58681cfa911e0366684d2331ef277ce42ef9f1b639026799b1a155897c6612301e106d0ace91757350ff123060e57fb799fb6a4fbf46d43
+  data.tar.gz: baa39ffbea0e3be47a2dfcc6b671461ecfef2f57f299fa09ac78f126cfd5ee98b4f963ae4562255616c810753a4ece35e7302aeaf33a440259d6b7a1ad31ef10

data/lib/payjp/api_operations/update.rb

@@ -1,13 +1,13 @@
 module Payjp
   module APIOperations
     module Update
-      def save(params = {})
+      def save(params = {}, opts = {})
         values = self.class.serialize_params(self).merge(params)
 
         if values.length > 0
           values.delete(:id)
 
-          response, opts = request(:post, url, values)
+          response, opts = request(:post, url, values, opts)
           refresh_from(response, opts)
         end
         self

data/lib/payjp/charge.rb

@@ -14,6 +14,11 @@ module Payjp
       refresh_from(response, opts)
     end
 
+    def reauth(params = {}, opts = {})
+      response, opts = request(:post, reauth_url, params, opts)
+      refresh_from(response, opts)
+    end
+
     private
 
     def refund_url
@@ -23,5 +28,9 @@ module Payjp
     def capture_url
       url + '/capture'
     end
+
+    def reauth_url
+      url + '/reauth'
+    end
   end
 end

data/lib/payjp/payjp_object.rb

@@ -129,7 +129,7 @@ module Payjp
         # remove keys at the server, but not known locally
         if @original_values.include?(key)
           keys_to_unset = @original_values[key].keys - new_keys
-          keys_to_unset.each { |key| update[key] = '' }
+          keys_to_unset.each { |unset_key| update[unset_key] = '' }
         end
 
         update

data/lib/payjp/util.rb

@@ -62,7 +62,16 @@ module Payjp
     end
 
     def self.url_encode(key)
-      URI.escape(key.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
+      # URI.escape is obsolete, so just use the code fragment in URI library
+      # (from URI::RFC2396_Parser#escape)
+      key.to_s.gsub(Regexp.new("[^#{URI::PATTERN::UNRESERVED}]")) do
+        us = $&
+        tmp = ''
+        us.each_byte do |uc|
+          tmp << sprintf('%%%02X', uc)
+        end
+        tmp
+      end.force_encoding(Encoding::US_ASCII)
     end
 
     def self.flatten_params(params, parent_key = nil)

data/lib/payjp/version.rb

@@ -1,3 +1,3 @@
 module Payjp
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/payjp.gemspec

@@ -16,7 +16,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency('mocha', '~> 1.2.1')
   s.add_development_dependency('activesupport', ['< 5.0', '~> 4.2.7'])
-  s.add_development_dependency('shoulda', '~> 3.3.2')
   s.add_development_dependency('test-unit', '~> 3.2.2')
   s.add_development_dependency('rake', '~> 11.3.0')
   s.add_development_dependency('bundler', '>= 1.7.6')

data/test/payjp/charge_test.rb

@@ -79,5 +79,17 @@ module Payjp
       })
       assert c.paid
     end
+
+    should "charges should be reauthable" do
+      now = Time.now.localtime("+09:00")
+      expired_at = now + 60 * 60 * 24 * 6
+      expired_at = Time.new(expired_at.year, expired_at.mon, expired_at.day, 23, 59, 59, now.utc_offset)
+      @mock.expects(:get).never
+      @mock.expects(:post).once.returns(test_response({ :id => "ch_test_charge", :expired_at => expired_at.to_i }))
+
+      c = Payjp::Charge.new("test_charge")
+      c.reauth
+      assert_equal expired_at.to_i, c.expired_at
+    end
   end
 end

data/test/payjp/util_test.rb

@@ -30,5 +30,17 @@ module Payjp
       assert_raise { Payjp::Util.normalize_opts(nil) }
       assert_raise { Payjp::Util.normalize_opts(:api_key => nil) }
     end
+
+    should "url_encode should escape only UNRESERVED characters" do
+      unreserved = %q|!'()*-.0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz~|
+      (0..255).each do |c|
+        s = [c].pack("C")
+        if unreserved.include?(s)
+          assert_equal(s, Payjp::Util.url_encode(s))
+        else
+          assert_equal("%"+sprintf("%02X", c), Payjp::Util.url_encode(s))
+        end
+      end
+    end
   end
 end

data/test/test_helper.rb

@@ -2,7 +2,6 @@ require 'payjp'
 require 'test/unit'
 require 'mocha/setup'
 require 'stringio'
-require 'shoulda'
 require File.expand_path('../test_data', __FILE__)
 
 # monkeypatch request methods
@@ -11,6 +10,7 @@ module Payjp
 
   class << self
     attr_writer :mock_rest_client
+    remove_method :execute_request
   end
 
   def self.execute_request(opts)
@@ -28,6 +28,11 @@ class Test::Unit::TestCase
   include Payjp::TestData
   include Mocha
 
+  class << self
+    alias_method :context, :sub_test_case
+    alias_method :should, :test
+  end
+
   def encode_credentials(user_name)
     "Basic #{Base64.strict_encode64("#{user_name}:")}"
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: payjp
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - PAY.JP
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2017-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -58,20 +58,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 4.2.7
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.3.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.3.2
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement