jamm 1.0.10 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7528bae90ca2eabb761344ddcb15ec10239a731ff15d9ca9a84d8ef4499ccfe
-  data.tar.gz: d59fd2991c8f320b63222678c868ce5cb44cb06c87ef7907049dd492cd7c636a
+  metadata.gz: 9c2a575430d09f4af5bb3e2bf4053a8d4da34b3d14a4184ca18c352e17dae8de
+  data.tar.gz: c8288eb2af176ac471c6fbf76703c5defd444884bfe1061b495f2693f755b6cf
 SHA512:
-  metadata.gz: 7c2efb8840f7eb2ee6416675205e504b1358fe8ab74a63e1d03ec29c8c70a294d50669cf754621e493b56da1c55062be058bf6f123d4e4fcbce7d4cf7f60123b
-  data.tar.gz: 78ad01db68cb8f2afe99102a9a58f7107adf811cd8c168996bbcbc68bdfeb10c885af2162e6f98bdc90a82dc7e0c2bc9c6eaea54a8a24d76e67ca7869cb437ff
+  metadata.gz: 33e200888db947536f6c81f0e7797784c6fcc9fd0c18cfb5cbedf22fe6717506aa15179532de2c003eaae24ca14783928523352554039b007092659f8e9923de
+  data.tar.gz: cc2dd1e86449dd40b5e601f7f2035500d1c0ead077024c79bb024d0973d64edc2f966c18af23045e90aec023dfeb411c07adc313f0d03350ca00d47428f7a173

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jamm (1.0.10)
+    jamm (1.0.12)
       rest-client (~> 2.0)
       typhoeus (~> 1.0, >= 1.0.1)
 

data/Rakefile

@@ -6,11 +6,7 @@ require 'bundler/gem_tasks'
 
 RuboCop::RakeTask.new
 
-task default: %i[test rubocop]
-
-Rake::TestTask.new do |t|
-  t.pattern = './test/**/*_test.rb'
-end
+task default: %i[rubocop]
 
 desc 'Run end-to-end tests'
 Rake::TestTask.new(:e2e) do |t|

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

@@ -25,6 +25,9 @@ module Api
     # Description is an arbitrary string for merchant to track the charge. This information is displayed on Merchant Dashboard.  決済の説明。ショップが決済を追跡するための任意の文字列です。  @gotags: validate:\"required\"
     attr_accessor :description
 
+    # Arbitrary key-value additional information about the charge. You can see this information in our merchant dashboard.  Chargeに関する任意のキーと値の追加情報。 加盟店ダッシュボードで確認できます。
+    attr_accessor :metadata
+
     # Merchant can optionally set the expiry date for the payment. Defaults to 90 minutes if not specified.  決済の有効期限。未指定の場合は90分後に自動失効します。
     attr_accessor :expires_at
 
@@ -34,6 +37,7 @@ module Api
         :id => :id,
         :price => :price,
         :description => :description,
+        :metadata => :metadata,
         :expires_at => :expiresAt
       }
     end
@@ -49,6 +53,7 @@ module Api
         :id => :String,
         :price => :Integer,
         :description => :String,
+        :metadata => :'Hash<String, String>',
         :expires_at => :Time
       }
     end
@@ -76,6 +81,10 @@ module Api
 
       self.description = attributes[:description] if attributes.key?(:description)
 
+      if attributes.key?(:metadata) && (value = attributes[:metadata]).is_a?(Hash)
+        self.metadata = value
+      end
+
       return unless attributes.key?(:expires_at)
 
       self.expires_at = attributes[:expires_at]
@@ -104,6 +113,7 @@ module Api
         id == other.id &&
         price == other.price &&
         description == other.description &&
+        metadata == other.metadata &&
         expires_at == other.expires_at
     end
 
@@ -116,7 +126,7 @@ module Api
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, price, description, expires_at].hash
+      [id, price, description, metadata, expires_at].hash
     end
 
     # Builds the object from hash

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

@@ -16,7 +16,7 @@ require 'time'
 module Api
   # Customer object.
   class Customer
-    attr_accessor :id, :email, :ekyc_completed, :created_at, :updated_at
+    attr_accessor :id, :email, :ekyc_completed, :activated, :created_at, :updated_at
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
@@ -24,6 +24,7 @@ module Api
         :id => :id,
         :email => :email,
         :ekyc_completed => :ekycCompleted,
+        :activated => :activated,
         :created_at => :createdAt,
         :updated_at => :updatedAt
       }
@@ -40,6 +41,7 @@ module Api
         :id => :String,
         :email => :String,
         :ekyc_completed => :Boolean,
+        :activated => :Boolean,
         :created_at => :Time,
         :updated_at => :Time
       }
@@ -68,6 +70,8 @@ module Api
 
       self.ekyc_completed = attributes[:ekyc_completed] if attributes.key?(:ekyc_completed)
 
+      self.activated = attributes[:activated] if attributes.key?(:activated)
+
       self.created_at = attributes[:created_at] if attributes.key?(:created_at)
 
       return unless attributes.key?(:updated_at)
@@ -98,6 +102,7 @@ module Api
         id == other.id &&
         email == other.email &&
         ekyc_completed == other.ekyc_completed &&
+        activated == other.activated &&
         created_at == other.created_at &&
         updated_at == other.updated_at
     end
@@ -111,7 +116,7 @@ module Api
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, email, ekyc_completed, created_at, updated_at].hash
+      [id, email, ekyc_completed, activated, created_at, updated_at].hash
     end
 
     # Builds the object from hash

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

@@ -15,13 +15,14 @@ require 'time'
 
 module Api
   class GetChargesResponse
-    attr_accessor :charges, :customer
+    attr_accessor :charges, :customer, :pagination
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         :charges => :charges,
-        :customer => :customer
+        :customer => :customer,
+        :pagination => :pagination
       }
     end
 
@@ -34,7 +35,8 @@ module Api
     def self.openapi_types
       {
         :charges => :'Array<ChargeResult>',
-        :customer => :Customer
+        :customer => :Customer,
+        :pagination => :Pagination
       }
     end
 
@@ -59,9 +61,11 @@ module Api
         self.charges = value
       end
 
-      return unless attributes.key?(:customer)
+      self.customer = attributes[:customer] if attributes.key?(:customer)
 
-      self.customer = attributes[:customer]
+      return unless attributes.key?(:pagination)
+
+      self.pagination = attributes[:pagination]
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -85,7 +89,8 @@ module Api
 
       self.class == other.class &&
         charges == other.charges &&
-        customer == other.customer
+        customer == other.customer &&
+        pagination == other.pagination
     end
 
     # @see the `==` method
@@ -97,7 +102,7 @@ module Api
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [charges, customer].hash
+      [charges, customer, pagination].hash
     end
 
     # Builds the object from hash

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

@@ -22,6 +22,9 @@ module Api
     # Description is an arbitrary string for merchant to track the charge. This information is displayed on Merchant Dashboard.  決済の説明。ショップが決済を追跡するための任意の文字列です。  @gotags: validate:\"required\"
     attr_accessor :description
 
+    # Arbitrary key-value additional information about the charge. You can see this information in our merchant dashboard.  Chargeに関する任意のキーと値の追加情報。 加盟店ダッシュボードで確認できます。
+    attr_accessor :metadata
+
     # Merchant can optionally set the expiry date for the payment. Defaults to 90 minutes if not specified.  決済の有効期限。未指定の場合は90分後に自動失効します。
     attr_accessor :expires_at
 
@@ -30,6 +33,7 @@ module Api
       {
         :price => :price,
         :description => :description,
+        :metadata => :metadata,
         :expires_at => :expiresAt
       }
     end
@@ -44,6 +48,7 @@ module Api
       {
         :price => :Integer,
         :description => :String,
+        :metadata => :'Hash<String, String>',
         :expires_at => :Time
       }
     end
@@ -69,6 +74,10 @@ module Api
 
       self.description = attributes[:description] if attributes.key?(:description)
 
+      if attributes.key?(:metadata) && (value = attributes[:metadata]).is_a?(Hash)
+        self.metadata = value
+      end
+
       return unless attributes.key?(:expires_at)
 
       self.expires_at = attributes[:expires_at]
@@ -96,6 +105,7 @@ module Api
       self.class == other.class &&
         price == other.price &&
         description == other.description &&
+        metadata == other.metadata &&
         expires_at == other.expires_at
     end
 
@@ -108,7 +118,7 @@ module Api
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [price, description, expires_at].hash
+      [price, description, metadata, expires_at].hash
     end
 
     # Builds the object from hash

data/lib/jamm/api_patches.rb

@@ -6,7 +6,7 @@ module Api
     # e.g. cus.charges --> []
     def charges(pagination: nil)
       Jamm::Charge.list(
-        customer: self.id,
+        customer: id,
         pagination: pagination
       )
     end

data/lib/jamm/charge.rb

@@ -33,11 +33,15 @@ module Jamm
     end
 
     def self.list(customer:, pagination: nil)
-      got = Jamm::OpenAPI::PaymentApi.new(Jamm::Client.handler).get_charges(customer, pagination.nil? ? {} : pagination)
-
-      got.charges
+      Jamm::OpenAPI::PaymentApi.new(Jamm::Client.handler).get_charges(customer, pagination.nil? ? {} : pagination)
     rescue Jamm::OpenAPI::ApiError => e
-      [404].include?(e.code) ? nil : []
+      if [404].include?(e.code)
+        nil
+      else
+        {
+          charges: []
+        }
+      end
     end
   end
 end

data/lib/jamm/client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Jamm
   module Client
     def self.handler

data/lib/jamm/customer.rb

@@ -17,7 +17,15 @@ module Jamm
     end
 
     def self.get(id_or_email)
-      Jamm::OpenAPI::CustomerApi.new(Jamm::Client.handler).get(id_or_email)
+      r = Jamm::OpenAPI::CustomerApi.new(Jamm::Client.handler).get(id_or_email)
+
+      if r.customer.activated.nil?
+        # Activated flag requires explicit binding on false, since RPC/OpenAPI does
+        # not return false value.
+        r.customer.activated = false
+      end
+
+      r.customer
     rescue Jamm::OpenAPI::ApiError => e
       [404].include?(e.code) ? nil : raise
     end

data/lib/jamm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jamm
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.12
 platform: ruby
 authors:
 - Jamm
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-29 00:00:00.000000000 Z
+date: 2025-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -123,7 +123,7 @@ licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/jamm-pay/Jamm-SDK-Ruby
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.19
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Ruby SDK for the Jamm API
 test_files: []