komoju 0.0.4 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9aa468573b03e3b7f7f434102e0ba9ed11e93318
-  data.tar.gz: 5f73f786782afdd5b8f4ed512b1b23210574fe44
+  metadata.gz: 8cfa7016aea050e4612e7c24e96854405b2f2237
+  data.tar.gz: b1c92adb38691718e43b2ab958398f45c6b4b7f7
 SHA512:
-  metadata.gz: fdd1fd599ba411375fd4b35d51a604e73a49f9e63eed788decc11d5a0c91da80d80d15e5443c3bb6eea6821af4c47db44861ce4d05ab84fefa34ce741f6e2549
-  data.tar.gz: 780f7c6d7ecb35fa0a16b0f2928b516c6d83bce20027c4dddcc169fc3b32ca6740d287859cbe2499c4a3813f9fa7accfaad29ca16484a09e5426358ad2815756
+  metadata.gz: 49955905870bbb6ba5d1ecf8e3371040da2f2915bacec70bc26f87fc86d717cdc3681744c06ccb8a74200f7b2eba6cc6ef31a7e5300835eafb9c90b6c0f19219
+  data.tar.gz: 0f51662cdfaba2722219cea8a75c68ff7491a006d4b276a13f61680d4f15237a54516c45a4e306c2cb2081737f78edea410cec0ac7a3380e14d7188ebd1726e6

data/Gemfile.lock

@@ -1,24 +1,24 @@
 PATH
   remote: .
   specs:
-    komoju (0.0.4)
-      erubis (~> 2.0)
-      excon
+    komoju (0.0.6)
+      heroics (= 0.0.21)
       moneta
-      multi_json (>= 1.9.2)
-      netrc
 
 GEM
   remote: https://rubygems.org/
   specs:
     ansi (1.5.0)
     erubis (2.7.0)
-    excon (0.45.4)
+    excon (0.55.0)
+    heroics (0.0.21)
+      erubis (~> 2.0)
+      excon
+      multi_json (>= 1.9.2)
     minitest (4.7.5)
-    moneta (0.8.0)
-    multi_json (1.11.2)
-    netrc (0.11.0)
-    rake (10.4.2)
+    moneta (1.0.0)
+    multi_json (1.12.1)
+    rake (10.5.0)
     turn (0.9.7)
       ansi
       minitest (~> 4)
@@ -32,3 +32,6 @@ DEPENDENCIES
   minitest (= 4.7.5)
   rake (~> 10.0)
   turn
+
+BUNDLED WITH
+   1.13.7

data/bin/generate-client

@@ -3,9 +3,13 @@
 require 'bundler/setup'
 require 'heroics'
 
-schema_url = "http://localhost:50130/api/v1/schema.json"
+schema_url = "https://komoju.com/api/v1/schema.json"
 schema = Heroics.download_schema(schema_url, {})
 endpoint_url = "https://komoju.com/api/v1"
 
-client = Heroics.generate_client("Komoju", schema, endpoint_url, {})
+Heroics::Configuration.defaults.module_name = "Komoju"
+Heroics::Configuration.defaults.schema = schema
+Heroics::Configuration.defaults.base_url = endpoint_url
+
+client = Heroics.generate_client
 File.write(File.join(File.dirname(__FILE__), "../lib/komoju/client.rb"), client)

data/komoju.gemspec

@@ -16,14 +16,10 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0") + Dir.glob("vendor/**/**.rb")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib", "vendor/heroics/lib"]
+  spec.require_paths = ["lib"]
 
-  # heroics dependencies
-  spec.add_dependency 'erubis', '~> 2.0'
-  spec.add_dependency 'excon'
+  spec.add_dependency 'heroics', '0.0.21'
   spec.add_dependency 'moneta'
-  spec.add_dependency 'multi_json', '>= 1.9.2'
-  spec.add_dependency 'netrc'
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/komoju.rb

@@ -1,5 +1,6 @@
 require 'komoju/version'
 require 'komoju/client'
+require 'moneta'
 
 module Komoju
   def self.connect(api_key, options=nil)

data/lib/komoju/client.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 #
 # WARNING: Do not edit by hand, this file was generated by Heroics:
@@ -10,19 +11,27 @@ require 'heroics'
 require 'uri'
 
 module Komoju
-  # Get a Client configured to use HTTP Basic authentication.
+  # Get a Client configured to use HTTP Basic or header-based authentication.
   #
   # @param api_key [String] The API key to use when connecting.
   # @param options [Hash<Symbol,String>] Optionally, custom settings
   #   to use with the client.  Allowed options are `default_headers`,
   #   `cache`, `user` and `url`.
   # @return [Client] A client configured to use the API with HTTP Basic
-  #   authentication.
+  #   or header-based authentication.
   def self.connect(api_key, options=nil)
     options = custom_options(options)
     uri = URI.parse(options[:url])
-    uri.user = URI.encode_www_form_component options.fetch(:user, 'user')
-    uri.password = api_key
+
+    if options[:user]
+      uri.user = URI.encode_www_form_component options[:user]
+    end
+
+    if api_key
+      uri.user ||= 'user'
+      uri.password = api_key
+    end
+
     client = Heroics.client_from_schema(SCHEMA, uri.to_s, options)
     Client.new(client)
   end
@@ -65,7 +74,7 @@ module Komoju
     if options[:default_headers]
       final_options[:default_headers].merge!(options[:default_headers])
     end
-    final_options[:cache] = options[:cache] if options[:cache]
+    final_options[:cache] = options[:cache] || Moneta.new(:Memory)
     final_options[:url] = options[:url] if options[:url]
     final_options[:user] = options[:user] if options[:user]
     final_options
@@ -74,10 +83,8 @@ module Komoju
   # Get the default options.
   def self.default_options
     default_headers = {}
-    cache = {}
     {
       default_headers: default_headers,
-      cache:           cache,
       url:             "https://komoju.com/api/v1"
     }
   end
@@ -163,10 +170,8 @@ module Komoju
     end
 
     # List events
-    #
-    # @param collection_options: additional collection options to pass with the request
-    def list(collection_options = {})
-      @client.events.list(collection_options)
+    def list()
+      @client.events.list()
     end
 
     # Show a event
@@ -185,9 +190,9 @@ module Komoju
 
     # List payments
     #
-    # @param collection_options: additional collection options to pass with the request
-    def list(collection_options = {})
-      @client.payments.list(collection_options)
+    # @param body: the object to pass as the request payload
+    def list(body = {})
+      @client.payments.list(body)
     end
 
     # Show a payment
@@ -200,7 +205,7 @@ module Komoju
     # Create a payment
     #
     # @param body: the object to pass as the request payload
-    def create(body)
+    def create(body = {})
       @client.payments.create(body)
     end
 
@@ -208,15 +213,22 @@ module Komoju
     #
     # @param payments_id: A unique indentifier for the payment
     # @param body: the object to pass as the request payload
-    def update(payments_id, body)
+    def update(payments_id, body = {})
       @client.payments.update(payments_id, body)
     end
 
+    # Capture a payment
+    #
+    # @param payments_id: A unique indentifier for the payment
+    def capture(payments_id)
+      @client.payments.capture(payments_id)
+    end
+
     # Refund a payment
     #
     # @param payments_id: A unique indentifier for the payment
     # @param body: the object to pass as the request payload
-    def refund(payments_id, body)
+    def refund(payments_id, body = {})
       @client.payments.refund(payments_id, body)
     end
 
@@ -236,9 +248,9 @@ module Komoju
 
     # List payouts
     #
-    # @param collection_options: additional collection options to pass with the request
-    def list(collection_options = {})
-      @client.payouts.list(collection_options)
+    # @param body: the object to pass as the request payload
+    def list(body = {})
+      @client.payouts.list(body)
     end
 
     # Show a payout
@@ -251,9 +263,8 @@ module Komoju
     # List payout items
     #
     # @param payouts_id: A unique identifier for a payout.
-    # @param collection_options: additional collection options to pass with the request
-    def payout_items(payouts_id, collection_options = {})
-      @client.payouts.payout_items(payouts_id, collection_options)
+    def payout_items(payouts_id)
+      @client.payouts.payout_items(payouts_id)
     end
   end
 
@@ -265,9 +276,9 @@ module Komoju
 
     # List subscriptions
     #
-    # @param collection_options: additional collection options to pass with the request
-    def list(collection_options = {})
-      @client.subscriptions.list(collection_options)
+    # @param body: the object to pass as the request payload
+    def list(body = {})
+      @client.subscriptions.list(body)
     end
 
     # Show a subscription
@@ -280,15 +291,16 @@ module Komoju
     # Create a subscription
     #
     # @param body: the object to pass as the request payload
-    def create(body)
+    def create(body = {})
       @client.subscriptions.create(body)
     end
 
-    # Delete a subscription
+    # Destroy a subscription
     #
     # @param subscriptions_id: A unique identifier for a subscription.
-    def delete(subscriptions_id)
-      @client.subscriptions.delete(subscriptions_id)
+    # @param body: the object to pass as the request payload
+    def destroy(subscriptions_id, body = {})
+      @client.subscriptions.destroy(subscriptions_id, body)
     end
   end
 
@@ -300,9 +312,9 @@ module Komoju
 
     # List customers
     #
-    # @param collection_options: additional collection options to pass with the request
-    def list(collection_options = {})
-      @client.customers.list(collection_options)
+    # @param body: the object to pass as the request payload
+    def list(body = {})
+      @client.customers.list(body)
     end
 
     # Show a customer
@@ -315,7 +327,7 @@ module Komoju
     # Create a customer
     #
     # @param body: the object to pass as the request payload
-    def create(body)
+    def create(body = {})
       @client.customers.create(body)
     end
 
@@ -323,15 +335,15 @@ module Komoju
     #
     # @param customers_id: A unique identifier for the customer.
     # @param body: the object to pass as the request payload
-    def update(customers_id, body)
+    def update(customers_id, body = {})
       @client.customers.update(customers_id, body)
     end
 
-    # Delete a customer
+    # Destroy a customer
     #
     # @param customers_id: A unique identifier for the customer.
-    def delete(customers_id)
-      @client.customers.delete(customers_id)
+    def destroy(customers_id)
+      @client.customers.destroy(customers_id)
     end
   end
 
@@ -343,9 +355,9 @@ module Komoju
 
     # List invoices
     #
-    # @param collection_options: additional collection options to pass with the request
-    def list(collection_options = {})
-      @client.invoices.list(collection_options)
+    # @param body: the object to pass as the request payload
+    def list(body = {})
+      @client.invoices.list(body)
     end
 
     # Show an invoice
@@ -355,17 +367,24 @@ module Komoju
       @client.invoices.show(invoices_id)
     end
 
+    # Cancel an invoice
+    #
+    # @param invoices_id: A unique identifier for the invoice.
+    def cancel(invoices_id)
+      @client.invoices.cancel(invoices_id)
+    end
+
     # Create an invoice
     #
     # @param body: the object to pass as the request payload
-    def create(body)
+    def create(body = {})
       @client.invoices.create(body)
     end
 
     # Preview an upcoming invoice
     #
     # @param body: the object to pass as the request payload
-    def preview(body)
+    def preview(body = {})
       @client.invoices.preview(body)
     end
 
@@ -373,7 +392,7 @@ module Komoju
     #
     # @param invoices_id: A unique identifier for the invoice.
     # @param body: the object to pass as the request payload
-    def pay(invoices_id, body)
+    def pay(invoices_id, body = {})
       @client.invoices.pay(invoices_id, body)
     end
   end
@@ -386,10 +405,9 @@ module Komoju
 
     # List invoice items
     #
-    # @param collection_options: additional collection options to pass with the request
     # @param body: the object to pass as the request payload
-    def list(collection_options = {}, body)
-      @client.invoice_items.list(collection_options, body)
+    def list(body = {})
+      @client.invoice_items.list(body)
     end
 
     # Show an invoice item
@@ -402,7 +420,7 @@ module Komoju
     # Create an invoice item
     #
     # @param body: the object to pass as the request payload
-    def create(body)
+    def create(body = {})
       @client.invoice_items.create(body)
     end
 
@@ -422,9 +440,9 @@ module Komoju
 
     # List plans
     #
-    # @param collection_options: additional collection options to pass with the request
-    def list(collection_options = {})
-      @client.plans.list(collection_options)
+    # @param body: the object to pass as the request payload
+    def list(body = {})
+      @client.plans.list(body)
     end
 
     # Show a plan
@@ -437,15 +455,15 @@ module Komoju
     # Create a plan
     #
     # @param body: the object to pass as the request payload
-    def create(body)
+    def create(body = {})
       @client.plans.create(body)
     end
 
-    # Delete a plan
+    # Destroy a plan
     #
     # @param plans_name: Name of the plan.
-    def delete(plans_name)
-      @client.plans.delete(plans_name)
+    def destroy(plans_name)
+      @client.plans.destroy(plans_name)
     end
   end
 
@@ -458,7 +476,7 @@ module Komoju
     # Create a token
     #
     # @param body: the object to pass as the request payload
-    def create(body)
+    def create(body = {})
       @client.tokens.create(body)
     end
   end
@@ -467,6 +485,35 @@ module Komoju
 {
   "$schema": "http://json-schema.org/draft-04/hyper-schema",
   "definitions": {
+    "list_filter": {
+      "type": [
+        "object"
+      ],
+      "properties": {
+        "start_time": {
+          "type": [
+            "string"
+          ],
+          "format": "date-time"
+        },
+        "end_time": {
+          "type": [
+            "string"
+          ],
+          "format": "date-time"
+        },
+        "per_page": {
+          "type": [
+            "number"
+          ]
+        },
+        "page": {
+          "type": [
+            "number"
+          ]
+        }
+      }
+    },
     "list": {
       "type": [
         "object"
@@ -679,6 +726,13 @@ module Komoju
         "object"
       ],
       "definitions": {
+        "capture": {
+          "type": [
+            "boolean"
+          ],
+          "default": true,
+          "description": "If true, the payment will be immediately captured. This option is ignored if a payment type is not credit_card"
+        },
         "given_name": {
           "type": [
             "string"
@@ -705,6 +759,19 @@ module Komoju
           ],
           "format": "email"
         },
+        "locale": {
+          "enum": [
+            "en",
+            "ja",
+            "ko"
+          ],
+          "default": "ja"
+        },
+        "partner_origin": {
+          "type": [
+            "string"
+          ]
+        },
         "phone": {
           "type": [
             "string"
@@ -804,7 +871,7 @@ module Komoju
             },
             "account_number": {
               "type": [
-                "integer"
+                "string"
               ]
             },
             "account_type": {
@@ -866,7 +933,6 @@ module Komoju
           "required": [
             "type",
             "store",
-            "phone",
             "email"
           ]
         },
@@ -896,7 +962,8 @@ module Komoju
             },
             "confirmation_code": {
               "type": [
-                "string"
+                "string",
+                "null"
               ]
             },
             "receipt": {
@@ -1066,6 +1133,273 @@ module Komoju
           },
           "additionalProperties": false
         },
+        "bit_cash_request": {
+          "type": [
+            "object"
+          ],
+          "properties": {
+            "type": {
+              "enum": [
+                "bit_cash"
+              ]
+            },
+            "prepaid_number": {
+              "type": [
+                "string"
+              ],
+              "maxLength": 16
+            }
+          },
+          "required": [
+            "type",
+            "prepaid_number"
+          ]
+        },
+        "bit_cash_response": {
+          "type": [
+            "object"
+          ],
+          "properties": {
+            "type": {
+              "enum": [
+                "bit_cash"
+              ]
+            }
+          },
+          "required": [
+            "type"
+          ]
+        },
+        "nanaco_request": {
+          "type": [
+            "object"
+          ],
+          "properties": {
+            "type": {
+              "enum": [
+                "nanaco"
+              ]
+            },
+            "prepaid_number": {
+              "type": [
+                "string"
+              ],
+              "maxLength": 16,
+              "minLength": 16
+            }
+          },
+          "required": [
+            "type",
+            "prepaid_number"
+          ]
+        },
+        "nanaco_response": {
+          "type": [
+            "object"
+          ],
+          "properties": {
+            "type": {
+              "enum": [
+                "nanaco"
+              ]
+            },
+            "email": {
+              "type": [
+                "string",
+                "null"
+              ],
+              "format": "email"
+            },
+            "short_amount": {
+              "type": [
+                "integer"
+              ]
+            },
+            "prepaid_cards": {
+              "type": [
+                "array"
+              ],
+              "items": {
+                "type": [
+                  "object"
+                ],
+                "properties": {
+                  "last_four_digits": {
+                    "type": [
+                      "string"
+                    ]
+                  },
+                  "points": {
+                    "type": [
+                      "number"
+                    ]
+                  }
+                },
+                "additionalProperties": false
+              }
+            }
+          },
+          "additionalProperties": false
+        },
+        "net_cash_request": {
+          "type": [
+            "object"
+          ],
+          "properties": {
+            "type": {
+              "enum": [
+                "net_cash"
+              ]
+            },
+            "prepaid_number": {
+              "type": [
+                "string"
+              ],
+              "maxLength": 16,
+              "minLength": 16
+            }
+          },
+          "required": [
+            "type",
+            "prepaid_number"
+          ]
+        },
+        "net_cash_response": {
+          "type": [
+            "object"
+          ],
+          "properties": {
+            "type": {
+              "enum": [
+                "net_cash"
+              ]
+            },
+            "email": {
+              "type": [
+                "string",
+                "null"
+              ],
+              "format": "email"
+            },
+            "short_amount": {
+              "type": [
+                "integer"
+              ]
+            },
+            "prepaid_cards": {
+              "type": [
+                "array"
+              ],
+              "items": {
+                "type": [
+                  "object"
+                ],
+                "properties": {
+                  "last_four_digits": {
+                    "type": [
+                      "string"
+                    ]
+                  },
+                  "points": {
+                    "type": [
+                      "number"
+                    ]
+                  }
+                },
+                "additionalProperties": false
+              }
+            }
+          },
+          "additionalProperties": false
+        },
+        "culture_voucher_request": {
+          "type": [
+            "object"
+          ],
+          "properties": {
+            "type": {
+              "enum": [
+                "culture_voucher"
+              ]
+            },
+            "culture_id": {
+              "type": [
+                "string"
+              ],
+              "maxLength": 12
+            },
+            "culture_password": {
+              "type": [
+                "string"
+              ],
+              "maxLength": 12
+            }
+          },
+          "required": [
+            "type",
+            "culture_id",
+            "culture_password"
+          ]
+        },
+        "culture_voucher_response": {
+          "type": [
+            "object"
+          ],
+          "properties": {
+            "type": {
+              "enum": [
+                "culture_voucher"
+              ]
+            }
+          },
+          "required": [
+            "type"
+          ]
+        },
+        "dospara_request": {
+          "type": [
+            "object"
+          ],
+          "properties": {
+            "type": {
+              "enum": [
+                "dospara"
+              ]
+            },
+            "user_no": {
+              "type": [
+                "string"
+              ],
+              "maxLength": 20
+            },
+            "user_password": {
+              "type": [
+                "string"
+              ],
+              "maxLength": 20
+            }
+          },
+          "required": [
+            "type",
+            "user_no",
+            "user_password"
+          ]
+        },
+        "dospara_response": {
+          "type": [
+            "object"
+          ],
+          "properties": {
+            "type": {
+              "enum": [
+                "dospara"
+              ]
+            }
+          },
+          "required": [
+            "type"
+          ]
+        },
         "credit_card_request": {
           "type": [
             "object"
@@ -1112,7 +1446,8 @@ module Komoju
                 "visa",
                 "american_express",
                 "master",
-                "jcb"
+                "jcb",
+                "diners_club"
               ]
             }
           },
@@ -1157,6 +1492,9 @@ module Komoju
                 "master",
                 "jcb"
               ]
+            },
+            "expiry_days": {
+              "$ref": "#/definitions/payments/definitions/expiry_days"
             }
           },
           "required": [
@@ -1238,7 +1576,10 @@ module Komoju
           "example": "JPY",
           "enum": [
             "JPY",
-            "USD"
+            "USD",
+            "EUR",
+            "TWD",
+            "KRW"
           ],
           "description": "3 letter ISO currency code of the transaction"
         },
@@ -1297,7 +1638,12 @@ module Komoju
                 "bank_transfer",
                 "konbini",
                 "pay_easy",
-                "web_money"
+                "web_money",
+                "bit_cash",
+                "nanaco",
+                "net_cash",
+                "culture_voucher",
+                "dospara"
               ]
             }
           },
@@ -1335,6 +1681,18 @@ module Komoju
             },
             {
               "$ref": "#/definitions/payments/definitions/web_money_response"
+            },
+            {
+              "$ref": "#/definitions/payments/definitions/bit_cash_response"
+            },
+            {
+              "$ref": "#/definitions/payments/definitions/nanaco_response"
+            },
+            {
+              "$ref": "#/definitions/payments/definitions/culture_voucher_response"
+            },
+            {
+              "$ref": "#/definitions/payments/definitions/net_cash_response"
             }
           ]
         },
@@ -1363,6 +1721,11 @@ module Komoju
                 "string"
               ]
             },
+            "customer_id": {
+              "type": [
+                "string"
+              ]
+            },
             "browser_language": {
               "type": [
                 "string"
@@ -1406,6 +1769,9 @@ module Komoju
           "response_example": "payments#index",
           "targetSchema": {
             "$ref": "#/definitions/list/"
+          },
+          "schema": {
+            "$ref": "#/definitions/list_filter/"
           }
         },
         {
@@ -1437,6 +1803,9 @@ module Komoju
               "amount": {
                 "$ref": "#/definitions/payments/definitions/amount"
               },
+              "capture": {
+                "$ref": "#/definitions/payments/definitions/capture"
+              },
               "tax": {
                 "$ref": "#/definitions/payments/definitions/tax"
               },
@@ -1446,6 +1815,12 @@ module Komoju
               "external_order_num": {
                 "$ref": "#/definitions/payments/definitions/external_order_num"
               },
+              "locale": {
+                "$ref": "#/definitions/payments/definitions/locale"
+              },
+              "partner_origin": {
+                "$ref": "#/definitions/payments/definitions/partner_origin"
+              },
               "metadata": {
                 "$ref": "#/definitions/payments/definitions/metadata"
               },
@@ -1494,7 +1869,9 @@ module Komoju
                 "properties": {
                   "type": {
                     "enum": [
-                      "web_money"
+                      "web_money",
+                      "net_cash",
+                      "nanaco"
                     ]
                   }
                 },
@@ -1506,6 +1883,17 @@ module Komoju
             "additionalProperties": false
           }
         },
+        {
+          "title": "Capture",
+          "description": "Capture a payment",
+          "href": "/payments/{(%2Fdefinitions%2Fpayments%2Fdefinitions%2Fid)}/capture",
+          "method": "POST",
+          "rel": "self",
+          "response_example": "payments#capture",
+          "targetSchema": {
+            "$ref": "#/definitions/payments/"
+          }
+        },
         {
           "title": "Refund",
           "description": "Refund a payment",
@@ -1714,6 +2102,9 @@ module Komoju
           "response_example": "payouts#index",
           "targetSchema": {
             "$ref": "#/definitions/list/"
+          },
+          "schema": {
+            "$ref": "#/definitions/list_filter/"
           }
         },
         {
@@ -1805,10 +2196,12 @@ module Komoju
           ],
           "description": "An ISO 8601 formatted timestamp of when the subscription will next be billed."
         },
-        "cancel_at_period_end": {
+        "cancel_later": {
           "type": [
             "boolean"
-          ]
+          ],
+          "default": true,
+          "description": "Cancel the subscription at the end of the current billing period (default: true)"
         },
         "metadata": {
           "$ref": "#/definitions/payments/definitions/metadata"
@@ -1833,6 +2226,9 @@ module Komoju
           "response_example": "subscriptions#index",
           "targetSchema": {
             "$ref": "#/definitions/list/"
+          },
+          "schema": {
+            "$ref": "#/definitions/list_filter/"
           }
         },
         {
@@ -1882,14 +2278,24 @@ module Komoju
           }
         },
         {
-          "title": "Delete",
-          "description": "Delete a subscription",
+          "title": "Destroy",
+          "description": "Destroy a subscription",
           "href": "/subscriptions/{(%2Fdefinitions%2Fsubscriptions%2Fdefinitions%2Fid)}",
           "method": "DELETE",
           "rel": "destroy",
           "response_example": "subscriptions#destroy",
           "targetSchema": {
             "$ref": "#/definitions/subscriptions/"
+          },
+          "schema": {
+            "type": [
+              "object"
+            ],
+            "properties": {
+              "cancel_later": {
+                "$ref": "#/definitions/subscriptions/definitions/cancel_later"
+              }
+            }
           }
         }
       ],
@@ -1909,8 +2315,8 @@ module Komoju
         "customer": {
           "$ref": "#/definitions/subscriptions/definitions/customer"
         },
-        "current_period_end_at": {
-          "$ref": "#/definitions/subscriptions/definitions/current_period_end_at"
+        "cancel_later": {
+          "$ref": "#/definitions/subscriptions/definitions/cancel_later"
         },
         "metadata": {
           "$ref": "#/definitions/subscriptions/definitions/metadata"
@@ -1944,13 +2350,6 @@ module Komoju
           ],
           "description": "Name of resource"
         },
-        "currency": {
-          "readOnly": true,
-          "type": [
-            "string",
-            "null"
-          ]
-        },
         "payment_details": {
           "$ref": "#/definitions/payments/definitions/payment_details_response"
         },
@@ -1985,6 +2384,9 @@ module Komoju
           "response_example": "customers#index",
           "targetSchema": {
             "$ref": "#/definitions/list/"
+          },
+          "schema": {
+            "$ref": "#/definitions/list_filter/"
           }
         },
         {
@@ -2041,9 +2443,6 @@ module Komoju
               "payment_details": {
                 "$ref": "#/definitions/payments/definitions/payment_details_request"
               },
-              "currency": {
-                "$ref": "#/definitions/payments/definitions/currency"
-              },
               "email": {
                 "$ref": "#/definitions/customers/definitions/email"
               },
@@ -2058,8 +2457,8 @@ module Komoju
           }
         },
         {
-          "title": "Delete",
-          "description": "Delete a customer",
+          "title": "Destroy",
+          "description": "Destroy a customer",
           "href": "/customers/{(%2Fdefinitions%2Fcustomers%2Fdefinitions%2Fid)}",
           "method": "DELETE",
           "rel": "destroy",
@@ -2076,9 +2475,6 @@ module Komoju
         "resource": {
           "$ref": "#/definitions/customers/definitions/resource"
         },
-        "currency": {
-          "$ref": "#/definitions/customers/definitions/currency"
-        },
         "email": {
           "$ref": "#/definitions/customers/definitions/email"
         },
@@ -2120,6 +2516,13 @@ module Komoju
             "null"
           ]
         },
+        "renewal": {
+          "type": [
+            "boolean"
+          ],
+          "default": true,
+          "description": "Include the upcoming renewal charge (default: true)"
+        },
         "paid": {
           "readOnly": true,
           "type": [
@@ -2146,6 +2549,9 @@ module Komoju
           "response_example": "invoices#index",
           "targetSchema": {
             "$ref": "#/definitions/list/"
+          },
+          "schema": {
+            "$ref": "#/definitions/list_filter/"
           }
         },
         {
@@ -2159,6 +2565,17 @@ module Komoju
             "$ref": "#/definitions/invoices/"
           }
         },
+        {
+          "title": "Cancel",
+          "description": "Cancel an invoice",
+          "href": "/invoices/{(%2Fdefinitions%2Finvoices%2Fdefinitions%2Fid)}/cancel",
+          "method": "POST",
+          "rel": "self",
+          "response_example": "invoices#cancel",
+          "targetSchema": {
+            "$ref": "#/definitions/invoices/"
+          }
+        },
         {
           "title": "Create",
           "description": "Create an invoice",
@@ -2201,15 +2618,15 @@ module Komoju
               "object"
             ],
             "properties": {
-              "customer": {
-                "$ref": "#/definitions/customers/definitions/id"
-              },
               "subscription": {
                 "$ref": "#/definitions/subscriptions/definitions/id"
+              },
+              "renewal": {
+                "$ref": "#/definitions/invoices/definitions/renewal"
               }
             },
             "required": [
-              "customer"
+              "subscription"
             ]
           }
         },
@@ -2251,6 +2668,9 @@ module Komoju
         "subscription": {
           "$ref": "#/definitions/subscriptions"
         },
+        "renewal": {
+          "$ref": "#/definitions/invoices/definitions/renewal"
+        },
         "paid": {
           "$ref": "#/definitions/invoices/definitions/paid"
         },
@@ -2328,14 +2748,21 @@ module Komoju
           "rel": "instances",
           "response_example": "invoice_items#index",
           "schema": {
-            "type": [
-              "object"
-            ],
-            "properties": {
-              "customer": {
-                "$ref": "#/definitions/customers/definitions/id"
+            "allOf": [
+              {
+                "type": [
+                  "object"
+                ],
+                "properties": {
+                  "subscription": {
+                    "$ref": "#/definitions/subscriptions/definitions/id"
+                  }
+                }
+              },
+              {
+                "$ref": "#/definitions/list_filter/"
               }
-            }
+            ]
           },
           "targetSchema": {
             "$ref": "#/definitions/list/"
@@ -2370,11 +2797,8 @@ module Komoju
               "amount": {
                 "$ref": "#/definitions/invoice_items/properties/amount"
               },
-              "currency": {
-                "$ref": "#/definitions/invoice_items/properties/currency"
-              },
-              "customer": {
-                "$ref": "#/definitions/invoice_items/properties/customer"
+              "subscription": {
+                "$ref": "#/definitions/invoice_items/properties/subscription"
               },
               "metadata": {
                 "$ref": "#/definitions/invoice_items/properties/metadata"
@@ -2382,8 +2806,7 @@ module Komoju
             },
             "required": [
               "amount",
-              "currency",
-              "customer"
+              "subscription"
             ]
           }
         },
@@ -2412,18 +2835,15 @@ module Komoju
         "amount": {
           "$ref": "#/definitions/payments/definitions/amount"
         },
-        "currency": {
-          "$ref": "#/definitions/payments/definitions/currency"
-        },
-        "customer": {
-          "$ref": "#/definitions/customers/definitions/id"
-        },
         "invoice": {
           "$ref": "#/definitions/invoice_items/definitions/invoice"
         },
         "plan": {
           "$ref": "#/definitions/invoice_items/definitions/plan"
         },
+        "subscription": {
+          "$ref": "#/definitions/subscriptions/definitions/id"
+        },
         "metadata": {
           "$ref": "#/definitions/payments/definitions/metadata"
         }
@@ -2435,6 +2855,7 @@ module Komoju
         "amount",
         "customer",
         "currency",
+        "subscription",
         "invoice",
         "metadata",
         "plan"
@@ -2528,6 +2949,9 @@ module Komoju
           "response_example": "plans#index",
           "targetSchema": {
             "$ref": "#/definitions/list/"
+          },
+          "schema": {
+            "$ref": "#/definitions/list_filter/"
           }
         },
         {
@@ -2593,8 +3017,8 @@ module Komoju
           }
         },
         {
-          "title": "Delete",
-          "description": "Delete a plan",
+          "title": "Destroy",
+          "description": "Destroy a plan",
           "href": "/plans/{(%2Fdefinitions%2Fplans%2Fdefinitions%2Fname)}",
           "method": "DELETE",
           "rel": "destroy",
@@ -2661,7 +3085,10 @@ module Komoju
           "description": "Name of resource"
         },
         "payment_details": {
-          "$ref": "#/definitions/payments/definitions/payment_details_response"
+          "type": [
+            "object"
+          ],
+          "description": "A hash or token describing the payment method."
         },
         "created_at": {
           "example": "2015-03-06T06:52:35Z",
@@ -2703,6 +3130,9 @@ module Komoju
         "id": {
           "$ref": "#/definitions/tokens/definitions/id"
         },
+        "payment_details": {
+          "$ref": "#/definitions/tokens/definitions/payment_details"
+        },
         "resource": {
           "$ref": "#/definitions/tokens/definitions/resource"
         },