dodopayments 1.55.7 → 1.56.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 527ad5aeb2718d8afaa8ae3837961c0ed70bc42216cfaf907b9cf9991ab96173
-  data.tar.gz: a38f8279d3110c349c5ca3ea8dd8250c85041d19ffbd0ac7d999a5c01eb32c11
+  metadata.gz: ce3e5943f7a051da09468b89769723b9a1ec3c8e985572676ac5ccbf1b9d6ad4
+  data.tar.gz: 244eb00a4c80ec77cf6aaffe5dea51207b4ebecf2afc310a26791f9471dcf997
 SHA512:
-  metadata.gz: 3335d1888e20925cc00b3f18e8bfc95f6a981837429ef7189746bd95243410bf8ba05f125163ef7a5075c480fe1d33e9626a8db1e67e163531a7f3dfde9f46f0
-  data.tar.gz: b79506359e274395e1b26ddf11185a829904526e92403aa4646654323ebf08c39740a0a6a70c11f20850e51cb912659011b3068a7b2e403357af4a2aeb105982
+  metadata.gz: a5ce6a84b5bf1224822d61c145e43ff3061bfbb5c8b7e8193e7ee929e94bf968e0129db2320c08862b49d21f2a2e53be13b0ace6f484d27b0b287d111a60f667
+  data.tar.gz: 78ff2e68c238a62dc345a945ac0f0c36123043cc36a83dccbc78143d6d5ac71667334b5af3d981203d8425e79162daede453b00f0d40c8e8ab58a830e8e99b3e

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 1.56.0 (2025-10-25)
+
+Full Changelog: [v1.55.8...v1.56.0](https://github.com/dodopayments/dodopayments-ruby/compare/v1.55.8...v1.56.0)
+
+### Features
+
+* **api:** added unwrap functions for webhooks ([3aab01b](https://github.com/dodopayments/dodopayments-ruby/commit/3aab01bd934c029ae0d533b2b28aec933f1c58bf))
+
+## 1.55.8 (2025-10-24)
+
+Full Changelog: [v1.55.7...v1.55.8](https://github.com/dodopayments/dodopayments-ruby/compare/v1.55.7...v1.55.8)
+
+### Features
+
+* handle thread interrupts in the core HTTP client ([704ad81](https://github.com/dodopayments/dodopayments-ruby/commit/704ad81101e265fcf099bc397643a650476672ce))
+
 ## 1.55.7 (2025-10-17)
 
 Full Changelog: [v1.54.0...v1.55.7](https://github.com/dodopayments/dodopayments-ruby/compare/v1.54.0...v1.55.7)

data/README.md

@@ -17,7 +17,7 @@ To use this gem, install via Bundler by adding the following to your application
 <!-- x-release-please-start-version -->
 
 ```ruby
-gem "dodopayments", "~> 1.55.7"
+gem "dodopayments", "~> 1.56.0"
 ```
 
 <!-- x-release-please-end -->

data/lib/dodopayments/client.rb

@@ -57,9 +57,6 @@ module Dodopayments
     # @return [Dodopayments::Resources::Payouts]
     attr_reader :payouts
 
-    # @return [Dodopayments::Resources::WebhookEvents]
-    attr_reader :webhook_events
-
     # @return [Dodopayments::Resources::Products]
     attr_reader :products
 
@@ -78,6 +75,9 @@ module Dodopayments
     # @return [Dodopayments::Resources::Webhooks]
     attr_reader :webhooks
 
+    # @return [Dodopayments::Resources::WebhookEvents]
+    attr_reader :webhook_events
+
     # @return [Dodopayments::Resources::UsageEvents]
     attr_reader :usage_events
 
@@ -153,13 +153,13 @@ module Dodopayments
       @refunds = Dodopayments::Resources::Refunds.new(client: self)
       @disputes = Dodopayments::Resources::Disputes.new(client: self)
       @payouts = Dodopayments::Resources::Payouts.new(client: self)
-      @webhook_events = Dodopayments::Resources::WebhookEvents.new(client: self)
       @products = Dodopayments::Resources::Products.new(client: self)
       @misc = Dodopayments::Resources::Misc.new(client: self)
       @discounts = Dodopayments::Resources::Discounts.new(client: self)
       @addons = Dodopayments::Resources::Addons.new(client: self)
       @brands = Dodopayments::Resources::Brands.new(client: self)
       @webhooks = Dodopayments::Resources::Webhooks.new(client: self)
+      @webhook_events = Dodopayments::Resources::WebhookEvents.new(client: self)
       @usage_events = Dodopayments::Resources::UsageEvents.new(client: self)
       @meters = Dodopayments::Resources::Meters.new(client: self)
     end

data/lib/dodopayments/internal/transport/pooled_net_requester.rb

@@ -128,40 +128,48 @@ module Dodopayments
           url, deadline = request.fetch_values(:url, :deadline)
 
           req = nil
-          eof = false
           finished = false
-          closing = nil
 
           # rubocop:disable Metrics/BlockLength
           enum = Enumerator.new do |y|
             next if finished
 
             with_pool(url, deadline: deadline) do |conn|
-              req, closing = self.class.build_request(request) do
-                self.class.calibrate_socket_timeout(conn, deadline)
-              end
-
-              self.class.calibrate_socket_timeout(conn, deadline)
-              unless conn.started?
-                conn.keep_alive_timeout = self.class::KEEP_ALIVE_TIMEOUT
-                conn.start
-              end
+              eof = false
+              closing = nil
+              ::Thread.handle_interrupt(Object => :never) do
+                ::Thread.handle_interrupt(Object => :immediate) do
+                  req, closing = self.class.build_request(request) do
+                    self.class.calibrate_socket_timeout(conn, deadline)
+                  end
 
-              self.class.calibrate_socket_timeout(conn, deadline)
-              conn.request(req) do |rsp|
-                y << [req, rsp]
-                break if finished
-
-                rsp.read_body do |bytes|
-                  y << bytes.force_encoding(Encoding::BINARY)
-                  break if finished
+                  self.class.calibrate_socket_timeout(conn, deadline)
+                  unless conn.started?
+                    conn.keep_alive_timeout = self.class::KEEP_ALIVE_TIMEOUT
+                    conn.start
+                  end
 
                   self.class.calibrate_socket_timeout(conn, deadline)
+                  conn.request(req) do |rsp|
+                    y << [req, rsp]
+                    break if finished
+
+                    rsp.read_body do |bytes|
+                      y << bytes.force_encoding(Encoding::BINARY)
+                      break if finished
+
+                      self.class.calibrate_socket_timeout(conn, deadline)
+                    end
+                    eof = true
+                  end
+                end
+              ensure
+                begin
+                  conn.finish if !eof && conn&.started?
+                ensure
+                  closing&.call
                 end
-                eof = true
               end
-            ensure
-              conn.finish if !eof && conn&.started?
             end
           rescue Timeout::Error
             raise Dodopayments::Errors::APITimeoutError.new(url: url, request: req)
@@ -174,8 +182,6 @@ module Dodopayments
           body = Dodopayments::Internal::Util.fused_enum(enum, external: true) do
             finished = true
             loop { enum.next }
-          ensure
-            closing&.call
           end
           [Integer(response.code), response, body]
         end

data/lib/dodopayments/internal/type/union.rb

@@ -6,14 +6,16 @@ module Dodopayments
       # @api private
       #
       # @example
-      #   # `customer_request` is a `Dodopayments::CustomerRequest`
-      #   case customer_request
-      #   when Dodopayments::AttachExistingCustomer
-      #     puts(customer_request.customer_id)
-      #   when Dodopayments::NewCustomer
-      #     puts(customer_request.email)
+      #   # `unsafe_unwrap_webhook_event` is a `Dodopayments::UnsafeUnwrapWebhookEvent`
+      #   case unsafe_unwrap_webhook_event
+      #   when Dodopayments::DisputeAcceptedWebhookEvent
+      #     puts(unsafe_unwrap_webhook_event.business_id)
+      #   when Dodopayments::DisputeCancelledWebhookEvent
+      #     puts(unsafe_unwrap_webhook_event.data)
+      #   when Dodopayments::DisputeChallengedWebhookEvent
+      #     puts(unsafe_unwrap_webhook_event.timestamp)
       #   else
-      #     puts(customer_request)
+      #     puts(unsafe_unwrap_webhook_event)
       #   end
       module Union
         include Dodopayments::Internal::Type::Converter

data/lib/dodopayments/models/dispute_accepted_webhook_event.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+module Dodopayments
+  module Models
+    class DisputeAcceptedWebhookEvent < Dodopayments::Internal::Type::BaseModel
+      # @!attribute business_id
+      #   The business identifier
+      #
+      #   @return [String]
+      required :business_id, String
+
+      # @!attribute data
+      #   Event-specific data
+      #
+      #   @return [Dodopayments::Models::DisputeAcceptedWebhookEvent::Data]
+      required :data, -> { Dodopayments::DisputeAcceptedWebhookEvent::Data }
+
+      # @!attribute timestamp
+      #   The timestamp of when the event occurred
+      #
+      #   @return [Time]
+      required :timestamp, Time
+
+      # @!attribute type
+      #   The event type
+      #
+      #   @return [Symbol, Dodopayments::Models::DisputeAcceptedWebhookEvent::Type]
+      required :type, enum: -> { Dodopayments::DisputeAcceptedWebhookEvent::Type }
+
+      # @!method initialize(business_id:, data:, timestamp:, type:)
+      #   @param business_id [String] The business identifier
+      #
+      #   @param data [Dodopayments::Models::DisputeAcceptedWebhookEvent::Data] Event-specific data
+      #
+      #   @param timestamp [Time] The timestamp of when the event occurred
+      #
+      #   @param type [Symbol, Dodopayments::Models::DisputeAcceptedWebhookEvent::Type] The event type
+
+      # @see Dodopayments::Models::DisputeAcceptedWebhookEvent#data
+      class Data < Dodopayments::Models::Dispute
+        # @!attribute payload_type
+        #   The type of payload in the data field
+        #
+        #   @return [Symbol, Dodopayments::Models::DisputeAcceptedWebhookEvent::Data::PayloadType, nil]
+        optional :payload_type, enum: -> { Dodopayments::DisputeAcceptedWebhookEvent::Data::PayloadType }
+
+        # @!method initialize(payload_type: nil)
+        #   Event-specific data
+        #
+        #   @param payload_type [Symbol, Dodopayments::Models::DisputeAcceptedWebhookEvent::Data::PayloadType] The type of payload in the data field
+
+        # The type of payload in the data field
+        module PayloadType
+          extend Dodopayments::Internal::Type::Enum
+
+          DISPUTE = :Dispute
+
+          # @!method self.values
+          #   @return [Array<Symbol>]
+        end
+      end
+
+      # The event type
+      #
+      # @see Dodopayments::Models::DisputeAcceptedWebhookEvent#type
+      module Type
+        extend Dodopayments::Internal::Type::Enum
+
+        DISPUTE_ACCEPTED = :"dispute.accepted"
+
+        # @!method self.values
+        #   @return [Array<Symbol>]
+      end
+    end
+  end
+end

data/lib/dodopayments/models/dispute_cancelled_webhook_event.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+module Dodopayments
+  module Models
+    class DisputeCancelledWebhookEvent < Dodopayments::Internal::Type::BaseModel
+      # @!attribute business_id
+      #   The business identifier
+      #
+      #   @return [String]
+      required :business_id, String
+
+      # @!attribute data
+      #   Event-specific data
+      #
+      #   @return [Dodopayments::Models::DisputeCancelledWebhookEvent::Data]
+      required :data, -> { Dodopayments::DisputeCancelledWebhookEvent::Data }
+
+      # @!attribute timestamp
+      #   The timestamp of when the event occurred
+      #
+      #   @return [Time]
+      required :timestamp, Time
+
+      # @!attribute type
+      #   The event type
+      #
+      #   @return [Symbol, Dodopayments::Models::DisputeCancelledWebhookEvent::Type]
+      required :type, enum: -> { Dodopayments::DisputeCancelledWebhookEvent::Type }
+
+      # @!method initialize(business_id:, data:, timestamp:, type:)
+      #   @param business_id [String] The business identifier
+      #
+      #   @param data [Dodopayments::Models::DisputeCancelledWebhookEvent::Data] Event-specific data
+      #
+      #   @param timestamp [Time] The timestamp of when the event occurred
+      #
+      #   @param type [Symbol, Dodopayments::Models::DisputeCancelledWebhookEvent::Type] The event type
+
+      # @see Dodopayments::Models::DisputeCancelledWebhookEvent#data
+      class Data < Dodopayments::Models::Dispute
+        # @!attribute payload_type
+        #   The type of payload in the data field
+        #
+        #   @return [Symbol, Dodopayments::Models::DisputeCancelledWebhookEvent::Data::PayloadType, nil]
+        optional :payload_type, enum: -> { Dodopayments::DisputeCancelledWebhookEvent::Data::PayloadType }
+
+        # @!method initialize(payload_type: nil)
+        #   Event-specific data
+        #
+        #   @param payload_type [Symbol, Dodopayments::Models::DisputeCancelledWebhookEvent::Data::PayloadType] The type of payload in the data field
+
+        # The type of payload in the data field
+        module PayloadType
+          extend Dodopayments::Internal::Type::Enum
+
+          DISPUTE = :Dispute
+
+          # @!method self.values
+          #   @return [Array<Symbol>]
+        end
+      end
+
+      # The event type
+      #
+      # @see Dodopayments::Models::DisputeCancelledWebhookEvent#type
+      module Type
+        extend Dodopayments::Internal::Type::Enum
+
+        DISPUTE_CANCELLED = :"dispute.cancelled"
+
+        # @!method self.values
+        #   @return [Array<Symbol>]
+      end
+    end
+  end
+end

data/lib/dodopayments/models/dispute_challenged_webhook_event.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+module Dodopayments
+  module Models
+    class DisputeChallengedWebhookEvent < Dodopayments::Internal::Type::BaseModel
+      # @!attribute business_id
+      #   The business identifier
+      #
+      #   @return [String]
+      required :business_id, String
+
+      # @!attribute data
+      #   Event-specific data
+      #
+      #   @return [Dodopayments::Models::DisputeChallengedWebhookEvent::Data]
+      required :data, -> { Dodopayments::DisputeChallengedWebhookEvent::Data }
+
+      # @!attribute timestamp
+      #   The timestamp of when the event occurred
+      #
+      #   @return [Time]
+      required :timestamp, Time
+
+      # @!attribute type
+      #   The event type
+      #
+      #   @return [Symbol, Dodopayments::Models::DisputeChallengedWebhookEvent::Type]
+      required :type, enum: -> { Dodopayments::DisputeChallengedWebhookEvent::Type }
+
+      # @!method initialize(business_id:, data:, timestamp:, type:)
+      #   @param business_id [String] The business identifier
+      #
+      #   @param data [Dodopayments::Models::DisputeChallengedWebhookEvent::Data] Event-specific data
+      #
+      #   @param timestamp [Time] The timestamp of when the event occurred
+      #
+      #   @param type [Symbol, Dodopayments::Models::DisputeChallengedWebhookEvent::Type] The event type
+
+      # @see Dodopayments::Models::DisputeChallengedWebhookEvent#data
+      class Data < Dodopayments::Models::Dispute
+        # @!attribute payload_type
+        #   The type of payload in the data field
+        #
+        #   @return [Symbol, Dodopayments::Models::DisputeChallengedWebhookEvent::Data::PayloadType, nil]
+        optional :payload_type, enum: -> { Dodopayments::DisputeChallengedWebhookEvent::Data::PayloadType }
+
+        # @!method initialize(payload_type: nil)
+        #   Event-specific data
+        #
+        #   @param payload_type [Symbol, Dodopayments::Models::DisputeChallengedWebhookEvent::Data::PayloadType] The type of payload in the data field
+
+        # The type of payload in the data field
+        module PayloadType
+          extend Dodopayments::Internal::Type::Enum
+
+          DISPUTE = :Dispute
+
+          # @!method self.values
+          #   @return [Array<Symbol>]
+        end
+      end
+
+      # The event type
+      #
+      # @see Dodopayments::Models::DisputeChallengedWebhookEvent#type
+      module Type
+        extend Dodopayments::Internal::Type::Enum
+
+        DISPUTE_CHALLENGED = :"dispute.challenged"
+
+        # @!method self.values
+        #   @return [Array<Symbol>]
+      end
+    end
+  end
+end

data/lib/dodopayments/models/dispute_expired_webhook_event.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+module Dodopayments
+  module Models
+    class DisputeExpiredWebhookEvent < Dodopayments::Internal::Type::BaseModel
+      # @!attribute business_id
+      #   The business identifier
+      #
+      #   @return [String]
+      required :business_id, String
+
+      # @!attribute data
+      #   Event-specific data
+      #
+      #   @return [Dodopayments::Models::DisputeExpiredWebhookEvent::Data]
+      required :data, -> { Dodopayments::DisputeExpiredWebhookEvent::Data }
+
+      # @!attribute timestamp
+      #   The timestamp of when the event occurred
+      #
+      #   @return [Time]
+      required :timestamp, Time
+
+      # @!attribute type
+      #   The event type
+      #
+      #   @return [Symbol, Dodopayments::Models::DisputeExpiredWebhookEvent::Type]
+      required :type, enum: -> { Dodopayments::DisputeExpiredWebhookEvent::Type }
+
+      # @!method initialize(business_id:, data:, timestamp:, type:)
+      #   @param business_id [String] The business identifier
+      #
+      #   @param data [Dodopayments::Models::DisputeExpiredWebhookEvent::Data] Event-specific data
+      #
+      #   @param timestamp [Time] The timestamp of when the event occurred
+      #
+      #   @param type [Symbol, Dodopayments::Models::DisputeExpiredWebhookEvent::Type] The event type
+
+      # @see Dodopayments::Models::DisputeExpiredWebhookEvent#data
+      class Data < Dodopayments::Models::Dispute
+        # @!attribute payload_type
+        #   The type of payload in the data field
+        #
+        #   @return [Symbol, Dodopayments::Models::DisputeExpiredWebhookEvent::Data::PayloadType, nil]
+        optional :payload_type, enum: -> { Dodopayments::DisputeExpiredWebhookEvent::Data::PayloadType }
+
+        # @!method initialize(payload_type: nil)
+        #   Event-specific data
+        #
+        #   @param payload_type [Symbol, Dodopayments::Models::DisputeExpiredWebhookEvent::Data::PayloadType] The type of payload in the data field
+
+        # The type of payload in the data field
+        module PayloadType
+          extend Dodopayments::Internal::Type::Enum
+
+          DISPUTE = :Dispute
+
+          # @!method self.values
+          #   @return [Array<Symbol>]
+        end
+      end
+
+      # The event type
+      #
+      # @see Dodopayments::Models::DisputeExpiredWebhookEvent#type
+      module Type
+        extend Dodopayments::Internal::Type::Enum
+
+        DISPUTE_EXPIRED = :"dispute.expired"
+
+        # @!method self.values
+        #   @return [Array<Symbol>]
+      end
+    end
+  end
+end

data/lib/dodopayments/models/dispute_lost_webhook_event.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+module Dodopayments
+  module Models
+    class DisputeLostWebhookEvent < Dodopayments::Internal::Type::BaseModel
+      # @!attribute business_id
+      #   The business identifier
+      #
+      #   @return [String]
+      required :business_id, String
+
+      # @!attribute data
+      #   Event-specific data
+      #
+      #   @return [Dodopayments::Models::DisputeLostWebhookEvent::Data]
+      required :data, -> { Dodopayments::DisputeLostWebhookEvent::Data }
+
+      # @!attribute timestamp
+      #   The timestamp of when the event occurred
+      #
+      #   @return [Time]
+      required :timestamp, Time
+
+      # @!attribute type
+      #   The event type
+      #
+      #   @return [Symbol, Dodopayments::Models::DisputeLostWebhookEvent::Type]
+      required :type, enum: -> { Dodopayments::DisputeLostWebhookEvent::Type }
+
+      # @!method initialize(business_id:, data:, timestamp:, type:)
+      #   @param business_id [String] The business identifier
+      #
+      #   @param data [Dodopayments::Models::DisputeLostWebhookEvent::Data] Event-specific data
+      #
+      #   @param timestamp [Time] The timestamp of when the event occurred
+      #
+      #   @param type [Symbol, Dodopayments::Models::DisputeLostWebhookEvent::Type] The event type
+
+      # @see Dodopayments::Models::DisputeLostWebhookEvent#data
+      class Data < Dodopayments::Models::Dispute
+        # @!attribute payload_type
+        #   The type of payload in the data field
+        #
+        #   @return [Symbol, Dodopayments::Models::DisputeLostWebhookEvent::Data::PayloadType, nil]
+        optional :payload_type, enum: -> { Dodopayments::DisputeLostWebhookEvent::Data::PayloadType }
+
+        # @!method initialize(payload_type: nil)
+        #   Event-specific data
+        #
+        #   @param payload_type [Symbol, Dodopayments::Models::DisputeLostWebhookEvent::Data::PayloadType] The type of payload in the data field
+
+        # The type of payload in the data field
+        module PayloadType
+          extend Dodopayments::Internal::Type::Enum
+
+          DISPUTE = :Dispute
+
+          # @!method self.values
+          #   @return [Array<Symbol>]
+        end
+      end
+
+      # The event type
+      #
+      # @see Dodopayments::Models::DisputeLostWebhookEvent#type
+      module Type
+        extend Dodopayments::Internal::Type::Enum
+
+        DISPUTE_LOST = :"dispute.lost"
+
+        # @!method self.values
+        #   @return [Array<Symbol>]
+      end
+    end
+  end
+end

data/lib/dodopayments/models/dispute_opened_webhook_event.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+module Dodopayments
+  module Models
+    class DisputeOpenedWebhookEvent < Dodopayments::Internal::Type::BaseModel
+      # @!attribute business_id
+      #   The business identifier
+      #
+      #   @return [String]
+      required :business_id, String
+
+      # @!attribute data
+      #   Event-specific data
+      #
+      #   @return [Dodopayments::Models::DisputeOpenedWebhookEvent::Data]
+      required :data, -> { Dodopayments::DisputeOpenedWebhookEvent::Data }
+
+      # @!attribute timestamp
+      #   The timestamp of when the event occurred
+      #
+      #   @return [Time]
+      required :timestamp, Time
+
+      # @!attribute type
+      #   The event type
+      #
+      #   @return [Symbol, Dodopayments::Models::DisputeOpenedWebhookEvent::Type]
+      required :type, enum: -> { Dodopayments::DisputeOpenedWebhookEvent::Type }
+
+      # @!method initialize(business_id:, data:, timestamp:, type:)
+      #   @param business_id [String] The business identifier
+      #
+      #   @param data [Dodopayments::Models::DisputeOpenedWebhookEvent::Data] Event-specific data
+      #
+      #   @param timestamp [Time] The timestamp of when the event occurred
+      #
+      #   @param type [Symbol, Dodopayments::Models::DisputeOpenedWebhookEvent::Type] The event type
+
+      # @see Dodopayments::Models::DisputeOpenedWebhookEvent#data
+      class Data < Dodopayments::Models::Dispute
+        # @!attribute payload_type
+        #   The type of payload in the data field
+        #
+        #   @return [Symbol, Dodopayments::Models::DisputeOpenedWebhookEvent::Data::PayloadType, nil]
+        optional :payload_type, enum: -> { Dodopayments::DisputeOpenedWebhookEvent::Data::PayloadType }
+
+        # @!method initialize(payload_type: nil)
+        #   Event-specific data
+        #
+        #   @param payload_type [Symbol, Dodopayments::Models::DisputeOpenedWebhookEvent::Data::PayloadType] The type of payload in the data field
+
+        # The type of payload in the data field
+        module PayloadType
+          extend Dodopayments::Internal::Type::Enum
+
+          DISPUTE = :Dispute
+
+          # @!method self.values
+          #   @return [Array<Symbol>]
+        end
+      end
+
+      # The event type
+      #
+      # @see Dodopayments::Models::DisputeOpenedWebhookEvent#type
+      module Type
+        extend Dodopayments::Internal::Type::Enum
+
+        DISPUTE_OPENED = :"dispute.opened"
+
+        # @!method self.values
+        #   @return [Array<Symbol>]
+      end
+    end
+  end
+end