jamm 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: deb0aa2025b4b68b8c4a3872ae094e76cb734ff6301bc0d208b4231e60cb363e
-  data.tar.gz: a84029a8041fe88dd7812685c5ee70d3e5375eba3411dc40f5aefda0e218b048
+  metadata.gz: 7ff167592a3b265fac5fec78cb2fc81b03319980f24caff65db16742fb24536e
+  data.tar.gz: b1de9712252cd6d60452c07e589f2e4558e66d8bc3fecb12e59ac00c9f8fac71
 SHA512:
-  metadata.gz: 7899440f22d582024b079342701534a72ff490654f29e9f9c6f4f577e969b553e99cd4299d2e0ae4ebff85fecbfb08898af0efe0e42f025ef44e8a31c2a5b1e0
-  data.tar.gz: d91e0b2376b51d8786a230fc2deb56e1d7389349cf44dfb74e48212513f14c2b35be1c60e9a9026f7a9803bfea319e8a4dab2b3f772f3e4b245eeaaea4e4385b
+  metadata.gz: c1437d7d975ee4a3f2d9f39910c15f7864f98e93d5b1addac74f8abdd9a4e2f14e49fdc86b2236a267d95a35b6be86118f0928957cdd8b4178379ca04d8788bf
+  data.tar.gz: 82b03ecc2a5ebae9e7c1756a00080f45df9637951910295891825463a74645a0fe14ed3457685f35faf3d7b6e801754dd32d65e181a00e214d299f1ab66faa18

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jamm (1.0.4)
+    jamm (1.0.5)
       rest-client (~> 2.0)
       typhoeus (~> 1.0, >= 1.0.1)
 
@@ -19,7 +19,9 @@ GEM
     domain_name (0.6.20240107)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    ffi (1.17.0)
+    ffi (1.17.0-aarch64-linux-gnu)
+    ffi (1.17.0-arm64-darwin)
+    ffi (1.17.0-x86_64-linux-gnu)
     hashdiff (1.1.0)
     http-accept (1.7.0)
     http-cookie (1.0.5)

data/jamm.gemspec

@@ -20,12 +20,12 @@ Gem::Specification.new do |s|
 
   s.files = `git ls-files`.split("\n").reject do |file|
     file.start_with?(
-      "examples",
-      "images",
-      "openapi",
-      "pkg",
-      "test",
-      "Makefile",
+      'examples',
+      'images',
+      'openapi',
+      'pkg',
+      'test',
+      'Makefile'
     )
   end
 

data/lib/jamm/api/api/payment_api.rb

@@ -20,6 +20,67 @@ module Api
       @api_client = api_client
     end
 
+    # Use existing contract with charge
+    # Use existing contract with charge
+    # @param body [AddChargeRequest]
+    # @param [Hash] opts the optional parameters
+    # @return [AddChargeResponse]
+    def add_charge(body, opts = {})
+      data, _status_code, _headers = add_charge_with_http_info(body, opts)
+      data
+    end
+
+    # Use existing contract with charge
+    # Use existing contract with charge
+    # @param body [AddChargeRequest]
+    # @param [Hash] opts the optional parameters
+    # @return [Array<(AddChargeResponse, Integer, Hash)>] AddChargeResponse data, response status code and response headers
+    def add_charge_with_http_info(body, opts = {})
+      @api_client.config.logger.debug 'Calling API: PaymentApi.add_charge ...' if @api_client.config.debugging
+      # verify the required parameter 'body' is set
+      raise ArgumentError, "Missing the required parameter 'body' when calling PaymentApi.add_charge" if @api_client.config.client_side_validation && body.nil?
+
+      # resource path
+      local_var_path = '/v1/add-charge'
+
+      # query parameters
+      query_params = opts[:query_params] || {}
+
+      # header parameters
+      header_params = opts[:header_params] || {}
+      # HTTP header 'Accept' (if needed)
+      header_params['Accept'] = @api_client.select_header_accept(['application/json']) unless header_params['Accept']
+      # HTTP header 'Content-Type'
+      content_type = @api_client.select_header_content_type(['application/json'])
+      header_params['Content-Type'] = content_type unless content_type.nil?
+
+      # form parameters
+      form_params = opts[:form_params] || {}
+
+      # http body (model)
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(body)
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'AddChargeResponse'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || []
+
+      new_options = opts.merge(
+        :operation => :"PaymentApi.add_charge",
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
+      @api_client.config.logger.debug "API called: PaymentApi#add_charge\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}" if @api_client.config.debugging
+      [data, status_code, headers]
+    end
+
     # Create a contract with initial charge
     # Create a contract with initial charge
     # @param body [CreateContractWithChargeRequest]

data/lib/jamm/api/models/v1_add_charge_request.rb

@@ -0,0 +1,217 @@
+# frozen_string_literal: true
+
+# #api/v1/common.proto
+#
+# No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+#
+# The version of the OpenAPI document: version not set
+#
+# Generated by: https://openapi-generator.tech
+# Generator version: 7.9.0
+#
+
+require 'date'
+require 'time'
+
+module Api
+  class AddChargeRequest
+    attr_accessor :customer, :charge, :redirect
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        :customer => :customer,
+        :charge => :charge,
+        :redirect => :redirect
+      }
+    end
+
+    # Returns all the JSON keys this model knows about
+    def self.acceptable_attributes
+      attribute_map.values
+    end
+
+    # Attribute type mapping.
+    def self.openapi_types
+      {
+        :customer => :String,
+        :charge => :InitialCharge,
+        :redirect => :URL
+      }
+    end
+
+    # List of attributes with nullable: true
+    def self.openapi_nullable
+      Set.new([])
+    end
+
+    # Initializes the object
+    # @param [Hash] attributes Model attributes in the form of hash
+    def initialize(attributes = {})
+      raise ArgumentError, 'The input argument (attributes) must be a hash in `Api::AddChargeRequest` initialize method' unless attributes.is_a?(Hash)
+
+      # check to see if the attribute exists and convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) do |(k, v), h|
+        raise ArgumentError, "`#{k}` is not a valid attribute in `Api::AddChargeRequest`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect unless self.class.attribute_map.key?(k.to_sym)
+
+        h[k.to_sym] = v
+      end
+
+      self.customer = attributes[:customer] if attributes.key?(:customer)
+
+      self.charge = attributes[:charge] if attributes.key?(:charge)
+
+      return unless attributes.key?(:redirect)
+
+      self.redirect = attributes[:redirect]
+    end
+
+    # Show invalid properties with the reasons. Usually used together with valid?
+    # @return Array for valid properties with the reasons
+    def list_invalid_properties
+      warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
+      []
+    end
+
+    # Check to see if the all the properties in the model are valid
+    # @return true if the model is valid
+    def valid?
+      warn '[DEPRECATED] the `valid?` method is obsolete'
+      true
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param [Object] Object to be compared
+    def ==(other)
+      return true if equal?(other)
+
+      self.class == other.class &&
+        customer == other.customer &&
+        charge == other.charge &&
+        redirect == other.redirect
+    end
+
+    # @see the `==` method
+    # @param [Object] Object to be compared
+    def eql?(other)
+      self == other
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Integer] Hash code
+    def hash
+      [customer, charge, redirect].hash
+    end
+
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    def self.build_from_hash(attributes)
+      return nil unless attributes.is_a?(Hash)
+
+      attributes = attributes.transform_keys(&:to_sym)
+      transformed_hash = {}
+      openapi_types.each_pair do |key, type|
+        if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
+          transformed_hash[key.to_s] = nil
+        elsif type =~ /\AArray<(.*)>/i
+          # check to ensure the input is an array given that the attribute
+          # is documented as an array but the input is not
+          transformed_hash[key.to_s] = attributes[attribute_map[key]].map { |v| _deserialize(::Regexp.last_match(1), v) } if attributes[attribute_map[key]].is_a?(Array)
+        elsif !attributes[attribute_map[key]].nil?
+          transformed_hash[key.to_s] = _deserialize(type, attributes[attribute_map[key]])
+        end
+      end
+      new(transformed_hash)
+    end
+
+    # Deserializes the data based on type
+    # @param string type Data type
+    # @param string value Value to be deserialized
+    # @return [Object] Deserialized data
+    def self._deserialize(type, value)
+      case type.to_sym
+      when :Time
+        Time.parse(value)
+      when :Date
+        Date.parse(value)
+      when :String
+        value.to_s
+      when :Integer
+        value.to_i
+      when :Float
+        value.to_f
+      when :Boolean
+        if value.to_s =~ /\A(true|t|yes|y|1)\z/i
+          true
+        else
+          false
+        end
+      when :Object
+        # generic object (usually a Hash), return directly
+        value
+      when /\AArray<(?<inner_type>.+)>\z/
+        inner_type = Regexp.last_match[:inner_type]
+        value.map { |v| _deserialize(inner_type, v) }
+      when /\AHash<(?<k_type>.+?), (?<v_type>.+)>\z/
+        k_type = Regexp.last_match[:k_type]
+        v_type = Regexp.last_match[:v_type]
+        {}.tap do |hash|
+          value.each do |k, v|
+            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
+          end
+        end
+      else # model
+        # models (e.g. Pet) or oneOf
+        klass = Api.const_get(type)
+        klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
+      end
+    end
+
+    # Returns the string representation of the object
+    # @return [String] String presentation of the object
+    def to_s
+      to_hash.to_s
+    end
+
+    # to_body is an alias to to_hash (backward compatibility)
+    # @return [Hash] Returns the object in the form of hash
+    def to_body
+      to_hash
+    end
+
+    # Returns the object in the form of hash
+    # @return [Hash] Returns the object in the form of hash
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = send(attr)
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+    # Outputs non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    # @param [Object] value Any valid value
+    # @return [Hash] Returns the value in the form of hash
+    def _to_hash(value)
+      if value.is_a?(Array)
+        value.compact.map { |v| _to_hash(v) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+  end
+end

data/lib/jamm/api/models/v1_add_charge_response.rb

@@ -0,0 +1,217 @@
+# frozen_string_literal: true
+
+# #api/v1/common.proto
+#
+# No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+#
+# The version of the OpenAPI document: version not set
+#
+# Generated by: https://openapi-generator.tech
+# Generator version: 7.9.0
+#
+
+require 'date'
+require 'time'
+
+module Api
+  class AddChargeResponse
+    attr_accessor :charge, :customer, :payment_link
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        :charge => :charge,
+        :customer => :customer,
+        :payment_link => :paymentLink
+      }
+    end
+
+    # Returns all the JSON keys this model knows about
+    def self.acceptable_attributes
+      attribute_map.values
+    end
+
+    # Attribute type mapping.
+    def self.openapi_types
+      {
+        :charge => :Charge,
+        :customer => :Customer,
+        :payment_link => :PaymentLink
+      }
+    end
+
+    # List of attributes with nullable: true
+    def self.openapi_nullable
+      Set.new([])
+    end
+
+    # Initializes the object
+    # @param [Hash] attributes Model attributes in the form of hash
+    def initialize(attributes = {})
+      raise ArgumentError, 'The input argument (attributes) must be a hash in `Api::AddChargeResponse` initialize method' unless attributes.is_a?(Hash)
+
+      # check to see if the attribute exists and convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) do |(k, v), h|
+        raise ArgumentError, "`#{k}` is not a valid attribute in `Api::AddChargeResponse`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect unless self.class.attribute_map.key?(k.to_sym)
+
+        h[k.to_sym] = v
+      end
+
+      self.charge = attributes[:charge] if attributes.key?(:charge)
+
+      self.customer = attributes[:customer] if attributes.key?(:customer)
+
+      return unless attributes.key?(:payment_link)
+
+      self.payment_link = attributes[:payment_link]
+    end
+
+    # Show invalid properties with the reasons. Usually used together with valid?
+    # @return Array for valid properties with the reasons
+    def list_invalid_properties
+      warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
+      []
+    end
+
+    # Check to see if the all the properties in the model are valid
+    # @return true if the model is valid
+    def valid?
+      warn '[DEPRECATED] the `valid?` method is obsolete'
+      true
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param [Object] Object to be compared
+    def ==(other)
+      return true if equal?(other)
+
+      self.class == other.class &&
+        charge == other.charge &&
+        customer == other.customer &&
+        payment_link == other.payment_link
+    end
+
+    # @see the `==` method
+    # @param [Object] Object to be compared
+    def eql?(other)
+      self == other
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Integer] Hash code
+    def hash
+      [charge, customer, payment_link].hash
+    end
+
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    def self.build_from_hash(attributes)
+      return nil unless attributes.is_a?(Hash)
+
+      attributes = attributes.transform_keys(&:to_sym)
+      transformed_hash = {}
+      openapi_types.each_pair do |key, type|
+        if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
+          transformed_hash[key.to_s] = nil
+        elsif type =~ /\AArray<(.*)>/i
+          # check to ensure the input is an array given that the attribute
+          # is documented as an array but the input is not
+          transformed_hash[key.to_s] = attributes[attribute_map[key]].map { |v| _deserialize(::Regexp.last_match(1), v) } if attributes[attribute_map[key]].is_a?(Array)
+        elsif !attributes[attribute_map[key]].nil?
+          transformed_hash[key.to_s] = _deserialize(type, attributes[attribute_map[key]])
+        end
+      end
+      new(transformed_hash)
+    end
+
+    # Deserializes the data based on type
+    # @param string type Data type
+    # @param string value Value to be deserialized
+    # @return [Object] Deserialized data
+    def self._deserialize(type, value)
+      case type.to_sym
+      when :Time
+        Time.parse(value)
+      when :Date
+        Date.parse(value)
+      when :String
+        value.to_s
+      when :Integer
+        value.to_i
+      when :Float
+        value.to_f
+      when :Boolean
+        if value.to_s =~ /\A(true|t|yes|y|1)\z/i
+          true
+        else
+          false
+        end
+      when :Object
+        # generic object (usually a Hash), return directly
+        value
+      when /\AArray<(?<inner_type>.+)>\z/
+        inner_type = Regexp.last_match[:inner_type]
+        value.map { |v| _deserialize(inner_type, v) }
+      when /\AHash<(?<k_type>.+?), (?<v_type>.+)>\z/
+        k_type = Regexp.last_match[:k_type]
+        v_type = Regexp.last_match[:v_type]
+        {}.tap do |hash|
+          value.each do |k, v|
+            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
+          end
+        end
+      else # model
+        # models (e.g. Pet) or oneOf
+        klass = Api.const_get(type)
+        klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
+      end
+    end
+
+    # Returns the string representation of the object
+    # @return [String] String presentation of the object
+    def to_s
+      to_hash.to_s
+    end
+
+    # to_body is an alias to to_hash (backward compatibility)
+    # @return [Hash] Returns the object in the form of hash
+    def to_body
+      to_hash
+    end
+
+    # Returns the object in the form of hash
+    # @return [Hash] Returns the object in the form of hash
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = send(attr)
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+    # Outputs non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    # @param [Object] value Any valid value
+    # @return [Hash] Returns the value in the form of hash
+    def _to_hash(value)
+      if value.is_a?(Array)
+        value.compact.map { |v| _to_hash(v) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+  end
+end

data/lib/jamm/api.rb

@@ -20,6 +20,8 @@ require 'jamm/api/configuration'
 require 'jamm/api/models/customer_service_update_customer_body'
 require 'jamm/api/models/protobuf_any'
 require 'jamm/api/models/rpc_status'
+require 'jamm/api/models/v1_add_charge_request'
+require 'jamm/api/models/v1_add_charge_response'
 require 'jamm/api/models/v1_buyer'
 require 'jamm/api/models/v1_charge'
 require 'jamm/api/models/v1_contract'

data/lib/jamm/payment.rb

@@ -18,9 +18,22 @@ module Jamm
     end
 
     def self.get_contract(contract:)
-      Jamm::PaymentApi.new(Jamm::Client.handler).get_contract(contract)
-    rescue Jamm::ApiError => e
-      puts e
+      begin
+        Jamm::PaymentApi.new(Jamm::Client.handler).get_contract(contract)
+      rescue Jamm::ApiError => e
+        puts e
+      end
+    end
+
+    def self.add_charge(**params)
+      request = Jamm::AddChargeRequest.new(params)
+
+      begin
+        p = Jamm::PaymentApi.new(Jamm::Client.handler)
+        p.add_charge(request)
+      rescue Jamm::ApiError => e
+        puts e
+      end
     end
   end
 end

data/lib/jamm/version.rb

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

data/lib/jamm.rb

@@ -46,7 +46,7 @@ module Jamm
     # Debugger mode, uncomment when needed
     # when 'develop'
     #   self.oauth_base = "https://merchant-identity.#{env}.jamm-pay.jp"
-    #
+
     #   self.openapi = Jamm::ApiClient.new
     #   openapi.config.host = 'api.jamm.test'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jamm
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Jamm
@@ -69,6 +69,8 @@ files:
 - lib/jamm/api/models/customer_service_update_customer_body.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_contract.rb