stripe 13.4.1 → 17.0.1

data/lib/stripe/services/test_helpers/terminal/reader_service.rb

@@ -15,6 +15,28 @@ module Stripe
             base_address: :api
           )
         end
+
+        # Use this endpoint to trigger a successful input collection on a simulated reader.
+        def succeed_input_collection(reader, params = {}, opts = {})
+          request(
+            method: :post,
+            path: format("/v1/test_helpers/terminal/readers/%<reader>s/succeed_input_collection", { reader: CGI.escape(reader) }),
+            params: params,
+            opts: opts,
+            base_address: :api
+          )
+        end
+
+        # Use this endpoint to complete an input collection with a timeout error on a simulated reader.
+        def timeout_input_collection(reader, params = {}, opts = {})
+          request(
+            method: :post,
+            path: format("/v1/test_helpers/terminal/readers/%<reader>s/timeout_input_collection", { reader: CGI.escape(reader) }),
+            params: params,
+            opts: opts,
+            base_address: :api
+          )
+        end
       end
     end
   end

data/lib/stripe/services/test_helpers/terminal_service.rb

@@ -7,7 +7,7 @@ module Stripe
       attr_reader :readers
 
       def initialize(requestor)
-        super(requestor)
+        super
         @readers = Stripe::TestHelpers::Terminal::ReaderService.new(@requestor)
       end
     end

data/lib/stripe/services/test_helpers/treasury_service.rb

@@ -7,7 +7,7 @@ module Stripe
       attr_reader :inbound_transfers, :outbound_payments, :outbound_transfers, :received_credits, :received_debits
 
       def initialize(requestor)
-        super(requestor)
+        super
         @inbound_transfers = Stripe::TestHelpers::Treasury::InboundTransferService.new(@requestor)
         @outbound_payments = Stripe::TestHelpers::Treasury::OutboundPaymentService.new(@requestor)
         @outbound_transfers = Stripe::TestHelpers::Treasury::OutboundTransferService.new(@requestor)

data/lib/stripe/services/test_helpers_service.rb

@@ -6,7 +6,7 @@ module Stripe
     attr_reader :confirmation_tokens, :customers, :issuing, :refunds, :terminal, :test_clocks, :treasury
 
     def initialize(requestor)
-      super(requestor)
+      super
       @confirmation_tokens = Stripe::TestHelpers::ConfirmationTokenService.new(@requestor)
       @customers = Stripe::TestHelpers::CustomerService.new(@requestor)
       @issuing = Stripe::TestHelpers::IssuingService.new(@requestor)

data/lib/stripe/services/token_service.rb

@@ -4,7 +4,7 @@
 module Stripe
   class TokenService < StripeService
     # Creates a single-use token that represents a bank account's details.
-    # You can use this token with any v1 API method in place of a bank account dictionary. You can only use this token once. To do so, attach it to a [connected account](https://stripe.com/docs/api#accounts) where [controller.requirement_collection](https://stripe.com/api/accounts/object#account_object-controller-requirement_collection) is application, which includes Custom accounts.
+    # You can use this token with any v1 API method in place of a bank account dictionary. You can only use this token once. To do so, attach it to a [connected account](https://docs.stripe.com/api#accounts) where [controller.requirement_collection](https://docs.stripe.com/api/accounts/object#account_object-controller-requirement_collection) is application, which includes Custom accounts.
     def create(params = {}, opts = {})
       request(method: :post, path: "/v1/tokens", params: params, opts: opts, base_address: :api)
     end

data/lib/stripe/services/transfer_service.rb

@@ -6,11 +6,11 @@ module Stripe
     attr_reader :reversals
 
     def initialize(requestor)
-      super(requestor)
+      super
       @reversals = Stripe::TransferReversalService.new(@requestor)
     end
 
-    # To send funds from your Stripe account to a connected account, you create a new transfer object. Your [Stripe balance](https://stripe.com/docs/api#balance) must be able to cover the transfer amount, or you'll receive an “Insufficient Funds” error.
+    # To send funds from your Stripe account to a connected account, you create a new transfer object. Your [Stripe balance](https://docs.stripe.com/api#balance) must be able to cover the transfer amount, or you'll receive an “Insufficient Funds” error.
     def create(params = {}, opts = {})
       request(method: :post, path: "/v1/transfers", params: params, opts: opts, base_address: :api)
     end

data/lib/stripe/services/treasury/financial_account_service.rb

@@ -7,7 +7,7 @@ module Stripe
       attr_reader :features
 
       def initialize(requestor)
-        super(requestor)
+        super
         @features = Stripe::Treasury::FinancialAccountFeaturesService.new(@requestor)
       end
 
@@ -22,7 +22,7 @@ module Stripe
         )
       end
 
-      # Creates a new FinancialAccount. For now, each connected account can only have one FinancialAccount.
+      # Creates a new FinancialAccount. Each connected account can have up to three FinancialAccounts by default.
       def create(params = {}, opts = {})
         request(
           method: :post,

data/lib/stripe/services/treasury_service.rb

@@ -6,7 +6,7 @@ module Stripe
     attr_reader :credit_reversals, :debit_reversals, :financial_accounts, :inbound_transfers, :outbound_payments, :outbound_transfers, :received_credits, :received_debits, :transactions, :transaction_entries
 
     def initialize(requestor)
-      super(requestor)
+      super
       @credit_reversals = Stripe::Treasury::CreditReversalService.new(@requestor)
       @debit_reversals = Stripe::Treasury::DebitReversalService.new(@requestor)
       @financial_accounts = Stripe::Treasury::FinancialAccountService.new(@requestor)

data/lib/stripe/services/v1_services.rb

@@ -4,14 +4,14 @@ module Stripe
   class V1Services < StripeService
     # v1 accessors: The beginning of the section generated from our OpenAPI spec
     attr_reader :accounts
-    attr_reader :account_links, :account_sessions, :apple_pay_domains, :application_fees, :apps, :balance, :balance_transactions, :billing, :billing_portal, :charges, :checkout, :climate, :confirmation_tokens, :test_helpers, :country_specs, :coupons, :credit_notes, :customers, :customer_sessions, :disputes, :entitlements, :ephemeral_keys, :events, :exchange_rates, :files, :file_links, :financial_connections, :forwarding, :identity, :invoices, :invoice_rendering_templates, :invoice_items, :issuing, :mandates, :payment_intents, :payment_links, :payment_methods, :payment_method_configurations, :payment_method_domains, :payouts, :plans, :prices, :products, :promotion_codes, :quotes, :radar, :refunds, :reporting, :reviews, :sigma, :setup_attempts, :setup_intents, :shipping_rates, :sources, :subscriptions, :subscription_items, :subscription_schedules, :tax, :tax_codes, :tax_ids, :tax_rates, :terminal, :tokens, :topups, :transfers, :treasury, :webhook_endpoints
+    attr_reader :account_links, :account_sessions, :apple_pay_domains, :application_fees, :apps, :balance, :balance_settings, :balance_transactions, :billing, :billing_portal, :charges, :checkout, :climate, :confirmation_tokens, :country_specs, :coupons, :credit_notes, :customers, :customer_sessions, :disputes, :entitlements, :ephemeral_keys, :events, :exchange_rates, :files, :file_links, :financial_connections, :forwarding, :identity, :invoices, :invoice_items, :invoice_payments, :invoice_rendering_templates, :issuing, :mandates, :payment_intents, :payment_links, :payment_methods, :payment_method_configurations, :payment_method_domains, :payouts, :plans, :prices, :products, :promotion_codes, :quotes, :radar, :refunds, :reporting, :reviews, :setup_attempts, :setup_intents, :shipping_rates, :sigma, :sources, :subscriptions, :subscription_items, :subscription_schedules, :tax, :tax_codes, :tax_ids, :tax_rates, :terminal, :test_helpers, :tokens, :topups, :transfers, :treasury, :webhook_endpoints
     # v1 accessors: The end of the section generated from our OpenAPI spec
 
     # OAuthService is manually maintained, as it has special behaviors
     attr_reader :oauth
 
     def initialize(requestor)
-      super(requestor)
+      super
       # v1 services: The beginning of the section generated from our OpenAPI spec
       @accounts = Stripe::AccountService.new(@requestor)
       @account_links = Stripe::AccountLinkService.new(@requestor)
@@ -20,6 +20,7 @@ module Stripe
       @application_fees = Stripe::ApplicationFeeService.new(@requestor)
       @apps = Stripe::AppsService.new(@requestor)
       @balance = Stripe::BalanceService.new(@requestor)
+      @balance_settings = Stripe::BalanceSettingsService.new(@requestor)
       @balance_transactions = Stripe::BalanceTransactionService.new(@requestor)
       @billing = Stripe::BillingService.new(@requestor)
       @billing_portal = Stripe::BillingPortalService.new(@requestor)
@@ -27,7 +28,6 @@ module Stripe
       @checkout = Stripe::CheckoutService.new(@requestor)
       @climate = Stripe::ClimateService.new(@requestor)
       @confirmation_tokens = Stripe::ConfirmationTokenService.new(@requestor)
-      @test_helpers = Stripe::TestHelpersService.new(@requestor)
       @country_specs = Stripe::CountrySpecService.new(@requestor)
       @coupons = Stripe::CouponService.new(@requestor)
       @credit_notes = Stripe::CreditNoteService.new(@requestor)
@@ -44,8 +44,9 @@ module Stripe
       @forwarding = Stripe::ForwardingService.new(@requestor)
       @identity = Stripe::IdentityService.new(@requestor)
       @invoices = Stripe::InvoiceService.new(@requestor)
-      @invoice_rendering_templates = Stripe::InvoiceRenderingTemplateService.new(@requestor)
       @invoice_items = Stripe::InvoiceItemService.new(@requestor)
+      @invoice_payments = Stripe::InvoicePaymentService.new(@requestor)
+      @invoice_rendering_templates = Stripe::InvoiceRenderingTemplateService.new(@requestor)
       @issuing = Stripe::IssuingService.new(@requestor)
       @mandates = Stripe::MandateService.new(@requestor)
       @payment_intents = Stripe::PaymentIntentService.new(@requestor)
@@ -63,10 +64,10 @@ module Stripe
       @refunds = Stripe::RefundService.new(@requestor)
       @reporting = Stripe::ReportingService.new(@requestor)
       @reviews = Stripe::ReviewService.new(@requestor)
-      @sigma = Stripe::SigmaService.new(@requestor)
       @setup_attempts = Stripe::SetupAttemptService.new(@requestor)
       @setup_intents = Stripe::SetupIntentService.new(@requestor)
       @shipping_rates = Stripe::ShippingRateService.new(@requestor)
+      @sigma = Stripe::SigmaService.new(@requestor)
       @sources = Stripe::SourceService.new(@requestor)
       @subscriptions = Stripe::SubscriptionService.new(@requestor)
       @subscription_items = Stripe::SubscriptionItemService.new(@requestor)
@@ -76,6 +77,7 @@ module Stripe
       @tax_ids = Stripe::TaxIdService.new(@requestor)
       @tax_rates = Stripe::TaxRateService.new(@requestor)
       @terminal = Stripe::TerminalService.new(@requestor)
+      @test_helpers = Stripe::TestHelpersService.new(@requestor)
       @tokens = Stripe::TokenService.new(@requestor)
       @topups = Stripe::TopupService.new(@requestor)
       @transfers = Stripe::TransferService.new(@requestor)

data/lib/stripe/services/v2/billing_service.rb

@@ -4,14 +4,14 @@
 module Stripe
   module V2
     class BillingService < StripeService
-      attr_reader :meter_event_session, :meter_event_adjustments, :meter_event_stream, :meter_events
+      attr_reader :meter_events, :meter_event_adjustments, :meter_event_session, :meter_event_stream
 
       def initialize(requestor)
-        super(requestor)
-        @meter_event_session = Stripe::V2::Billing::MeterEventSessionService.new(@requestor)
+        super
+        @meter_events = Stripe::V2::Billing::MeterEventService.new(@requestor)
         @meter_event_adjustments = Stripe::V2::Billing::MeterEventAdjustmentService.new(@requestor)
+        @meter_event_session = Stripe::V2::Billing::MeterEventSessionService.new(@requestor)
         @meter_event_stream = Stripe::V2::Billing::MeterEventStreamService.new(@requestor)
-        @meter_events = Stripe::V2::Billing::MeterEventService.new(@requestor)
       end
     end
   end

data/lib/stripe/services/v2/core_service.rb

@@ -4,12 +4,12 @@
 module Stripe
   module V2
     class CoreService < StripeService
-      attr_reader :event_destinations, :events
+      attr_reader :events, :event_destinations
 
       def initialize(requestor)
-        super(requestor)
-        @event_destinations = Stripe::V2::Core::EventDestinationService.new(@requestor)
+        super
         @events = Stripe::V2::Core::EventService.new(@requestor)
+        @event_destinations = Stripe::V2::Core::EventDestinationService.new(@requestor)
       end
     end
   end

data/lib/stripe/services/v2_services.rb

@@ -6,7 +6,7 @@ module Stripe
     attr_reader :billing, :core
 
     def initialize(requestor)
-      super(requestor)
+      super
       @billing = Stripe::V2::BillingService.new(@requestor)
       @core = Stripe::V2::CoreService.new(@requestor)
     end

data/lib/stripe/services.rb

@@ -14,6 +14,7 @@ require "stripe/services/application_fee_service"
 require "stripe/services/apps/secret_service"
 require "stripe/services/apps_service"
 require "stripe/services/balance_service"
+require "stripe/services/balance_settings_service"
 require "stripe/services/balance_transaction_service"
 require "stripe/services/billing/alert_service"
 require "stripe/services/billing/credit_balance_summary_service"
@@ -71,9 +72,9 @@ require "stripe/services/identity/verification_session_service"
 require "stripe/services/identity_service"
 require "stripe/services/invoice_item_service"
 require "stripe/services/invoice_line_item_service"
+require "stripe/services/invoice_payment_service"
 require "stripe/services/invoice_rendering_template_service"
 require "stripe/services/invoice_service"
-require "stripe/services/invoice_upcoming_lines_service"
 require "stripe/services/issuing/authorization_service"
 require "stripe/services/issuing/card_service"
 require "stripe/services/issuing/cardholder_service"
@@ -116,8 +117,6 @@ require "stripe/services/sigma_service"
 require "stripe/services/source_service"
 require "stripe/services/source_transaction_service"
 require "stripe/services/subscription_item_service"
-require "stripe/services/subscription_item_usage_record_service"
-require "stripe/services/subscription_item_usage_record_summary_service"
 require "stripe/services/subscription_schedule_service"
 require "stripe/services/subscription_service"
 require "stripe/services/tax/calculation_line_item_service"

data/lib/stripe/stripe_client.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "json"
+require "stripe/events/unknown_event_notification"
 
 module Stripe
   class StripeClient
@@ -15,7 +16,7 @@ module Stripe
     CLIENT_OPTIONS = Set.new(%i[api_key stripe_account stripe_context api_version api_base uploads_base connect_base meter_events_base client_id])
 
     # Initializes a new StripeClient
-    def initialize(api_key, # rubocop:todo Metrics/ParameterLists
+    def initialize(api_key,
                    stripe_account: nil,
                    stripe_context: nil,
                    stripe_version: nil,
@@ -42,7 +43,7 @@ module Stripe
         connect_base: connect_base,
         meter_events_base: meter_events_base,
         client_id: client_id,
-      }.reject { |_k, v| v.nil? }
+      }.compact
 
       config = StripeConfiguration.client_init(config_opts)
       @requestor = APIRequestor.new(config)
@@ -59,7 +60,7 @@ module Stripe
     extend Gem::Deprecate
     deprecate :request, :raw_request, 2024, 9
 
-    def parse_thin_event(payload, sig_header, secret, tolerance: Webhook::DEFAULT_TOLERANCE)
+    def parse_event_notification(payload, sig_header, secret, tolerance: Webhook::DEFAULT_TOLERANCE)
       payload = payload.force_encoding("UTF-8") if payload.respond_to?(:force_encoding)
 
       # v2 events use the same signing mechanism as v1 events
@@ -67,14 +68,17 @@ module Stripe
 
       parsed = JSON.parse(payload, symbolize_names: true)
 
-      Stripe::ThinEvent.new(parsed)
+      cls = Util.event_notification_classes.fetch(parsed[:type], Stripe::Events::UnknownEventNotification)
+
+      cls.new(parsed, self)
     end
 
-    def raw_request(method, url, base_address: :api, params: {}, opts: {})
+    def raw_request(method, url, base_address: :api, params: {}, opts: {}, usage: nil)
       opts = Util.normalize_opts(opts)
       req_opts = RequestOptions.extract_opts_from_hash(opts)
 
-      resp, = @requestor.send(:execute_request_internal, method, url, base_address, params, req_opts, usage: ["raw_request"])
+      params = params.to_h if params.is_a?(Stripe::RequestParams)
+      resp, = @requestor.send(:execute_request_internal, method, url, base_address, params, req_opts, usage: usage || ["raw_request"])
 
       @requestor.interpret_response(resp)
     end

data/lib/stripe/stripe_configuration.rb

@@ -45,12 +45,7 @@ module Stripe
       imported_options = USER_CONFIGURABLE_GLOBAL_OPTIONS - StripeClient::CLIENT_OPTIONS
       client_config = StripeConfiguration.setup do |instance|
         imported_options.each do |key|
-          begin
-            instance.public_send("#{key}=", global_config.public_send(key)) if global_config.respond_to?(key)
-          rescue NotImplementedError => e
-            # In Ruby <= 2.5, we can't set write_timeout on Net::HTTP, log an error and continue
-            Util.log_error("Failed to set #{key} on client configuration: #{e}")
-          end
+          instance.public_send("#{key}=", global_config.public_send(key)) if global_config.respond_to?(key)
         end
       end
       client_config.reverse_duplicate_merge(config_opts)

data/lib/stripe/stripe_context.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+module Stripe
+  # Represents hierarchical context for Stripe API operations.
+  #
+  # This class is immutable - all methods return new instances rather than
+  # modifying the existing instance. It provides utilities for building
+  # context hierarchies and converting to/from string representations.
+  class StripeContext
+    include Comparable
+
+    attr_reader :segments
+
+    # Creates a new StripeContext with the given segments.
+    def initialize(segments = nil)
+      @segments = (segments || []).map(&:to_s).freeze
+    end
+
+    # Parses a context string into a StripeContext instance.
+    def self.parse(context_str)
+      return new if context_str.nil? || context_str.empty?
+
+      new(context_str.split("/"))
+    end
+
+    # Creates a new StripeContext with an additional segment appended.
+    def push(segment)
+      segment_str = segment.to_s.strip
+      raise ArgumentError, "Segment cannot be empty or whitespace" if segment_str.empty?
+
+      new_segments = @segments + [segment_str]
+      self.class.new(new_segments)
+    end
+
+    # Creates a new StripeContext with the last segment removed.
+    # If there are no segments, returns a new empty StripeContext.
+    def pop
+      raise IndexError, "No segments to pop" if @segments.empty?
+
+      new_segments = @segments[0...-1]
+      self.class.new(new_segments)
+    end
+
+    # Converts this context to its string representation.
+    def to_s
+      @segments.join("/")
+    end
+
+    # Checks equality with another StripeContext.
+    def ==(other)
+      other.is_a?(StripeContext) && @segments == other.segments
+    end
+
+    # Alias for == to support eql? method
+    alias eql? ==
+
+    # Returns a human-readable representation for debugging.
+    def inspect
+      "#<#{self.class}:0x#{object_id.to_s(16)} segments=#{@segments.inspect}>"
+    end
+
+    # Returns true if the context has no segments.
+    # @return [Boolean] true if empty, false otherwise
+    def empty?
+      @segments.empty?
+    end
+  end
+end

data/lib/stripe/stripe_object.rb

@@ -83,6 +83,7 @@ module Stripe
       @unsaved_values = Set.new
       @transient_values = Set.new
       @values[:id] = id if id
+      @id = id
       @last_response = nil
       @requestor = requestor || APIRequestor.active_requestor
     end
@@ -153,12 +154,22 @@ module Stripe
     def update_attributes(values, opts = {}, dirty: true)
       values.each do |k, v|
         add_accessors([k], values) unless metaclass.method_defined?(k.to_sym)
-        @values[k] = Util.convert_to_stripe_object(v, opts, api_mode: @api_mode, requestor: @requestor)
+        @values[k] = convert_value_with_inner_types(k, v, opts)
         dirty_value!(@values[k]) if dirty
         @unsaved_values.add(k)
       end
     end
 
+    private def convert_value_with_inner_types(key, value, opts)
+      inner_class = _get_inner_class_type(key)
+
+      if inner_class
+        Util.convert_to_stripe_object(value, opts, api_mode: @api_mode, requestor: @requestor, klass: inner_class)
+      else
+        Util.convert_to_stripe_object(value, opts, api_mode: @api_mode, requestor: @requestor)
+      end
+    end
+
     def [](key)
       @values[key.to_sym]
     end
@@ -191,13 +202,13 @@ module Stripe
         value.respond_to?(:to_hash) ? value.to_hash : value
       end
 
-      @values.each_with_object({}) do |(key, value), acc|
-        acc[key] = case value
-                   when Array
-                     value.map(&maybe_to_hash)
-                   else
-                     maybe_to_hash.call(value)
-                   end
+      @values.transform_values do |value|
+        case value
+        when Array
+          value.map(&maybe_to_hash)
+        else
+          maybe_to_hash.call(value)
+        end
       end
     end
 
@@ -262,7 +273,7 @@ module Stripe
 
       # a `nil` that makes it out of `#serialize_params_value` signals an empty
       # value that we shouldn't appear in the serialized form of the object
-      update_hash.reject! { |_, v| v.nil? }
+      update_hash.compact!
 
       update_hash
     end
@@ -302,6 +313,7 @@ module Stripe
     protected def remove_accessors(keys)
       # not available in the #instance_eval below
       protected_fields = self.class.protected_fields
+      obj = self # capture self to use inside instance_eval
 
       metaclass.instance_eval do
         keys.each do |k|
@@ -331,11 +343,16 @@ module Stripe
                    "collide with an API property name.")
             end
           end
+
+          # Also remove instance variables so that static attr_readers (if any exist)
+          # will return nil instead of stale data or data of the wrong type
+          ivar_name = :"@#{k}"
+          obj.remove_instance_variable(ivar_name) if obj.instance_variable_defined?(ivar_name)
         end
       end
     end
 
-    protected def add_accessors(keys, values)
+    protected def add_accessors(keys, values) # rubocop:todo Metrics/PerceivedComplexity
       # not available in the #instance_eval below
       protected_fields = self.class.protected_fields
 
@@ -369,6 +386,19 @@ module Stripe
           define_method(:"#{k}?") { @values[k] } if [FalseClass, TrueClass].include?(values[k].class)
         end
       end
+
+      keys.each do |k|
+        if Util.valid_variable_name?(k)
+          instance_variable_set(:"@#{k}", values[k])
+        else
+          Util.log_info(<<~LOG
+            The variable name '#{k}' is not a valid Ruby variable name.
+            Use ["#{k}"] to access this field, skipping instance variable instantiation...
+          LOG
+                       )
+
+        end
+      end
     end
 
     # Disabling the cop because it's confused by the fact that the methods are
@@ -468,13 +498,14 @@ module Stripe
 
     # Should only be for v2 events and lists, for now.
     protected def _request(method:, path:, base_address:, params: {}, opts: {})
-      req_opts = RequestOptions.combine_opts(@opts, opts)
+      req_opts = RequestOptions.extract_opts_from_hash(opts)
+      req_opts = RequestOptions.combine_opts(@opts, req_opts)
       @requestor.execute_request(
         method,
         path,
         base_address,
         params: params,
-        opts: RequestOptions.extract_opts_from_hash(req_opts)
+        opts: req_opts
       )
     end
 
@@ -605,5 +636,19 @@ module Stripe
         update[k] = ""
       end
     end
+
+    # Instance methods to get inner class types
+    def _get_inner_class_type(field_name)
+      self.class.inner_class_types[field_name.to_sym]
+    end
+
+    # Class methods for inner class types, similar to Python's implementation
+    def self.inner_class_types
+      @inner_class_types ||= {}
+    end
+
+    def self.field_remappings
+      @field_remappings ||= {}
+    end
   end
 end

data/lib/stripe/stripe_service.rb

@@ -14,7 +14,8 @@ module Stripe
         path,
         base_address,
         params: params,
-        opts: RequestOptions.extract_opts_from_hash(opts)
+        opts: RequestOptions.extract_opts_from_hash(opts),
+        usage: ["stripe_client"]
       )
     end
 
@@ -25,6 +26,7 @@ module Stripe
         base_address,
         params: params,
         opts: RequestOptions.extract_opts_from_hash(opts),
+        usage: ["stripe_client"],
         &read_body_chunk_block
       )
     end

data/lib/stripe/util.rb

@@ -4,6 +4,9 @@ require "cgi"
 
 module Stripe
   module Util
+    LEGAL_FIRST_CHARACTER = /[a-zA-Z_]/.freeze
+    LEGAL_VARIABLE_CHARACTER = /[a-zA-Z0-9_]/.freeze
+
     def self.objects_to_ids(obj)
       case obj
       when APIResource
@@ -27,8 +30,12 @@ module Stripe
       @v2_object_classes ||= Stripe::ObjectTypes.v2_object_names_to_classes
     end
 
-    def self.thin_event_classes
-      @thin_event_classes ||= Stripe::EventTypes.thin_event_names_to_classes
+    def self.v2_event_classes
+      @v2_event_classes ||= Stripe::EventTypes.v2_event_types_to_classes
+    end
+
+    def self.event_notification_classes
+      @event_notification_classes ||= Stripe::EventTypes.event_notification_types_to_classes
     end
 
     def self.object_name_matches_class?(object_name, klass)
@@ -96,8 +103,8 @@ module Stripe
     #   will be reused on subsequent API calls.
     # * +opts+ - Options for +StripeObject+ like an API key that will be reused
     #   on subsequent API calls.
-    def self.convert_to_stripe_object(data, opts = {}, api_mode: :v1, requestor: nil)
-      convert_to_stripe_object_with_params(data, {}, opts, api_mode: api_mode, requestor: requestor)
+    def self.convert_to_stripe_object(data, opts = {}, api_mode: :v1, requestor: nil, klass: nil)
+      convert_to_stripe_object_with_params(data, {}, opts, api_mode: api_mode, requestor: requestor, klass: klass)
     end
 
     # Converts a hash of fields or an array of hashes into a +StripeObject+ or
@@ -115,23 +122,26 @@ module Stripe
     # * +last_response+ - The raw response associated with the object.
     # * +api_mode+ - The API mode to use when converting the object, either :v1 or :v2.
     # * +requestor+ - The requestor to use when constructing the object.
+    # * +v2_deleted_object+ - If true, ignore the object tag for casting purposes
+    # * +klass+ - The class to use for inner types
     def self.convert_to_stripe_object_with_params(
       data,
       params,
       opts = {},
       last_response = nil,
       api_mode: :v1,
-      requestor: nil
+      requestor: nil,
+      v2_deleted_object: false,
+      klass: nil
     )
       opts = normalize_opts(opts)
 
       case data
       when Array
-        data.map { |i| convert_to_stripe_object(i, opts, api_mode: api_mode, requestor: requestor) }
+        data.map { |i| convert_to_stripe_object(i, opts, api_mode: api_mode, requestor: requestor, klass: klass) }
       when Hash
         # TODO: This is a terrible hack.
-        # Waiting on https://jira.corp.stripe.com/browse/API_SERVICES-3167 to add
-        # an object in v2 lists
+        # Waiting on https://go/j/API_SERVICES-3167 to add an object in v2 lists
         if api_mode == :v2 && data.include?(:data) && data.include?(:next_page_url)
           return V2::ListObject.construct_from(data, opts, last_response, api_mode, requestor)
         end
@@ -140,9 +150,13 @@ module Stripe
         # to generic StripeObject
         object_type = data[:type] || data["type"]
         object_name = data[:object] || data["object"]
-        object_class = if api_mode == :v2
-                         if object_name == "v2.core.event" && thin_event_classes.key?(object_type)
-                           thin_event_classes.fetch(object_type)
+        object_class = if klass
+                         klass
+                       elsif api_mode == :v2
+                         if v2_deleted_object
+                           V2::DeletedObject
+                         elsif object_name == "v2.core.event" && v2_event_classes.key?(object_type)
+                           v2_event_classes.fetch(object_type)
                          else
                            v2_object_classes.fetch(
                              object_name, StripeObject
@@ -309,6 +323,14 @@ module Stripe
       end
     end
 
+    # Return false for strings that are invalid variable names
+    # Does NOT expect there to be a preceding '@' for instance variables
+    def self.valid_variable_name?(key)
+      return false if key.empty? || key[0] !~ LEGAL_FIRST_CHARACTER
+
+      key[1..].chars.all? { |char| char =~ LEGAL_VARIABLE_CHARACTER }
+    end
+
     def self.check_string_argument!(key)
       raise TypeError, "argument must be a string" unless key.is_a?(String)
 
@@ -406,7 +428,7 @@ module Stripe
     private_class_method :level_name
 
     def self.log_internal(message, data = {}, color:, level:, logger:, out:)
-      data_str = data.reject { |_k, v| v.nil? }
+      data_str = data.compact
                      .map do |(k, v)|
         format("%<key>s=%<value>s",
                key: colorize(k, color, logger.nil? && !out.nil? && out.isatty),