webpay 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c927ca24f603b3b182f7001148cb32839dbda14e
-  data.tar.gz: 063d18639d6a65db61d86d4e70fbb09b746d580c
+  metadata.gz: ab7cf932ec8c0372298a6f00d6e885b4fd729568
+  data.tar.gz: 27aad786e540929fa939d41411a341998344cb1b
 SHA512:
-  metadata.gz: 16cc7aaed7e03c44ea73b601c034609d7736e03b2b6688310cef13176211d319cd443a249130b6ac9e6bfc7f9048c8c6623a1af6e6a256d302844049e09002ba
-  data.tar.gz: a9d269f913a2ddd4082ce5538234aa0852b4bc23818979494ec57d251d8e2af89cba558d347dbd1cff895f05de98ec0797f9e6375e70ee2528840b165d0dc11b
+  metadata.gz: 9c9945eaad012fc3060d14101e158a05ddc050a082010e166b7517d25e2a7ae05894e4a4cf6d951b4c92b1e9ca2a9e56a627a1507e4d5687eb24c7195f269753
+  data.tar.gz: 9b676b07a53a773edca3eeca496fcf7f7b375bc8b570e08212fff6d3f9671d9fa58d0140f924ec96fc40037a3cadc7c8a0c2d327cea659e7532e3b31dc5ba3e8

data/lib/webpay/recursion.rb

@@ -0,0 +1,52 @@
+module WebPay
+
+  # Object for API response hash object with <code>hash['object'] = recursion</code>
+  class Recursion < Entity
+    install_class_operations :create, :all
+
+    # @return [String] Relative path to API root
+    # @api private
+    def self.path
+      '/recursions'
+    end
+
+    # @return [Entity] WebPay::Recursion or WebPay::DeletedEntity. <code>deleted?</code> is to classify.
+    def self.retrieve(id)
+      id = id.to_s
+      if id.strip == ''
+        raise InvalidRequestError.invalid_id(id)
+      end
+      response = WebPay.client.get([path, id].join('/'))
+      if response['deleted']
+        DeletedEntity.new(response)
+      else
+        convert(response)
+      end
+    end
+
+    # @return [Boolean] false
+    def deleted?
+      false
+    end
+
+    # Send resume request.
+    # @return [Recursion] this object, resumed
+    def resume(params = {})
+      update_attributes(WebPay.client.post([path, 'resume'].join('/'), params))
+    end
+
+    # Delete this recursion.
+    # This operation cannot be undone.
+    # @return [Boolean] true if operation succeeded
+    def delete
+      response = WebPay.client.delete(path)
+      response['deleted']
+    end
+
+    # @return [String] Relative path of instance to API root
+    # @api private
+    def path
+      "/recursions/#{id}"
+    end
+  end
+end

data/lib/webpay/response_converter.rb

@@ -39,6 +39,8 @@ module WebPay
         Event.new(attributes)
       when 'shop'
         Shop.new(attributes)
+      when 'recursion'
+        Recursion.new(attributes)
       when 'account'
         Account.new(attributes)
 

data/lib/webpay/version.rb

@@ -1,5 +1,5 @@
 module WebPay
 
   # Version of WebPay gem
-  VERSION = "2.3.1"
+  VERSION = "2.4.0"
 end

data/lib/webpay.rb

@@ -22,6 +22,7 @@ module WebPay
   autoload(:Fee, 'webpay/fee')
   autoload(:Token, 'webpay/token')
   autoload(:Shop, 'webpay/shop')
+  autoload(:Recursion, 'webpay/recursion')
   autoload(:ResponseConverter, 'webpay/response_converter')
 
   @api_base = 'https://api.webpay.jp'

data/spec/resources/recursions/all.txt

@@ -0,0 +1,61 @@
+HTTP/1.1 200 OK 
+Content-Type: application/json; charset=utf-8
+X-Ua-Compatible: IE=Edge
+Etag: "85a874114a18027d48c30b768d7d795f"
+Cache-Control: max-age=0, private, must-revalidate
+X-Request-Id: 0f1a2a36522cabe66be6a7bd3b5d31ec
+X-Runtime: 0.010103
+Server: WEBrick/1.3.1 (Ruby/1.9.3/2013-02-22)
+Date: Fri, 18 Apr 2014 06:44:15 GMT
+Content-Length: 1109
+Connection: Keep-Alive
+
+{
+  "object": "list",
+  "url": "/v1/recursions",
+  "count": 5,
+  "data": [
+    {
+      "id": "rec_5lF9aV07v9IR3L0",
+      "object": "recursion",
+      "livemode": false,
+      "created": 1397803401,
+      "amount": 400,
+      "currency": "jpy",
+      "period": "month",
+      "description": "Test4",
+      "customer": "cus_5lF6YD7mq3dWdzB",
+      "shop": null,
+      "attempted": null,
+      "status": "active"
+    },
+    {
+      "id": "rec_5lF8Yxc6V65c7zc",
+      "object": "recursion",
+      "livemode": false,
+      "created": 1397803398,
+      "amount": 400,
+      "currency": "jpy",
+      "period": "month",
+      "description": "Test3",
+      "customer": "cus_5lF6YD7mq3dWdzB",
+      "shop": null,
+      "attempted": null,
+      "status": "active"
+    },
+    {
+      "id": "rec_5lF8UpcBrfAj0Rz",
+      "object": "recursion",
+      "livemode": false,
+      "created": 1397803397,
+      "amount": 400,
+      "currency": "jpy",
+      "period": "month",
+      "description": "Test2",
+      "customer": "cus_5lF6YD7mq3dWdzB",
+      "shop": null,
+      "attempted": null,
+      "status": "active"
+    }
+  ]
+}

data/spec/resources/recursions/create.txt

@@ -0,0 +1,26 @@
+HTTP/1.1 201 Created 
+Content-Type: application/json; charset=utf-8
+X-Ua-Compatible: IE=Edge
+Etag: "37625663f15f24dec9ef0739d046d14b"
+Cache-Control: max-age=0, private, must-revalidate
+X-Request-Id: faae37f4e9971a2e20ff3740bcdf8675
+X-Runtime: 0.415393
+Server: WEBrick/1.3.1 (Ruby/1.9.3/2013-02-22)
+Date: Fri, 18 Apr 2014 06:35:06 GMT
+Content-Length: 308
+Connection: Keep-Alive
+
+{
+  "id": "rec_5lFaeX56W7bkdKR",
+  "object": "recursion",
+  "livemode": false,
+  "created": 1397802905,
+  "amount": 400,
+  "currency": "jpy",
+  "period": "month",
+  "description": "WebPayマガジン購読料",
+  "customer": "cus_5lF6YD7mq3dWdzB",
+  "shop": null,
+  "attempted": null,
+  "status": "active"
+}

data/spec/resources/recursions/delete.txt

@@ -0,0 +1,16 @@
+HTTP/1.1 200 OK 
+Content-Type: application/json; charset=utf-8
+X-Ua-Compatible: IE=Edge
+Etag: "ab1d4d4a559e3f8eb960027a141a54a3"
+Cache-Control: max-age=0, private, must-revalidate
+X-Request-Id: f5ee127050e68d06e0c2e1c070679111
+X-Runtime: 0.293522
+Server: WEBrick/1.3.1 (Ruby/1.9.3/2013-02-22)
+Date: Fri, 18 Apr 2014 07:53:07 GMT
+Content-Length: 53
+Connection: Keep-Alive
+
+{
+  "id": "rec_5lFaeX56W7bkdKR",
+  "deleted": true
+}

data/spec/resources/recursions/resume.txt

@@ -0,0 +1,26 @@
+HTTP/1.1 200 OK 
+Content-Type: application/json; charset=utf-8
+X-Ua-Compatible: IE=Edge
+Etag: "24621c69f613b6fccdc9d4a4a8abf3fb"
+Cache-Control: max-age=0, private, must-revalidate
+X-Request-Id: a008ef1567889291bb1829fbc51d1431
+X-Runtime: 0.980437
+Server: WEBrick/1.3.1 (Ruby/1.9.3/2013-02-22)
+Date: Fri, 18 Apr 2014 06:47:17 GMT
+Content-Length: 292
+Connection: Keep-Alive
+
+{
+  "id": "rec_5lF8UpcBrfAj0Rz",
+  "object": "recursion",
+  "livemode": false,
+  "created": 1397803397,
+  "amount": 400,
+  "currency": "jpy",
+  "period": "month",
+  "description": "Test2",
+  "customer": "cus_5lF6YD7mq3dWdzB",
+  "shop": null,
+  "attempted": 1397803500,
+  "status": "active"
+}

data/spec/resources/recursions/retrieve.txt

@@ -0,0 +1,26 @@
+HTTP/1.1 200 OK 
+Content-Type: application/json; charset=utf-8
+X-Ua-Compatible: IE=Edge
+Etag: "9a39c473972ee2c6c7d9bd4f7ed998c9"
+Cache-Control: max-age=0, private, must-revalidate
+X-Request-Id: 1a3babf541f3500faeee6f37cc4014e7
+X-Runtime: 0.008752
+Server: WEBrick/1.3.1 (Ruby/1.9.3/2013-02-22)
+Date: Fri, 18 Apr 2014 06:42:32 GMT
+Content-Length: 314
+Connection: Keep-Alive
+
+{
+  "id": "rec_5lFaeX56W7bkdKR",
+  "object": "recursion",
+  "livemode": false,
+  "created": 1397802905,
+  "amount": 400,
+  "currency": "jpy",
+  "period": "month",
+  "description": "WebPayマガジン購読料",
+  "customer": "cus_5lF6YD7mq3dWdzB",
+  "shop": null,
+  "attempted": 1397803007,
+  "status": "active"
+}

data/spec/resources/recursions/retrieve_deleted.txt

@@ -0,0 +1,16 @@
+HTTP/1.1 200 OK 
+Content-Type: application/json; charset=utf-8
+X-Ua-Compatible: IE=Edge
+Etag: "5f69aa9cd4f51a072ee1d717727fbbc2"
+Cache-Control: max-age=0, private, must-revalidate
+X-Request-Id: 763d8f6e2a44ffa75a74d765fc7ebc11
+X-Runtime: 0.006094
+Server: WEBrick/1.3.1 (Ruby/1.9.3/2013-02-22)
+Date: Fri, 18 Apr 2014 06:48:04 GMT
+Content-Length: 53
+Connection: Keep-Alive
+
+{
+  "id": "rec_5lF8M9bka5Ov4Po",
+  "deleted": true
+}

data/spec/resources/recursions/retrieve_suspended.txt

@@ -0,0 +1,26 @@
+HTTP/1.1 200 OK 
+Content-Type: application/json; charset=utf-8
+X-Ua-Compatible: IE=Edge
+Etag: "12698e0d94810f39f72a419511570eae"
+Cache-Control: max-age=0, private, must-revalidate
+X-Request-Id: e2e4a33762953b14b091e0a2398b421a
+X-Runtime: 0.008016
+Server: WEBrick/1.3.1 (Ruby/1.9.3/2013-02-22)
+Date: Fri, 18 Apr 2014 07:59:16 GMT
+Content-Length: 295
+Connection: Keep-Alive
+
+{
+  "id": "rec_5lF8UpcBrfAj0Rz",
+  "object": "recursion",
+  "livemode": false,
+  "created": 1397803397,
+  "amount": 400,
+  "currency": "jpy",
+  "period": "month",
+  "description": "Test2",
+  "customer": "cus_5lF6YD7mq3dWdzB",
+  "shop": null,
+  "attempted": 1397803500,
+  "status": "suspended"
+}

data/spec/webpay/recursion_spec.rb

@@ -0,0 +1,93 @@
+# -*- coding: utf-8 -*-
+require 'spec_helper'
+describe WebPay::Recursion do
+  describe '.create' do
+    let(:params) {{
+        :amount => '400',
+        :currency => 'jpy',
+        :customer => 'cus_5lF6YD7mq3dWdzB',
+        :period => 'month',
+        :description => 'WebPayマガジン購読料',
+      }}
+    before do
+      stub_post_request('/recursions', 'recursions/create', params)
+    end
+    subject(:recursion) { WebPay::Recursion.create(params)}
+
+    its(:id) { should eq 'rec_5lFaeX56W7bkdKR' }
+    its(:object) { should eq 'recursion' }
+    its(:livemode) { should eq false }
+    its(:description) { should eq 'WebPayマガジン購読料' }
+    its(:attempted) { should eq nil }
+    its(:status) { should eq 'active' }
+  end
+
+  describe '.retrieve' do
+    let(:id) { 'rec_5lFaeX56W7bkdKR' }
+    before do
+      stub_get_request("/recursions/#{id}", 'recursions/retrieve')
+    end
+
+    subject(:recursion) { described_class.retrieve(id) }
+    its(:id) { should eq id }
+    its(:object) { should eq 'recursion' }
+    its(:livemode) { should eq false }
+    its(:description) { should eq 'WebPayマガジン購読料' }
+    its(:attempted) { should eq 1397803007 }
+    its(:status) { should eq 'active' }
+  end
+
+  describe '.retrieve deleted instance' do
+    let(:id) { 'rec_5lF8M9bka5Ov4Po' }
+    before do
+      stub_get_request("/recursions/#{id}", 'recursions/retrieve_deleted')
+    end
+
+    subject(:recursion) { described_class.retrieve(id) }
+    its(:id) { should eq id }
+    its(:deleted) { should eq true }
+    it { should be_deleted }
+  end
+
+  describe '.all' do
+    let(:customer_id) { 'cus_5lF6YD7mq3dWdzB' }
+    before do
+      stub_get_request("/recursions?count=3&suspended=false&customer=#{customer_id}", 'recursions/all')
+    end
+
+    subject(:list) { described_class.all(count: 3, suspended: false, customer: customer_id) }
+    its(:url) { should eq '/v1/recursions' }
+    its(:count) { should eq 5 }
+    it 'data[0].customer' do
+      expect(list.data[0].customer).to eq customer_id
+    end
+  end
+
+  describe '#resume' do
+    let(:id) { 'rec_5lF8UpcBrfAj0Rz' }
+    before do
+      stub_get_request("/recursions/#{id}", 'recursions/retrieve_suspended')
+      stub_post_request("/recursions/#{id}/resume", 'recursions/resume', retry: 'false')
+    end
+
+    it 'should update information of the retrieved recursion' do
+      recursion = described_class.retrieve(id)
+      recursion.resume(retry: false)
+
+      expect(recursion.status).to eq 'active'
+    end
+  end
+
+  describe '#delete' do
+    let(:id) { 'rec_5lFaeX56W7bkdKR' }
+    before do
+      stub_get_request("/recursions/#{id}", 'recursions/retrieve')
+      stub_delete_request("/recursions/#{id}", 'recursions/delete')
+    end
+
+    it 'should delete the retrieved recursion' do
+      recursion = described_class.retrieve(id)
+      expect(recursion.delete).to eq true
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webpay
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - webpay
@@ -9,104 +9,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2014-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.6.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.6.2
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.13.0
 description: WebPay is payment gateway service in Japan. see also https://webpay.jp/
@@ -117,9 +117,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -138,6 +138,7 @@ files:
 - lib/webpay/event.rb
 - lib/webpay/fee.rb
 - lib/webpay/operations.rb
+- lib/webpay/recursion.rb
 - lib/webpay/response_converter.rb
 - lib/webpay/shop.rb
 - lib/webpay/token.rb
@@ -167,6 +168,13 @@ files:
 - spec/resources/errors/unknown_api_error.txt
 - spec/resources/events/all_with_type.txt
 - spec/resources/events/retrieve.txt
+- spec/resources/recursions/all.txt
+- spec/resources/recursions/create.txt
+- spec/resources/recursions/delete.txt
+- spec/resources/recursions/resume.txt
+- spec/resources/recursions/retrieve.txt
+- spec/resources/recursions/retrieve_deleted.txt
+- spec/resources/recursions/retrieve_suspended.txt
 - spec/resources/shops/all.txt
 - spec/resources/shops/create.txt
 - spec/resources/shops/retrieve.txt
@@ -178,6 +186,7 @@ files:
 - spec/webpay/charge_spec.rb
 - spec/webpay/customer_spec.rb
 - spec/webpay/event_spec.rb
+- spec/webpay/recursion_spec.rb
 - spec/webpay/shop_spec.rb
 - spec/webpay/token_spec.rb
 - spec/webpay/webpay_error_spec.rb
@@ -193,17 +202,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Ruby bindings of WebPay API
@@ -232,6 +241,13 @@ test_files:
 - spec/resources/errors/unknown_api_error.txt
 - spec/resources/events/all_with_type.txt
 - spec/resources/events/retrieve.txt
+- spec/resources/recursions/all.txt
+- spec/resources/recursions/create.txt
+- spec/resources/recursions/delete.txt
+- spec/resources/recursions/resume.txt
+- spec/resources/recursions/retrieve.txt
+- spec/resources/recursions/retrieve_deleted.txt
+- spec/resources/recursions/retrieve_suspended.txt
 - spec/resources/shops/all.txt
 - spec/resources/shops/create.txt
 - spec/resources/shops/retrieve.txt
@@ -243,6 +259,7 @@ test_files:
 - spec/webpay/charge_spec.rb
 - spec/webpay/customer_spec.rb
 - spec/webpay/event_spec.rb
+- spec/webpay/recursion_spec.rb
 - spec/webpay/shop_spec.rb
 - spec/webpay/token_spec.rb
 - spec/webpay/webpay_error_spec.rb