recurly 3.0.0.beta.5 → 3.0.0

data/benchmark.rb

@@ -0,0 +1,16 @@
+require "rubygems"
+require "bundler/setup"
+require "recurly"
+require "benchmark"
+
+N = 1_000
+
+account_body = "{\"id\":\"ljvmmbjchtgs\",\"object\":\"account\",\"code\":\"9ebd49f7288@example.com\",\"parent_account_id\":null,\"bill_to\":\"self\",\"state\":\"active\",\"username\":null,\"email\":null,\"cc_emails\":null,\"preferred_locale\":null,\"first_name\":\"Benjamin\",\"last_name\":\"Du Monde\",\"company\":null,\"vat_number\":null,\"tax_exempt\":false,\"exemption_certificate\":null,\"address\":null,\"billing_info\":null,\"shipping_addresses\":[{\"object\":\"shipping_address\",\"first_name\":\"Benjamin\",\"last_name\":\"Du Monde\",\"company\":null,\"phone\":null,\"street1\":\"1 Tchoupitoulas St\",\"street2\":null,\"city\":\"New Orleans\",\"region\":\"LA\",\"postal_code\":\"70115\",\"country\":\"US\",\"nickname\":\"Home\",\"email\":null,\"vat_number\":null,\"id\":\"ljvmmbk9e1as\",\"account_id\":\"ljvmmbjchtgs\",\"created_at\":\"2019-09-19T22:45:59Z\",\"updated_at\":\"2019-09-19T22:45:59Z\"}],\"custom_fields\":[],\"hosted_login_token\":\"PSvcHow5H4HGEGKTfHXadLNoDcRaDVMK\",\"created_at\":\"2019-09-19T22:45:59Z\",\"updated_at\":\"2019-09-19T22:45:59Z\",\"deleted_at\":null}"
+
+Benchmark.bm do |benchmark|
+  benchmark.report("JSON parsing and casting\n") do
+    N.times do
+      _account = Recurly::JSONParser.parse(nil, account_body)
+    end
+  end
+end

data/lib/recurly.rb

@@ -3,17 +3,14 @@ require "recurly/schema"
 require "recurly/request"
 require "recurly/resource"
 require "recurly/pager"
-# Include all request files
-resources = File.join(File.dirname(__FILE__), "recurly", "requests", "*.rb")
-Dir.glob(resources, &method(:require))
-# Include all resource files
-resources = File.join(File.dirname(__FILE__), "recurly", "resources", "*.rb")
-Dir.glob(resources, &method(:require))
+require "recurly/requests"
+require "recurly/resources"
+require "recurly/http"
 require "recurly/errors"
 require "recurly/client"
 
 module Recurly
-  STRICT_MODE = !ENV["RECURLY_STRICT_MODE"].nil?
+  STRICT_MODE = ENV["RECURLY_STRICT_MODE"] && ENV["RECURLY_STRICT_MODE"].downcase == "true"
   if STRICT_MODE
     puts "[Recurly] [WARNING] STRICT_MODE enabled. This should only be used for testing purposes."
   end

data/lib/recurly/client.rb

@@ -8,49 +8,30 @@ module Recurly
   class Client
     require_relative "./client/operations"
 
-    BASE_URL = "https://partner-api.recurly.com/"
-
-    # The last result of the *X-RateLimit-Limit* header
-    # @return [Integer] The rate limit applied to this client.
-    attr_reader :rate_limit
-
-    # The last result of the *X-RateLimit-Remaining* header
-    # @return [Integer] The number of remaining requests, decrements per request.
-    attr_reader :rate_limit_remaining
-
-    # The last result of the *X-RateLimit-Reset* header
-    # @return [DateTime] The DateTime in which the request count will be reset.
-    attr_reader :rate_limit_reset
+    BASE_URL = "https://v3.recurly.com/"
 
     # Initialize a client. It requires an API key.
     #
     # @example
     #   API_KEY = '83749879bbde395b5fe0cc1a5abf8e5'
-    #   SITE_ID = 'dqzlv9shi7wa'
-    #   client = Recurly::Client.new(site_id: SITE_ID, api_key: API_KEY)
-    #   # You can optionally use the subdomain instead of the site id
-    #   client = Recurly::Client.new(subdomain: 'mysite-prod', api_key: API_KEY)
+    #   client = Recurly::Client.new(api_key: API_KEY)
     #   sub = client.get_subscription(subscription_id: 'abcd123456')
     # @example
     #   # You can also pass the initializer a block. This will give you
     #   # a client scoped for just that block
-    #   Recurly::Client.new(subdomain: 'mysite-prod', api_key: API_KEY) do |client|
+    #   Recurly::Client.new(api_key: API_KEY) do |client|
     #     sub = client.get_subscription(subscription_id: 'abcd123456')
     #   end
     # @example
     #   # If you only plan on using the client for more than one site,
     #   # you should initialize a new client for each site.
     #
-    #   # Give a `site_id`
-    #   client = Recurly::Client.new(api_key: API_KEY, site_id: SITE_ID)
-    #   # Or use the subdomain
-    #   client = Recurly::Client.new(api_key: API_KEY, subdomain: 'mysite-dev')
-    #
-    #   sub = client.get_subscription(subscription_id: 'abcd123456')
+    #   client = Recurly::Client.new(api_key: API_KEY1)
+    #   sub = client.get_subscription(subscription_id: 'uuid-abcd123456')
     #
     #   # you should create a new client to connect to another site
-    #   client = Recurly::Client.new(api_key: API_KEY, subdomain: 'mysite-prod')
-    #   sub = client.get_subscription(subscription_id: 'abcd7890')
+    #   client = Recurly::Client.new(api_key: API_KEY2)
+    #   sub = client.get_subscription(subscription_id: 'uuid-abcd7890')
     #
     # @param api_key [String] The private API key
     # @param site_id [String] The site you wish to be scoped to.
@@ -65,57 +46,60 @@ module Recurly
     end
 
     def next_page(pager)
-      run_request(:get, pager.next, nil, headers).tap do |response|
-        raise_api_error!(response) unless (200...300).include?(response.status)
-      end
+      req = HTTP::Request.new(:get, pager.next, nil)
+      faraday_resp = run_request(req, headers)
+      handle_response! req, faraday_resp
     end
 
     protected
 
     def pager(path, **options)
-      Pager.new(client: self, path: path, options: options)
+      path = scope_by_site(path, **options)
+      Pager.new(
+        client: self,
+        path: path,
+        options: options,
+      )
     end
 
     def get(path, **options)
-      response = run_request(:get, path, nil, headers)
-      raise_api_error!(response) unless (200...300).include?(response.status)
-      JSONParser.parse(self, response.body)
+      path = scope_by_site(path, **options)
+      request = HTTP::Request.new(:get, path, nil)
+      faraday_resp = run_request(request, headers)
+      handle_response! request, faraday_resp
     rescue Faraday::ClientError => ex
       raise_network_error!(ex)
     end
 
     def post(path, request_data, request_class, **options)
-      request = request_class.new(request_data)
-      request.validate!
-      logger.info("POST BODY #{JSON.dump(request_data)}")
-      response = run_request(:post, path, JSON.dump(request.attributes), headers)
-      raise_api_error!(response) unless (200...300).include?(response.status)
-      JSONParser.parse(self, response.body)
+      request_class.new(request_data).validate!
+      path = scope_by_site(path, **options)
+      request = HTTP::Request.new(:post, path, JSON.dump(request_data))
+      faraday_resp = run_request(request, headers)
+      handle_response! request, faraday_resp
     rescue Faraday::ClientError => ex
       raise_network_error!(ex)
     end
 
     def put(path, request_data = nil, request_class = nil, **options)
-      response = if request_data
-                   request = request_class.new(request_data)
-                   request.validate!
-                   logger.info("PUT BODY #{JSON.dump(request_data)}")
-                   run_request(:put, path, JSON.dump(request_data), headers)
-                 else
-                   run_request(:put, path, nil, headers)
-                 end
-      raise_api_error!(response) unless (200...300).include?(response.status)
-      JSONParser.parse(self, response.body)
+      path = scope_by_site(path, **options)
+      request = HTTP::Request.new(:put, path)
+      if request_data
+        request_class.new(request_data).validate!
+        logger.info("PUT BODY #{JSON.dump(request_data)}")
+        request.body = JSON.dump(request_data)
+      end
+      faraday_resp = run_request(request, headers)
+      handle_response! request, faraday_resp
     rescue Faraday::ClientError => ex
       raise_network_error!(ex)
     end
 
     def delete(path, **options)
-      response = run_request(:delete, path, nil, headers)
-      raise_api_error!(response) unless (200...300).include?(response.status)
-      if response.body && !response.body.empty?
-        JSONParser.parse(self, response.body)
-      end
+      path = scope_by_site(path, **options)
+      request = HTTP::Request.new(:delete, path, nil)
+      faraday_resp = run_request(request, headers)
+      handle_response! request, faraday_resp
     rescue Faraday::ClientError => ex
       raise_network_error!(ex)
     end
@@ -130,8 +114,21 @@ module Recurly
     # @return [Logger]
     attr_reader :logger
 
-    def run_request(method, url, body, headers)
-      read_headers @conn.run_request(method, url, body, headers)
+    def run_request(request, headers)
+      read_headers @conn.run_request(request.method, request.path, request.body, headers)
+    end
+
+    def handle_response!(request, faraday_resp)
+      response = HTTP::Response.new(faraday_resp, request)
+      raise_api_error!(response) unless (200...300).include?(response.status)
+      resource = if response.body
+                   JSONParser.parse(self, response.body)
+                 else
+                   Resources::Empty.new
+                 end
+      # Keep this interface "private"
+      resource.instance_variable_set(:@response, response)
+      resource
     end
 
     def raise_network_error!(ex)
@@ -156,9 +153,6 @@ module Recurly
     end
 
     def read_headers(response)
-      @rate_limit = response.headers["x-ratelimit-limit"].to_i
-      @rate_limit_remaining = response.headers["x-ratelimit-remaining"].to_i
-      @rate_limit_reset = Time.at(response.headers["x-ratelimit-reset"].to_i).to_datetime
       if !@_ignore_deprecation_warning && response.headers["Recurly-Deprecated"]&.upcase == "TRUE"
         puts "[recurly-client-ruby] WARNING: Your current API version \"#{api_version}\" is deprecated and will be sunset on #{response.headers["Recurly-Sunset-Date"]}"
       end
@@ -196,8 +190,14 @@ module Recurly
         @site_id = site_id
       elsif subdomain
         @site_id = "subdomain-#{subdomain}"
+      end
+    end
+
+    def scope_by_site(path, **options)
+      if site = site_id || options[:site_id]
+        "/sites/#{site}#{path}"
       else
-        raise ArgumentError, "You must pass a site_id or subdomain argument to initialize the Client"
+        path
       end
     end
 

data/lib/recurly/client/operations.rb

@@ -5,14 +5,14 @@
 module Recurly
   class Client
     def api_version
-      "v2018-08-09"
+      "v2019-10-10"
     end
 
     # List sites
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/list_sites list_sites api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/list_sites list_sites api documenation}
     #
-    # @param ids [string] Filter results by their IDs. Up to 200 IDs can be passed at once using
+    # @param ids [String] Filter results by their IDs. Up to 200 IDs can be passed at once using
     #   commas as separators, e.g. +ids=h1at4d57xlmy,gyqgg0d3v9n1,jrsm5b4yefg6+.
     #
     #   *Important notes:*
@@ -44,19 +44,20 @@ module Recurly
 
     # Fetch a site
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/get_site get_site api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/get_site get_site api documenation}
     #
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::Site] A site.
-    def get_site()
+    def get_site(site_id:)
       path = interpolate_path("/sites/{site_id}", site_id: site_id)
       get(path)
     end
 
     # List a site's accounts
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/list_accounts list_accounts api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/list_accounts list_accounts api documenation}
     #
-    # @param ids [string] Filter results by their IDs. Up to 200 IDs can be passed at once using
+    # @param ids [String] Filter results by their IDs. Up to 200 IDs can be passed at once using
     #   commas as separators, e.g. +ids=h1at4d57xlmy,gyqgg0d3v9n1,jrsm5b4yefg6+.
     #
     #   *Important notes:*
@@ -80,10 +81,12 @@ module Recurly
     # @param end_time [DateTime] Filter by end_time when +sort=created_at+ or +sort=updated_at+.
     #   *Note:* this value is an ISO8601 timestamp. A partial timestamp that does not include a time zone will default to UTC.
     #
-    # @param subscriber [String] Filter accounts accounts with or without a subscription in the +active+,
+    # @param email [String] Filter for accounts with this exact email address. A blank value will return accounts with both +null+ and +""+ email addresses. Note that multiple accounts can share one email address.
+    # @param subscriber [Boolean] Filter for accounts with or without a subscription in the +active+,
     #   +canceled+, or +future+ state.
     #
     # @param past_due [String] Filter for accounts with an invoice in the +past_due+ state.
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Pager<Resources::Account>] A list of the site's accounts.
     # @example
     #   accounts = @client.list_accounts(limit: 200)
@@ -92,15 +95,16 @@ module Recurly
     #   end
     #
     def list_accounts(**options)
-      path = interpolate_path("/sites/{site_id}/accounts", site_id: site_id)
+      path = interpolate_path("/accounts")
       pager(path, **options)
     end
 
     # Create an account
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/create_account create_account api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/create_account create_account api documenation}
     #
     # @param body [Requests::AccountCreate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::AccountCreate}
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::Account] An account.
     # @example
     #   begin
@@ -138,16 +142,17 @@ module Recurly
     #     puts "ValidationError: #{e.recurly_error.params}"
     #   end
     #
-    def create_account(body:)
-      path = interpolate_path("/sites/{site_id}/accounts", site_id: site_id)
-      post(path, body, Requests::AccountCreate)
+    def create_account(body:, **options)
+      path = interpolate_path("/accounts")
+      post(path, body, Requests::AccountCreate, **options)
     end
 
     # Fetch an account
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/get_account get_account api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/get_account get_account api documenation}
     #
     # @param account_id [String] Account ID or code (use prefix: +code-+, e.g. +code-bob+).
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::Account] An account.
     # @example
     #   begin
@@ -159,17 +164,18 @@ module Recurly
     #     puts "Resource Not Found"
     #   end
     #
-    def get_account(account_id:)
-      path = interpolate_path("/sites/{site_id}/accounts/{account_id}", site_id: site_id, account_id: account_id)
-      get(path)
+    def get_account(account_id:, **options)
+      path = interpolate_path("/accounts/{account_id}", account_id: account_id)
+      get(path, **options)
     end
 
     # Modify an account
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/update_account update_account api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/update_account update_account api documenation}
     #
     # @param account_id [String] Account ID or code (use prefix: +code-+, e.g. +code-bob+).
     # @param body [Requests::AccountUpdate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::AccountUpdate}
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::Account] An account.
     # @example
     #   begin
@@ -188,16 +194,17 @@ module Recurly
     #     puts "ValidationError: #{e.recurly_error.params}"
     #   end
     #
-    def update_account(account_id:, body:)
-      path = interpolate_path("/sites/{site_id}/accounts/{account_id}", site_id: site_id, account_id: account_id)
-      put(path, body, Requests::AccountUpdate)
+    def update_account(account_id:, body:, **options)
+      path = interpolate_path("/accounts/{account_id}", account_id: account_id)
+      put(path, body, Requests::AccountUpdate, **options)
     end
 
     # Deactivate an account
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/deactivate_account deactivate_account api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/deactivate_account deactivate_account api documenation}
     #
     # @param account_id [String] Account ID or code (use prefix: +code-+, e.g. +code-bob+).
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::Account] An account.
     # @example
     #   begin
@@ -209,16 +216,17 @@ module Recurly
     #     puts "Resource Not Found"
     #   end
     #
-    def deactivate_account(account_id:)
-      path = interpolate_path("/sites/{site_id}/accounts/{account_id}", site_id: site_id, account_id: account_id)
-      delete(path)
+    def deactivate_account(account_id:, **options)
+      path = interpolate_path("/accounts/{account_id}", account_id: account_id)
+      delete(path, **options)
     end
 
     # Fetch an account's acquisition data
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/get_account_acquisition get_account_acquisition api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/get_account_acquisition get_account_acquisition api documenation}
     #
     # @param account_id [String] Account ID or code (use prefix: +code-+, e.g. +code-bob+).
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::AccountAcquisition] An account's acquisition data.
     # @example
     #   begin
@@ -230,28 +238,31 @@ module Recurly
     #     puts "Resource Not Found"
     #   end
     #
-    def get_account_acquisition(account_id:)
-      path = interpolate_path("/sites/{site_id}/accounts/{account_id}/acquisition", site_id: site_id, account_id: account_id)
-      get(path)
+    def get_account_acquisition(account_id:, **options)
+      path = interpolate_path("/accounts/{account_id}/acquisition", account_id: account_id)
+      get(path, **options)
     end
 
     # Update an account's acquisition data
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/update_account_acquisition update_account_acquisition api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/update_account_acquisition update_account_acquisition api documenation}
     #
     # @param account_id [String] Account ID or code (use prefix: +code-+, e.g. +code-bob+).
     # @param body [Requests::AccountAcquisitionUpdatable] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::AccountAcquisitionUpdatable}
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::AccountAcquisition] An account's updated acquisition data.
-    def update_account_acquisition(account_id:, body:)
-      path = interpolate_path("/sites/{site_id}/accounts/{account_id}/acquisition", site_id: site_id, account_id: account_id)
-      put(path, body, Requests::AccountAcquisitionUpdatable)
+    def update_account_acquisition(account_id:, body:, **options)
+      path = interpolate_path("/accounts/{account_id}/acquisition", account_id: account_id)
+      put(path, body, Requests::AccountAcquisitionUpdatable, **options)
     end
 
     # Remove an account's acquisition data
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/remove_account_acquisition remove_account_acquisition api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/remove_account_acquisition remove_account_acquisition api documenation}
     #
     # @param account_id [String] Account ID or code (use prefix: +code-+, e.g. +code-bob+).
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
+    # @return [Empty] Acquisition data was succesfully deleted.
     # @example
     #   begin
     #     acquisition = @client.remove_account_acquisition(account_id: account_id)
@@ -262,16 +273,17 @@ module Recurly
     #     puts "Resource Not Found"
     #   end
     #
-    def remove_account_acquisition(account_id:)
-      path = interpolate_path("/sites/{site_id}/accounts/{account_id}/acquisition", site_id: site_id, account_id: account_id)
-      delete(path)
+    def remove_account_acquisition(account_id:, **options)
+      path = interpolate_path("/accounts/{account_id}/acquisition", account_id: account_id)
+      delete(path, **options)
     end
 
     # Reactivate an inactive account
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/reactivate_account reactivate_account api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/reactivate_account reactivate_account api documenation}
     #
     # @param account_id [String] Account ID or code (use prefix: +code-+, e.g. +code-bob+).
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::Account] An account.
     # @example
     #   begin
@@ -283,16 +295,17 @@ module Recurly
     #     puts "Resource Not Found"
     #   end
     #
-    def reactivate_account(account_id:)
-      path = interpolate_path("/sites/{site_id}/accounts/{account_id}/reactivate", site_id: site_id, account_id: account_id)
-      put(path)
+    def reactivate_account(account_id:, **options)
+      path = interpolate_path("/accounts/{account_id}/reactivate", account_id: account_id)
+      put(path, **options)
     end
 
     # Fetch an account's balance and past due status
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/get_account_balance get_account_balance api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/get_account_balance get_account_balance api documenation}
     #
     # @param account_id [String] Account ID or code (use prefix: +code-+, e.g. +code-bob+).
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::AccountBalance] An account's balance.
     # @example
     #   begin
@@ -304,16 +317,17 @@ module Recurly
     #     puts "Resource Not Found"
     #   end
     #
-    def get_account_balance(account_id:)
-      path = interpolate_path("/sites/{site_id}/accounts/{account_id}/balance", site_id: site_id, account_id: account_id)
-      get(path)
+    def get_account_balance(account_id:, **options)
+      path = interpolate_path("/accounts/{account_id}/balance", account_id: account_id)
+      get(path, **options)
     end
 
     # Fetch an account's billing information
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/get_billing_info get_billing_info api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/get_billing_info get_billing_info api documenation}
     #
     # @param account_id [String] Account ID or code (use prefix: +code-+, e.g. +code-bob+).
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::BillingInfo] An account's billing information.
     # @example
     #   begin
@@ -325,17 +339,18 @@ module Recurly
     #     puts "Resource Not Found"
     #   end
     #
-    def get_billing_info(account_id:)
-      path = interpolate_path("/sites/{site_id}/accounts/{account_id}/billing_info", site_id: site_id, account_id: account_id)
-      get(path)
+    def get_billing_info(account_id:, **options)
+      path = interpolate_path("/accounts/{account_id}/billing_info", account_id: account_id)
+      get(path, **options)
     end
 
     # Set an account's billing information
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/update_billing_info update_billing_info api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/update_billing_info update_billing_info api documenation}
     #
     # @param account_id [String] Account ID or code (use prefix: +code-+, e.g. +code-bob+).
     # @param body [Requests::BillingInfoCreate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::BillingInfoCreate}
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::BillingInfo] Updated billing information.
     # @example
     #   begin
@@ -354,16 +369,18 @@ module Recurly
     #     puts "ValidationError: #{e.recurly_error.params}"
     #   end
     #
-    def update_billing_info(account_id:, body:)
-      path = interpolate_path("/sites/{site_id}/accounts/{account_id}/billing_info", site_id: site_id, account_id: account_id)
-      put(path, body, Requests::BillingInfoCreate)
+    def update_billing_info(account_id:, body:, **options)
+      path = interpolate_path("/accounts/{account_id}/billing_info", account_id: account_id)
+      put(path, body, Requests::BillingInfoCreate, **options)
     end
 
     # Remove an account's billing information
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/remove_billing_info remove_billing_info api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/remove_billing_info remove_billing_info api documenation}
     #
     # @param account_id [String] Account ID or code (use prefix: +code-+, e.g. +code-bob+).
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
+    # @return [Empty] Billing information deleted
     # @example
     #   begin
     #     @client.remove_billing_info(account_id: account_id)
@@ -374,17 +391,17 @@ module Recurly
     #     puts "Resource Not Found"
     #   end
     #
-    def remove_billing_info(account_id:)
-      path = interpolate_path("/sites/{site_id}/accounts/{account_id}/billing_info", site_id: site_id, account_id: account_id)
-      delete(path)
+    def remove_billing_info(account_id:, **options)
+      path = interpolate_path("/accounts/{account_id}/billing_info", account_id: account_id)
+      delete(path, **options)
     end
 
     # Show the coupon redemptions for an account
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/list_account_coupon_redemptions list_account_coupon_redemptions api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/list_account_coupon_redemptions list_account_coupon_redemptions api documenation}
     #
     # @param account_id [String] Account ID or code (use prefix: +code-+, e.g. +code-bob+).
-    # @param ids [string] Filter results by their IDs. Up to 200 IDs can be passed at once using
+    # @param ids [String] Filter results by their IDs. Up to 200 IDs can be passed at once using
     #   commas as separators, e.g. +ids=h1at4d57xlmy,gyqgg0d3v9n1,jrsm5b4yefg6+.
     #
     #   *Important notes:*
@@ -406,6 +423,7 @@ module Recurly
     # @param end_time [DateTime] Filter by end_time when +sort=created_at+ or +sort=updated_at+.
     #   *Note:* this value is an ISO8601 timestamp. A partial timestamp that does not include a time zone will default to UTC.
     #
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Pager<Resources::CouponRedemption>] A list of the the coupon redemptions on an account.
     # @example
     #   redemptions = @client.list_account_coupon_redemptions(
@@ -417,15 +435,16 @@ module Recurly
     #   end
     #
     def list_account_coupon_redemptions(account_id:, **options)
-      path = interpolate_path("/sites/{site_id}/accounts/{account_id}/coupon_redemptions", site_id: site_id, account_id: account_id)
+      path = interpolate_path("/accounts/{account_id}/coupon_redemptions", account_id: account_id)
       pager(path, **options)
     end
 
     # Show the coupon redemption that is active on an account
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/get_active_coupon_redemption get_active_coupon_redemption api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/get_active_coupon_redemption get_active_coupon_redemption api documenation}
     #
     # @param account_id [String] Account ID or code (use prefix: +code-+, e.g. +code-bob+).
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::CouponRedemption] An active coupon redemption on an account.
     # @example
     #   begin
@@ -437,17 +456,18 @@ module Recurly
     #     puts "Resource Not Found"
     #   end
     #
-    def get_active_coupon_redemption(account_id:)
-      path = interpolate_path("/sites/{site_id}/accounts/{account_id}/coupon_redemptions/active", site_id: site_id, account_id: account_id)
-      get(path)
+    def get_active_coupon_redemption(account_id:, **options)
+      path = interpolate_path("/accounts/{account_id}/coupon_redemptions/active", account_id: account_id)
+      get(path, **options)
     end
 
     # Generate an active coupon redemption on an account
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/create_coupon_redemption create_coupon_redemption api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/create_coupon_redemption create_coupon_redemption api documenation}
     #
     # @param account_id [String] Account ID or code (use prefix: +code-+, e.g. +code-bob+).
     # @param body [Requests::CouponRedemptionCreate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::CouponRedemptionCreate}
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::CouponRedemption] Returns the new coupon redemption.
     # @example
     #   begin
@@ -466,16 +486,17 @@ module Recurly
     #     puts "ValidationError: #{e.recurly_error.params}"
     #   end
     #
-    def create_coupon_redemption(account_id:, body:)
-      path = interpolate_path("/sites/{site_id}/accounts/{account_id}/coupon_redemptions/active", site_id: site_id, account_id: account_id)
-      post(path, body, Requests::CouponRedemptionCreate)
+    def create_coupon_redemption(account_id:, body:, **options)
+      path = interpolate_path("/accounts/{account_id}/coupon_redemptions/active", account_id: account_id)
+      post(path, body, Requests::CouponRedemptionCreate, **options)
     end
 
     # Delete the active coupon redemption from an account
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/remove_coupon_redemption remove_coupon_redemption api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/remove_coupon_redemption remove_coupon_redemption api documenation}
     #
     # @param account_id [String] Account ID or code (use prefix: +code-+, e.g. +code-bob+).
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::CouponRedemption] Coupon redemption deleted.
     # @example
     #   begin
@@ -487,14 +508,14 @@ module Recurly
     #     puts "Resource Not Found"
     #   end
     #
-    def remove_coupon_redemption(account_id:)
-      path = interpolate_path("/sites/{site_id}/accounts/{account_id}/coupon_redemptions/active", site_id: site_id, account_id: account_id)
-      delete(path)
+    def remove_coupon_redemption(account_id:, **options)
+      path = interpolate_path("/accounts/{account_id}/coupon_redemptions/active", account_id: account_id)
+      delete(path, **options)
     end
 
     # List an account's credit payments
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/list_account_credit_payments list_account_credit_payments api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/list_account_credit_payments list_account_credit_payments api documenation}
     #
     # @param account_id [String] Account ID or code (use prefix: +code-+, e.g. +code-bob+).
     # @param limit [Integer] Limit number of records 1-200.
@@ -509,6 +530,7 @@ module Recurly
     # @param end_time [DateTime] Filter by end_time when +sort=created_at+ or +sort=updated_at+.
     #   *Note:* this value is an ISO8601 timestamp. A partial timestamp that does not include a time zone will default to UTC.
     #
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Pager<Resources::CreditPayment>] A list of the account's credit payments.
     # @example
     #   payments = @client.list_account_credit_payments(
@@ -520,16 +542,16 @@ module Recurly
     #   end
     #
     def list_account_credit_payments(account_id:, **options)
-      path = interpolate_path("/sites/{site_id}/accounts/{account_id}/credit_payments", site_id: site_id, account_id: account_id)
+      path = interpolate_path("/accounts/{account_id}/credit_payments", account_id: account_id)
       pager(path, **options)
     end
 
     # List an account's invoices
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/list_account_invoices list_account_invoices api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/list_account_invoices list_account_invoices api documenation}
     #
     # @param account_id [String] Account ID or code (use prefix: +code-+, e.g. +code-bob+).
-    # @param ids [string] Filter results by their IDs. Up to 200 IDs can be passed at once using
+    # @param ids [String] Filter results by their IDs. Up to 200 IDs can be passed at once using
     #   commas as separators, e.g. +ids=h1at4d57xlmy,gyqgg0d3v9n1,jrsm5b4yefg6+.
     #
     #   *Important notes:*
@@ -559,6 +581,7 @@ module Recurly
     #   - +type=non-legacy+, only charge and credit invoices will be returned.
     #   - +type=legacy+, only legacy invoices will be returned.
     #
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Pager<Resources::Invoice>] A list of the account's invoices.
     # @example
     #   invoices = @client.list_account_invoices(
@@ -570,16 +593,17 @@ module Recurly
     #   end
     #
     def list_account_invoices(account_id:, **options)
-      path = interpolate_path("/sites/{site_id}/accounts/{account_id}/invoices", site_id: site_id, account_id: account_id)
+      path = interpolate_path("/accounts/{account_id}/invoices", account_id: account_id)
       pager(path, **options)
     end
 
     # Create an invoice for pending line items
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/create_invoice create_invoice api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/create_invoice create_invoice api documenation}
     #
     # @param account_id [String] Account ID or code (use prefix: +code-+, e.g. +code-bob+).
     # @param body [Requests::InvoiceCreate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::InvoiceCreate}
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::InvoiceCollection] Returns the new invoices.
     # @example
     #   begin
@@ -598,17 +622,18 @@ module Recurly
     #     puts "ValidationError: #{e.recurly_error.params}"
     #   end
     #
-    def create_invoice(account_id:, body:)
-      path = interpolate_path("/sites/{site_id}/accounts/{account_id}/invoices", site_id: site_id, account_id: account_id)
-      post(path, body, Requests::InvoiceCreate)
+    def create_invoice(account_id:, body:, **options)
+      path = interpolate_path("/accounts/{account_id}/invoices", account_id: account_id)
+      post(path, body, Requests::InvoiceCreate, **options)
     end
 
     # Preview new invoice for pending line items
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/preview_invoice preview_invoice api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/preview_invoice preview_invoice api documenation}
     #
     # @param account_id [String] Account ID or code (use prefix: +code-+, e.g. +code-bob+).
     # @param body [Requests::InvoiceCreate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::InvoiceCreate}
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::InvoiceCollection] Returns the invoice previews.
     # @example
     #   begin
@@ -627,17 +652,17 @@ module Recurly
     #     puts "ValidationError: #{e.recurly_error.params}"
     #   end
     #
-    def preview_invoice(account_id:, body:)
-      path = interpolate_path("/sites/{site_id}/accounts/{account_id}/invoices/preview", site_id: site_id, account_id: account_id)
-      post(path, body, Requests::InvoiceCreate)
+    def preview_invoice(account_id:, body:, **options)
+      path = interpolate_path("/accounts/{account_id}/invoices/preview", account_id: account_id)
+      post(path, body, Requests::InvoiceCreate, **options)
     end
 
     # List an account's line items
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/list_account_line_items list_account_line_items api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/list_account_line_items list_account_line_items api documenation}
     #
     # @param account_id [String] Account ID or code (use prefix: +code-+, e.g. +code-bob+).
-    # @param ids [string] Filter results by their IDs. Up to 200 IDs can be passed at once using
+    # @param ids [String] Filter results by their IDs. Up to 200 IDs can be passed at once using
     #   commas as separators, e.g. +ids=h1at4d57xlmy,gyqgg0d3v9n1,jrsm5b4yefg6+.
     #
     #   *Important notes:*
@@ -664,6 +689,7 @@ module Recurly
     # @param original [String] Filter by original field.
     # @param state [String] Filter by state field.
     # @param type [String] Filter by type field.
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Pager<Resources::LineItem>] A list of the account's line items.
     # @example
     #   line_items = @client.list_account_line_items(
@@ -675,16 +701,17 @@ module Recurly
     #   end
     #
     def list_account_line_items(account_id:, **options)
-      path = interpolate_path("/sites/{site_id}/accounts/{account_id}/line_items", site_id: site_id, account_id: account_id)
+      path = interpolate_path("/accounts/{account_id}/line_items", account_id: account_id)
       pager(path, **options)
     end
 
     # Create a new line item for the account
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/create_line_item create_line_item api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/create_line_item create_line_item api documenation}
     #
     # @param account_id [String] Account ID or code (use prefix: +code-+, e.g. +code-bob+).
     # @param body [Requests::LineItemCreate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::LineItemCreate}
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::LineItem] Returns the new line item.
     # @example
     #   begin
@@ -704,17 +731,17 @@ module Recurly
     #     puts "ValidationError: #{e.recurly_error.params}"
     #   end
     #
-    def create_line_item(account_id:, body:)
-      path = interpolate_path("/sites/{site_id}/accounts/{account_id}/line_items", site_id: site_id, account_id: account_id)
-      post(path, body, Requests::LineItemCreate)
+    def create_line_item(account_id:, body:, **options)
+      path = interpolate_path("/accounts/{account_id}/line_items", account_id: account_id)
+      post(path, body, Requests::LineItemCreate, **options)
     end
 
     # Fetch a list of an account's notes
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/list_account_notes list_account_notes api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/list_account_notes list_account_notes api documenation}
     #
     # @param account_id [String] Account ID or code (use prefix: +code-+, e.g. +code-bob+).
-    # @param ids [string] Filter results by their IDs. Up to 200 IDs can be passed at once using
+    # @param ids [String] Filter results by their IDs. Up to 200 IDs can be passed at once using
     #   commas as separators, e.g. +ids=h1at4d57xlmy,gyqgg0d3v9n1,jrsm5b4yefg6+.
     #
     #   *Important notes:*
@@ -726,6 +753,7 @@ module Recurly
     #   * Records are returned in an arbitrary order. Since results are all
     #     returned at once you can sort the records yourself.
     #
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Pager<Resources::AccountNote>] A list of an account's notes.
     # @example
     #   account_notes = @client.list_account_notes(account_id: account_id, limit: 200)
@@ -734,16 +762,17 @@ module Recurly
     #   end
     #
     def list_account_notes(account_id:, **options)
-      path = interpolate_path("/sites/{site_id}/accounts/{account_id}/notes", site_id: site_id, account_id: account_id)
+      path = interpolate_path("/accounts/{account_id}/notes", account_id: account_id)
       pager(path, **options)
     end
 
     # Fetch an account note
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/get_account_note get_account_note api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/get_account_note get_account_note api documenation}
     #
     # @param account_id [String] Account ID or code (use prefix: +code-+, e.g. +code-bob+).
     # @param account_note_id [String] Account Note ID.
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::AccountNote] An account note.
     # @example
     #   begin
@@ -758,17 +787,17 @@ module Recurly
     #     puts "Resource Not Found"
     #   end
     #
-    def get_account_note(account_id:, account_note_id:)
-      path = interpolate_path("/sites/{site_id}/accounts/{account_id}/notes/{account_note_id}", site_id: site_id, account_id: account_id, account_note_id: account_note_id)
-      get(path)
+    def get_account_note(account_id:, account_note_id:, **options)
+      path = interpolate_path("/accounts/{account_id}/notes/{account_note_id}", account_id: account_id, account_note_id: account_note_id)
+      get(path, **options)
     end
 
     # Fetch a list of an account's shipping addresses
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/list_shipping_addresses list_shipping_addresses api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/list_shipping_addresses list_shipping_addresses api documenation}
     #
     # @param account_id [String] Account ID or code (use prefix: +code-+, e.g. +code-bob+).
-    # @param ids [string] Filter results by their IDs. Up to 200 IDs can be passed at once using
+    # @param ids [String] Filter results by their IDs. Up to 200 IDs can be passed at once using
     #   commas as separators, e.g. +ids=h1at4d57xlmy,gyqgg0d3v9n1,jrsm5b4yefg6+.
     #
     #   *Important notes:*
@@ -792,6 +821,7 @@ module Recurly
     # @param end_time [DateTime] Filter by end_time when +sort=created_at+ or +sort=updated_at+.
     #   *Note:* this value is an ISO8601 timestamp. A partial timestamp that does not include a time zone will default to UTC.
     #
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Pager<Resources::ShippingAddress>] A list of an account's shipping addresses.
     # @example
     #   shipping_addresses = @client.list_shipping_addresses(
@@ -803,28 +833,30 @@ module Recurly
     #   end
     #
     def list_shipping_addresses(account_id:, **options)
-      path = interpolate_path("/sites/{site_id}/accounts/{account_id}/shipping_addresses", site_id: site_id, account_id: account_id)
+      path = interpolate_path("/accounts/{account_id}/shipping_addresses", account_id: account_id)
       pager(path, **options)
     end
 
     # Create a new shipping address for the account
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/create_shipping_address create_shipping_address api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/create_shipping_address create_shipping_address api documenation}
     #
     # @param account_id [String] Account ID or code (use prefix: +code-+, e.g. +code-bob+).
     # @param body [Requests::ShippingAddressCreate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::ShippingAddressCreate}
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::ShippingAddress] Returns the new shipping address.
-    def create_shipping_address(account_id:, body:)
-      path = interpolate_path("/sites/{site_id}/accounts/{account_id}/shipping_addresses", site_id: site_id, account_id: account_id)
-      post(path, body, Requests::ShippingAddressCreate)
+    def create_shipping_address(account_id:, body:, **options)
+      path = interpolate_path("/accounts/{account_id}/shipping_addresses", account_id: account_id)
+      post(path, body, Requests::ShippingAddressCreate, **options)
     end
 
     # Fetch an account's shipping address
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/get_shipping_address get_shipping_address api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/get_shipping_address get_shipping_address api documenation}
     #
     # @param account_id [String] Account ID or code (use prefix: +code-+, e.g. +code-bob+).
     # @param shipping_address_id [String] Shipping Address ID.
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::ShippingAddress] A shipping address.
     # @example
     #   begin
@@ -839,18 +871,19 @@ module Recurly
     #     puts "Resource Not Found"
     #   end
     #
-    def get_shipping_address(account_id:, shipping_address_id:)
-      path = interpolate_path("/sites/{site_id}/accounts/{account_id}/shipping_addresses/{shipping_address_id}", site_id: site_id, account_id: account_id, shipping_address_id: shipping_address_id)
-      get(path)
+    def get_shipping_address(account_id:, shipping_address_id:, **options)
+      path = interpolate_path("/accounts/{account_id}/shipping_addresses/{shipping_address_id}", account_id: account_id, shipping_address_id: shipping_address_id)
+      get(path, **options)
     end
 
     # Update an account's shipping address
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/update_shipping_address update_shipping_address api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/update_shipping_address update_shipping_address api documenation}
     #
     # @param account_id [String] Account ID or code (use prefix: +code-+, e.g. +code-bob+).
     # @param shipping_address_id [String] Shipping Address ID.
     # @param body [Requests::ShippingAddressUpdate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::ShippingAddressUpdate}
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::ShippingAddress] The updated shipping address.
     # @example
     #   begin
@@ -871,17 +904,19 @@ module Recurly
     #     puts "ValidationError: #{e.recurly_error.params}"
     #   end
     #
-    def update_shipping_address(account_id:, shipping_address_id:, body:)
-      path = interpolate_path("/sites/{site_id}/accounts/{account_id}/shipping_addresses/{shipping_address_id}", site_id: site_id, account_id: account_id, shipping_address_id: shipping_address_id)
-      put(path, body, Requests::ShippingAddressUpdate)
+    def update_shipping_address(account_id:, shipping_address_id:, body:, **options)
+      path = interpolate_path("/accounts/{account_id}/shipping_addresses/{shipping_address_id}", account_id: account_id, shipping_address_id: shipping_address_id)
+      put(path, body, Requests::ShippingAddressUpdate, **options)
     end
 
     # Remove an account's shipping address
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/remove_shipping_address remove_shipping_address api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/remove_shipping_address remove_shipping_address api documenation}
     #
     # @param account_id [String] Account ID or code (use prefix: +code-+, e.g. +code-bob+).
     # @param shipping_address_id [String] Shipping Address ID.
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
+    # @return [Empty] Shipping address deleted.
     # @example
     #   begin
     #     @client.remove_shipping_address(
@@ -895,17 +930,17 @@ module Recurly
     #     puts "Resource Not Found"
     #   end
     #
-    def remove_shipping_address(account_id:, shipping_address_id:)
-      path = interpolate_path("/sites/{site_id}/accounts/{account_id}/shipping_addresses/{shipping_address_id}", site_id: site_id, account_id: account_id, shipping_address_id: shipping_address_id)
-      delete(path)
+    def remove_shipping_address(account_id:, shipping_address_id:, **options)
+      path = interpolate_path("/accounts/{account_id}/shipping_addresses/{shipping_address_id}", account_id: account_id, shipping_address_id: shipping_address_id)
+      delete(path, **options)
     end
 
     # List an account's subscriptions
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/list_account_subscriptions list_account_subscriptions api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/list_account_subscriptions list_account_subscriptions api documenation}
     #
     # @param account_id [String] Account ID or code (use prefix: +code-+, e.g. +code-bob+).
-    # @param ids [string] Filter results by their IDs. Up to 200 IDs can be passed at once using
+    # @param ids [String] Filter results by their IDs. Up to 200 IDs can be passed at once using
     #   commas as separators, e.g. +ids=h1at4d57xlmy,gyqgg0d3v9n1,jrsm5b4yefg6+.
     #
     #   *Important notes:*
@@ -935,6 +970,7 @@ module Recurly
     #   - When +state=in_trial+, only subscriptions that have a trial_started_at date earlier than now and a trial_ends_at date later than now will be returned.
     #   - When +state=live+, only subscriptions that are in an active, canceled, or future state or are in trial will be returned.
     #
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Pager<Resources::Subscription>] A list of the account's subscriptions.
     # @example
     #   subscriptions = @client.list_account_subscriptions(
@@ -946,16 +982,16 @@ module Recurly
     #   end
     #
     def list_account_subscriptions(account_id:, **options)
-      path = interpolate_path("/sites/{site_id}/accounts/{account_id}/subscriptions", site_id: site_id, account_id: account_id)
+      path = interpolate_path("/accounts/{account_id}/subscriptions", account_id: account_id)
       pager(path, **options)
     end
 
     # List an account's transactions
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/list_account_transactions list_account_transactions api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/list_account_transactions list_account_transactions api documenation}
     #
     # @param account_id [String] Account ID or code (use prefix: +code-+, e.g. +code-bob+).
-    # @param ids [string] Filter results by their IDs. Up to 200 IDs can be passed at once using
+    # @param ids [String] Filter results by their IDs. Up to 200 IDs can be passed at once using
     #   commas as separators, e.g. +ids=h1at4d57xlmy,gyqgg0d3v9n1,jrsm5b4yefg6+.
     #
     #   *Important notes:*
@@ -981,6 +1017,7 @@ module Recurly
     #
     # @param type [String] Filter by type field. The value +payment+ will return both +purchase+ and +capture+ transactions.
     # @param success [String] Filter by success field.
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Pager<Resources::Transaction>] A list of the account's transactions.
     # @example
     #   transactions = @client.list_account_transactions(
@@ -992,16 +1029,16 @@ module Recurly
     #   end
     #
     def list_account_transactions(account_id:, **options)
-      path = interpolate_path("/sites/{site_id}/accounts/{account_id}/transactions", site_id: site_id, account_id: account_id)
+      path = interpolate_path("/accounts/{account_id}/transactions", account_id: account_id)
       pager(path, **options)
     end
 
     # List an account's child accounts
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/list_child_accounts list_child_accounts api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/list_child_accounts list_child_accounts api documenation}
     #
     # @param account_id [String] Account ID or code (use prefix: +code-+, e.g. +code-bob+).
-    # @param ids [string] Filter results by their IDs. Up to 200 IDs can be passed at once using
+    # @param ids [String] Filter results by their IDs. Up to 200 IDs can be passed at once using
     #   commas as separators, e.g. +ids=h1at4d57xlmy,gyqgg0d3v9n1,jrsm5b4yefg6+.
     #
     #   *Important notes:*
@@ -1025,10 +1062,12 @@ module Recurly
     # @param end_time [DateTime] Filter by end_time when +sort=created_at+ or +sort=updated_at+.
     #   *Note:* this value is an ISO8601 timestamp. A partial timestamp that does not include a time zone will default to UTC.
     #
-    # @param subscriber [String] Filter accounts accounts with or without a subscription in the +active+,
+    # @param email [String] Filter for accounts with this exact email address. A blank value will return accounts with both +null+ and +""+ email addresses. Note that multiple accounts can share one email address.
+    # @param subscriber [Boolean] Filter for accounts with or without a subscription in the +active+,
     #   +canceled+, or +future+ state.
     #
     # @param past_due [String] Filter for accounts with an invoice in the +past_due+ state.
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Pager<Resources::Account>] A list of an account's child accounts.
     # @example
     #   child_accounts = @client.list_child_accounts(
@@ -1040,15 +1079,15 @@ module Recurly
     #   end
     #
     def list_child_accounts(account_id:, **options)
-      path = interpolate_path("/sites/{site_id}/accounts/{account_id}/accounts", site_id: site_id, account_id: account_id)
+      path = interpolate_path("/accounts/{account_id}/accounts", account_id: account_id)
       pager(path, **options)
     end
 
     # List a site's account acquisition data
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/list_account_acquisition list_account_acquisition api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/list_account_acquisition list_account_acquisition api documenation}
     #
-    # @param ids [string] Filter results by their IDs. Up to 200 IDs can be passed at once using
+    # @param ids [String] Filter results by their IDs. Up to 200 IDs can be passed at once using
     #   commas as separators, e.g. +ids=h1at4d57xlmy,gyqgg0d3v9n1,jrsm5b4yefg6+.
     #
     #   *Important notes:*
@@ -1072,6 +1111,7 @@ module Recurly
     # @param end_time [DateTime] Filter by end_time when +sort=created_at+ or +sort=updated_at+.
     #   *Note:* this value is an ISO8601 timestamp. A partial timestamp that does not include a time zone will default to UTC.
     #
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Pager<Resources::AccountAcquisition>] A list of the site's account acquisition data.
     # @example
     #   acquisitions = @client.list_account_acquisition(limit: 200)
@@ -1080,15 +1120,15 @@ module Recurly
     #   end
     #
     def list_account_acquisition(**options)
-      path = interpolate_path("/sites/{site_id}/acquisitions", site_id: site_id)
+      path = interpolate_path("/acquisitions")
       pager(path, **options)
     end
 
     # List a site's coupons
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/list_coupons list_coupons api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/list_coupons list_coupons api documenation}
     #
-    # @param ids [string] Filter results by their IDs. Up to 200 IDs can be passed at once using
+    # @param ids [String] Filter results by their IDs. Up to 200 IDs can be passed at once using
     #   commas as separators, e.g. +ids=h1at4d57xlmy,gyqgg0d3v9n1,jrsm5b4yefg6+.
     #
     #   *Important notes:*
@@ -1112,6 +1152,7 @@ module Recurly
     # @param end_time [DateTime] Filter by end_time when +sort=created_at+ or +sort=updated_at+.
     #   *Note:* this value is an ISO8601 timestamp. A partial timestamp that does not include a time zone will default to UTC.
     #
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Pager<Resources::Coupon>] A list of the site's coupons.
     # @example
     #   coupons = @client.list_coupons(limit: 200)
@@ -1120,15 +1161,16 @@ module Recurly
     #   end
     #
     def list_coupons(**options)
-      path = interpolate_path("/sites/{site_id}/coupons", site_id: site_id)
+      path = interpolate_path("/coupons")
       pager(path, **options)
     end
 
     # Create a new coupon
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/create_coupon create_coupon api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/create_coupon create_coupon api documenation}
     #
     # @param body [Requests::CouponCreate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::CouponCreate}
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::Coupon] A new coupon.
     # @example
     #   begin
@@ -1153,16 +1195,17 @@ module Recurly
     #     puts "ValidationError: #{e.recurly_error.params}"
     #   end
     #
-    def create_coupon(body:)
-      path = interpolate_path("/sites/{site_id}/coupons", site_id: site_id)
-      post(path, body, Requests::CouponCreate)
+    def create_coupon(body:, **options)
+      path = interpolate_path("/coupons")
+      post(path, body, Requests::CouponCreate, **options)
     end
 
     # Fetch a coupon
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/get_coupon get_coupon api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/get_coupon get_coupon api documenation}
     #
     # @param coupon_id [String] Coupon ID or code (use prefix: +code-+, e.g. +code-10off+).
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::Coupon] A coupon.
     # @example
     #   begin
@@ -1174,29 +1217,30 @@ module Recurly
     #     puts "Resource Not Found"
     #   end
     #
-    def get_coupon(coupon_id:)
-      path = interpolate_path("/sites/{site_id}/coupons/{coupon_id}", site_id: site_id, coupon_id: coupon_id)
-      get(path)
+    def get_coupon(coupon_id:, **options)
+      path = interpolate_path("/coupons/{coupon_id}", coupon_id: coupon_id)
+      get(path, **options)
     end
 
     # Update an active coupon
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/update_coupon update_coupon api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/update_coupon update_coupon api documenation}
     #
     # @param coupon_id [String] Coupon ID or code (use prefix: +code-+, e.g. +code-10off+).
     # @param body [Requests::CouponUpdate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::CouponUpdate}
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::Coupon] The updated coupon.
-    def update_coupon(coupon_id:, body:)
-      path = interpolate_path("/sites/{site_id}/coupons/{coupon_id}", site_id: site_id, coupon_id: coupon_id)
-      put(path, body, Requests::CouponUpdate)
+    def update_coupon(coupon_id:, body:, **options)
+      path = interpolate_path("/coupons/{coupon_id}", coupon_id: coupon_id)
+      put(path, body, Requests::CouponUpdate, **options)
     end
 
     # List unique coupon codes associated with a bulk coupon
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/list_unique_coupon_codes list_unique_coupon_codes api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/list_unique_coupon_codes list_unique_coupon_codes api documenation}
     #
     # @param coupon_id [String] Coupon ID or code (use prefix: +code-+, e.g. +code-10off+).
-    # @param ids [string] Filter results by their IDs. Up to 200 IDs can be passed at once using
+    # @param ids [String] Filter results by their IDs. Up to 200 IDs can be passed at once using
     #   commas as separators, e.g. +ids=h1at4d57xlmy,gyqgg0d3v9n1,jrsm5b4yefg6+.
     #
     #   *Important notes:*
@@ -1220,15 +1264,16 @@ module Recurly
     # @param end_time [DateTime] Filter by end_time when +sort=created_at+ or +sort=updated_at+.
     #   *Note:* this value is an ISO8601 timestamp. A partial timestamp that does not include a time zone will default to UTC.
     #
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Pager<Resources::UniqueCouponCode>] A list of unique coupon codes that were generated
     def list_unique_coupon_codes(coupon_id:, **options)
-      path = interpolate_path("/sites/{site_id}/coupons/{coupon_id}/unique_coupon_codes", site_id: site_id, coupon_id: coupon_id)
+      path = interpolate_path("/coupons/{coupon_id}/unique_coupon_codes", coupon_id: coupon_id)
       pager(path, **options)
     end
 
     # List a site's credit payments
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/list_credit_payments list_credit_payments api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/list_credit_payments list_credit_payments api documenation}
     #
     # @param limit [Integer] Limit number of records 1-200.
     # @param order [String] Sort order.
@@ -1242,6 +1287,7 @@ module Recurly
     # @param end_time [DateTime] Filter by end_time when +sort=created_at+ or +sort=updated_at+.
     #   *Note:* this value is an ISO8601 timestamp. A partial timestamp that does not include a time zone will default to UTC.
     #
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Pager<Resources::CreditPayment>] A list of the site's credit payments.
     # @example
     #   payments = @client.list_credit_payments(limit: 200)
@@ -1250,26 +1296,27 @@ module Recurly
     #   end
     #
     def list_credit_payments(**options)
-      path = interpolate_path("/sites/{site_id}/credit_payments", site_id: site_id)
+      path = interpolate_path("/credit_payments")
       pager(path, **options)
     end
 
     # Fetch a credit payment
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/get_credit_payment get_credit_payment api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/get_credit_payment get_credit_payment api documenation}
     #
     # @param credit_payment_id [String] Credit Payment ID or UUID (use prefix: +uuid-+, e.g. +uuid-123457890+).
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::CreditPayment] A credit payment.
-    def get_credit_payment(credit_payment_id:)
-      path = interpolate_path("/sites/{site_id}/credit_payments/{credit_payment_id}", site_id: site_id, credit_payment_id: credit_payment_id)
-      get(path)
+    def get_credit_payment(credit_payment_id:, **options)
+      path = interpolate_path("/credit_payments/{credit_payment_id}", credit_payment_id: credit_payment_id)
+      get(path, **options)
     end
 
     # List a site's custom field definitions
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/list_custom_field_definitions list_custom_field_definitions api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/list_custom_field_definitions list_custom_field_definitions api documenation}
     #
-    # @param ids [string] Filter results by their IDs. Up to 200 IDs can be passed at once using
+    # @param ids [String] Filter results by their IDs. Up to 200 IDs can be passed at once using
     #   commas as separators, e.g. +ids=h1at4d57xlmy,gyqgg0d3v9n1,jrsm5b4yefg6+.
     #
     #   *Important notes:*
@@ -1293,6 +1340,7 @@ module Recurly
     # @param end_time [DateTime] Filter by end_time when +sort=created_at+ or +sort=updated_at+.
     #   *Note:* this value is an ISO8601 timestamp. A partial timestamp that does not include a time zone will default to UTC.
     #
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Pager<Resources::CustomFieldDefinition>] A list of the site's custom field definitions.
     # @example
     #   custom_fields = @client.list_custom_field_definitions(limit: 200)
@@ -1301,26 +1349,27 @@ module Recurly
     #   end
     #
     def list_custom_field_definitions(**options)
-      path = interpolate_path("/sites/{site_id}/custom_field_definitions", site_id: site_id)
+      path = interpolate_path("/custom_field_definitions")
       pager(path, **options)
     end
 
     # Fetch an custom field definition
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/get_custom_field_definition get_custom_field_definition api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/get_custom_field_definition get_custom_field_definition api documenation}
     #
     # @param custom_field_definition_id [String] Custom Field Definition ID
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::CustomFieldDefinition] An custom field definition.
-    def get_custom_field_definition(custom_field_definition_id:)
-      path = interpolate_path("/sites/{site_id}/custom_field_definitions/{custom_field_definition_id}", site_id: site_id, custom_field_definition_id: custom_field_definition_id)
-      get(path)
+    def get_custom_field_definition(custom_field_definition_id:, **options)
+      path = interpolate_path("/custom_field_definitions/{custom_field_definition_id}", custom_field_definition_id: custom_field_definition_id)
+      get(path, **options)
     end
 
     # List a site's invoices
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/list_invoices list_invoices api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/list_invoices list_invoices api documenation}
     #
-    # @param ids [string] Filter results by their IDs. Up to 200 IDs can be passed at once using
+    # @param ids [String] Filter results by their IDs. Up to 200 IDs can be passed at once using
     #   commas as separators, e.g. +ids=h1at4d57xlmy,gyqgg0d3v9n1,jrsm5b4yefg6+.
     #
     #   *Important notes:*
@@ -1350,6 +1399,7 @@ module Recurly
     #   - +type=non-legacy+, only charge and credit invoices will be returned.
     #   - +type=legacy+, only legacy invoices will be returned.
     #
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Pager<Resources::Invoice>] A list of the site's invoices.
     # @example
     #   invoices = @client.list_invoices(limit: 200)
@@ -1358,15 +1408,16 @@ module Recurly
     #   end
     #
     def list_invoices(**options)
-      path = interpolate_path("/sites/{site_id}/invoices", site_id: site_id)
+      path = interpolate_path("/invoices")
       pager(path, **options)
     end
 
     # Fetch an invoice
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/get_invoice get_invoice api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/get_invoice get_invoice api documenation}
     #
     # @param invoice_id [String] Invoice ID or number (use prefix: +number-+, e.g. +number-1000+).
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::Invoice] An invoice.
     # @example
     #   begin
@@ -1378,28 +1429,30 @@ module Recurly
     #     puts "Resource Not Found"
     #   end
     #
-    def get_invoice(invoice_id:)
-      path = interpolate_path("/sites/{site_id}/invoices/{invoice_id}", site_id: site_id, invoice_id: invoice_id)
-      get(path)
+    def get_invoice(invoice_id:, **options)
+      path = interpolate_path("/invoices/{invoice_id}", invoice_id: invoice_id)
+      get(path, **options)
     end
 
     # Update an invoice
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/put_invoice put_invoice api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/put_invoice put_invoice api documenation}
     #
     # @param invoice_id [String] Invoice ID or number (use prefix: +number-+, e.g. +number-1000+).
     # @param body [Requests::InvoiceUpdatable] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::InvoiceUpdatable}
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::Invoice] An invoice.
-    def put_invoice(invoice_id:, body:)
-      path = interpolate_path("/sites/{site_id}/invoices/{invoice_id}", site_id: site_id, invoice_id: invoice_id)
-      put(path, body, Requests::InvoiceUpdatable)
+    def put_invoice(invoice_id:, body:, **options)
+      path = interpolate_path("/invoices/{invoice_id}", invoice_id: invoice_id)
+      put(path, body, Requests::InvoiceUpdatable, **options)
     end
 
     # Collect a pending or past due, automatic invoice
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/collect_invoice collect_invoice api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/collect_invoice collect_invoice api documenation}
     #
     # @param invoice_id [String] Invoice ID or number (use prefix: +number-+, e.g. +number-1000+).
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::Invoice] The updated invoice.
     # @example
     #   begin
@@ -1411,16 +1464,17 @@ module Recurly
     #     puts "Resource Not Found"
     #   end
     #
-    def collect_invoice(invoice_id:)
-      path = interpolate_path("/sites/{site_id}/invoices/{invoice_id}/collect", site_id: site_id, invoice_id: invoice_id)
-      put(path)
+    def collect_invoice(invoice_id:, **options)
+      path = interpolate_path("/invoices/{invoice_id}/collect", invoice_id: invoice_id)
+      put(path, **options)
     end
 
     # Mark an open invoice as failed
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/fail_invoice fail_invoice api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/fail_invoice fail_invoice api documenation}
     #
     # @param invoice_id [String] Invoice ID or number (use prefix: +number-+, e.g. +number-1000+).
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::Invoice] The updated invoice.
     # @example
     #   begin
@@ -1432,16 +1486,17 @@ module Recurly
     #     puts "Resource Not Found"
     #   end
     #
-    def fail_invoice(invoice_id:)
-      path = interpolate_path("/sites/{site_id}/invoices/{invoice_id}/mark_failed", site_id: site_id, invoice_id: invoice_id)
-      put(path)
+    def fail_invoice(invoice_id:, **options)
+      path = interpolate_path("/invoices/{invoice_id}/mark_failed", invoice_id: invoice_id)
+      put(path, **options)
     end
 
     # Mark an open invoice as successful
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/mark_invoice_successful mark_invoice_successful api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/mark_invoice_successful mark_invoice_successful api documenation}
     #
     # @param invoice_id [String] Invoice ID or number (use prefix: +number-+, e.g. +number-1000+).
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::Invoice] The updated invoice.
     # @example
     #   begin
@@ -1453,16 +1508,17 @@ module Recurly
     #     puts "Resource Not Found"
     #   end
     #
-    def mark_invoice_successful(invoice_id:)
-      path = interpolate_path("/sites/{site_id}/invoices/{invoice_id}/mark_successful", site_id: site_id, invoice_id: invoice_id)
-      put(path)
+    def mark_invoice_successful(invoice_id:, **options)
+      path = interpolate_path("/invoices/{invoice_id}/mark_successful", invoice_id: invoice_id)
+      put(path, **options)
     end
 
     # Reopen a closed, manual invoice
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/reopen_invoice reopen_invoice api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/reopen_invoice reopen_invoice api documenation}
     #
     # @param invoice_id [String] Invoice ID or number (use prefix: +number-+, e.g. +number-1000+).
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::Invoice] The updated invoice.
     # @example
     #   begin
@@ -1474,17 +1530,29 @@ module Recurly
     #     puts "Resource Not Found"
     #   end
     #
-    def reopen_invoice(invoice_id:)
-      path = interpolate_path("/sites/{site_id}/invoices/{invoice_id}/reopen", site_id: site_id, invoice_id: invoice_id)
-      put(path)
+    def reopen_invoice(invoice_id:, **options)
+      path = interpolate_path("/invoices/{invoice_id}/reopen", invoice_id: invoice_id)
+      put(path, **options)
+    end
+
+    # Void a credit invoice.
+    #
+    # {https://developers.recurly.com/api/v2019-10-10#operation/void_invoice void_invoice api documenation}
+    #
+    # @param invoice_id [String] Invoice ID or number (use prefix: +number-+, e.g. +number-1000+).
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
+    # @return [Resources::Invoice] The updated invoice.
+    def void_invoice(invoice_id:, **options)
+      path = interpolate_path("/invoices/{invoice_id}/void", invoice_id: invoice_id)
+      put(path, **options)
     end
 
     # List an invoice's line items
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/list_invoice_line_items list_invoice_line_items api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/list_invoice_line_items list_invoice_line_items api documenation}
     #
     # @param invoice_id [String] Invoice ID or number (use prefix: +number-+, e.g. +number-1000+).
-    # @param ids [string] Filter results by their IDs. Up to 200 IDs can be passed at once using
+    # @param ids [String] Filter results by their IDs. Up to 200 IDs can be passed at once using
     #   commas as separators, e.g. +ids=h1at4d57xlmy,gyqgg0d3v9n1,jrsm5b4yefg6+.
     #
     #   *Important notes:*
@@ -1511,18 +1579,19 @@ module Recurly
     # @param original [String] Filter by original field.
     # @param state [String] Filter by state field.
     # @param type [String] Filter by type field.
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Pager<Resources::LineItem>] A list of the invoice's line items.
     def list_invoice_line_items(invoice_id:, **options)
-      path = interpolate_path("/sites/{site_id}/invoices/{invoice_id}/line_items", site_id: site_id, invoice_id: invoice_id)
+      path = interpolate_path("/invoices/{invoice_id}/line_items", invoice_id: invoice_id)
       pager(path, **options)
     end
 
     # Show the coupon redemptions applied to an invoice
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/list_invoice_coupon_redemptions list_invoice_coupon_redemptions api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/list_invoice_coupon_redemptions list_invoice_coupon_redemptions api documenation}
     #
     # @param invoice_id [String] Invoice ID or number (use prefix: +number-+, e.g. +number-1000+).
-    # @param ids [string] Filter results by their IDs. Up to 200 IDs can be passed at once using
+    # @param ids [String] Filter results by their IDs. Up to 200 IDs can be passed at once using
     #   commas as separators, e.g. +ids=h1at4d57xlmy,gyqgg0d3v9n1,jrsm5b4yefg6+.
     #
     #   *Important notes:*
@@ -1544,6 +1613,7 @@ module Recurly
     # @param end_time [DateTime] Filter by end_time when +sort=created_at+ or +sort=updated_at+.
     #   *Note:* this value is an ISO8601 timestamp. A partial timestamp that does not include a time zone will default to UTC.
     #
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Pager<Resources::CouponRedemption>] A list of the the coupon redemptions associated with the invoice.
     # @example
     #   coupon_redemptions = @client.list_invoice_coupon_redemptions(
@@ -1555,27 +1625,29 @@ module Recurly
     #   end
     #
     def list_invoice_coupon_redemptions(invoice_id:, **options)
-      path = interpolate_path("/sites/{site_id}/invoices/{invoice_id}/coupon_redemptions", site_id: site_id, invoice_id: invoice_id)
+      path = interpolate_path("/invoices/{invoice_id}/coupon_redemptions", invoice_id: invoice_id)
       pager(path, **options)
     end
 
     # List an invoice's related credit or charge invoices
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/list_related_invoices list_related_invoices api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/list_related_invoices list_related_invoices api documenation}
     #
     # @param invoice_id [String] Invoice ID or number (use prefix: +number-+, e.g. +number-1000+).
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Pager<Resources::Invoice>] A list of the credit or charge invoices associated with the invoice.
-    def list_related_invoices(invoice_id:)
-      path = interpolate_path("/sites/{site_id}/invoices/{invoice_id}/related_invoices", site_id: site_id, invoice_id: invoice_id)
-      pager(path)
+    def list_related_invoices(invoice_id:, **options)
+      path = interpolate_path("/invoices/{invoice_id}/related_invoices", invoice_id: invoice_id)
+      pager(path, **options)
     end
 
     # Refund an invoice
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/refund_invoice refund_invoice api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/refund_invoice refund_invoice api documenation}
     #
     # @param invoice_id [String] Invoice ID or number (use prefix: +number-+, e.g. +number-1000+).
     # @param body [Requests::InvoiceRefund] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::InvoiceRefund}
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::Invoice] Returns the new credit invoice.
     # @example
     #   begin
@@ -1594,16 +1666,16 @@ module Recurly
     #     puts "ValidationError: #{e.recurly_error.params}"
     #   end
     #
-    def refund_invoice(invoice_id:, body:)
-      path = interpolate_path("/sites/{site_id}/invoices/{invoice_id}/refund", site_id: site_id, invoice_id: invoice_id)
-      post(path, body, Requests::InvoiceRefund)
+    def refund_invoice(invoice_id:, body:, **options)
+      path = interpolate_path("/invoices/{invoice_id}/refund", invoice_id: invoice_id)
+      post(path, body, Requests::InvoiceRefund, **options)
     end
 
     # List a site's line items
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/list_line_items list_line_items api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/list_line_items list_line_items api documenation}
     #
-    # @param ids [string] Filter results by their IDs. Up to 200 IDs can be passed at once using
+    # @param ids [String] Filter results by their IDs. Up to 200 IDs can be passed at once using
     #   commas as separators, e.g. +ids=h1at4d57xlmy,gyqgg0d3v9n1,jrsm5b4yefg6+.
     #
     #   *Important notes:*
@@ -1630,17 +1702,19 @@ module Recurly
     # @param original [String] Filter by original field.
     # @param state [String] Filter by state field.
     # @param type [String] Filter by type field.
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Pager<Resources::LineItem>] A list of the site's line items.
     def list_line_items(**options)
-      path = interpolate_path("/sites/{site_id}/line_items", site_id: site_id)
+      path = interpolate_path("/line_items")
       pager(path, **options)
     end
 
     # Fetch a line item
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/get_line_item get_line_item api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/get_line_item get_line_item api documenation}
     #
     # @param line_item_id [String] Line Item ID.
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::LineItem] A line item.
     # @example
     #   begin
@@ -1652,16 +1726,18 @@ module Recurly
     #     puts "Resource Not Found"
     #   end
     #
-    def get_line_item(line_item_id:)
-      path = interpolate_path("/sites/{site_id}/line_items/{line_item_id}", site_id: site_id, line_item_id: line_item_id)
-      get(path)
+    def get_line_item(line_item_id:, **options)
+      path = interpolate_path("/line_items/{line_item_id}", line_item_id: line_item_id)
+      get(path, **options)
     end
 
     # Delete an uninvoiced line item
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/remove_line_item remove_line_item api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/remove_line_item remove_line_item api documenation}
     #
     # @param line_item_id [String] Line Item ID.
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
+    # @return [Empty] Line item deleted.
     # @example
     #   begin
     #     @client.remove_line_item(
@@ -1674,16 +1750,16 @@ module Recurly
     #     puts "Resource Not Found"
     #   end
     #
-    def remove_line_item(line_item_id:)
-      path = interpolate_path("/sites/{site_id}/line_items/{line_item_id}", site_id: site_id, line_item_id: line_item_id)
-      delete(path)
+    def remove_line_item(line_item_id:, **options)
+      path = interpolate_path("/line_items/{line_item_id}", line_item_id: line_item_id)
+      delete(path, **options)
     end
 
     # List a site's plans
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/list_plans list_plans api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/list_plans list_plans api documenation}
     #
-    # @param ids [string] Filter results by their IDs. Up to 200 IDs can be passed at once using
+    # @param ids [String] Filter results by their IDs. Up to 200 IDs can be passed at once using
     #   commas as separators, e.g. +ids=h1at4d57xlmy,gyqgg0d3v9n1,jrsm5b4yefg6+.
     #
     #   *Important notes:*
@@ -1708,6 +1784,7 @@ module Recurly
     #   *Note:* this value is an ISO8601 timestamp. A partial timestamp that does not include a time zone will default to UTC.
     #
     # @param state [String] Filter by state.
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Pager<Resources::Plan>] A list of plans.
     # @example
     #   plans = @client.list_plans(limit: 200)
@@ -1716,15 +1793,16 @@ module Recurly
     #   end
     #
     def list_plans(**options)
-      path = interpolate_path("/sites/{site_id}/plans", site_id: site_id)
+      path = interpolate_path("/plans")
       pager(path, **options)
     end
 
     # Create a plan
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/create_plan create_plan api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/create_plan create_plan api documenation}
     #
     # @param body [Requests::PlanCreate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::PlanCreate}
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::Plan] A plan.
     # @example
     #   begin
@@ -1753,16 +1831,17 @@ module Recurly
     #     puts "ValidationError: #{e.recurly_error.params}"
     #   end
     #
-    def create_plan(body:)
-      path = interpolate_path("/sites/{site_id}/plans", site_id: site_id)
-      post(path, body, Requests::PlanCreate)
+    def create_plan(body:, **options)
+      path = interpolate_path("/plans")
+      post(path, body, Requests::PlanCreate, **options)
     end
 
     # Fetch a plan
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/get_plan get_plan api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/get_plan get_plan api documenation}
     #
     # @param plan_id [String] Plan ID or code (use prefix: +code-+, e.g. +code-gold+).
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::Plan] A plan.
     # @example
     #   begin
@@ -1774,40 +1853,42 @@ module Recurly
     #     puts "Resource Not Found"
     #   end
     #
-    def get_plan(plan_id:)
-      path = interpolate_path("/sites/{site_id}/plans/{plan_id}", site_id: site_id, plan_id: plan_id)
-      get(path)
+    def get_plan(plan_id:, **options)
+      path = interpolate_path("/plans/{plan_id}", plan_id: plan_id)
+      get(path, **options)
     end
 
     # Update a plan
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/update_plan update_plan api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/update_plan update_plan api documenation}
     #
     # @param plan_id [String] Plan ID or code (use prefix: +code-+, e.g. +code-gold+).
     # @param body [Requests::PlanUpdate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::PlanUpdate}
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::Plan] A plan.
-    def update_plan(plan_id:, body:)
-      path = interpolate_path("/sites/{site_id}/plans/{plan_id}", site_id: site_id, plan_id: plan_id)
-      put(path, body, Requests::PlanUpdate)
+    def update_plan(plan_id:, body:, **options)
+      path = interpolate_path("/plans/{plan_id}", plan_id: plan_id)
+      put(path, body, Requests::PlanUpdate, **options)
     end
 
     # Remove a plan
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/remove_plan remove_plan api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/remove_plan remove_plan api documenation}
     #
     # @param plan_id [String] Plan ID or code (use prefix: +code-+, e.g. +code-gold+).
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::Plan] Plan deleted
-    def remove_plan(plan_id:)
-      path = interpolate_path("/sites/{site_id}/plans/{plan_id}", site_id: site_id, plan_id: plan_id)
-      delete(path)
+    def remove_plan(plan_id:, **options)
+      path = interpolate_path("/plans/{plan_id}", plan_id: plan_id)
+      delete(path, **options)
     end
 
     # List a plan's add-ons
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/list_plan_add_ons list_plan_add_ons api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/list_plan_add_ons list_plan_add_ons api documenation}
     #
     # @param plan_id [String] Plan ID or code (use prefix: +code-+, e.g. +code-gold+).
-    # @param ids [string] Filter results by their IDs. Up to 200 IDs can be passed at once using
+    # @param ids [String] Filter results by their IDs. Up to 200 IDs can be passed at once using
     #   commas as separators, e.g. +ids=h1at4d57xlmy,gyqgg0d3v9n1,jrsm5b4yefg6+.
     #
     #   *Important notes:*
@@ -1832,6 +1913,7 @@ module Recurly
     #   *Note:* this value is an ISO8601 timestamp. A partial timestamp that does not include a time zone will default to UTC.
     #
     # @param state [String] Filter by state.
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Pager<Resources::AddOn>] A list of add-ons.
     # @example
     #   add_ons = @client.list_plan_add_ons(
@@ -1843,28 +1925,30 @@ module Recurly
     #   end
     #
     def list_plan_add_ons(plan_id:, **options)
-      path = interpolate_path("/sites/{site_id}/plans/{plan_id}/add_ons", site_id: site_id, plan_id: plan_id)
+      path = interpolate_path("/plans/{plan_id}/add_ons", plan_id: plan_id)
       pager(path, **options)
     end
 
     # Create an add-on
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/create_plan_add_on create_plan_add_on api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/create_plan_add_on create_plan_add_on api documenation}
     #
     # @param plan_id [String] Plan ID or code (use prefix: +code-+, e.g. +code-gold+).
     # @param body [Requests::AddOnCreate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::AddOnCreate}
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::AddOn] An add-on.
-    def create_plan_add_on(plan_id:, body:)
-      path = interpolate_path("/sites/{site_id}/plans/{plan_id}/add_ons", site_id: site_id, plan_id: plan_id)
-      post(path, body, Requests::AddOnCreate)
+    def create_plan_add_on(plan_id:, body:, **options)
+      path = interpolate_path("/plans/{plan_id}/add_ons", plan_id: plan_id)
+      post(path, body, Requests::AddOnCreate, **options)
     end
 
     # Fetch a plan's add-on
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/get_plan_add_on get_plan_add_on api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/get_plan_add_on get_plan_add_on api documenation}
     #
     # @param plan_id [String] Plan ID or code (use prefix: +code-+, e.g. +code-gold+).
     # @param add_on_id [String] Add-on ID or code (use prefix: +code-+, e.g. +code-gold+).
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::AddOn] An add-on.
     # @example
     #   begin
@@ -1878,41 +1962,43 @@ module Recurly
     #     puts "Resource Not Found"
     #   end
     #
-    def get_plan_add_on(plan_id:, add_on_id:)
-      path = interpolate_path("/sites/{site_id}/plans/{plan_id}/add_ons/{add_on_id}", site_id: site_id, plan_id: plan_id, add_on_id: add_on_id)
-      get(path)
+    def get_plan_add_on(plan_id:, add_on_id:, **options)
+      path = interpolate_path("/plans/{plan_id}/add_ons/{add_on_id}", plan_id: plan_id, add_on_id: add_on_id)
+      get(path, **options)
     end
 
     # Update an add-on
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/update_plan_add_on update_plan_add_on api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/update_plan_add_on update_plan_add_on api documenation}
     #
     # @param plan_id [String] Plan ID or code (use prefix: +code-+, e.g. +code-gold+).
     # @param add_on_id [String] Add-on ID or code (use prefix: +code-+, e.g. +code-gold+).
     # @param body [Requests::AddOnUpdate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::AddOnUpdate}
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::AddOn] An add-on.
-    def update_plan_add_on(plan_id:, add_on_id:, body:)
-      path = interpolate_path("/sites/{site_id}/plans/{plan_id}/add_ons/{add_on_id}", site_id: site_id, plan_id: plan_id, add_on_id: add_on_id)
-      put(path, body, Requests::AddOnUpdate)
+    def update_plan_add_on(plan_id:, add_on_id:, body:, **options)
+      path = interpolate_path("/plans/{plan_id}/add_ons/{add_on_id}", plan_id: plan_id, add_on_id: add_on_id)
+      put(path, body, Requests::AddOnUpdate, **options)
     end
 
     # Remove an add-on
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/remove_plan_add_on remove_plan_add_on api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/remove_plan_add_on remove_plan_add_on api documenation}
     #
     # @param plan_id [String] Plan ID or code (use prefix: +code-+, e.g. +code-gold+).
     # @param add_on_id [String] Add-on ID or code (use prefix: +code-+, e.g. +code-gold+).
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::AddOn] Add-on deleted
-    def remove_plan_add_on(plan_id:, add_on_id:)
-      path = interpolate_path("/sites/{site_id}/plans/{plan_id}/add_ons/{add_on_id}", site_id: site_id, plan_id: plan_id, add_on_id: add_on_id)
-      delete(path)
+    def remove_plan_add_on(plan_id:, add_on_id:, **options)
+      path = interpolate_path("/plans/{plan_id}/add_ons/{add_on_id}", plan_id: plan_id, add_on_id: add_on_id)
+      delete(path, **options)
     end
 
     # List a site's add-ons
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/list_add_ons list_add_ons api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/list_add_ons list_add_ons api documenation}
     #
-    # @param ids [string] Filter results by their IDs. Up to 200 IDs can be passed at once using
+    # @param ids [String] Filter results by their IDs. Up to 200 IDs can be passed at once using
     #   commas as separators, e.g. +ids=h1at4d57xlmy,gyqgg0d3v9n1,jrsm5b4yefg6+.
     #
     #   *Important notes:*
@@ -1937,28 +2023,77 @@ module Recurly
     #   *Note:* this value is an ISO8601 timestamp. A partial timestamp that does not include a time zone will default to UTC.
     #
     # @param state [String] Filter by state.
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Pager<Resources::AddOn>] A list of add-ons.
     def list_add_ons(**options)
-      path = interpolate_path("/sites/{site_id}/add_ons", site_id: site_id)
+      path = interpolate_path("/add_ons")
       pager(path, **options)
     end
 
     # Fetch an add-on
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/get_add_on get_add_on api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/get_add_on get_add_on api documenation}
     #
     # @param add_on_id [String] Add-on ID or code (use prefix: +code-+, e.g. +code-gold+).
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::AddOn] An add-on.
-    def get_add_on(add_on_id:)
-      path = interpolate_path("/sites/{site_id}/add_ons/{add_on_id}", site_id: site_id, add_on_id: add_on_id)
-      get(path)
+    def get_add_on(add_on_id:, **options)
+      path = interpolate_path("/add_ons/{add_on_id}", add_on_id: add_on_id)
+      get(path, **options)
+    end
+
+    # List a site's shipping methods
+    #
+    # {https://developers.recurly.com/api/v2019-10-10#operation/list_shipping_methods list_shipping_methods api documenation}
+    #
+    # @param ids [String] Filter results by their IDs. Up to 200 IDs can be passed at once using
+    #   commas as separators, e.g. +ids=h1at4d57xlmy,gyqgg0d3v9n1,jrsm5b4yefg6+.
+    #
+    #   *Important notes:*
+    #
+    #   * The +ids+ parameter cannot be used with any other ordering or filtering
+    #     parameters (+limit+, +order+, +sort+, +begin_time+, +end_time+, etc)
+    #   * Invalid or unknown IDs will be ignored, so you should check that the
+    #     results correspond to your request.
+    #   * Records are returned in an arbitrary order. Since results are all
+    #     returned at once you can sort the records yourself.
+    #
+    # @param limit [Integer] Limit number of records 1-200.
+    # @param order [String] Sort order.
+    # @param sort [String] Sort field. You *really* only want to sort by +updated_at+ in ascending
+    #   order. In descending order updated records will move behind the cursor and could
+    #   prevent some records from being returned.
+    #
+    # @param begin_time [DateTime] Filter by begin_time when +sort=created_at+ or +sort=updated_at+.
+    #   *Note:* this value is an ISO8601 timestamp. A partial timestamp that does not include a time zone will default to UTC.
+    #
+    # @param end_time [DateTime] Filter by end_time when +sort=created_at+ or +sort=updated_at+.
+    #   *Note:* this value is an ISO8601 timestamp. A partial timestamp that does not include a time zone will default to UTC.
+    #
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
+    # @return [Pager<Resources::ShippingMethod>] A list of the site's shipping methods.
+    def list_shipping_methods(**options)
+      path = interpolate_path("/shipping_methods")
+      pager(path, **options)
+    end
+
+    # Fetch a shipping method
+    #
+    # {https://developers.recurly.com/api/v2019-10-10#operation/get_shipping_method get_shipping_method api documenation}
+    #
+    # @param id [String] Shipping Method ID or code (use prefix: +code-+, e.g. +code-usps_2-day+).
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
+    # @return [Resources::ShippingMethod] A shipping_method.
+    def get_shipping_method(id:, **options)
+      path = interpolate_path("/shipping_methods/{id}", id: id)
+      get(path, **options)
     end
 
     # List a site's subscriptions
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/list_subscriptions list_subscriptions api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/list_subscriptions list_subscriptions api documenation}
     #
-    # @param ids [string] Filter results by their IDs. Up to 200 IDs can be passed at once using
+    # @param ids [String] Filter results by their IDs. Up to 200 IDs can be passed at once using
     #   commas as separators, e.g. +ids=h1at4d57xlmy,gyqgg0d3v9n1,jrsm5b4yefg6+.
     #
     #   *Important notes:*
@@ -1988,6 +2123,7 @@ module Recurly
     #   - When +state=in_trial+, only subscriptions that have a trial_started_at date earlier than now and a trial_ends_at date later than now will be returned.
     #   - When +state=live+, only subscriptions that are in an active, canceled, or future state or are in trial will be returned.
     #
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Pager<Resources::Subscription>] A list of the site's subscriptions.
     # @example
     #   subscriptions = @client.list_subscriptions(limit: 200)
@@ -1996,15 +2132,16 @@ module Recurly
     #   end
     #
     def list_subscriptions(**options)
-      path = interpolate_path("/sites/{site_id}/subscriptions", site_id: site_id)
+      path = interpolate_path("/subscriptions")
       pager(path, **options)
     end
 
     # Create a new subscription
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/create_subscription create_subscription api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/create_subscription create_subscription api documenation}
     #
     # @param body [Requests::SubscriptionCreate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::SubscriptionCreate}
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::Subscription] A subscription.
     # @example
     #   begin
@@ -2027,16 +2164,17 @@ module Recurly
     #     puts "ValidationError: #{e.recurly_error.params}"
     #   end
     #
-    def create_subscription(body:)
-      path = interpolate_path("/sites/{site_id}/subscriptions", site_id: site_id)
-      post(path, body, Requests::SubscriptionCreate)
+    def create_subscription(body:, **options)
+      path = interpolate_path("/subscriptions")
+      post(path, body, Requests::SubscriptionCreate, **options)
     end
 
     # Fetch a subscription
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/get_subscription get_subscription api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/get_subscription get_subscription api documenation}
     #
     # @param subscription_id [String] Subscription ID or UUID (use prefix: +uuid-+, e.g. +uuid-123457890+).
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::Subscription] A subscription.
     # @example
     #   begin
@@ -2050,17 +2188,18 @@ module Recurly
     #     puts "Resource Not Found"
     #   end
     #
-    def get_subscription(subscription_id:)
-      path = interpolate_path("/sites/{site_id}/subscriptions/{subscription_id}", site_id: site_id, subscription_id: subscription_id)
-      get(path)
+    def get_subscription(subscription_id:, **options)
+      path = interpolate_path("/subscriptions/{subscription_id}", subscription_id: subscription_id)
+      get(path, **options)
     end
 
     # Modify a subscription
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/modify_subscription modify_subscription api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/modify_subscription modify_subscription api documenation}
     #
     # @param subscription_id [String] Subscription ID or UUID (use prefix: +uuid-+, e.g. +uuid-123457890+).
     # @param body [Requests::SubscriptionUpdate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::SubscriptionUpdate}
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::Subscription] A subscription.
     # @example
     #   begin
@@ -2079,14 +2218,14 @@ module Recurly
     #     puts "ValidationError: #{e.recurly_error.params}"
     #   end
     #
-    def modify_subscription(subscription_id:, body:)
-      path = interpolate_path("/sites/{site_id}/subscriptions/{subscription_id}", site_id: site_id, subscription_id: subscription_id)
-      put(path, body, Requests::SubscriptionUpdate)
+    def modify_subscription(subscription_id:, body:, **options)
+      path = interpolate_path("/subscriptions/{subscription_id}", subscription_id: subscription_id)
+      put(path, body, Requests::SubscriptionUpdate, **options)
     end
 
     # Terminate a subscription
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/terminate_subscription terminate_subscription api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/terminate_subscription terminate_subscription api documenation}
     #
     # @param subscription_id [String] Subscription ID or UUID (use prefix: +uuid-+, e.g. +uuid-123457890+).
     # @param refund [String] The type of refund to perform:
@@ -2099,6 +2238,7 @@ module Recurly
     #
     #   You may also terminate a subscription with no refund and then manually refund specific invoices.
     #
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::Subscription] An expired subscription.
     # @example
     #   begin
@@ -2113,15 +2253,16 @@ module Recurly
     #   end
     #
     def terminate_subscription(subscription_id:, **options)
-      path = interpolate_path("/sites/{site_id}/subscriptions/{subscription_id}", site_id: site_id, subscription_id: subscription_id)
+      path = interpolate_path("/subscriptions/{subscription_id}", subscription_id: subscription_id)
       delete(path, **options)
     end
 
     # Cancel a subscription
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/cancel_subscription cancel_subscription api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/cancel_subscription cancel_subscription api documenation}
     #
     # @param subscription_id [String] Subscription ID or UUID (use prefix: +uuid-+, e.g. +uuid-123457890+).
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::Subscription] A canceled or failed subscription.
     # @example
     #   begin
@@ -2135,16 +2276,17 @@ module Recurly
     #     puts "Resource Not Found"
     #   end
     #
-    def cancel_subscription(subscription_id:)
-      path = interpolate_path("/sites/{site_id}/subscriptions/{subscription_id}/cancel", site_id: site_id, subscription_id: subscription_id)
-      put(path)
+    def cancel_subscription(subscription_id:, **options)
+      path = interpolate_path("/subscriptions/{subscription_id}/cancel", subscription_id: subscription_id)
+      put(path, **options)
     end
 
     # Reactivate a canceled subscription
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/reactivate_subscription reactivate_subscription api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/reactivate_subscription reactivate_subscription api documenation}
     #
     # @param subscription_id [String] Subscription ID or UUID (use prefix: +uuid-+, e.g. +uuid-123457890+).
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::Subscription] An active subscription.
     # @example
     #   begin
@@ -2158,17 +2300,18 @@ module Recurly
     #     puts "Resource Not Found"
     #   end
     #
-    def reactivate_subscription(subscription_id:)
-      path = interpolate_path("/sites/{site_id}/subscriptions/{subscription_id}/reactivate", site_id: site_id, subscription_id: subscription_id)
-      put(path)
+    def reactivate_subscription(subscription_id:, **options)
+      path = interpolate_path("/subscriptions/{subscription_id}/reactivate", subscription_id: subscription_id)
+      put(path, **options)
     end
 
     # Pause subscription
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/pause_subscription pause_subscription api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/pause_subscription pause_subscription api documenation}
     #
     # @param subscription_id [String] Subscription ID or UUID (use prefix: +uuid-+, e.g. +uuid-123457890+).
     # @param body [Requests::SubscriptionPause] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::SubscriptionPause}
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::Subscription] A subscription.
     # @example
     #   begin
@@ -2186,16 +2329,17 @@ module Recurly
     #     puts "Resource Not Found"
     #   end
     #
-    def pause_subscription(subscription_id:, body:)
-      path = interpolate_path("/sites/{site_id}/subscriptions/{subscription_id}/pause", site_id: site_id, subscription_id: subscription_id)
-      put(path, body, Requests::SubscriptionPause)
+    def pause_subscription(subscription_id:, body:, **options)
+      path = interpolate_path("/subscriptions/{subscription_id}/pause", subscription_id: subscription_id)
+      put(path, body, Requests::SubscriptionPause, **options)
     end
 
     # Resume subscription
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/resume_subscription resume_subscription api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/resume_subscription resume_subscription api documenation}
     #
     # @param subscription_id [String] Subscription ID or UUID (use prefix: +uuid-+, e.g. +uuid-123457890+).
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::Subscription] A subscription.
     # @example
     #   begin
@@ -2209,16 +2353,17 @@ module Recurly
     #     puts "Resource Not Found"
     #   end
     #
-    def resume_subscription(subscription_id:)
-      path = interpolate_path("/sites/{site_id}/subscriptions/{subscription_id}/resume", site_id: site_id, subscription_id: subscription_id)
-      put(path)
+    def resume_subscription(subscription_id:, **options)
+      path = interpolate_path("/subscriptions/{subscription_id}/resume", subscription_id: subscription_id)
+      put(path, **options)
     end
 
     # Fetch a subscription's pending change
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/get_subscription_change get_subscription_change api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/get_subscription_change get_subscription_change api documenation}
     #
     # @param subscription_id [String] Subscription ID or UUID (use prefix: +uuid-+, e.g. +uuid-123457890+).
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::SubscriptionChange] A subscription's pending change.
     # @example
     #   begin
@@ -2232,17 +2377,18 @@ module Recurly
     #     puts "Resource Not Found"
     #   end
     #
-    def get_subscription_change(subscription_id:)
-      path = interpolate_path("/sites/{site_id}/subscriptions/{subscription_id}/change", site_id: site_id, subscription_id: subscription_id)
-      get(path)
+    def get_subscription_change(subscription_id:, **options)
+      path = interpolate_path("/subscriptions/{subscription_id}/change", subscription_id: subscription_id)
+      get(path, **options)
     end
 
     # Create a new subscription change
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/create_subscription_change create_subscription_change api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/create_subscription_change create_subscription_change api documenation}
     #
     # @param subscription_id [String] Subscription ID or UUID (use prefix: +uuid-+, e.g. +uuid-123457890+).
     # @param body [Requests::SubscriptionChangeCreate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::SubscriptionChangeCreate}
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::SubscriptionChange] A subscription change.
     # @example
     #   begin
@@ -2261,16 +2407,18 @@ module Recurly
     #     puts "ValidationError: #{e.recurly_error.params}"
     #   end
     #
-    def create_subscription_change(subscription_id:, body:)
-      path = interpolate_path("/sites/{site_id}/subscriptions/{subscription_id}/change", site_id: site_id, subscription_id: subscription_id)
-      post(path, body, Requests::SubscriptionChangeCreate)
+    def create_subscription_change(subscription_id:, body:, **options)
+      path = interpolate_path("/subscriptions/{subscription_id}/change", subscription_id: subscription_id)
+      post(path, body, Requests::SubscriptionChangeCreate, **options)
     end
 
     # Delete the pending subscription change
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/remove_subscription_change remove_subscription_change api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/remove_subscription_change remove_subscription_change api documenation}
     #
     # @param subscription_id [String] Subscription ID or UUID (use prefix: +uuid-+, e.g. +uuid-123457890+).
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
+    # @return [Empty] Subscription change was deleted.
     # @example
     #   begin
     #     @client.remove_subscription_change(
@@ -2283,17 +2431,17 @@ module Recurly
     #     puts "Resource Not Found"
     #   end
     #
-    def remove_subscription_change(subscription_id:)
-      path = interpolate_path("/sites/{site_id}/subscriptions/{subscription_id}/change", site_id: site_id, subscription_id: subscription_id)
-      delete(path)
+    def remove_subscription_change(subscription_id:, **options)
+      path = interpolate_path("/subscriptions/{subscription_id}/change", subscription_id: subscription_id)
+      delete(path, **options)
     end
 
     # List a subscription's invoices
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/list_subscription_invoices list_subscription_invoices api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/list_subscription_invoices list_subscription_invoices api documenation}
     #
     # @param subscription_id [String] Subscription ID or UUID (use prefix: +uuid-+, e.g. +uuid-123457890+).
-    # @param ids [string] Filter results by their IDs. Up to 200 IDs can be passed at once using
+    # @param ids [String] Filter results by their IDs. Up to 200 IDs can be passed at once using
     #   commas as separators, e.g. +ids=h1at4d57xlmy,gyqgg0d3v9n1,jrsm5b4yefg6+.
     #
     #   *Important notes:*
@@ -2323,6 +2471,7 @@ module Recurly
     #   - +type=non-legacy+, only charge and credit invoices will be returned.
     #   - +type=legacy+, only legacy invoices will be returned.
     #
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Pager<Resources::Invoice>] A list of the subscription's invoices.
     # @example
     #   invoices = @client.list_subscription_invoices(
@@ -2334,16 +2483,16 @@ module Recurly
     #   end
     #
     def list_subscription_invoices(subscription_id:, **options)
-      path = interpolate_path("/sites/{site_id}/subscriptions/{subscription_id}/invoices", site_id: site_id, subscription_id: subscription_id)
+      path = interpolate_path("/subscriptions/{subscription_id}/invoices", subscription_id: subscription_id)
       pager(path, **options)
     end
 
     # List a subscription's line items
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/list_subscription_line_items list_subscription_line_items api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/list_subscription_line_items list_subscription_line_items api documenation}
     #
     # @param subscription_id [String] Subscription ID or UUID (use prefix: +uuid-+, e.g. +uuid-123457890+).
-    # @param ids [string] Filter results by their IDs. Up to 200 IDs can be passed at once using
+    # @param ids [String] Filter results by their IDs. Up to 200 IDs can be passed at once using
     #   commas as separators, e.g. +ids=h1at4d57xlmy,gyqgg0d3v9n1,jrsm5b4yefg6+.
     #
     #   *Important notes:*
@@ -2370,6 +2519,7 @@ module Recurly
     # @param original [String] Filter by original field.
     # @param state [String] Filter by state field.
     # @param type [String] Filter by type field.
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Pager<Resources::LineItem>] A list of the subscription's line items.
     # @example
     #   line_items = @client.list_subscription_line_items(
@@ -2381,16 +2531,16 @@ module Recurly
     #   end
     #
     def list_subscription_line_items(subscription_id:, **options)
-      path = interpolate_path("/sites/{site_id}/subscriptions/{subscription_id}/line_items", site_id: site_id, subscription_id: subscription_id)
+      path = interpolate_path("/subscriptions/{subscription_id}/line_items", subscription_id: subscription_id)
       pager(path, **options)
     end
 
     # Show the coupon redemptions for a subscription
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/list_subscription_coupon_redemptions list_subscription_coupon_redemptions api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/list_subscription_coupon_redemptions list_subscription_coupon_redemptions api documenation}
     #
     # @param subscription_id [String] Subscription ID or UUID (use prefix: +uuid-+, e.g. +uuid-123457890+).
-    # @param ids [string] Filter results by their IDs. Up to 200 IDs can be passed at once using
+    # @param ids [String] Filter results by their IDs. Up to 200 IDs can be passed at once using
     #   commas as separators, e.g. +ids=h1at4d57xlmy,gyqgg0d3v9n1,jrsm5b4yefg6+.
     #
     #   *Important notes:*
@@ -2412,6 +2562,7 @@ module Recurly
     # @param end_time [DateTime] Filter by end_time when +sort=created_at+ or +sort=updated_at+.
     #   *Note:* this value is an ISO8601 timestamp. A partial timestamp that does not include a time zone will default to UTC.
     #
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Pager<Resources::CouponRedemption>] A list of the the coupon redemptions on a subscription.
     # @example
     #   coupon_redemptions = @client.list_subscription_coupon_redemptions(
@@ -2423,15 +2574,15 @@ module Recurly
     #   end
     #
     def list_subscription_coupon_redemptions(subscription_id:, **options)
-      path = interpolate_path("/sites/{site_id}/subscriptions/{subscription_id}/coupon_redemptions", site_id: site_id, subscription_id: subscription_id)
+      path = interpolate_path("/subscriptions/{subscription_id}/coupon_redemptions", subscription_id: subscription_id)
       pager(path, **options)
     end
 
     # List a site's transactions
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/list_transactions list_transactions api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/list_transactions list_transactions api documenation}
     #
-    # @param ids [string] Filter results by their IDs. Up to 200 IDs can be passed at once using
+    # @param ids [String] Filter results by their IDs. Up to 200 IDs can be passed at once using
     #   commas as separators, e.g. +ids=h1at4d57xlmy,gyqgg0d3v9n1,jrsm5b4yefg6+.
     #
     #   *Important notes:*
@@ -2457,6 +2608,7 @@ module Recurly
     #
     # @param type [String] Filter by type field. The value +payment+ will return both +purchase+ and +capture+ transactions.
     # @param success [String] Filter by success field.
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Pager<Resources::Transaction>] A list of the site's transactions.
     # @example
     #   transactions = @client.list_transactions(limit: 200)
@@ -2465,15 +2617,16 @@ module Recurly
     #   end
     #
     def list_transactions(**options)
-      path = interpolate_path("/sites/{site_id}/transactions", site_id: site_id)
+      path = interpolate_path("/transactions")
       pager(path, **options)
     end
 
     # Fetch a transaction
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/get_transaction get_transaction api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/get_transaction get_transaction api documenation}
     #
     # @param transaction_id [String] Transaction ID or UUID (use prefix: +uuid-+, e.g. +uuid-123457890+).
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::Transaction] A transaction.
     # @example
     #   begin
@@ -2485,49 +2638,53 @@ module Recurly
     #     puts "Resource Not Found"
     #   end
     #
-    def get_transaction(transaction_id:)
-      path = interpolate_path("/sites/{site_id}/transactions/{transaction_id}", site_id: site_id, transaction_id: transaction_id)
-      get(path)
+    def get_transaction(transaction_id:, **options)
+      path = interpolate_path("/transactions/{transaction_id}", transaction_id: transaction_id)
+      get(path, **options)
     end
 
     # Fetch a unique coupon code
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/get_unique_coupon_code get_unique_coupon_code api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/get_unique_coupon_code get_unique_coupon_code api documenation}
     #
     # @param unique_coupon_code_id [String] Unique Coupon Code ID or code (use prefix: +code-+, e.g. +code-abc-8dh2-def+).
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::UniqueCouponCode] A unique coupon code.
-    def get_unique_coupon_code(unique_coupon_code_id:)
-      path = interpolate_path("/sites/{site_id}/unique_coupon_codes/{unique_coupon_code_id}", site_id: site_id, unique_coupon_code_id: unique_coupon_code_id)
-      get(path)
+    def get_unique_coupon_code(unique_coupon_code_id:, **options)
+      path = interpolate_path("/unique_coupon_codes/{unique_coupon_code_id}", unique_coupon_code_id: unique_coupon_code_id)
+      get(path, **options)
     end
 
     # Deactivate a unique coupon code
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/deactivate_unique_coupon_code deactivate_unique_coupon_code api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/deactivate_unique_coupon_code deactivate_unique_coupon_code api documenation}
     #
     # @param unique_coupon_code_id [String] Unique Coupon Code ID or code (use prefix: +code-+, e.g. +code-abc-8dh2-def+).
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::UniqueCouponCode] A unique coupon code.
-    def deactivate_unique_coupon_code(unique_coupon_code_id:)
-      path = interpolate_path("/sites/{site_id}/unique_coupon_codes/{unique_coupon_code_id}", site_id: site_id, unique_coupon_code_id: unique_coupon_code_id)
-      delete(path)
+    def deactivate_unique_coupon_code(unique_coupon_code_id:, **options)
+      path = interpolate_path("/unique_coupon_codes/{unique_coupon_code_id}", unique_coupon_code_id: unique_coupon_code_id)
+      delete(path, **options)
     end
 
     # Restore a unique coupon code
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/reactivate_unique_coupon_code reactivate_unique_coupon_code api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/reactivate_unique_coupon_code reactivate_unique_coupon_code api documenation}
     #
     # @param unique_coupon_code_id [String] Unique Coupon Code ID or code (use prefix: +code-+, e.g. +code-abc-8dh2-def+).
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::UniqueCouponCode] A unique coupon code.
-    def reactivate_unique_coupon_code(unique_coupon_code_id:)
-      path = interpolate_path("/sites/{site_id}/unique_coupon_codes/{unique_coupon_code_id}/restore", site_id: site_id, unique_coupon_code_id: unique_coupon_code_id)
-      put(path)
+    def reactivate_unique_coupon_code(unique_coupon_code_id:, **options)
+      path = interpolate_path("/unique_coupon_codes/{unique_coupon_code_id}/restore", unique_coupon_code_id: unique_coupon_code_id)
+      put(path, **options)
     end
 
     # Create a new purchase
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/create_purchase create_purchase api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/create_purchase create_purchase api documenation}
     #
     # @param body [Requests::PurchaseCreate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::PurchaseCreate}
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::InvoiceCollection] Returns the new invoices
     # @example
     #   begin
@@ -2556,16 +2713,17 @@ module Recurly
     #     puts "ValidationError: #{e.recurly_error.params}"
     #   end
     #
-    def create_purchase(body:)
-      path = interpolate_path("/sites/{site_id}/purchases", site_id: site_id)
-      post(path, body, Requests::PurchaseCreate)
+    def create_purchase(body:, **options)
+      path = interpolate_path("/purchases")
+      post(path, body, Requests::PurchaseCreate, **options)
     end
 
     # Preview a new purchase
     #
-    # {https://partner-docs.recurly.com/v2018-08-09#operation/preview_purchase preview_purchase api documenation}
+    # {https://developers.recurly.com/api/v2019-10-10#operation/preview_purchase preview_purchase api documenation}
     #
     # @param body [Requests::PurchaseCreate] The Hash representing the JSON request to send to the server. It should conform to the schema of {Requests::PurchaseCreate}
+    # @param site_id [String] Site ID or subdomain (use prefix: +subdomain-+, e.g. +subdomain-recurly+).
     # @return [Resources::InvoiceCollection] Returns preview of the new invoices
     # @example
     #   begin
@@ -2594,9 +2752,9 @@ module Recurly
     #     puts "ValidationError: #{e.recurly_error.params}"
     #   end
     #
-    def preview_purchase(body:)
-      path = interpolate_path("/sites/{site_id}/purchases/preview", site_id: site_id)
-      post(path, body, Requests::PurchaseCreate)
+    def preview_purchase(body:, **options)
+      path = interpolate_path("/purchases/preview")
+      post(path, body, Requests::PurchaseCreate, **options)
     end
   end
 end