jamm 1.0.9 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e05e9f651604ac4972167326fee6e8870ee8218c3c2022d2f772928788f6d5d4
-  data.tar.gz: 421d587623b6f11691cbaa3b4d9531fb01de829b2ceedf003a5310c993110069
+  metadata.gz: 8b5dabb16cbdc7168f755f1c8afe2feb53ec086d312b051df92561475dec64fe
+  data.tar.gz: f71fa5d88f1b17f796744ef35d5fd8f5975874d47e8934c7834e1d78cc4fe79e
 SHA512:
-  metadata.gz: bf69ef3389bf9504ee89049f80df829b6695eafd6fdbda3df4a88075fa5bb96ad7620813882160bcf807d9b1abba86cd6051497f4066740b11a481f92db0ab81
-  data.tar.gz: 0dfa484efb56bc6db48590e32f04397e6ea49422adaac38673cd50dadfd5dba70b3309bc357022435b4a657ef063359e0fcb245d405e9db8e428b0e496b87c0e
+  metadata.gz: 84f27de5200f6d8392195b37a758e1fa107f3e565ee80190d327e5438f8ae73ae3475b7a7a504ba2907675a7a9e801f4376a55aefb7b6f7a1a18048170cffe20
+  data.tar.gz: bb3c6a9b22e0c8d62948c1d2d62182a32118176ec8e065e189d7819c12dd476a9a2df3787f1f7cf436d930abb50b1f7315131aaeeac7c6a9edbae45e5e924e45

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jamm (1.0.9)
+    jamm (1.0.11)
       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_charge_message.rb

@@ -15,7 +15,7 @@ require 'time'
 
 module Api
   class ChargeMessage
-    attr_accessor :id, :customer, :status, :description, :merchant_name, :initial_amount, :discount, :final_amount, :amount_refunded, :currency, :processed_at, :created_at, :updated_at
+    attr_accessor :id, :customer, :status, :description, :merchant_name, :initial_amount, :discount, :final_amount, :amount_refunded, :currency, :processed_at, :created_at, :updated_at, :error
 
     class EnumAttributeValidator
       attr_reader :datatype, :allowable_values
@@ -53,7 +53,8 @@ module Api
         :currency => :currency,
         :processed_at => :processedAt,
         :created_at => :createdAt,
-        :updated_at => :updatedAt
+        :updated_at => :updatedAt,
+        :error => :error
       }
     end
 
@@ -77,7 +78,8 @@ module Api
         :currency => :String,
         :processed_at => :String,
         :created_at => :String,
-        :updated_at => :String
+        :updated_at => :String,
+        :error => :Error
       }
     end
 
@@ -126,9 +128,11 @@ module Api
 
       self.created_at = attributes[:created_at] if attributes.key?(:created_at)
 
-      return unless attributes.key?(:updated_at)
+      self.updated_at = attributes[:updated_at] if attributes.key?(:updated_at)
 
-      self.updated_at = attributes[:updated_at]
+      return unless attributes.key?(:error)
+
+      self.error = attributes[:error]
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -163,7 +167,8 @@ module Api
         currency == other.currency &&
         processed_at == other.processed_at &&
         created_at == other.created_at &&
-        updated_at == other.updated_at
+        updated_at == other.updated_at &&
+        error == other.error
     end
 
     # @see the `==` method
@@ -175,7 +180,7 @@ module Api
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [id, customer, status, description, merchant_name, initial_amount, discount, final_amount, amount_refunded, currency, processed_at, created_at, updated_at].hash
+      [id, customer, status, description, merchant_name, initial_amount, discount, final_amount, amount_refunded, currency, processed_at, created_at, updated_at, error].hash
     end
 
     # Builds the object from hash

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

@@ -0,0 +1,222 @@
+# frozen_string_literal: true
+
+# #Jamm API
+#
+# No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+#
+# The version of the OpenAPI document: 1.0
+#
+# Generated by: https://openapi-generator.tech
+# Generator version: 7.9.0
+#
+
+require 'date'
+require 'time'
+
+module Api
+  class ContractMessage
+    attr_accessor :customer, :created_at, :activated_at, :merchant_name
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        :customer => :customer,
+        :created_at => :createdAt,
+        :activated_at => :activatedAt,
+        :merchant_name => :merchantName
+      }
+    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,
+        :created_at => :String,
+        :activated_at => :String,
+        :merchant_name => :String
+      }
+    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::ContractMessage` 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::ContractMessage`. 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.created_at = attributes[:created_at] if attributes.key?(:created_at)
+
+      self.activated_at = attributes[:activated_at] if attributes.key?(:activated_at)
+
+      return unless attributes.key?(:merchant_name)
+
+      self.merchant_name = attributes[:merchant_name]
+    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 &&
+        created_at == other.created_at &&
+        activated_at == other.activated_at &&
+        merchant_name == other.merchant_name
+    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, created_at, activated_at, merchant_name].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_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_error.rb

@@ -0,0 +1,217 @@
+# frozen_string_literal: true
+
+# #Jamm API
+#
+# No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+#
+# The version of the OpenAPI document: 1.0
+#
+# Generated by: https://openapi-generator.tech
+# Generator version: 7.9.0
+#
+
+require 'date'
+require 'time'
+
+module Api
+  # Generic error type.
+  class Error
+    # Jamm defined error code.
+    attr_accessor :code
+
+    # Human readable error message.
+    attr_accessor :message
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        :code => :code,
+        :message => :message
+      }
+    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
+      {
+        :code => :String,
+        :message => :String
+      }
+    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::Error` 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::Error`. 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.code = attributes[:code] if attributes.key?(:code)
+
+      return unless attributes.key?(:message)
+
+      self.message = attributes[:message]
+    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 &&
+        code == other.code &&
+        message == other.message
+    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
+      [code, message].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_event_type.rb

@@ -19,11 +19,12 @@ module Api
     CHARGE_CREATED = 'EVENT_TYPE_CHARGE_CREATED'
     CHARGE_UPDATED = 'EVENT_TYPE_CHARGE_UPDATED'
     CHARGE_SUCCESS = 'EVENT_TYPE_CHARGE_SUCCESS'
+    CHARGE_FAIL = 'EVENT_TYPE_CHARGE_FAIL'
     CONTRACT_ACTIVATED = 'EVENT_TYPE_CONTRACT_ACTIVATED'
     TESTING = 'EVENT_TYPE_TESTING'
 
     def self.all_vars
-      @all_vars ||= [UNSPECIFIED, CHARGE_CREATED, CHARGE_UPDATED, CHARGE_SUCCESS, CONTRACT_ACTIVATED, TESTING].freeze
+      @all_vars ||= [UNSPECIFIED, CHARGE_CREATED, CHARGE_UPDATED, CHARGE_SUCCESS, CHARGE_FAIL, CONTRACT_ACTIVATED, TESTING].freeze
     end
 
     # Builds the enum from string

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/models/v1_message_response.rb

@@ -15,13 +15,14 @@ require 'time'
 
 module Api
   class MessageResponse
-    attr_accessor :merchant_webhook_message, :charge_message
+    attr_accessor :merchant_webhook_message, :charge_message, :contract_message
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         :merchant_webhook_message => :merchantWebhookMessage,
-        :charge_message => :chargeMessage
+        :charge_message => :chargeMessage,
+        :contract_message => :contractMessage
       }
     end
 
@@ -34,7 +35,8 @@ module Api
     def self.openapi_types
       {
         :merchant_webhook_message => :MerchantWebhookMessage,
-        :charge_message => :ChargeMessage
+        :charge_message => :ChargeMessage,
+        :contract_message => :ContractMessage
       }
     end
 
@@ -57,9 +59,11 @@ module Api
 
       self.merchant_webhook_message = attributes[:merchant_webhook_message] if attributes.key?(:merchant_webhook_message)
 
-      return unless attributes.key?(:charge_message)
+      self.charge_message = attributes[:charge_message] if attributes.key?(:charge_message)
 
-      self.charge_message = attributes[:charge_message]
+      return unless attributes.key?(:contract_message)
+
+      self.contract_message = attributes[:contract_message]
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -83,7 +87,8 @@ module Api
 
       self.class == other.class &&
         merchant_webhook_message == other.merchant_webhook_message &&
-        charge_message == other.charge_message
+        charge_message == other.charge_message &&
+        contract_message == other.contract_message
     end
 
     # @see the `==` method
@@ -95,7 +100,7 @@ module Api
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [merchant_webhook_message, charge_message].hash
+      [merchant_webhook_message, charge_message, contract_message].hash
     end
 
     # Builds the object from hash

data/lib/jamm/api.rb

@@ -28,6 +28,7 @@ require 'jamm/api/models/v1_charge_message'
 require 'jamm/api/models/v1_charge_message_status'
 require 'jamm/api/models/v1_charge_result'
 require 'jamm/api/models/v1_contract'
+require 'jamm/api/models/v1_contract_message'
 require 'jamm/api/models/v1_contract_status'
 require 'jamm/api/models/v1_create_contract_with_charge_request'
 require 'jamm/api/models/v1_create_contract_with_charge_response'
@@ -37,6 +38,7 @@ require 'jamm/api/models/v1_create_customer_request'
 require 'jamm/api/models/v1_create_customer_response'
 require 'jamm/api/models/v1_customer'
 require 'jamm/api/models/v1_delete_customer_response'
+require 'jamm/api/models/v1_error'
 require 'jamm/api/models/v1_event_type'
 require 'jamm/api/models/v1_get_charge_response'
 require 'jamm/api/models/v1_get_charges_response'

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/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.9'
+  VERSION = '1.0.11'
 end

data/lib/jamm/webhook.rb

@@ -13,13 +13,12 @@ module Jamm
       out = {
         id: json[:id],
         signature: json[:signature],
-        merchant_id: json[:merchantId],
-        event_type: json[:eventType],
+        event_type: json[:event_type],
         content: nil,
-        created_at: json[:createdAt]
+        created_at: json[:created_at]
       }
 
-      case json[:eventType]
+      case json[:event_type]
       when Jamm::OpenAPI::EventType::CHARGE_CREATED
         out[:content] = Jamm::OpenAPI::ChargeMessage.new(json[:content])
         return out
@@ -27,9 +26,21 @@ module Jamm
       when Jamm::OpenAPI::EventType::CHARGE_UPDATED
         out[:content] = Jamm::OpenAPI::ChargeMessage.new(json[:content])
         return out
+
+      when Jamm::OpenAPI::EventType::CHARGE_SUCCESS
+        out[:content] = Jamm::OpenAPI::ChargeMessage.new(json[:content])
+        return out
+
+      when Jamm::OpenAPI::EventType::CHARGE_FAIL
+        out[:content] = Jamm::OpenAPI::ChargeMessage.new(json[:content])
+        return out
+
+      when Jamm::OpenAPI::EventType::CONTRACT_ACTIVATED
+        out[:content] = Jamm::OpenAPI::ContractMessage.new(json[:content])
+        return out
       end
 
-      raise Jamm::Error, 'Unknown event type'
+      raise 'Unknown event type'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jamm
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.11
 platform: ruby
 authors:
 - Jamm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-29 00:00:00.000000000 Z
+date: 2024-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -78,6 +78,7 @@ files:
 - lib/jamm/api/models/v1_charge_message_status.rb
 - lib/jamm/api/models/v1_charge_result.rb
 - lib/jamm/api/models/v1_contract.rb
+- lib/jamm/api/models/v1_contract_message.rb
 - lib/jamm/api/models/v1_contract_status.rb
 - lib/jamm/api/models/v1_create_contract_with_charge_request.rb
 - lib/jamm/api/models/v1_create_contract_with_charge_response.rb
@@ -87,6 +88,7 @@ files:
 - lib/jamm/api/models/v1_create_customer_response.rb
 - lib/jamm/api/models/v1_customer.rb
 - lib/jamm/api/models/v1_delete_customer_response.rb
+- lib/jamm/api/models/v1_error.rb
 - lib/jamm/api/models/v1_event_type.rb
 - lib/jamm/api/models/v1_get_charge_response.rb
 - lib/jamm/api/models/v1_get_charges_response.rb