payjpv2 1.0.10 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 763b163bb9ca0ca64ab5680c2ce6a4692b23ba7adfe6565bfa9c7af5d69503c3
-  data.tar.gz: 6ea914a0427bcf2fbafd02f1605545229c3320169d5324f1a590999ea4c583b0
+  metadata.gz: 56b88fd18889958097f5e7e121adfb3525c0df32c2c248653b686753b6ec90d2
+  data.tar.gz: 7d022140ae970e85dffb8a88f91abdb0633d9c07909e5b83deaf06e1ff290332
 SHA512:
-  metadata.gz: 1b8a6fa2ca6a2736cb7490326aa9592276c9163d7a068de1c451d02dea05271d012336a0625650fe281c84d77cb30092d7047dbb0e85a89ef3ac82b79812b24b
-  data.tar.gz: 14ecb925bd10aa5494c46d1035ab7233f4ecc2246f8ac13a65f229b1dadd604a0161837c0ba700fbe43e74d041258bbf9453aa903151622497069081750d7b46
+  metadata.gz: cf3ba18464531a698a3e0f8353d3f3a85a958f743c3aca94ce96b1b86cbf73065324893521ef39b7d05076c259501336882cb841fb832829ce7b12bd4e735d23
+  data.tar.gz: a56d69719517c149a0918f879f52170c51a5d645eebfa24530426045aabeb61c4612c6d1a2431cda384cded5ba129d1cbae52b8c4b2eecccb101a0acece00fae

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    payjpv2 (1.0.10)
+    payjpv2 (1.1.0)
       typhoeus (~> 1.0, >= 1.0.1)
 
 GEM

data/README.md

@@ -5,7 +5,7 @@ A Ruby client library for the PAY.JP v2 API. This SDK provides a convenient way
 This Ruby gem is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
 - API version: 2.0.0
-- Package version: 1.0.10
+- Package version: 1.1.0
 - Generator version: 7.14.0
 - Build package: org.openapitools.codegen.languages.RubyClientCodegen
 
@@ -26,7 +26,7 @@ gem install payjpv2
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'payjpv2', '~> 1.0.10'
+gem 'payjpv2', '~> 1.1.0'
 ```
 
 Then execute:
@@ -350,11 +350,13 @@ Class | Method | HTTP request | Description
  - [PAYJPv2::PaymentTransactionResponse](docs/PaymentTransactionResponse.md)
  - [PAYJPv2::PaymentTransactionType](docs/PaymentTransactionType.md)
  - [PAYJPv2::PriceCreateRequest](docs/PriceCreateRequest.md)
+ - [PAYJPv2::PriceDataRequest](docs/PriceDataRequest.md)
  - [PAYJPv2::PriceDetailsResponse](docs/PriceDetailsResponse.md)
  - [PAYJPv2::PriceListResponse](docs/PriceListResponse.md)
  - [PAYJPv2::PriceType](docs/PriceType.md)
  - [PAYJPv2::PriceUpdateRequest](docs/PriceUpdateRequest.md)
  - [PAYJPv2::ProductCreateRequest](docs/ProductCreateRequest.md)
+ - [PAYJPv2::ProductDataRequest](docs/ProductDataRequest.md)
  - [PAYJPv2::ProductDeletedResponse](docs/ProductDeletedResponse.md)
  - [PAYJPv2::ProductDetailsResponse](docs/ProductDetailsResponse.md)
  - [PAYJPv2::ProductListResponse](docs/ProductListResponse.md)

data/docs/CustomerUpdateRequest.md

@@ -4,7 +4,7 @@
 
 | Name | Type | Description | Notes |
 | ---- | ---- | ----------- | ----- |
-| **default_payment_method_id** | **String** |  | [optional] |
+| **default_payment_method_id** | **String** | 支払いにデフォルトで使用される支払い方法 ID | [optional] |
 | **email** | **String** | 顧客のメールアドレス。メールアドレスの形式が正しいかどうかは検証されます。 | [optional] |
 | **description** | **String** | 顧客オブジェクトに付加できる任意の文字列です。管理画面で顧客と一緒に表示されます。 | [optional] |
 | **metadata** | [**Hash<String, MetadataValue>**](MetadataValue.md) | キーバリューの任意のデータを格納できます。20件まで登録可能で、空文字列を指定するとそのキーを削除できます。<a href=\"https://docs.pay.jp/v2/guide/developers/metadata\">詳細はメタデータのドキュメントを参照してください。</a> | [optional] |

data/docs/LineItemRequest.md

@@ -4,7 +4,8 @@
 
 | Name | Type | Description | Notes |
 | ---- | ---- | ----------- | ----- |
-| **price_id** | **String** | 料金 ID |  |
+| **price_id** | **String** |  | [optional] |
+| **price_data** | [**PriceDataRequest**](PriceDataRequest.md) |  | [optional] |
 | **quantity** | **Integer** | 購入する商品の数量 |  |
 | **tax_rates** | **Array<String>** | 税率 ID | [optional] |
 
@@ -15,6 +16,7 @@ require 'payjpv2'
 
 instance = PAYJPv2::LineItemRequest.new(
   price_id: null,
+  price_data: null,
   quantity: null,
   tax_rates: null
 )

data/docs/PriceDataRequest.md

@@ -0,0 +1,24 @@
+# PAYJPv2::PriceDataRequest
+
+## Properties
+
+| Name | Type | Description | Notes |
+| ---- | ---- | ----------- | ----- |
+| **currency** | [**Currency**](Currency.md) | 通貨。現在は `jpy` のみサポートしています。 |  |
+| **unit_amount** | **Integer** | 単価（0以上の整数） |  |
+| **product_id** | **String** |  | [optional] |
+| **product_data** | [**ProductDataRequest**](ProductDataRequest.md) |  | [optional] |
+
+## Example
+
+```ruby
+require 'payjpv2'
+
+instance = PAYJPv2::PriceDataRequest.new(
+  currency: null,
+  unit_amount: null,
+  product_id: null,
+  product_data: null
+)
+```
+

data/docs/ProductDataRequest.md

@@ -0,0 +1,20 @@
+# PAYJPv2::ProductDataRequest
+
+## Properties
+
+| Name | Type | Description | Notes |
+| ---- | ---- | ----------- | ----- |
+| **name** | **String** | Checkout などで顧客に表示される商品名 |  |
+| **description** | **String** |  | [optional] |
+
+## Example
+
+```ruby
+require 'payjpv2'
+
+instance = PAYJPv2::ProductDataRequest.new(
+  name: null,
+  description: null
+)
+```
+

data/example.rb

@@ -21,6 +21,7 @@ api_instance = PAYJPv2::CustomersApi.new
 checkout_sessions_api = PAYJPv2::CheckoutSessionsApi.new
 products_api = PAYJPv2::ProductsApi.new
 prices_api = PAYJPv2::PricesApi.new
+payment_methods_api = PAYJPv2::PaymentMethodsApi.new
 
 customer_create_request = PAYJPv2::CustomerCreateRequest.new(
   email: 'jennyrosen@example.com',
@@ -73,16 +74,65 @@ begin
   end
   puts "\n"
 
-  # 5. Delete Customer
-  puts "=== 5. Delete Customer ==="
+  # 5. PaymentMethod operations
+  #    Note: create_payment_method is available only in test mode. In production,
+  #    a PaymentMethod is created by tokenizing card details on the client side
+  #    (e.g. payment.js) and then attaching the resulting token to a Customer.
+  puts "=== 5. PaymentMethod operations ==="
+
+  # 5a. Create PaymentMethod (test mode)
+  puts "\n--- 5a. Create PaymentMethod (test mode) ---"
+  payment_method_request = PAYJPv2::PaymentMethodCardCreateRequest.new(
+    type: 'card',
+    card: PAYJPv2::PaymentMethodCreateCardDetailsRequest.new(
+      number: '4242424242424242',
+      exp_month: 12,
+      exp_year: 2030,
+      cvc: '123'
+    ),
+    billing_details: PAYJPv2::PaymentMethodCardBillingDetailsRequest.new(
+      email: 'billing@example.com'
+    )
+  )
+  payment_method = payment_methods_api.create_payment_method(payment_method_request)
+  payment_method_id = payment_method.id
+  puts "Created PaymentMethod: #{payment_method_id}"
+  puts "Type: #{payment_method.type}"
+
+  # 5b. Attach PaymentMethod to Customer
+  puts "\n--- 5b. Attach PaymentMethod ---"
+  attached = payment_methods_api.attach_payment_method(
+    payment_method_id,
+    PAYJPv2::PaymentMethodAttachRequest.new(customer_id: customer_id)
+  )
+  puts "Attached PaymentMethod: #{attached.id}"
+  puts "Customer: #{attached.customer_id}"
+
+  # 5c. Retrieve PaymentMethod (active)
+  puts "\n--- 5c. Retrieve PaymentMethod ---"
+  retrieved_pm = payment_methods_api.get_payment_method(payment_method_id)
+  puts "PaymentMethod ID: #{retrieved_pm.id}"
+  puts "Customer: #{retrieved_pm.customer_id}"
+  puts "Detached at: #{retrieved_pm.detached_at || '(active)'}"
+
+  # 5d. Detach PaymentMethod
+  #     The API marks the PaymentMethod with `detached_at` while keeping
+  #     `customer_id` for historical reference.
+  puts "\n--- 5d. Detach PaymentMethod ---"
+  detached = payment_methods_api.detach_payment_method(payment_method_id)
+  puts "Detached PaymentMethod: #{detached.id}"
+  puts "Detached at: #{detached.detached_at}\n\n"
+
+  # 6. Delete Customer
+  puts "=== 6. Delete Customer ==="
   api_instance.delete_customer(customer_id)
   puts "Deleted customer: #{customer_id}\n\n"
 
-  # 6. Create Product, Price, and Checkout Session
-  puts "=== 6. Create Product, Price, and Checkout Session ==="
+  # 7. Create Product, Price, and Checkout Session
+  puts "=== 7. Create Product, Price, and Checkout Session ==="
 
-  # 6a. Create Product
-  puts "\n--- 6a. Create Product ---"
+  # 7a. Create Product
+  puts "\n--- 7a. Create Product ---"
   product_request = PAYJPv2::ProductCreateRequest.new(
     name: 'Sample Product',
     description: 'A sample product for checkout session demo',
@@ -100,8 +150,8 @@ begin
   puts "Created product: #{product_id}"
   puts "Product name: #{product.name}"
 
-  # 6b. Create Price
-  puts "\n--- 6b. Create Price ---"
+  # 7b. Create Price
+  puts "\n--- 7b. Create Price ---"
   price_request = PAYJPv2::PriceCreateRequest.new(
     currency: 'jpy',
     product_id: product_id,
@@ -121,8 +171,8 @@ begin
   puts "Created price: #{price_id}"
   puts "Unit amount: #{price.unit_amount} JPY"
 
-  # 6c. Create Checkout Session
-  puts "\n--- 6c. Create Checkout Session ---"
+  # 7c. Create Checkout Session
+  puts "\n--- 7c. Create Checkout Session ---"
   line_items = [
     PAYJPv2::LineItemRequest.new(
       price_id: price_id,  # Use the actual price ID we just created
@@ -158,5 +208,5 @@ begin
   puts "=== All tests passed! ==="
 
 rescue PAYJPv2::ApiError => e
-  puts "Exception when calling CustomersApi->create_customer: #{e}"
+  puts "Exception when calling PAYJPv2 API: #{e}"
 end

data/lib/payjpv2/api_client.rb

@@ -280,9 +280,9 @@ module PAYJPv2
           data.each { |k, v| hash[k] = convert_to_type(v, sub_type) }
         end
       else
-        # models (e.g. Pet) or oneOf
+        # models (e.g. Pet) or oneOf / anyOf
         klass = PAYJPv2.const_get(return_type)
-        klass.respond_to?(:openapi_one_of) ? klass.build(data) : klass.build_from_hash(data)
+        klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(data) : klass.build_from_hash(data)
       end
     end
 

data/lib/payjpv2/models/customer_update_request.rb

@@ -15,6 +15,7 @@ require 'time'
 
 module PAYJPv2
   class CustomerUpdateRequest
+    # 支払いにデフォルトで使用される支払い方法 ID
     attr_accessor :default_payment_method_id
 
     # 顧客のメールアドレス。メールアドレスの形式が正しいかどうかは検証されます。
@@ -59,7 +60,6 @@ module PAYJPv2
     # List of attributes with nullable: true
     def self.openapi_nullable
       Set.new([
-        :default_payment_method_id,
       ])
     end
 

data/lib/payjpv2/models/line_item_request.rb

@@ -15,9 +15,10 @@ require 'time'
 
 module PAYJPv2
   class LineItemRequest
-    # 料金 ID
     attr_accessor :price_id
 
+    attr_accessor :price_data
+
     # 購入する商品の数量
     attr_accessor :quantity
 
@@ -28,6 +29,7 @@ module PAYJPv2
     def self.attribute_map
       {
         :price_id => :price_id,
+        :price_data => :price_data,
         :quantity => :quantity,
         :tax_rates => :tax_rates
       }
@@ -47,6 +49,7 @@ module PAYJPv2
     def self.openapi_types
       {
         :price_id => :'String',
+        :price_data => :'PriceDataRequest',
         :quantity => :'Integer',
         :tax_rates => :'Array<String>'
       }
@@ -55,6 +58,8 @@ module PAYJPv2
     # List of attributes with nullable: true
     def self.openapi_nullable
       Set.new([
+        :price_id,
+        :price_data,
       ])
     end
 
@@ -76,8 +81,10 @@ module PAYJPv2
 
       if attributes.key?(:price_id)
         self.price_id = attributes[:price_id]
-      else
-        self.price_id = nil
+      end
+
+      if attributes.key?(:price_data)
+        self.price_data = attributes[:price_data]
       end
 
       if attributes.key?(:quantity)
@@ -93,16 +100,6 @@ module PAYJPv2
       end
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] price_id Value to be assigned
-    def price_id=(price_id)
-      if price_id.nil?
-        raise ArgumentError, 'price_id cannot be nil'
-      end
-
-      @price_id = price_id
-    end
-
     # Custom attribute writer method with validation
     # @param [Object] quantity Value to be assigned
     def quantity=(quantity)
@@ -119,6 +116,7 @@ module PAYJPv2
       return true if self.equal?(o)
       self.class == o.class &&
           price_id == o.price_id &&
+          price_data == o.price_data &&
           quantity == o.quantity &&
           tax_rates == o.tax_rates
     end
@@ -132,7 +130,7 @@ module PAYJPv2
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [price_id, quantity, tax_rates].hash
+      [price_id, price_data, quantity, tax_rates].hash
     end
 
     # Builds the object from hash

data/lib/payjpv2/models/metadata_value.rb

@@ -88,7 +88,8 @@ module PAYJPv2
               return model if model
             else
               # raise if data contains keys that are not known to the model
-              raise if const.respond_to?(:acceptable_attributes) && !(data.keys - const.acceptable_attributes).empty?
+              # NOTE: acceptable_attributes returns symbols while data keys are strings (from JSON.parse), so symbolize before diff
+              raise if const.respond_to?(:acceptable_attributes) && !(data.keys.map(&:to_sym) - const.acceptable_attributes).empty?
               model = const.build_from_hash(data)
               return model if model
             end

data/lib/payjpv2/models/payment_method_response.rb

@@ -87,7 +87,8 @@ module PAYJPv2
               return model if model
             else
               # raise if data contains keys that are not known to the model
-              raise if const.respond_to?(:acceptable_attributes) && !(data.keys - const.acceptable_attributes).empty?
+              # NOTE: acceptable_attributes returns symbols while data keys are strings (from JSON.parse), so symbolize before diff
+              raise if const.respond_to?(:acceptable_attributes) && !(data.keys.map(&:to_sym) - const.acceptable_attributes).empty?
               model = const.build_from_hash(data)
               return model if model
             end

data/lib/payjpv2/models/price_data_request.rb

@@ -0,0 +1,286 @@
+=begin
+#PAY.JP API v2
+
+#No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+
+The version of the OpenAPI document: 2.0.0
+
+Generated by: https://openapi-generator.tech
+Generator version: 7.14.0
+
+=end
+
+require 'date'
+require 'time'
+
+module PAYJPv2
+  class PriceDataRequest
+    # 通貨。現在は `jpy` のみサポートしています。
+    attr_accessor :currency
+
+    # 単価（0以上の整数）
+    attr_accessor :unit_amount
+
+    attr_accessor :product_id
+
+    attr_accessor :product_data
+
+    class EnumAttributeValidator
+      attr_reader :datatype
+      attr_reader :allowable_values
+
+      def initialize(datatype, allowable_values)
+        @allowable_values = allowable_values.map do |value|
+          case datatype.to_s
+          when /Integer/i
+            value.to_i
+          when /Float/i
+            value.to_f
+          else
+            value
+          end
+        end
+      end
+
+      def valid?(value)
+        !value || allowable_values.include?(value)
+      end
+    end
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        :currency => :currency,
+        :unit_amount => :unit_amount,
+        :product_id => :product_id,
+        :product_data => :product_data
+      }
+    end
+
+    # Returns attribute mapping this model knows about
+    def self.acceptable_attribute_map
+      attribute_map
+    end
+
+    # Returns all the JSON keys this model knows about
+    def self.acceptable_attributes
+      acceptable_attribute_map.values
+    end
+
+    # Attribute type mapping.
+    def self.openapi_types
+      {
+        :currency => :'Currency',
+        :unit_amount => :'Integer',
+        :product_id => :'String',
+        :product_data => :'ProductDataRequest'
+      }
+    end
+
+    # List of attributes with nullable: true
+    def self.openapi_nullable
+      Set.new([
+        :product_id,
+        :product_data
+      ])
+    end
+
+    # Initializes the object
+    # @param [Hash] attributes Model attributes in the form of hash
+    def initialize(attributes = {})
+      if (!attributes.is_a?(Hash))
+        raise ArgumentError, "The input argument (attributes) must be a hash in `PAYJPv2::PriceDataRequest` initialize method"
+      end
+
+      # check to see if the attribute exists and convert string to symbol for hash key
+      acceptable_attribute_map = self.class.acceptable_attribute_map
+      attributes = attributes.each_with_object({}) { |(k, v), h|
+        if (!acceptable_attribute_map.key?(k.to_sym))
+          raise ArgumentError, "`#{k}` is not a valid attribute in `PAYJPv2::PriceDataRequest`. Please check the name to make sure it's valid. List of attributes: " + acceptable_attribute_map.keys.inspect
+        end
+        h[k.to_sym] = v
+      }
+
+      if attributes.key?(:currency)
+        self.currency = attributes[:currency]
+      else
+        self.currency = nil
+      end
+
+      if attributes.key?(:unit_amount)
+        self.unit_amount = attributes[:unit_amount]
+      else
+        self.unit_amount = nil
+      end
+
+      if attributes.key?(:product_id)
+        self.product_id = attributes[:product_id]
+      end
+
+      if attributes.key?(:product_data)
+        self.product_data = attributes[:product_data]
+      end
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] currency Value to be assigned
+    def currency=(currency)
+      if currency.nil?
+        raise ArgumentError, 'currency cannot be nil'
+      end
+
+      @currency = currency
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] unit_amount Value to be assigned
+    def unit_amount=(unit_amount)
+      if unit_amount.nil?
+        raise ArgumentError, 'unit_amount cannot be nil'
+      end
+
+      if unit_amount < 0
+        raise ArgumentError, 'invalid value for "unit_amount", must be greater than or equal to 0.'
+      end
+
+      @unit_amount = unit_amount
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param [Object] Object to be compared
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          currency == o.currency &&
+          unit_amount == o.unit_amount &&
+          product_id == o.product_id &&
+          product_data == o.product_data
+    end
+
+    # @see the `==` method
+    # @param [Object] Object to be compared
+    def eql?(o)
+      self == o
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Integer] Hash code
+    def hash
+      [currency, unit_amount, product_id, product_data].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}"] = 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
+          if attributes[attribute_map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
+          end
+        elsif !attributes[attribute_map[key]].nil?
+          transformed_hash["#{key}"] = _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 = PAYJPv2.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 = self.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/payjpv2/models/product_data_request.rb

@@ -0,0 +1,228 @@
+=begin
+#PAY.JP API v2
+
+#No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+
+The version of the OpenAPI document: 2.0.0
+
+Generated by: https://openapi-generator.tech
+Generator version: 7.14.0
+
+=end
+
+require 'date'
+require 'time'
+
+module PAYJPv2
+  class ProductDataRequest
+    # Checkout などで顧客に表示される商品名
+    attr_accessor :name
+
+    attr_accessor :description
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        :name => :name,
+        :description => :description
+      }
+    end
+
+    # Returns attribute mapping this model knows about
+    def self.acceptable_attribute_map
+      attribute_map
+    end
+
+    # Returns all the JSON keys this model knows about
+    def self.acceptable_attributes
+      acceptable_attribute_map.values
+    end
+
+    # Attribute type mapping.
+    def self.openapi_types
+      {
+        :name => :'String',
+        :description => :'String'
+      }
+    end
+
+    # List of attributes with nullable: true
+    def self.openapi_nullable
+      Set.new([
+        :description
+      ])
+    end
+
+    # Initializes the object
+    # @param [Hash] attributes Model attributes in the form of hash
+    def initialize(attributes = {})
+      if (!attributes.is_a?(Hash))
+        raise ArgumentError, "The input argument (attributes) must be a hash in `PAYJPv2::ProductDataRequest` initialize method"
+      end
+
+      # check to see if the attribute exists and convert string to symbol for hash key
+      acceptable_attribute_map = self.class.acceptable_attribute_map
+      attributes = attributes.each_with_object({}) { |(k, v), h|
+        if (!acceptable_attribute_map.key?(k.to_sym))
+          raise ArgumentError, "`#{k}` is not a valid attribute in `PAYJPv2::ProductDataRequest`. Please check the name to make sure it's valid. List of attributes: " + acceptable_attribute_map.keys.inspect
+        end
+        h[k.to_sym] = v
+      }
+
+      if attributes.key?(:name)
+        self.name = attributes[:name]
+      else
+        self.name = nil
+      end
+
+      if attributes.key?(:description)
+        self.description = attributes[:description]
+      end
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] name Value to be assigned
+    def name=(name)
+      if name.nil?
+        raise ArgumentError, 'name cannot be nil'
+      end
+
+      @name = name
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param [Object] Object to be compared
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          name == o.name &&
+          description == o.description
+    end
+
+    # @see the `==` method
+    # @param [Object] Object to be compared
+    def eql?(o)
+      self == o
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Integer] Hash code
+    def hash
+      [name, description].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}"] = 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
+          if attributes[attribute_map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
+          end
+        elsif !attributes[attribute_map[key]].nil?
+          transformed_hash["#{key}"] = _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 = PAYJPv2.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 = self.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/payjpv2/version.rb

@@ -11,5 +11,5 @@ Generator version: 7.14.0
 =end
 
 module PAYJPv2
-  VERSION = '1.0.10'
+  VERSION = '1.1.0'
 end

data/lib/payjpv2.rb

@@ -106,11 +106,13 @@ require 'payjpv2/models/payment_transaction_list_response'
 require 'payjpv2/models/payment_transaction_response'
 require 'payjpv2/models/payment_transaction_type'
 require 'payjpv2/models/price_create_request'
+require 'payjpv2/models/price_data_request'
 require 'payjpv2/models/price_details_response'
 require 'payjpv2/models/price_list_response'
 require 'payjpv2/models/price_type'
 require 'payjpv2/models/price_update_request'
 require 'payjpv2/models/product_create_request'
+require 'payjpv2/models/product_data_request'
 require 'payjpv2/models/product_deleted_response'
 require 'payjpv2/models/product_details_response'
 require 'payjpv2/models/product_list_response'

data/spec/integration/anyof_deserialization_spec.rb

@@ -0,0 +1,107 @@
+=begin
+PaymentMethodResponse のような anyOf module が API client の convert_to_type 経由で
+正しくデシリアライズされることを確認するスペック。
+
+過去、 templates/ruby/api_client.mustache の convert_to_type は openapi_one_of だけを
+チェックして openapi_any_of を見ていなかったため、 Pydantic の RootModel + Union から
+生成された anyOf module に対して build_from_hash を呼んでしまい
+``NoMethodError: undefined method 'build_from_hash' for module PAYJPv2::PaymentMethodResponse``
+が発生していた。
+
+加えて partial_anyof_module.mustache (および partial_oneof_module.mustache) の
+find_and_cast_into_type は data.keys (string, from JSON.parse) を
+acceptable_attributes (symbol) と直接比較していたため、常に raise → rescue → nil で
+build 自体も機能していなかった。
+
+両者を修正した後の挙動を回帰テストとして固定する。
+=end
+
+require 'spec_helper'
+
+describe 'anyOf module deserialization via ApiClient#convert_to_type' do
+  let(:api_client) { PAYJPv2::ApiClient.new }
+
+  let(:card_payload) do
+    {
+      'object' => 'payment_method',
+      'id' => 'pm_test_card',
+      'livemode' => false,
+      'type' => 'card',
+      'customer_id' => 'cus_test',
+      'detached_at' => nil,
+      'metadata' => {},
+      'created_at' => '2026-01-01T00:00:00Z',
+      'updated_at' => '2026-01-01T00:00:00Z',
+      'billing_details' => {
+        'name' => 'PAY TARO',
+        'phone' => '09012345678',
+        'email' => 'test@example.com',
+        'address' => {
+          'country' => 'JP',
+          'zip' => '1000001',
+          'state' => 'Tokyo',
+          'city' => 'Chiyoda',
+          'line1' => '1-1-1',
+          'line2' => nil
+        }
+      },
+      'card' => {
+        'last4' => '4242',
+        'brand' => 'visa',
+        'exp_month' => 12,
+        'exp_year' => 2030,
+        'fingerprint' => 'fp_test',
+        'country' => 'JP'
+      }
+    }
+  end
+
+  let(:paypay_payload) do
+    {
+      'object' => 'payment_method',
+      'id' => 'pm_test_paypay',
+      'livemode' => false,
+      'type' => 'paypay',
+      'customer_id' => 'cus_test',
+      'detached_at' => nil,
+      'metadata' => {},
+      'created_at' => '2026-01-01T00:00:00Z',
+      'updated_at' => '2026-01-01T00:00:00Z',
+      'billing_details' => {
+        'name' => 'PAY TARO',
+        'phone' => '09012345678',
+        'email' => 'test@example.com',
+        'address' => {
+          'country' => 'JP',
+          'zip' => '1000001',
+          'state' => 'Tokyo',
+          'city' => 'Chiyoda',
+          'line1' => '1-1-1',
+          'line2' => nil
+        }
+      }
+    }
+  end
+
+  it 'PaymentMethodResponse が anyOf module として生成されていること' do
+    expect(PAYJPv2::PaymentMethodResponse).to be_a(Module)
+    expect(PAYJPv2::PaymentMethodResponse).to respond_to(:openapi_any_of)
+    expect(PAYJPv2::PaymentMethodResponse).to respond_to(:build)
+    expect(PAYJPv2::PaymentMethodResponse).not_to respond_to(:build_from_hash)
+  end
+
+  it 'card 型のレスポンスを convert_to_type で PaymentMethodCardResponse に解決できること' do
+    result = api_client.send(:convert_to_type, card_payload, 'PaymentMethodResponse')
+    expect(result).to be_a(PAYJPv2::PaymentMethodCardResponse)
+    expect(result.id).to eq('pm_test_card')
+    expect(result.type).to eq('card')
+    expect(result.card.last4).to eq('4242')
+  end
+
+  it 'paypay 型のレスポンスを convert_to_type で PaymentMethodPayPayResponse に解決できること' do
+    result = api_client.send(:convert_to_type, paypay_payload, 'PaymentMethodResponse')
+    expect(result).to be_a(PAYJPv2::PaymentMethodPayPayResponse)
+    expect(result.id).to eq('pm_test_paypay')
+    expect(result.type).to eq('paypay')
+  end
+end

data/spec/integration/payment_methods_api_detach_spec.rb

@@ -0,0 +1,137 @@
+=begin
+加盟店から報告された事象の回帰テスト。
+
+  pm_api = PAYJPv2::PaymentMethodsApi.new
+  pm_api.detach_payment_method(payment_method_id)
+  # => NoMethodError: undefined method 'build_from_hash' for module PAYJPv2::PaymentMethodResponse
+
+がテンプレート修正後は起きないこと、および返り値が想定どおりの
+具体クラス (PaymentMethodCardResponse / PaymentMethodPayPayResponse) で
+返ってくることを呼び出し経路全体で保証する。
+
+anyof_deserialization_spec.rb は ApiClient#convert_to_type を直接叩いており
+バグの根因の単体検証だが、本 spec は加盟店が書いたコード経路そのものを
+Typhoeus stub 経由で再現する。
+=end
+
+require 'spec_helper'
+
+describe 'PAYJPv2::PaymentMethodsApi#detach_payment_method (regression for anyOf build_from_hash)' do
+  let(:payment_method_id) { 'pm_test_card' }
+
+  let(:detached_card_response_body) do
+    {
+      'object' => 'payment_method',
+      'id' => payment_method_id,
+      'livemode' => false,
+      'type' => 'card',
+      'customer_id' => 'cus_test',
+      'detached_at' => '2026-05-13T15:00:00Z',
+      'metadata' => {},
+      'created_at' => '2026-01-01T00:00:00Z',
+      'updated_at' => '2026-05-13T15:00:00Z',
+      'billing_details' => {
+        'name' => 'PAY TARO',
+        'phone' => '09012345678',
+        'email' => 'test@example.com',
+        'address' => {
+          'country' => 'JP',
+          'zip' => '1000001',
+          'state' => 'Tokyo',
+          'city' => 'Chiyoda',
+          'line1' => '1-1-1',
+          'line2' => nil
+        }
+      },
+      'card' => {
+        'last4' => '4242',
+        'brand' => 'visa',
+        'exp_month' => 12,
+        'exp_year' => 2030,
+        'fingerprint' => 'fp_test',
+        'country' => 'JP'
+      }
+    }
+  end
+
+  let(:detached_paypay_response_body) do
+    {
+      'object' => 'payment_method',
+      'id' => 'pm_test_paypay',
+      'livemode' => false,
+      'type' => 'paypay',
+      'customer_id' => 'cus_test',
+      'detached_at' => '2026-05-13T15:00:00Z',
+      'metadata' => {},
+      'created_at' => '2026-01-01T00:00:00Z',
+      'updated_at' => '2026-05-13T15:00:00Z',
+      'billing_details' => {
+        'name' => 'PAY TARO',
+        'phone' => '09012345678',
+        'email' => 'test@example.com',
+        'address' => {
+          'country' => 'JP',
+          'zip' => '1000001',
+          'state' => 'Tokyo',
+          'city' => 'Chiyoda',
+          'line1' => '1-1-1',
+          'line2' => nil
+        }
+      }
+    }
+  end
+
+  before do
+    PAYJPv2.configure do |c|
+      c.host = 'api.pay.jp'
+      c.access_token = 'sk_test_dummy'
+    end
+    Typhoeus::Expectation.clear
+  end
+
+  after do
+    Typhoeus::Expectation.clear
+  end
+
+  it 'card 型の detach レスポンスを PaymentMethodCardResponse で受け取れる' do
+    Typhoeus.stub(/payment_methods\/#{payment_method_id}\/detach/).and_return(
+      Typhoeus::Response.new(
+        code: 200,
+        headers: { 'Content-Type' => 'application/json' },
+        body: detached_card_response_body.to_json
+      )
+    )
+
+    pm_api = PAYJPv2::PaymentMethodsApi.new
+
+    expect { pm_api.detach_payment_method(payment_method_id) }.not_to raise_error
+
+    result = pm_api.detach_payment_method(payment_method_id)
+    expect(result).to be_a(PAYJPv2::PaymentMethodCardResponse)
+    expect(result.id).to eq(payment_method_id)
+    expect(result.type).to eq('card')
+    expect(result.detached_at).not_to be_nil
+    expect(result.card.last4).to eq('4242')
+  end
+
+  it 'paypay 型の detach レスポンスを PaymentMethodPayPayResponse で受け取れる' do
+    paypay_id = 'pm_test_paypay'
+    Typhoeus.stub(/payment_methods\/#{paypay_id}\/detach/).and_return(
+      Typhoeus::Response.new(
+        code: 200,
+        headers: { 'Content-Type' => 'application/json' },
+        body: detached_paypay_response_body.to_json
+      )
+    )
+
+    pm_api = PAYJPv2::PaymentMethodsApi.new
+
+    expect { pm_api.detach_payment_method(paypay_id) }.not_to raise_error
+
+    result = pm_api.detach_payment_method(paypay_id)
+    expect(result).to be_a(PAYJPv2::PaymentMethodPayPayResponse)
+    expect(result.id).to eq(paypay_id)
+    expect(result.type).to eq('paypay')
+    expect(result.detached_at).not_to be_nil
+  end
+end

data/spec/models/line_item_request_spec.rb

@@ -33,6 +33,12 @@ describe PAYJPv2::LineItemRequest do
     end
   end
 
+  describe 'test attribute "price_data"' do
+    it 'should work' do
+      # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/
+    end
+  end
+
   describe 'test attribute "quantity"' do
     it 'should work' do
       # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/

data/spec/models/price_data_request_spec.rb

@@ -0,0 +1,54 @@
+=begin
+#PAY.JP API v2
+
+#No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+
+The version of the OpenAPI document: 2.0.0
+
+Generated by: https://openapi-generator.tech
+Generator version: 7.14.0
+
+=end
+
+require 'spec_helper'
+require 'json'
+require 'date'
+
+# Unit tests for PAYJPv2::PriceDataRequest
+# Automatically generated by openapi-generator (https://openapi-generator.tech)
+# Please update as you see appropriate
+describe PAYJPv2::PriceDataRequest do
+  let(:instance) { PAYJPv2::PriceDataRequest.new }
+
+  describe 'test an instance of PriceDataRequest' do
+    it 'should create an instance of PriceDataRequest' do
+      # uncomment below to test the instance creation
+      #expect(instance).to be_instance_of(PAYJPv2::PriceDataRequest)
+    end
+  end
+
+  describe 'test attribute "currency"' do
+    it 'should work' do
+      # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/
+    end
+  end
+
+  describe 'test attribute "unit_amount"' do
+    it 'should work' do
+      # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/
+    end
+  end
+
+  describe 'test attribute "product_id"' do
+    it 'should work' do
+      # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/
+    end
+  end
+
+  describe 'test attribute "product_data"' do
+    it 'should work' do
+      # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/
+    end
+  end
+
+end

data/spec/models/product_data_request_spec.rb

@@ -0,0 +1,42 @@
+=begin
+#PAY.JP API v2
+
+#No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+
+The version of the OpenAPI document: 2.0.0
+
+Generated by: https://openapi-generator.tech
+Generator version: 7.14.0
+
+=end
+
+require 'spec_helper'
+require 'json'
+require 'date'
+
+# Unit tests for PAYJPv2::ProductDataRequest
+# Automatically generated by openapi-generator (https://openapi-generator.tech)
+# Please update as you see appropriate
+describe PAYJPv2::ProductDataRequest do
+  let(:instance) { PAYJPv2::ProductDataRequest.new }
+
+  describe 'test an instance of ProductDataRequest' do
+    it 'should create an instance of ProductDataRequest' do
+      # uncomment below to test the instance creation
+      #expect(instance).to be_instance_of(PAYJPv2::ProductDataRequest)
+    end
+  end
+
+  describe 'test attribute "name"' do
+    it 'should work' do
+      # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/
+    end
+  end
+
+  describe 'test attribute "description"' do
+    it 'should work' do
+      # assertion here. ref: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers/
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: payjpv2
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.1.0
 platform: ruby
 authors:
 - PAY.JP
@@ -164,12 +164,14 @@ files:
 - docs/PaymentTransactionType.md
 - docs/PaymentTransactionsApi.md
 - docs/PriceCreateRequest.md
+- docs/PriceDataRequest.md
 - docs/PriceDetailsResponse.md
 - docs/PriceListResponse.md
 - docs/PriceType.md
 - docs/PriceUpdateRequest.md
 - docs/PricesApi.md
 - docs/ProductCreateRequest.md
+- docs/ProductDataRequest.md
 - docs/ProductDeletedResponse.md
 - docs/ProductDetailsResponse.md
 - docs/ProductListResponse.md
@@ -312,11 +314,13 @@ files:
 - lib/payjpv2/models/payment_transaction_response.rb
 - lib/payjpv2/models/payment_transaction_type.rb
 - lib/payjpv2/models/price_create_request.rb
+- lib/payjpv2/models/price_data_request.rb
 - lib/payjpv2/models/price_details_response.rb
 - lib/payjpv2/models/price_list_response.rb
 - lib/payjpv2/models/price_type.rb
 - lib/payjpv2/models/price_update_request.rb
 - lib/payjpv2/models/product_create_request.rb
+- lib/payjpv2/models/product_data_request.rb
 - lib/payjpv2/models/product_deleted_response.rb
 - lib/payjpv2/models/product_details_response.rb
 - lib/payjpv2/models/product_list_response.rb
@@ -362,6 +366,8 @@ files:
 - spec/api/statements_api_spec.rb
 - spec/api/tax_rates_api_spec.rb
 - spec/api/terms_api_spec.rb
+- spec/integration/anyof_deserialization_spec.rb
+- spec/integration/payment_methods_api_detach_spec.rb
 - spec/models/apple_pay_config_request_spec.rb
 - spec/models/balance_list_response_spec.rb
 - spec/models/balance_response_spec.rb
@@ -451,11 +457,13 @@ files:
 - spec/models/payment_transaction_response_spec.rb
 - spec/models/payment_transaction_type_spec.rb
 - spec/models/price_create_request_spec.rb
+- spec/models/price_data_request_spec.rb
 - spec/models/price_details_response_spec.rb
 - spec/models/price_list_response_spec.rb
 - spec/models/price_type_spec.rb
 - spec/models/price_update_request_spec.rb
 - spec/models/product_create_request_spec.rb
+- spec/models/product_data_request_spec.rb
 - spec/models/product_deleted_response_spec.rb
 - spec/models/product_details_response_spec.rb
 - spec/models/product_list_response_spec.rb
@@ -527,6 +535,8 @@ test_files:
 - spec/api/statements_api_spec.rb
 - spec/api/tax_rates_api_spec.rb
 - spec/api/terms_api_spec.rb
+- spec/integration/anyof_deserialization_spec.rb
+- spec/integration/payment_methods_api_detach_spec.rb
 - spec/models/apple_pay_config_request_spec.rb
 - spec/models/balance_list_response_spec.rb
 - spec/models/balance_response_spec.rb
@@ -616,11 +626,13 @@ test_files:
 - spec/models/payment_transaction_response_spec.rb
 - spec/models/payment_transaction_type_spec.rb
 - spec/models/price_create_request_spec.rb
+- spec/models/price_data_request_spec.rb
 - spec/models/price_details_response_spec.rb
 - spec/models/price_list_response_spec.rb
 - spec/models/price_type_spec.rb
 - spec/models/price_update_request_spec.rb
 - spec/models/product_create_request_spec.rb
+- spec/models/product_data_request_spec.rb
 - spec/models/product_deleted_response_spec.rb
 - spec/models/product_details_response_spec.rb
 - spec/models/product_list_response_spec.rb