payjpv2 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 763b163bb9ca0ca64ab5680c2ce6a4692b23ba7adfe6565bfa9c7af5d69503c3
-  data.tar.gz: 6ea914a0427bcf2fbafd02f1605545229c3320169d5324f1a590999ea4c583b0
+  metadata.gz: b5c7c9af553704a217bd596adb3053420567631ce8cc4f70e645359d4d4bd39e
+  data.tar.gz: c6f326ca919ac51333a6088d36dccca76d3a7748006709b52af31b0beaf1a9b1
 SHA512:
-  metadata.gz: 1b8a6fa2ca6a2736cb7490326aa9592276c9163d7a068de1c451d02dea05271d012336a0625650fe281c84d77cb30092d7047dbb0e85a89ef3ac82b79812b24b
-  data.tar.gz: 14ecb925bd10aa5494c46d1035ab7233f4ecc2246f8ac13a65f229b1dadd604a0161837c0ba700fbe43e74d041258bbf9453aa903151622497069081750d7b46
+  metadata.gz: 347a4b4656ec911fc1cdb57edff26d85111fa396c62e7d620d31ff529b4eb28c5f9cf0104131316e95583cab03177d4e6261dc794fe4a438fa22486dbcd665bd
+  data.tar.gz: aa7a00e763734f551ee06ec9eaba83608c798d9979ae473c28cc36edfc7530a67aa3abf44117e949c841dc2c1ba4a502c9372f1ba48feea428ea646cbb6d268d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    payjpv2 (1.0.10)
+    payjpv2 (1.0.11)
       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.0.11
 - 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.0.11'
 ```
 
 Then execute:

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/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/version.rb

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: payjpv2
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - PAY.JP
@@ -362,6 +362,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
@@ -527,6 +529,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