payrex-ruby 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 103e2049b70a972b5995bcec17e7818bd9c28a40169522c2290a02c3b0e0bab4
-  data.tar.gz: f23b06044e54af6ceed20ebefaffd12f54d60a8a83ccd050e198767518e2daff
+  metadata.gz: d7c49f394c25feab4ff376615d550792a83de2c2a64aa61207c21b8821c2607c
+  data.tar.gz: d8980ccd6a3b5cd6b68e9bee80f1312a60e66e630f378974ccbc50fc0db6803b
 SHA512:
-  metadata.gz: 0a45a650b0d230e765c7397fd460e0f918381d82ed60c0d396d580cd8e4402ad7d77a0c063299f04be96b09d241365c53e76af4b76fc24a52186c672e51fa824
-  data.tar.gz: 8a39cd749b95e4193c561c4d710cedb1994b9309a32871f1c349facaccf70329f1005814e30f077f850a4522ff31365e49a53867e7719f65ed8f5bc6c86ad3ec
+  metadata.gz: 31dc305db78be2c7fa367e2472ab03082e247fa3b00b4c4362bf609c082d7018d890fc4122149af3f461313f0e82e60077a1df982955b0194cdbf786b348c4e3
+  data.tar.gz: 6bbdd917dcff61578d3e0dba55d07c8b59ef7ea122e18c9d616aeaefedc5096aab770cdbcf5c31f730e6f9d18c01863ba5e74ad3fcfea2e3982aaf96b26ea4d5

data/lib/config.rb

@@ -1,7 +1,7 @@
 module Payrex
   class Config
     attr_reader :api_base_url,
-                :api_key
+      :api_key
 
     API_BASE_URL = "https://api.payrexhq.com"
 

data/lib/entities/checkout_session.rb

@@ -2,29 +2,26 @@ module Payrex
   module Entities
     class CheckoutSession
       attr_reader :id,
-                  :resource,
-                  :customer_reference_id,
-                  :client_secret,
-                  :status,
-                  :currency,
-                  :line_items,
-                  :livemode,
-                  :url,
-                  :payment_intent,
-                  :metadata,
-                  :success_url,
-                  :cancel_url,
-                  :payment_methods,
-                  :capture_type,
-                  :description,
-                  :submit_type,
-                  :expires_at,
-                  :created_at,
-                  :updated_at
+        :customer_reference_id,
+        :client_secret,
+        :status,
+        :currency,
+        :line_items,
+        :livemode,
+        :url,
+        :payment_intent,
+        :metadata,
+        :success_url,
+        :cancel_url,
+        :payment_methods,
+        :description,
+        :submit_type,
+        :expires_at,
+        :created_at,
+        :updated_at
 
       def initialize(api_resource)
         @id = api_resource.data["id"]
-        @resource = api_resource.data["resource"]
         @customer_reference_id = api_resource.data["customer_reference_id"]
         @client_secret = api_resource.data["client_secret"]
         @status = api_resource.data["status"]
@@ -32,12 +29,15 @@ module Payrex
         @line_items = api_resource.data["line_items"]
         @livemode = api_resource.data["livemode"]
         @url = api_resource.data["url"]
-        @payment_intent = api_resource.data["payment_intent"]
+        @payment_intent = ::Payrex::Entities::PaymentIntent.new(
+          ::Payrex::ApiResource.new(
+            api_resource.data["payment_intent"]
+          )
+        )
         @metadata = api_resource.data["metadata"]
         @success_url = api_resource.data["success_url"]
         @cancel_url = api_resource.data["cancel_url"]
         @payment_methods = api_resource.data["payment_methods"]
-        @capture_type = api_resource.data["capture_type"]
         @description = api_resource.data["description"]
         @submit_type = api_resource.data["submit_type"]
         @expires_at = api_resource.data["expires_at"]

data/lib/entities/event.rb

@@ -2,12 +2,12 @@ module Payrex
   module Entities
     class Event
       attr_reader :id,
-                  :data,
-                  :type,
-                  :pending_webhooks,
-                  :previous_attributes,
-                  :created_at,
-                  :updated_at
+        :data,
+        :type,
+        :pending_webhooks,
+        :previous_attributes,
+        :created_at,
+        :updated_at
 
       def initialize(api_resource)
         @id = api_resource.data["id"]

data/lib/entities/listing.rb

@@ -2,7 +2,7 @@ module Payrex
   module Entities
     class Listing
       attr_reader :data,
-                  :has_more
+        :has_more
 
       def initialize(data:, has_more:)
         @data = data

data/lib/entities/merchant.rb

@@ -2,15 +2,13 @@ module Payrex
   module Entities
     class Merchant
       attr_reader :id,
-                  :resource,
-                  :connection_type,
-                  :livemode,
-                  :created_at,
-                  :updated_at
+        :connection_type,
+        :livemode,
+        :created_at,
+        :updated_at
 
       def initialize(api_resource)
         @id = api_resource.data["id"]
-        @resource = api_resource.data["resource"]
         @connection_type = api_resource.data["connection_type"]
         @livemode = api_resource.data["livemode"]
         @created_at = api_resource.data["created_at"]

data/lib/entities/payment_intent.rb

@@ -2,8 +2,9 @@ module Payrex
   module Entities
     class PaymentIntent
       attr_reader :id,
-        :resource,
         :amount,
+        :amount_received,
+        :amount_capturable,
         :client_secret,
         :currency,
         :description,
@@ -22,8 +23,9 @@ module Payrex
 
       def initialize(api_resource)
         @id = api_resource.data["id"]
-        @resource = api_resource.data["resource"]
         @amount = api_resource.data["amount"]
+        @amount_received = api_resource.data["amount_received"]
+        @amount_capturable = api_resource.data["amount_capturable"]
         @client_secret = api_resource.data["client_secret"]
         @currency = api_resource.data["currency"]
         @description = api_resource.data["description"]

data/lib/entities/payment_method.rb

@@ -2,17 +2,15 @@ module Payrex
   module Entities
     class PaymentMethod
       attr_reader :id,
-                  :resource,
-                  :type,
-                  :billing_details,
-                  :livemode,
-                  :metadata,
-                  :created_at,
-                  :updated_at
+        :type,
+        :billing_details,
+        :livemode,
+        :metadata,
+        :created_at,
+        :updated_at
 
       def initialize(api_resource)
         @id = api_resource.data["id"]
-        @resource = api_resource.data["resource"]
         @type = api_resource.data["type"]
         @billing_details = api_resource.data["billing_details"]
         @livemode = api_resource.data["livemode"]

data/lib/entities/refund.rb

@@ -2,22 +2,20 @@ module Payrex
   module Entities
     class Refund
       attr_reader :id,
-                  :resource,
-                  :amount,
-                  :currency,
-                  :livemode,
-                  :status,
-                  :description,
-                  :reason,
-                  :remarks,
-                  :payment_id,
-                  :metadata,
-                  :created_at,
-                  :updated_at
+        :amount,
+        :currency,
+        :livemode,
+        :status,
+        :description,
+        :reason,
+        :remarks,
+        :payment_id,
+        :metadata,
+        :created_at,
+        :updated_at
 
       def initialize(api_resource)
         @id = api_resource.data["id"]
-        @resource = api_resource.data["resource"]
         @amount = api_resource.data["amount"]
         @currency = api_resource.data["currency"]
         @livemode = api_resource.data["livemode"]

data/lib/entities/webhook.rb

@@ -2,19 +2,17 @@ module Payrex
   module Entities
     class Webhook
       attr_reader :id,
-                  :resource,
-                  :secret_key,
-                  :status,
-                  :description,
-                  :livemode,
-                  :url,
-                  :events,
-                  :created_at,
-                  :updated_at
+        :secret_key,
+        :status,
+        :description,
+        :livemode,
+        :url,
+        :events,
+        :created_at,
+        :updated_at
 
       def initialize(api_resource)
         @id = api_resource.data["id"]
-        @resource = api_resource.data["resource"]
         @secret_key = api_resource.data["secret_key"]
         @status = api_resource.data["status"]
         @description = api_resource.data["description"]

data/lib/http_client.rb

@@ -5,7 +5,7 @@ module Payrex
       @base_url = base_url
     end
 
-    def request(method:, params: {}, path:)
+    def request(method:, path:, params: {})
       uri = URI("#{@base_url}/#{path}")
 
       request = build_request(method: method, params: params, uri: uri)
@@ -21,12 +21,15 @@ module Payrex
 
     private
 
-    def build_request(method:, params: {}, uri:)
+    def build_request(method:, uri:, params: {})
       request_class = Net::HTTP.const_get(method.capitalize)
       request = request_class.new(uri)
 
-      set_request_headers(request)
-      set_request_body(request, params) if %i[post put].include?(method)
+      request = set_request_headers(request)
+
+      if %i[post put].include?(method)
+        request = set_request_body(request, params)
+      end
 
       request
     end
@@ -52,11 +55,15 @@ module Payrex
 
     def set_request_headers(request)
       request.basic_auth(@api_key, "")
-      request["Content-Type"] = "application/json"
+      request.content_type = "application/x-www-form-urlencoded"
+
+      request
     end
 
     def set_request_body(request, params)
-      request.body = params.to_json
+      request.body = ::Payrex::Parameter.encode(params).gsub(/%5B[\d+]%5D/, "%5B%5D")
+
+      request
     end
 
     def failed?(response)

data/lib/payrex-ruby.rb

@@ -5,12 +5,12 @@ require "openssl"
 require_relative "api_resource"
 require_relative "client"
 require_relative "config"
+require_relative "helpers/parameter"
 require_relative "http_client"
 require_relative "payrex_error"
 require_relative "entities/checkout_session"
 require_relative "entities/event"
 require_relative "entities/listing"
-require_relative "entities/merchant"
 require_relative "entities/payment_intent"
 require_relative "entities/payment_method"
 require_relative "entities/refund"
@@ -22,12 +22,11 @@ require_relative "errors/resource_not_found_error"
 require_relative "errors/signature_invalid_error"
 require_relative "errors/value_unexpected_error"
 require_relative "services/base_service"
-require_relative "services/checkout_session_service"
-require_relative "services/merchant_service"
-require_relative "services/payment_intent_service"
-require_relative "services/payment_method_service"
-require_relative "services/refund_service"
-require_relative "services/webhook_service"
+require_relative "services/checkout_sessions_service"
+require_relative "services/payment_intents_service"
+require_relative "services/payment_methods_service"
+require_relative "services/refunds_service"
+require_relative "services/webhooks_service"
 require_relative "services/service_factory"
 
 module Payrex

data/lib/payrex_error.rb

@@ -1,8 +1,8 @@
 module Payrex
   class PayrexError
     attr_reader :code,
-                :detail,
-                :parameter
+      :detail,
+      :parameter
 
     def initialize(error)
       @code = error["code"]

data/lib/services/base_service.rb

@@ -5,7 +5,7 @@ module Payrex
         @client = client
       end
 
-      def request(is_list: false, method:, object:, path:, payload: {})
+      def request(method:, object:, path:, is_list: false, payload: {})
         http_client = Payrex::HttpClient.new(api_key: @client.config.api_key, base_url: @client.config.api_base_url)
 
         api_resource = http_client.request(
@@ -16,7 +16,7 @@ module Payrex
 
         if is_list
           data = api_resource.data["data"].map { |data| object.new(Payrex::ApiResource.new(data)) }
-  
+
           Payrex::Entities::Listing.new(data: data, has_more: api_resource.data["has_more"])
         else
           object.new(api_resource)

data/lib/services/{checkout_session_service.rb → checkout_sessions_service.rb}

@@ -1,6 +1,6 @@
 module Payrex
   module Services
-    class CheckoutSessionService < BaseService
+    class CheckoutSessionsService < BaseService
       PATH = "checkout_sessions"
 
       def create(payload)

data/lib/services/{payment_intent_service.rb → payment_intents_service.rb}

@@ -1,6 +1,6 @@
 module Payrex
   module Services
-    class PaymentIntentService < BaseService
+    class PaymentIntentsService < BaseService
       PATH = "payment_intents"
 
       def capture(id, payload)

data/lib/services/{payment_method_service.rb → payment_methods_service.rb}

@@ -1,6 +1,6 @@
 module Payrex
   module Services
-    class PaymentMethodService < BaseService
+    class PaymentMethodsService < BaseService
       PATH = "payment_methods"
 
       def create(payload)

data/lib/services/{refund_service.rb → refunds_service.rb}

@@ -1,6 +1,6 @@
 module Payrex
   module Services
-    class RefundService < BaseService
+    class RefundsService < BaseService
       PATH = "refunds"
 
       def create(payload)

data/lib/services/{webhook_service.rb → webhooks_service.rb}

@@ -1,6 +1,6 @@
 module Payrex
   module Services
-    class WebhookService < BaseService
+    class WebhooksService < BaseService
       PATH = "webhooks"
 
       def parse_event(payload:, signature_header:, webhook_secret_key:)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: payrex-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - PayRex
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-23 00:00:00.000000000 Z
+date: 2024-07-30 00:00:00.000000000 Z
 dependencies: []
 description: PayRex Ruby Library
 email: support@payrexhq.com
@@ -37,13 +37,12 @@ files:
 - lib/payrex-ruby.rb
 - lib/payrex_error.rb
 - lib/services/base_service.rb
-- lib/services/checkout_session_service.rb
-- lib/services/merchant_service.rb
-- lib/services/payment_intent_service.rb
-- lib/services/payment_method_service.rb
-- lib/services/refund_service.rb
+- lib/services/checkout_sessions_service.rb
+- lib/services/payment_intents_service.rb
+- lib/services/payment_methods_service.rb
+- lib/services/refunds_service.rb
 - lib/services/service_factory.rb
-- lib/services/webhook_service.rb
+- lib/services/webhooks_service.rb
 homepage: https://www.payrexhq.com/
 licenses:
 - MIT

data/lib/services/merchant_service.rb

@@ -1,16 +0,0 @@
-module Payrex
-  module Services
-    class MerchantService < BaseService
-      PATH = "merchants"
-
-      def create(payload)
-        request(
-          method: :post,
-          object: Payrex::Entities::Merchant,
-          path: PATH,
-          payload: payload
-        )
-      end
-    end
-  end
-end