pokeapi_client 2.1.0 → 2.2.0

data/lib/pokeapi_client/models/{evolution_chain_detail_chain.rb → evolution_chain_link.rb}

@@ -1,12 +1,12 @@
 =begin
 #PokéAPI
 
-#All the Pokémon data you'll ever need in one place, easily accessible through a modern free open-source RESTful API.  ## What is this?  This is a full RESTful API linked to an extensive database detailing everything about the Pokémon main game series.  We've covered everything from Pokémon to Berry Flavors.  ## Where do I start?  We have awesome [documentation](https://pokeapi.co/docs/v2) on how to use this API. It takes minutes to get started.  This API will always be publicly available and will never require any extensive setup process to consume.  Created by [**Paul Hallett**(]https://github.com/phalt) and other [**PokéAPI contributors***](https://github.com/PokeAPI/pokeapi#contributing) around the world. Pokémon and Pokémon character names are trademarks of Nintendo.     
+#All the Pokémon data you'll ever need in one place, easily accessible through a modern free open-source RESTful API.  ## What is this?  This is a full RESTful API linked to an extensive database detailing everything about the Pokémon main game series.  We've covered everything from Pokémon to Berry Flavors.  ## Where do I start?  We have awesome [documentation](https://pokeapi.co/docs/v2) on how to use this API. It takes minutes to get started.  This API will always be publicly available and will never require any extensive setup process to consume.  Created by [**Paul Hallett**](https://github.com/phalt) and other [**PokéAPI contributors**](https://github.com/PokeAPI/pokeapi#contributing) around the world. Pokémon and Pokémon character names are trademarks of Nintendo.
 
-The version of the OpenAPI document: 2.7.0
+The version of the OpenAPI document: 2.10.0
 Contact: blah+oapicf@cliffano.com
 Generated by: https://openapi-generator.tech
-Generator version: 7.24.0
+Generator version: 7.26.0
 
 =end
 
@@ -14,22 +14,26 @@ require 'date'
 require 'time'
 
 module PokeApiClient
-  class EvolutionChainDetailChain < ApiModelBase
-    attr_accessor :evolution_details
-
-    attr_accessor :evolves_to
-
+  class EvolutionChainLink < ApiModelBase
+    # Whether or not this link is for a baby Pokémon. This would only ever be true on the base link.
     attr_accessor :is_baby
 
+    # The Pokémon species at this point in the evolution chain.
     attr_accessor :species
 
+    # All details regarding the specific details of the referenced Pokémon species evolution.
+    attr_accessor :evolution_details
+
+    # A List of chain objects.
+    attr_accessor :evolves_to
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'evolution_details' => :'evolution_details',
-        :'evolves_to' => :'evolves_to',
         :'is_baby' => :'is_baby',
-        :'species' => :'species'
+        :'species' => :'species',
+        :'evolution_details' => :'evolution_details',
+        :'evolves_to' => :'evolves_to'
       }
     end
 
@@ -46,10 +50,10 @@ module PokeApiClient
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'evolution_details' => :'Array<Object>',
-        :'evolves_to' => :'Array<EvolutionChainDetailChainEvolvesToInner>',
         :'is_baby' => :'Boolean',
-        :'species' => :'AbilityDetailPokemonInnerPokemon'
+        :'species' => :'PokemonSpeciesSummary',
+        :'evolution_details' => :'Array<PokemonEvolution>',
+        :'evolves_to' => :'Array<EvolutionChainLink>'
       }
     end
 
@@ -59,22 +63,44 @@ module PokeApiClient
       ])
     end
 
+    # Returns attribute type mapping
+    def self.acceptable_openapi_types
+      openapi_types
+    end
+
+    # Returns the nullable attributes
+    def self.acceptable_openapi_nullable
+      openapi_nullable
+    end
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
       if (!attributes.is_a?(Hash))
-        fail ArgumentError, "The input argument (attributes) must be a hash in `PokeApiClient::EvolutionChainDetailChain` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `PokeApiClient::EvolutionChainLink` 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))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `PokeApiClient::EvolutionChainDetailChain`. Please check the name to make sure it's valid. List of attributes: " + acceptable_attribute_map.keys.inspect
+          fail ArgumentError, "`#{k}` is not a valid attribute in `PokeApiClient::EvolutionChainLink`. 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?(:'is_baby')
+        self.is_baby = attributes[:'is_baby']
+      else
+        self.is_baby = nil
+      end
+
+      if attributes.key?(:'species')
+        self.species = attributes[:'species']
+      else
+        self.species = nil
+      end
+
       if attributes.key?(:'evolution_details')
         if (value = attributes[:'evolution_details']).is_a?(Array)
           self.evolution_details = value
@@ -90,18 +116,6 @@ module PokeApiClient
       else
         self.evolves_to = nil
       end
-
-      if attributes.key?(:'is_baby')
-        self.is_baby = attributes[:'is_baby']
-      else
-        self.is_baby = nil
-      end
-
-      if attributes.key?(:'species')
-        self.species = attributes[:'species']
-      else
-        self.species = nil
-      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -109,14 +123,6 @@ module PokeApiClient
     def list_invalid_properties
       warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
       invalid_properties = Array.new
-      if @evolution_details.nil?
-        invalid_properties.push('invalid value for "evolution_details", evolution_details cannot be nil.')
-      end
-
-      if @evolves_to.nil?
-        invalid_properties.push('invalid value for "evolves_to", evolves_to cannot be nil.')
-      end
-
       if @is_baby.nil?
         invalid_properties.push('invalid value for "is_baby", is_baby cannot be nil.')
       end
@@ -125,6 +131,14 @@ module PokeApiClient
         invalid_properties.push('invalid value for "species", species cannot be nil.')
       end
 
+      if @evolution_details.nil?
+        invalid_properties.push('invalid value for "evolution_details", evolution_details cannot be nil.')
+      end
+
+      if @evolves_to.nil?
+        invalid_properties.push('invalid value for "evolves_to", evolves_to cannot be nil.')
+      end
+
       invalid_properties
     end
 
@@ -132,33 +146,13 @@ module PokeApiClient
     # @return true if the model is valid
     def valid?
       warn '[DEPRECATED] the `valid?` method is obsolete'
-      return false if @evolution_details.nil?
-      return false if @evolves_to.nil?
       return false if @is_baby.nil?
       return false if @species.nil?
+      return false if @evolution_details.nil?
+      return false if @evolves_to.nil?
       true
     end
 
-    # Custom attribute writer method with validation
-    # @param [Object] evolution_details Value to be assigned
-    def evolution_details=(evolution_details)
-      if evolution_details.nil?
-        fail ArgumentError, 'evolution_details cannot be nil'
-      end
-
-      @evolution_details = evolution_details
-    end
-
-    # Custom attribute writer method with validation
-    # @param [Object] evolves_to Value to be assigned
-    def evolves_to=(evolves_to)
-      if evolves_to.nil?
-        fail ArgumentError, 'evolves_to cannot be nil'
-      end
-
-      @evolves_to = evolves_to
-    end
-
     # Custom attribute writer method with validation
     # @param [Object] is_baby Value to be assigned
     def is_baby=(is_baby)
@@ -179,15 +173,35 @@ module PokeApiClient
       @species = species
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] evolution_details Value to be assigned
+    def evolution_details=(evolution_details)
+      if evolution_details.nil?
+        fail ArgumentError, 'evolution_details cannot be nil'
+      end
+
+      @evolution_details = evolution_details
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] evolves_to Value to be assigned
+    def evolves_to=(evolves_to)
+      if evolves_to.nil?
+        fail ArgumentError, 'evolves_to cannot be nil'
+      end
+
+      @evolves_to = evolves_to
+    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 &&
-          evolution_details == o.evolution_details &&
-          evolves_to == o.evolves_to &&
           is_baby == o.is_baby &&
-          species == o.species
+          species == o.species &&
+          evolution_details == o.evolution_details &&
+          evolves_to == o.evolves_to
     end
 
     # @see the `==` method
@@ -199,7 +213,7 @@ module PokeApiClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [evolution_details, evolves_to, is_baby, species].hash
+      [is_baby, species, evolution_details, evolves_to].hash
     end
 
     # Builds the object from hash
@@ -208,18 +222,20 @@ module PokeApiClient
     def self.build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       attributes = attributes.transform_keys(&:to_sym)
+      # include attributes inherited from allOf parents (the nearest declaration wins)
+      map = acceptable_attribute_map
       transformed_hash = {}
-      openapi_types.each_pair do |key, type|
-        if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
+      acceptable_openapi_types.each_pair do |key, type|
+        if attributes.key?(map[key]) && attributes[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) }
+          if attributes[map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[map[key]].map { |v| _deserialize($1, v) }
           end
-        elsif !attributes[attribute_map[key]].nil?
-          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
+        elsif !attributes[map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[map[key]])
         end
       end
       new(transformed_hash)
@@ -229,10 +245,11 @@ module PokeApiClient
     # @return [Hash] Returns the object in the form of hash
     def to_hash
       hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
+      # include attributes inherited from allOf parents (the nearest declaration wins)
+      self.class.acceptable_attribute_map.each_pair do |attr, param|
         value = self.send(attr)
         if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
+          is_nullable = self.class.acceptable_openapi_nullable.include?(attr)
           next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
         end
 

data/lib/pokeapi_client/models/evolution_chain_summary.rb

@@ -1,12 +1,12 @@
 =begin
 #PokéAPI
 
-#All the Pokémon data you'll ever need in one place, easily accessible through a modern free open-source RESTful API.  ## What is this?  This is a full RESTful API linked to an extensive database detailing everything about the Pokémon main game series.  We've covered everything from Pokémon to Berry Flavors.  ## Where do I start?  We have awesome [documentation](https://pokeapi.co/docs/v2) on how to use this API. It takes minutes to get started.  This API will always be publicly available and will never require any extensive setup process to consume.  Created by [**Paul Hallett**(]https://github.com/phalt) and other [**PokéAPI contributors***](https://github.com/PokeAPI/pokeapi#contributing) around the world. Pokémon and Pokémon character names are trademarks of Nintendo.     
+#All the Pokémon data you'll ever need in one place, easily accessible through a modern free open-source RESTful API.  ## What is this?  This is a full RESTful API linked to an extensive database detailing everything about the Pokémon main game series.  We've covered everything from Pokémon to Berry Flavors.  ## Where do I start?  We have awesome [documentation](https://pokeapi.co/docs/v2) on how to use this API. It takes minutes to get started.  This API will always be publicly available and will never require any extensive setup process to consume.  Created by [**Paul Hallett**](https://github.com/phalt) and other [**PokéAPI contributors**](https://github.com/PokeAPI/pokeapi#contributing) around the world. Pokémon and Pokémon character names are trademarks of Nintendo.
 
-The version of the OpenAPI document: 2.7.0
+The version of the OpenAPI document: 2.10.0
 Contact: blah+oapicf@cliffano.com
 Generated by: https://openapi-generator.tech
-Generator version: 7.24.0
+Generator version: 7.26.0
 
 =end
 
@@ -15,6 +15,7 @@ require 'time'
 
 module PokeApiClient
   class EvolutionChainSummary < ApiModelBase
+    # The URL of the referenced resource.
     attr_accessor :url
 
     # Attribute mapping from ruby-style variable name to JSON key.
@@ -47,6 +48,16 @@ module PokeApiClient
       ])
     end
 
+    # Returns attribute type mapping
+    def self.acceptable_openapi_types
+      openapi_types
+    end
+
+    # Returns the nullable attributes
+    def self.acceptable_openapi_nullable
+      openapi_nullable
+    end
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
@@ -126,18 +137,20 @@ module PokeApiClient
     def self.build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       attributes = attributes.transform_keys(&:to_sym)
+      # include attributes inherited from allOf parents (the nearest declaration wins)
+      map = acceptable_attribute_map
       transformed_hash = {}
-      openapi_types.each_pair do |key, type|
-        if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
+      acceptable_openapi_types.each_pair do |key, type|
+        if attributes.key?(map[key]) && attributes[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) }
+          if attributes[map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[map[key]].map { |v| _deserialize($1, v) }
           end
-        elsif !attributes[attribute_map[key]].nil?
-          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
+        elsif !attributes[map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[map[key]])
         end
       end
       new(transformed_hash)
@@ -147,10 +160,11 @@ module PokeApiClient
     # @return [Hash] Returns the object in the form of hash
     def to_hash
       hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
+      # include attributes inherited from allOf parents (the nearest declaration wins)
+      self.class.acceptable_attribute_map.each_pair do |attr, param|
         value = self.send(attr)
         if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
+          is_nullable = self.class.acceptable_openapi_nullable.include?(attr)
           next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
         end
 

data/lib/pokeapi_client/models/evolution_condition_expression.rb

@@ -0,0 +1,220 @@
+=begin
+#PokéAPI
+
+#All the Pokémon data you'll ever need in one place, easily accessible through a modern free open-source RESTful API.  ## What is this?  This is a full RESTful API linked to an extensive database detailing everything about the Pokémon main game series.  We've covered everything from Pokémon to Berry Flavors.  ## Where do I start?  We have awesome [documentation](https://pokeapi.co/docs/v2) on how to use this API. It takes minutes to get started.  This API will always be publicly available and will never require any extensive setup process to consume.  Created by [**Paul Hallett**](https://github.com/phalt) and other [**PokéAPI contributors**](https://github.com/PokeAPI/pokeapi#contributing) around the world. Pokémon and Pokémon character names are trademarks of Nintendo.
+
+The version of the OpenAPI document: 2.10.0
+Contact: blah+oapicf@cliffano.com
+Generated by: https://openapi-generator.tech
+Generator version: 7.26.0
+
+=end
+
+require 'date'
+require 'time'
+
+module PokeApiClient
+  class EvolutionConditionExpression < ApiModelBase
+    # Evaluatable RPN condition expression using evolution variables (e.g. 'EC 100 % 0 ==')
+    attr_accessor :expression
+
+    # Percentage chance of evolution under this condition (0-100)
+    attr_accessor :percentage_chance
+
+    # Evolution variables referenced in the expression
+    attr_accessor :variables
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        :'expression' => :'expression',
+        :'percentage_chance' => :'percentage_chance',
+        :'variables' => :'variables'
+      }
+    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
+      {
+        :'expression' => :'String',
+        :'percentage_chance' => :'Float',
+        :'variables' => :'Array<EvolutionVariableSummary>'
+      }
+    end
+
+    # List of attributes with nullable: true
+    def self.openapi_nullable
+      Set.new([
+        :'percentage_chance',
+      ])
+    end
+
+    # Returns attribute type mapping
+    def self.acceptable_openapi_types
+      openapi_types
+    end
+
+    # Returns the nullable attributes
+    def self.acceptable_openapi_nullable
+      openapi_nullable
+    end
+
+    # Initializes the object
+    # @param [Hash] attributes Model attributes in the form of hash
+    def initialize(attributes = {})
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `PokeApiClient::EvolutionConditionExpression` 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))
+          fail ArgumentError, "`#{k}` is not a valid attribute in `PokeApiClient::EvolutionConditionExpression`. 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?(:'expression')
+        self.expression = attributes[:'expression']
+      else
+        self.expression = nil
+      end
+
+      if attributes.key?(:'percentage_chance')
+        self.percentage_chance = attributes[:'percentage_chance']
+      else
+        self.percentage_chance = nil
+      end
+
+      if attributes.key?(:'variables')
+        if (value = attributes[:'variables']).is_a?(Array)
+          self.variables = value
+        end
+      else
+        self.variables = nil
+      end
+    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'
+      invalid_properties = Array.new
+      if @expression.nil?
+        invalid_properties.push('invalid value for "expression", expression cannot be nil.')
+      end
+
+      if @variables.nil?
+        invalid_properties.push('invalid value for "variables", variables cannot be nil.')
+      end
+
+      invalid_properties
+    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'
+      return false if @expression.nil?
+      return false if @variables.nil?
+      true
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] expression Value to be assigned
+    def expression=(expression)
+      if expression.nil?
+        fail ArgumentError, 'expression cannot be nil'
+      end
+
+      @expression = expression
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] variables Value to be assigned
+    def variables=(variables)
+      if variables.nil?
+        fail ArgumentError, 'variables cannot be nil'
+      end
+
+      @variables = variables
+    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 &&
+          expression == o.expression &&
+          percentage_chance == o.percentage_chance &&
+          variables == o.variables
+    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
+      [expression, percentage_chance, variables].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)
+      # include attributes inherited from allOf parents (the nearest declaration wins)
+      map = acceptable_attribute_map
+      transformed_hash = {}
+      acceptable_openapi_types.each_pair do |key, type|
+        if attributes.key?(map[key]) && attributes[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[map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[map[key]].map { |v| _deserialize($1, v) }
+          end
+        elsif !attributes[map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[map[key]])
+        end
+      end
+      new(transformed_hash)
+    end
+
+    # Returns the object in the form of hash
+    # @return [Hash] Returns the object in the form of hash
+    def to_hash
+      hash = {}
+      # include attributes inherited from allOf parents (the nearest declaration wins)
+      self.class.acceptable_attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        if value.nil?
+          is_nullable = self.class.acceptable_openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+  end
+
+end