recurly 3.28.0 → 4.0.0

data/lib/recurly/client.rb

@@ -20,7 +20,14 @@ module Recurly
     MAX_RETRIES = 3
     LOG_LEVELS = %i(debug info warn error fatal).freeze
     BASE36_ALPHABET = (("0".."9").to_a + ("a".."z").to_a).freeze
-    REQUEST_OPTIONS = [:headers].freeze
+    ALLOWED_OPTIONS = [
+      :site_id,
+      :open_timeout,
+      :read_timeout,
+      :body,
+      :params,
+      :headers,
+    ].freeze
 
     # Initialize a client. It requires an API key.
     #
@@ -47,8 +54,7 @@ module Recurly
     #
     # @param api_key [String] The private API key
     # @param logger [Logger] A logger to use. Defaults to creating a new STDOUT logger with level WARN.
-    def initialize(api_key:, site_id: nil, subdomain: nil, logger: nil)
-      set_site_id(site_id, subdomain)
+    def initialize(api_key:, logger: nil)
       set_api_key(api_key)
 
       if logger.nil?
@@ -90,6 +96,7 @@ module Recurly
     end
 
     def head(path, **options)
+      validate_options!(options)
       request = Net::HTTP::Head.new build_url(path, options)
       set_headers(request, options[:headers])
       http_response = run_request(request, options)
@@ -97,25 +104,26 @@ module Recurly
     end
 
     def get(path, **options)
+      validate_options!(options)
       request = Net::HTTP::Get.new build_url(path, options)
       set_headers(request, options[:headers])
       http_response = run_request(request, options)
       handle_response! request, http_response
     end
 
-    def post(path, request_data = nil, request_class = nil, **options)
+    def post(path, request_data, request_class, **options)
+      validate_options!(options)
+      request_class.new(request_data).validate!
       request = Net::HTTP::Post.new build_url(path, options)
       request.set_content_type(JSON_CONTENT_TYPE)
       set_headers(request, options[:headers])
-      if request_data
-        request_class.new(request_data).validate!
-        request.body = JSON.dump(request_data)
-      end
+      request.body = JSON.dump(request_data)
       http_response = run_request(request, options)
       handle_response! request, http_response
     end
 
     def put(path, request_data = nil, request_class = nil, **options)
+      validate_options!(options)
       request = Net::HTTP::Put.new build_url(path, options)
       request.set_content_type(JSON_CONTENT_TYPE)
       set_headers(request, options[:headers])
@@ -129,6 +137,7 @@ module Recurly
     end
 
     def delete(path, **options)
+      validate_options!(options)
       request = Net::HTTP::Delete.new build_url(path, options)
       set_headers(request, options[:headers])
       http_response = run_request(request, options)
@@ -242,7 +251,7 @@ module Recurly
           elsif BINARY_TYPES.include?(http_response.content_type)
             FileParser.parse(response.body)
           else
-            raise Recurly::Errors::InvalidResponseError, "Unexpected content type: #{http_response.content_type}"
+            raise Recurly::Errors::InvalidContentTypeError, "Unexpected content type: #{http_response.content_type}"
           end
         else
           Resources::Empty.new
@@ -255,20 +264,15 @@ module Recurly
     def raise_api_error!(http_response, response)
       if response.content_type.include?(JSON_CONTENT_TYPE)
         error = JSONParser.parse(self, response.body)
-        begin
-          error_class = Errors::APIError.error_class(error.type)
-          raise error_class.new(response, error)
-        rescue NameError
-          error_class = Errors::APIError.from_response(http_response)
-          raise error_class.new(response, error)
-        end
+        error_class = Errors::APIError.error_class(error.type)
+        raise error_class.new(error.message, response, error)
       end
 
       error_class = Errors::APIError.from_response(http_response)
 
       if error_class <= Recurly::Errors::APIError
         error = Recurly::Resources::Error.new(message: "#{http_response.code}: #{http_response.message}")
-        raise error_class.new(response, error)
+        raise error_class.new(error.message, response, error)
       else
         raise error_class, "#{http_response.code}: #{http_response.message}"
       end
@@ -281,6 +285,17 @@ module Recurly
       response
     end
 
+    def validate_options!(**options)
+      invalid_options = options.keys.reject do |k|
+        ALLOWED_OPTIONS.include?(k)
+      end
+      if invalid_options.any?
+        joinedKeys = invalid_options.join(", ")
+        joinedOptions = ALLOWED_OPTIONS.join(", ")
+        raise ArgumentError, "Invalid options: '#{joinedKeys}'. Allowed options: '#{joinedOptions}'"
+      end
+    end
+
     def validate_path_parameters!(**options)
       # Check to see that we are passing the correct data types
       # This prevents a confusing error if the user passes in a non-primitive by mistake
@@ -301,7 +316,7 @@ module Recurly
     end
 
     def interpolate_path(path, **options)
-      validate_path_parameters!(**options)
+      validate_path_parameters!(options)
       options.each do |k, v|
         # We need to encode the values for the url
         options[k] = ERB::Util.url_encode(v.to_s)
@@ -310,21 +325,13 @@ module Recurly
       path % options
     end
 
-    def set_site_id(site_id, subdomain)
-      if site_id
-        @site_id = site_id
-      elsif subdomain
-        @site_id = "subdomain-#{subdomain}"
-      end
-    end
-
     def set_api_key(api_key)
       @api_key = api_key
     end
 
     def build_url(path, options)
       path = scope_by_site(path, options)
-      query_params = options.reject { |k, _| REQUEST_OPTIONS.include?(k.to_sym) }
+      query_params = map_array_params(options.fetch(:params, {}))
       if query_params.any?
         "#{path}?#{URI.encode_www_form(query_params)}"
       else
@@ -332,7 +339,16 @@ module Recurly
       end
     end
 
-    def scope_by_site(path, options)
+    # Converts array parameters to CSV strings to maintain consistency with
+    # how the server expects the request to be formatted while providing the
+    # developer with an array type to maintain developer happiness!
+    def map_array_params(params)
+      params.map do |key, param|
+        [key, param.is_a?(Array) ? param.join(",") : param]
+      end.to_h
+    end
+
+    def scope_by_site(path, **options)
       if site = site_id || options[:site_id]
         # Ensure that we are only including the site_id once because the Pager operations
         # will use the cursor returned from the API which may already have these components

data/lib/recurly/errors/api_errors.rb

@@ -8,6 +8,7 @@ module Recurly
       "500" => "InternalServerError",
       "502" => "BadGatewayError",
       "503" => "ServiceUnavailableError",
+      "504" => "TimeoutError",
       "304" => "NotModifiedError",
       "400" => "BadRequestError",
       "401" => "UnauthorizedError",
@@ -28,12 +29,12 @@ module Recurly
 
     class ServiceNotAvailableError < InternalServerError; end
 
-    class TaxServiceError < InternalServerError; end
-
     class BadGatewayError < ServerError; end
 
     class ServiceUnavailableError < ServerError; end
 
+    class TimeoutError < ServerError; end
+
     class RedirectionError < ResponseError; end
 
     class NotModifiedError < ResponseError; end

data/lib/recurly/errors.rb

@@ -21,34 +21,17 @@ module Recurly
       # Error class based on the response code. This may occur when a load balancer
       # returns an error before it reaches Recurly's API.
       # @param response [Net::Response]
-      # @return [Errors::APIError,Errors::NetworkError]
-      # rubocop:disable Metrics/CyclomaticComplexity
+      # @return [Errors::APIError]
       def self.from_response(response)
-        case response
-        when Net::HTTPBadRequest # 400
-          Recurly::Errors::BadRequestError
-        when Net::HTTPUnauthorized, Net::HTTPForbidden # 401, 403
-          Recurly::Errors::UnauthorizedError
-        when Net::HTTPRequestTimeOut # 408
-          Recurly::Errors::TimeoutError
-        when Net::HTTPTooManyRequests # 429
-          Recurly::Errors::RateLimitedError
-        when Net::HTTPInternalServerError # 500
-          Recurly::Errors::InternalServerError
-        when Net::HTTPServiceUnavailable # 503
-          Recurly::Errors::UnavailableError
-        when Net::HTTPGatewayTimeOut # 504
-          Recurly::Errors::TimeoutError
-        when Net::HTTPServerError # 5xx
-          Recurly::Errors::UnavailableError
+        if Recurly::Errors::ERROR_MAP.has_key?(response.code)
+          Recurly::Errors.const_get(Recurly::Errors::ERROR_MAP[response.code])
         else
           Recurly::Errors::APIError
         end
       end
-      # rubocop:enable Metrics/CyclomaticComplexity
 
-      def initialize(response, error)
-        super(error.message)
+      def initialize(message, response = nil, error = nil)
+        super(message)
         @response = response
         @recurly_error = error
       end
@@ -64,5 +47,4 @@ module Recurly
   end
 
   require_relative "./errors/api_errors"
-  require_relative "./errors/network_errors"
 end

data/lib/recurly/pager.rb

@@ -6,7 +6,7 @@ module Recurly
     def initialize(client:, path:, options: {})
       @client = client
       @path = path
-      @options = map_array_params(options)
+      @options = options
       rewind!
     end
 
@@ -16,7 +16,7 @@ module Recurly
       # Modify the @next url to set the :limit to 1
       original_next = @next
       @next = @path
-      fetch_next!(@options.merge(limit: 1))
+      fetch_next!(@options.merge(params: @options.fetch(:params, {}).merge({ limit: 1 })))
       # Restore the @next url to the original
       @next = original_next
       @data.first
@@ -24,7 +24,7 @@ module Recurly
 
     # Makes a HEAD request to the API to determine how many total records exist.
     def count
-      resource = @client.send(:head, self.next, **@options)
+      resource = @client.send(:head, self.next, @options)
       resource.get_response.total_records
     end
 
@@ -103,7 +103,7 @@ module Recurly
       Enumerator.new do |yielder|
         loop do
           # Pass in @options when requesting the first page (@data.empty?)
-          next_options = @data.empty? ? @options : {}
+          next_options = @data.empty? ? @options : @options.merge(params: {})
           fetch_next!(next_options)
           yielder << data
           unless has_more?
@@ -116,7 +116,7 @@ module Recurly
 
     def fetch_next!(options)
       path = extract_path(self.next)
-      page = @client.send(:get, path, **options)
+      page = @client.send(:get, path, options)
       @data = page.data.map { |d| JSONParser.from_json(d) }
       @has_more = page.has_more
       @next = page.next
@@ -132,15 +132,5 @@ module Recurly
       uri = URI(uri_or_path)
       uri.kind_of?(URI::HTTP) ? uri.request_uri : uri_or_path
     end
-
-    # Converts array parameters to CSV strings to maintain consistency with
-    # how the server expects the request to be formatted while providing the
-    # developer with an array type to maintain developer happiness!
-    def map_array_params(params)
-      @options = params.map do |key, param|
-        new_param = param.is_a?(Array) ? param.join(",") : param
-        [key, new_param]
-      end.to_h
-    end
   end
 end

data/lib/recurly/requests/{account_acquisition_updatable.rb → account_acquisition_update.rb}

@@ -4,7 +4,7 @@
 # need and we will usher them to the appropriate places.
 module Recurly
   module Requests
-    class AccountAcquisitionUpdatable < Request
+    class AccountAcquisitionUpdate < Request
 
       # @!attribute campaign
       #   @return [String] An arbitrary identifier for the marketing campaign that led to the acquisition of this account.

data/lib/recurly/requests/account_create.rb

@@ -7,8 +7,8 @@ module Recurly
     class AccountCreate < Request
 
       # @!attribute acquisition
-      #   @return [AccountAcquisitionUpdatable]
-      define_attribute :acquisition, :AccountAcquisitionUpdatable
+      #   @return [AccountAcquisitionUpdate]
+      define_attribute :acquisition, :AccountAcquisitionUpdate
 
       # @!attribute address
       #   @return [Address]
@@ -38,10 +38,6 @@ module Recurly
       #   @return [Array[CustomField]] The custom fields will only be altered when they are included in a request. Sending an empty array will not remove any existing values. To remove a field send the name with a null or empty value.
       define_attribute :custom_fields, Array, { :item_type => :CustomField }
 
-      # @!attribute dunning_campaign_id
-      #   @return [String] Unique ID to identify a dunning campaign. Used to specify if a non-default dunning campaign should be assigned to this account. For sites without multiple dunning campaigns enabled, the default dunning campaign will always be used.
-      define_attribute :dunning_campaign_id, String
-
       # @!attribute email
       #   @return [String] The email address used for communicating with this customer. The customer will also use this email address to log into your hosted account management pages. This value does not need to be unique.
       define_attribute :email, String
@@ -70,10 +66,6 @@ module Recurly
       #   @return [String] Used to determine the language and locale of emails sent on behalf of the merchant to the customer. The list of locales is restricted to those the merchant has enabled on the site.
       define_attribute :preferred_locale, String
 
-      # @!attribute preferred_time_zone
-      #   @return [String] Used to determine the time zone of emails sent on behalf of the merchant to the customer. Must be a [supported IANA time zone name](https://docs.recurly.com/docs/email-time-zones-and-time-stamps#supported-api-iana-time-zone-names)
-      define_attribute :preferred_time_zone, String
-
       # @!attribute shipping_addresses
       #   @return [Array[ShippingAddressCreate]]
       define_attribute :shipping_addresses, Array, { :item_type => :ShippingAddressCreate }

data/lib/recurly/requests/account_purchase.rb

@@ -7,8 +7,8 @@ module Recurly
     class AccountPurchase < Request
 
       # @!attribute acquisition
-      #   @return [AccountAcquisitionUpdatable]
-      define_attribute :acquisition, :AccountAcquisitionUpdatable
+      #   @return [AccountAcquisitionUpdate]
+      define_attribute :acquisition, :AccountAcquisitionUpdate
 
       # @!attribute address
       #   @return [Address]
@@ -38,10 +38,6 @@ module Recurly
       #   @return [Array[CustomField]] The custom fields will only be altered when they are included in a request. Sending an empty array will not remove any existing values. To remove a field send the name with a null or empty value.
       define_attribute :custom_fields, Array, { :item_type => :CustomField }
 
-      # @!attribute dunning_campaign_id
-      #   @return [String] Unique ID to identify a dunning campaign. Used to specify if a non-default dunning campaign should be assigned to this account. For sites without multiple dunning campaigns enabled, the default dunning campaign will always be used.
-      define_attribute :dunning_campaign_id, String
-
       # @!attribute email
       #   @return [String] The email address used for communicating with this customer. The customer will also use this email address to log into your hosted account management pages. This value does not need to be unique.
       define_attribute :email, String
@@ -74,10 +70,6 @@ module Recurly
       #   @return [String] Used to determine the language and locale of emails sent on behalf of the merchant to the customer. The list of locales is restricted to those the merchant has enabled on the site.
       define_attribute :preferred_locale, String
 
-      # @!attribute preferred_time_zone
-      #   @return [String] Used to determine the time zone of emails sent on behalf of the merchant to the customer. Must be a [supported IANA time zone name](https://docs.recurly.com/docs/email-time-zones-and-time-stamps#supported-api-iana-time-zone-names)
-      define_attribute :preferred_time_zone, String
-
       # @!attribute tax_exempt
       #   @return [Boolean] The tax status of the account. `true` exempts tax on the account, `false` applies tax on the account.
       define_attribute :tax_exempt, :Boolean

data/lib/recurly/requests/account_update.rb

@@ -30,10 +30,6 @@ module Recurly
       #   @return [Array[CustomField]] The custom fields will only be altered when they are included in a request. Sending an empty array will not remove any existing values. To remove a field send the name with a null or empty value.
       define_attribute :custom_fields, Array, { :item_type => :CustomField }
 
-      # @!attribute dunning_campaign_id
-      #   @return [String] Unique ID to identify a dunning campaign. Used to specify if a non-default dunning campaign should be assigned to this account. For sites without multiple dunning campaigns enabled, the default dunning campaign will always be used.
-      define_attribute :dunning_campaign_id, String
-
       # @!attribute email
       #   @return [String] The email address used for communicating with this customer. The customer will also use this email address to log into your hosted account management pages. This value does not need to be unique.
       define_attribute :email, String
@@ -62,10 +58,6 @@ module Recurly
       #   @return [String] Used to determine the language and locale of emails sent on behalf of the merchant to the customer. The list of locales is restricted to those the merchant has enabled on the site.
       define_attribute :preferred_locale, String
 
-      # @!attribute preferred_time_zone
-      #   @return [String] Used to determine the time zone of emails sent on behalf of the merchant to the customer. Must be a [supported IANA time zone name](https://docs.recurly.com/docs/email-time-zones-and-time-stamps#supported-api-iana-time-zone-names)
-      define_attribute :preferred_time_zone, String
-
       # @!attribute tax_exempt
       #   @return [Boolean] The tax status of the account. `true` exempts tax on the account, `false` applies tax on the account.
       define_attribute :tax_exempt, :Boolean

data/lib/recurly/requests/add_on_create.rb

@@ -39,11 +39,11 @@ module Recurly
       define_attribute :display_quantity, :Boolean
 
       # @!attribute item_code
-      #   @return [String] Unique code to identify an item. Avaliable when the `Credit Invoices` feature is enabled. If `item_id` and `item_code` are both present, `item_id` will be used.
+      #   @return [String] Unique code to identify an item. Available when the `Credit Invoices` and `Subscription Billing Terms` features are enabled. If `item_id` and `item_code` are both present, `item_id` will be used.
       define_attribute :item_code, String
 
       # @!attribute item_id
-      #   @return [String] System-generated unique identifier for an item. Available when the `Credit Invoices` feature is enabled. If `item_id` and `item_code` are both present, `item_id` will be used.
+      #   @return [String] System-generated unique identifier for an item. Available when the `Credit Invoices` and `Subscription Billing Terms` features are enabled. If `item_id` and `item_code` are both present, `item_id` will be used.
       define_attribute :item_id, String
 
       # @!attribute measured_unit_id
@@ -75,7 +75,7 @@ module Recurly
       define_attribute :tax_code, String
 
       # @!attribute tier_type
-      #   @return [String] The pricing model for the add-on.  For more information, [click here](https://docs.recurly.com/docs/billing-models#section-quantity-based). See our [Guide](https://recurly.com/developers/guides/item-addon-guide.html) for an overview of how to configure quantity-based pricing models.
+      #   @return [String] The pricing model for the add-on.  For more information, [click here](https://docs.recurly.com/docs/billing-models#section-quantity-based). See our [Guide](https://developers.recurly.com/guides/item-addon-guide.html) for an overview of how to configure quantity-based pricing models.
       define_attribute :tier_type, String
 
       # @!attribute tiers
@@ -87,7 +87,7 @@ module Recurly
       define_attribute :usage_percentage, Float
 
       # @!attribute usage_type
-      #   @return [String] Type of usage, required if `add_on_type` is `usage`. See our [Guide](https://recurly.com/developers/guides/usage-based-billing-guide.html) for an overview of how to configure usage add-ons.
+      #   @return [String] Type of usage, required if `add_on_type` is `usage`. See our [Guide](https://developers.recurly.com/guides/usage-based-billing-guide.html) for an overview of how to configure usage add-ons.
       define_attribute :usage_type, String
     end
   end

data/lib/recurly/requests/add_on_pricing.rb

@@ -10,13 +10,13 @@ module Recurly
       #   @return [String] 3-letter ISO 4217 currency code.
       define_attribute :currency, String
 
-      # @!attribute tax_inclusive
-      #   @return [Boolean] This field is deprecated. Please do not use it.
-      define_attribute :tax_inclusive, :Boolean
-
       # @!attribute unit_amount
-      #   @return [Float] Unit price
+      #   @return [Float] Allows up to 2 decimal places. Required unless `unit_amount_decimal` is provided.
       define_attribute :unit_amount, Float
+
+      # @!attribute unit_amount_decimal
+      #   @return [String] Allows up to 9 decimal places. Only supported when `add_on_type` = `usage`. If `unit_amount_decimal` is provided, `unit_amount` cannot be provided.
+      define_attribute :unit_amount_decimal, String
     end
   end
 end

data/lib/recurly/requests/add_on_update.rb

@@ -23,7 +23,7 @@ module Recurly
       define_attribute :code, String
 
       # @!attribute currencies
-      #   @return [Array[AddOnPricing]] If the add-on's `tier_type` is `tiered`, `volume` or `stairstep`, then `currencies` must be absent. Must also be absent if `add_on_type` is `usage` and `usage_type` is `percentage`.
+      #   @return [Array[AddOnPricing]] If the add-on's `tier_type` is `tiered`, `volume`, or `stairstep`, then currencies must be absent. Must also be absent if `add_on_type` is `usage` and `usage_type` is `percentage`.
       define_attribute :currencies, Array, { :item_type => :AddOnPricing }
 
       # @!attribute default_quantity
@@ -55,7 +55,7 @@ module Recurly
       define_attribute :optional, :Boolean
 
       # @!attribute revenue_schedule_type
-      #   @return [String] When this add-on is invoiced, the line item will use this revenue schedule. If an `Item` is associated to the `AddOn` then `revenue_schedule_type` must be absent in the request as the value will be set from the item.
+      #   @return [String] When this add-on is invoiced, the line item will use this revenue schedule. If `item_code`/`item_id` is part of the request then `revenue_schedule_type` must be absent in the request as the value will be set from the item.
       define_attribute :revenue_schedule_type, String
 
       # @!attribute tax_code

data/lib/recurly/requests/address.rb

@@ -11,17 +11,9 @@ module Recurly
       define_attribute :city, String
 
       # @!attribute country
-      #   @return [String] Country, 2-letter ISO 3166-1 alpha-2 code.
+      #   @return [String] Country, 2-letter ISO code.
       define_attribute :country, String
 
-      # @!attribute first_name
-      #   @return [String] First name
-      define_attribute :first_name, String
-
-      # @!attribute last_name
-      #   @return [String] Last name
-      define_attribute :last_name, String
-
       # @!attribute phone
       #   @return [String] Phone number
       define_attribute :phone, String

data/lib/recurly/requests/billing_info_create.rb

@@ -6,14 +6,6 @@ module Recurly
   module Requests
     class BillingInfoCreate < Request
 
-      # @!attribute account_number
-      #   @return [String] The bank account number. (ACH, Bacs only)
-      define_attribute :account_number, String
-
-      # @!attribute account_type
-      #   @return [String] The bank account type. (ACH only)
-      define_attribute :account_type, String
-
       # @!attribute address
       #   @return [Address]
       define_attribute :address, :Address
@@ -22,18 +14,10 @@ module Recurly
       #   @return [String] Amazon billing agreement ID
       define_attribute :amazon_billing_agreement_id, String
 
-      # @!attribute backup_payment_method
-      #   @return [Boolean] The `backup_payment_method` field is used to designate a billing info as a backup on the account that will be tried if the initial billing info used for an invoice is declined. All payment methods, including the billing info marked `primary_payment_method` can be set as a backup. An account can have a maximum of 1 backup, if a user sets a different payment method as a backup, the existing backup will no longer be marked as such.
-      define_attribute :backup_payment_method, :Boolean
-
       # @!attribute company
       #   @return [String] Company name
       define_attribute :company, String
 
-      # @!attribute currency
-      #   @return [String] 3-letter ISO 4217 currency code.
-      define_attribute :currency, String
-
       # @!attribute cvv
       #   @return [String] *STRONGLY RECOMMENDED*
       define_attribute :cvv, String
@@ -46,10 +30,6 @@ module Recurly
       #   @return [String] Fraud Session ID
       define_attribute :fraud_session_id, String
 
-      # @!attribute gateway_attributes
-      #   @return [GatewayAttributes] Additional attributes to send to the gateway.
-      define_attribute :gateway_attributes, :GatewayAttributes
-
       # @!attribute gateway_code
       #   @return [String] An identifier for a specific payment gateway. Must be used in conjunction with `gateway_token`.
       define_attribute :gateway_code, String
@@ -59,7 +39,7 @@ module Recurly
       define_attribute :gateway_token, String
 
       # @!attribute iban
-      #   @return [String] The International Bank Account Number, up to 34 alphanumeric characters comprising a country code; two check digits; and a number that includes the domestic bank account number, branch identifier, and potential routing information. (SEPA only)
+      #   @return [String] The International Bank Account Number, up to 34 alphanumeric characters comprising a country code; two check digits; and a number that includes the domestic bank account number, branch identifier, and potential routing information
       define_attribute :iban, String
 
       # @!attribute ip_address
@@ -74,10 +54,6 @@ module Recurly
       #   @return [String] Expiration month
       define_attribute :month, String
 
-      # @!attribute name_on_account
-      #   @return [String] The name associated with the bank account (ACH, SEPA, Bacs only)
-      define_attribute :name_on_account, String
-
       # @!attribute number
       #   @return [String] Credit card number, spaces and dashes are accepted.
       define_attribute :number, String
@@ -87,17 +63,9 @@ module Recurly
       define_attribute :paypal_billing_agreement_id, String
 
       # @!attribute primary_payment_method
-      #   @return [Boolean] The `primary_payment_method` field is used to designate the primary billing info on the account. The first billing info created on an account will always become primary. Adding additional billing infos provides the flexibility to mark another billing info as primary, or adding additional non-primary billing infos. This can be accomplished by passing the `primary_payment_method` with a value of `true`. When adding billing infos via the billing_info and /accounts endpoints, this value is not permitted, and will return an error if provided.
+      #   @return [Boolean] The `primary_payment_method` indicator is used to designate the primary billing info on the account. The first billing info created on an account will always become primary. Adding additional billing infos provides the flexibility to mark another billing info as primary, or adding additional non-primary billing infos. This can be accomplished by passing the `primary_payment_method` indicator. When adding billing infos via the billing_info and /accounts endpoints, this value is not permitted, and will return an error if provided.
       define_attribute :primary_payment_method, :Boolean
 
-      # @!attribute routing_number
-      #   @return [String] The bank's rounting number. (ACH only)
-      define_attribute :routing_number, String
-
-      # @!attribute sort_code
-      #   @return [String] Bank identifier code for UK based banks. Required for Bacs based billing infos. (Bacs only)
-      define_attribute :sort_code, String
-
       # @!attribute tax_identifier
       #   @return [String] Tax identifier is required if adding a billing info that is a consumer card in Brazil. This would be the customer's CPF, CPF is a Brazilian tax identifier for all tax paying residents.
       define_attribute :tax_identifier, String
@@ -111,17 +79,13 @@ module Recurly
       define_attribute :three_d_secure_action_result_token_id, String
 
       # @!attribute token_id
-      #   @return [String] A token [generated by Recurly.js](https://recurly.com/developers/reference/recurly-js/#getting-a-token).
+      #   @return [String] A token [generated by Recurly.js](https://developers.recurly.com/reference/recurly-js/#getting-a-token).
       define_attribute :token_id, String
 
       # @!attribute transaction_type
       #   @return [String] An optional type designation for the payment gateway transaction created by this request. Supports 'moto' value, which is the acronym for mail order and telephone transactions.
       define_attribute :transaction_type, String
 
-      # @!attribute type
-      #   @return [String] The payment method type for a non-credit card based billing info. `bacs` and `becs` are the only accepted values.
-      define_attribute :type, String
-
       # @!attribute vat_number
       #   @return [String] VAT number
       define_attribute :vat_number, String

data/lib/recurly/requests/coupon_create.rb

@@ -11,7 +11,7 @@ module Recurly
       define_attribute :applies_to_all_items, :Boolean
 
       # @!attribute applies_to_all_plans
-      #   @return [Boolean] The coupon is valid for all plans if true. If false then `plans` and `plans_names` will list the applicable plans.
+      #   @return [Boolean] The coupon is valid for all plans if true. If false then `plans` will list the applicable plans.
       define_attribute :applies_to_all_plans, :Boolean
 
       # @!attribute applies_to_non_plan_charges

data/lib/recurly/requests/external_transaction.rb

@@ -19,7 +19,7 @@ module Recurly
       define_attribute :description, String
 
       # @!attribute payment_method
-      #   @return [String] Payment method used for the external transaction.
+      #   @return [String] Payment method used for external transaction.
       define_attribute :payment_method, String
     end
   end

data/lib/recurly/requests/invoice_address.rb

@@ -15,7 +15,7 @@ module Recurly
       define_attribute :company, String
 
       # @!attribute country
-      #   @return [String] Country, 2-letter ISO 3166-1 alpha-2 code.
+      #   @return [String] Country, 2-letter ISO code.
       define_attribute :country, String
 
       # @!attribute first_name

data/lib/recurly/requests/invoice_collect.rb

@@ -7,7 +7,7 @@ module Recurly
     class InvoiceCollect < Request
 
       # @!attribute billing_info_id
-      #   @return [String] The `billing_info_id` is the value that represents a specific billing info for an end customer. When `billing_info_id` is used to assign billing info to the subscription, all future billing events for the subscription will bill to the specified billing info. `billing_info_id` can ONLY be used for sites utilizing the Wallet feature.
+      #   @return [String] The `billing_info_id` is the value that represents a specific billing info for an end customer. When `billing_info_id` is used to assign billing info to the subscription, all future billing events for the subscription will bill to the specified billing info.
       define_attribute :billing_info_id, String
 
       # @!attribute three_d_secure_action_result_token_id

data/lib/recurly/requests/{invoice_updatable.rb → invoice_update.rb}

@@ -4,7 +4,7 @@
 # need and we will usher them to the appropriate places.
 module Recurly
   module Requests
-    class InvoiceUpdatable < Request
+    class InvoiceUpdate < Request
 
       # @!attribute address
       #   @return [InvoiceAddress]