jamm 1.0.8 → 1.0.9

data/lib/jamm/openapi.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'jamm/api'
+
+module Jamm
+  # Customer wrapper for OpenAPI definitions.
+  module OpenAPI
+    include Api
+  end
+end

data/lib/jamm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Jamm
-  VERSION = '1.0.8'
+  VERSION = '1.0.9'
 end

data/lib/jamm/webhook.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'rest-client'
+require 'json'
+require 'base64'
+require 'jamm/errors'
+
+module Jamm
+  module Webhook
+    # Parse command is for parsing the received webhook message.
+    # It does not call anything remotely, instead returns the suitable object.
+    def self.parse(json)
+      out = {
+        id: json[:id],
+        signature: json[:signature],
+        merchant_id: json[:merchantId],
+        event_type: json[:eventType],
+        content: nil,
+        created_at: json[:createdAt]
+      }
+
+      case json[:eventType]
+      when Jamm::OpenAPI::EventType::CHARGE_CREATED
+        out[:content] = Jamm::OpenAPI::ChargeMessage.new(json[:content])
+        return out
+
+      when Jamm::OpenAPI::EventType::CHARGE_UPDATED
+        out[:content] = Jamm::OpenAPI::ChargeMessage.new(json[:content])
+        return out
+      end
+
+      raise Jamm::Error, 'Unknown event type'
+    end
+  end
+end

data/lib/jamm.rb

@@ -4,15 +4,21 @@ require 'rest-client'
 require 'openssl'
 require 'json'
 
-require 'jamm/api'
 require 'jamm/client'
 require 'jamm/errors'
 require 'jamm/oauth'
+require 'jamm/openapi'
 require 'jamm/version'
 
 # OpenAPI wrappers
+require 'jamm/charge'
 require 'jamm/customer'
-require 'jamm/payment'
+require 'jamm/contract'
+require 'jamm/healthcheck'
+require 'jamm/webhook'
+
+# Patches
+require 'jamm/api_patches'
 
 # Jamm Ruby SDK
 module Jamm
@@ -23,10 +29,6 @@ module Jamm
   @read_timeout = 90
   @max_retry = 0
 
-  # Include OpenAPI generated module into root Jamm namespace.
-  # The OpenAPI sub-modules and methods can be accessed via Jamm::{foo}
-  include Api
-
   class << self
     attr_accessor :api, :client_id, :client_secret, :api_base, :env, :oauth_base, :api_version, :connect_base,
                   :openapi, :open_timeout, :read_timeout, :max_retry, :retry_initial_delay, :retry_max_delay
@@ -40,20 +42,20 @@ module Jamm
     when 'prod'
       self.oauth_base = 'https://merchant-identity.jamm-pay.jp'
 
-      self.openapi = Jamm::ApiClient.new
+      self.openapi = Jamm::OpenAPI::ApiClient.new
       openapi.config.host = 'api.jamm-pay.jp'
 
-    # Debugger mode, uncomment when needed
-    # when 'local'
-    #   self.oauth_base = "https://merchant-identity.#{env}.jamm-pay.jp"
-
-    #   self.openapi = Jamm::ApiClient.new
-    #   openapi.config.host = 'api.jamm.test'
+    when 'local'
+      self.oauth_base = 'https://merchant-identity.develop.jamm-pay.jp'
 
+      self.openapi = Jamm::OpenAPI::ApiClient.new
+      openapi.config.host = 'api.jamm.test'
+      openapi.config.verify_ssl = false
+      openapi.config.verify_ssl_host = false
     else
       self.oauth_base = "https://merchant-identity.#{env}.jamm-pay.jp"
 
-      self.openapi = Jamm::ApiClient.new
+      self.openapi = Jamm::OpenAPI::ApiClient.new
       openapi.config.host = "api.#{env}.jamm-pay.jp"
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jamm
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Jamm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-05 00:00:00.000000000 Z
+date: 2024-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -63,16 +63,20 @@ files:
 - lib/jamm/api/api/customer_api.rb
 - lib/jamm/api/api/healthcheck_api.rb
 - lib/jamm/api/api/payment_api.rb
+- lib/jamm/api/api/webhook_service_api.rb
 - lib/jamm/api/api_client.rb
 - lib/jamm/api/api_error.rb
 - lib/jamm/api/configuration.rb
 - lib/jamm/api/models/customer_service_update_customer_body.rb
+- lib/jamm/api/models/googlerpc_status.rb
 - lib/jamm/api/models/protobuf_any.rb
-- lib/jamm/api/models/rpc_status.rb
 - lib/jamm/api/models/v1_add_charge_request.rb
 - lib/jamm/api/models/v1_add_charge_response.rb
 - lib/jamm/api/models/v1_buyer.rb
 - lib/jamm/api/models/v1_charge.rb
+- lib/jamm/api/models/v1_charge_message.rb
+- lib/jamm/api/models/v1_charge_message_status.rb
+- lib/jamm/api/models/v1_charge_result.rb
 - lib/jamm/api/models/v1_contract.rb
 - lib/jamm/api/models/v1_contract_status.rb
 - lib/jamm/api/models/v1_create_contract_with_charge_request.rb
@@ -83,22 +87,35 @@ files:
 - lib/jamm/api/models/v1_create_customer_response.rb
 - lib/jamm/api/models/v1_customer.rb
 - lib/jamm/api/models/v1_delete_customer_response.rb
+- lib/jamm/api/models/v1_event_type.rb
+- lib/jamm/api/models/v1_get_charge_response.rb
+- lib/jamm/api/models/v1_get_charges_response.rb
 - lib/jamm/api/models/v1_get_contract_response.rb
 - lib/jamm/api/models/v1_get_customer_response.rb
 - lib/jamm/api/models/v1_initial_charge.rb
 - lib/jamm/api/models/v1_merchant.rb
 - lib/jamm/api/models/v1_merchant_customer.rb
+- lib/jamm/api/models/v1_merchant_webhook_message.rb
+- lib/jamm/api/models/v1_message_response.rb
+- lib/jamm/api/models/v1_pagination.rb
 - lib/jamm/api/models/v1_payment_link.rb
 - lib/jamm/api/models/v1_ping_response.rb
 - lib/jamm/api/models/v1_update_customer_response.rb
 - lib/jamm/api/models/v1_url.rb
+- lib/jamm/api/models/v1_withdraw_request.rb
+- lib/jamm/api/models/v1_withdraw_response.rb
 - lib/jamm/api/version.rb
+- lib/jamm/api_patches.rb
+- lib/jamm/charge.rb
 - lib/jamm/client.rb
+- lib/jamm/contract.rb
 - lib/jamm/customer.rb
 - lib/jamm/errors.rb
+- lib/jamm/healthcheck.rb
 - lib/jamm/oauth.rb
-- lib/jamm/payment.rb
+- lib/jamm/openapi.rb
 - lib/jamm/version.rb
+- lib/jamm/webhook.rb
 homepage: https://jamm-pay.jp
 licenses:
 - MIT

data/lib/jamm/payment.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-require 'rest-client'
-require 'json'
-require 'base64'
-require 'jamm/errors'
-
-module Jamm
-  module Payment
-    def self.contract_with_charge(**params)
-      request = Jamm::CreateContractWithChargeRequest.new(params)
-
-      Jamm::PaymentApi.new(Jamm::Client.handler).create_contract_with_charge(request)
-    end
-
-    def self.get_contract(contract:)
-      Jamm::PaymentApi.new(Jamm::Client.handler).get_contract(contract)
-    end
-
-    def self.add_charge(**params)
-      request = Jamm::AddChargeRequest.new(params)
-
-      p = Jamm::PaymentApi.new(Jamm::Client.handler)
-      p.add_charge(request)
-    end
-  end
-end