pulp_npm_client 0.1.0a4 → 0.2.0

data/lib/pulp_npm_client/models/npm_npm_distribution.rb

@@ -6,11 +6,12 @@
 The version of the OpenAPI document: v3
 Contact: pulp-list@redhat.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.1
+Generator version: 7.10.0
 
 =end
 
 require 'date'
+require 'time'
 
 module PulpNpmClient
   # Serializer for NPM Distributions.
@@ -21,6 +22,9 @@ module PulpNpmClient
     # An optional content-guard.
     attr_accessor :content_guard
 
+    # Whether this distribution should be shown in the content app.
+    attr_accessor :hidden
+
     attr_accessor :pulp_labels
 
     # A unique name. Ex, `rawhide` and `stable`.
@@ -29,25 +33,37 @@ module PulpNpmClient
     # The latest RepositoryVersion for this Repository will be served.
     attr_accessor :repository
 
+    # Remote that can be used to fetch content when using pull-through caching.
+    attr_accessor :remote
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         :'base_path' => :'base_path',
         :'content_guard' => :'content_guard',
+        :'hidden' => :'hidden',
         :'pulp_labels' => :'pulp_labels',
         :'name' => :'name',
-        :'repository' => :'repository'
+        :'repository' => :'repository',
+        :'remote' => :'remote'
       }
     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
       {
         :'base_path' => :'String',
         :'content_guard' => :'String',
-        :'pulp_labels' => :'Object',
+        :'hidden' => :'Boolean',
+        :'pulp_labels' => :'Hash<String, String>',
         :'name' => :'String',
-        :'repository' => :'String'
+        :'repository' => :'String',
+        :'remote' => :'String'
       }
     end
 
@@ -55,7 +71,8 @@ module PulpNpmClient
     def self.openapi_nullable
       Set.new([
         :'content_guard',
-        :'repository'
+        :'repository',
+        :'remote'
       ])
     end
 
@@ -76,28 +93,45 @@ module PulpNpmClient
 
       if attributes.key?(:'base_path')
         self.base_path = attributes[:'base_path']
+      else
+        self.base_path = nil
       end
 
       if attributes.key?(:'content_guard')
         self.content_guard = attributes[:'content_guard']
       end
 
+      if attributes.key?(:'hidden')
+        self.hidden = attributes[:'hidden']
+      else
+        self.hidden = false
+      end
+
       if attributes.key?(:'pulp_labels')
-        self.pulp_labels = attributes[:'pulp_labels']
+        if (value = attributes[:'pulp_labels']).is_a?(Hash)
+          self.pulp_labels = value
+        end
       end
 
       if attributes.key?(:'name')
         self.name = attributes[:'name']
+      else
+        self.name = nil
       end
 
       if attributes.key?(:'repository')
         self.repository = attributes[:'repository']
       end
+
+      if attributes.key?(:'remote')
+        self.remote = attributes[:'remote']
+      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 @base_path.nil?
         invalid_properties.push('invalid value for "base_path", base_path cannot be nil.')
@@ -121,6 +155,7 @@ module PulpNpmClient
     # 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 @base_path.nil?
       return false if @base_path.to_s.length < 1
       return false if @name.nil?
@@ -163,9 +198,11 @@ module PulpNpmClient
       self.class == o.class &&
           base_path == o.base_path &&
           content_guard == o.content_guard &&
+          hidden == o.hidden &&
           pulp_labels == o.pulp_labels &&
           name == o.name &&
-          repository == o.repository
+          repository == o.repository &&
+          remote == o.remote
     end
 
     # @see the `==` method
@@ -177,44 +214,40 @@ module PulpNpmClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [base_path, content_guard, pulp_labels, name, repository].hash
+      [base_path, content_guard, hidden, pulp_labels, name, repository, remote].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)
-      new.build_from_hash(attributes)
-    end
-
-    # Builds the object from hash
-    # @param [Hash] attributes Model attributes in the form of hash
-    # @return [Object] Returns the model itself
-    def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
-      self.class.openapi_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
+      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[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+          if attributes[attribute_map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
           end
-        elsif !attributes[self.class.attribute_map[key]].nil?
-          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end # or else data not found in attributes(hash), not an issue as the data can be optional
+        elsif !attributes[attribute_map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
+        end
       end
-
-      self
+      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 _deserialize(type, value)
+    def self._deserialize(type, value)
       case type.to_sym
-      when :DateTime
-        DateTime.parse(value)
+      when :Time
+        Time.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -244,7 +277,9 @@ module PulpNpmClient
           end
         end
       else # model
-        PulpNpmClient.const_get(type).build_from_hash(value)
+        # models (e.g. Pet) or oneOf
+        klass = PulpNpmClient.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
 
@@ -270,7 +305,7 @@ module PulpNpmClient
           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
@@ -293,5 +328,7 @@ module PulpNpmClient
         value
       end
     end
+
   end
+
 end

data/lib/pulp_npm_client/models/npm_npm_distribution_response.rb

@@ -6,29 +6,42 @@
 The version of the OpenAPI document: v3
 Contact: pulp-list@redhat.com
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.3.1
+Generator version: 7.10.0
 
 =end
 
 require 'date'
+require 'time'
 
 module PulpNpmClient
   # Serializer for NPM Distributions.
   class NpmNpmDistributionResponse
     attr_accessor :pulp_href
 
+    # The Pulp Resource Name (PRN).
+    attr_accessor :prn
+
     # Timestamp of creation.
     attr_accessor :pulp_created
 
+    # Timestamp of the last time this resource was updated. Note: for immutable resources - like content, repository versions, and publication - pulp_created and pulp_last_updated dates will be the same.
+    attr_accessor :pulp_last_updated
+
     # The base (relative) path component of the published url. Avoid paths that                     overlap with other distribution base paths (e.g. \"foo\" and \"foo/bar\")
     attr_accessor :base_path
 
-    # The URL for accessing the universe API as defined by this distribution.
+    # The URL for accessing the publication as defined by this distribution.
     attr_accessor :base_url
 
     # An optional content-guard.
     attr_accessor :content_guard
 
+    # Timestamp since when the distributed content served by this distribution has not changed. If equals to `null`, no guarantee is provided about content changes.
+    attr_accessor :no_content_change_since
+
+    # Whether this distribution should be shown in the content app.
+    attr_accessor :hidden
+
     attr_accessor :pulp_labels
 
     # A unique name. Ex, `rawhide` and `stable`.
@@ -37,31 +50,49 @@ module PulpNpmClient
     # The latest RepositoryVersion for this Repository will be served.
     attr_accessor :repository
 
+    # Remote that can be used to fetch content when using pull-through caching.
+    attr_accessor :remote
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
         :'pulp_href' => :'pulp_href',
+        :'prn' => :'prn',
         :'pulp_created' => :'pulp_created',
+        :'pulp_last_updated' => :'pulp_last_updated',
         :'base_path' => :'base_path',
         :'base_url' => :'base_url',
         :'content_guard' => :'content_guard',
+        :'no_content_change_since' => :'no_content_change_since',
+        :'hidden' => :'hidden',
         :'pulp_labels' => :'pulp_labels',
         :'name' => :'name',
-        :'repository' => :'repository'
+        :'repository' => :'repository',
+        :'remote' => :'remote'
       }
     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
       {
         :'pulp_href' => :'String',
-        :'pulp_created' => :'DateTime',
+        :'prn' => :'String',
+        :'pulp_created' => :'Time',
+        :'pulp_last_updated' => :'Time',
         :'base_path' => :'String',
         :'base_url' => :'String',
         :'content_guard' => :'String',
-        :'pulp_labels' => :'Object',
+        :'no_content_change_since' => :'String',
+        :'hidden' => :'Boolean',
+        :'pulp_labels' => :'Hash<String, String>',
         :'name' => :'String',
-        :'repository' => :'String'
+        :'repository' => :'String',
+        :'remote' => :'String'
       }
     end
 
@@ -69,7 +100,8 @@ module PulpNpmClient
     def self.openapi_nullable
       Set.new([
         :'content_guard',
-        :'repository'
+        :'repository',
+        :'remote'
       ])
     end
 
@@ -92,12 +124,22 @@ module PulpNpmClient
         self.pulp_href = attributes[:'pulp_href']
       end
 
+      if attributes.key?(:'prn')
+        self.prn = attributes[:'prn']
+      end
+
       if attributes.key?(:'pulp_created')
         self.pulp_created = attributes[:'pulp_created']
       end
 
+      if attributes.key?(:'pulp_last_updated')
+        self.pulp_last_updated = attributes[:'pulp_last_updated']
+      end
+
       if attributes.key?(:'base_path')
         self.base_path = attributes[:'base_path']
+      else
+        self.base_path = nil
       end
 
       if attributes.key?(:'base_url')
@@ -108,22 +150,41 @@ module PulpNpmClient
         self.content_guard = attributes[:'content_guard']
       end
 
+      if attributes.key?(:'no_content_change_since')
+        self.no_content_change_since = attributes[:'no_content_change_since']
+      end
+
+      if attributes.key?(:'hidden')
+        self.hidden = attributes[:'hidden']
+      else
+        self.hidden = false
+      end
+
       if attributes.key?(:'pulp_labels')
-        self.pulp_labels = attributes[:'pulp_labels']
+        if (value = attributes[:'pulp_labels']).is_a?(Hash)
+          self.pulp_labels = value
+        end
       end
 
       if attributes.key?(:'name')
         self.name = attributes[:'name']
+      else
+        self.name = nil
       end
 
       if attributes.key?(:'repository')
         self.repository = attributes[:'repository']
       end
+
+      if attributes.key?(:'remote')
+        self.remote = attributes[:'remote']
+      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 @base_path.nil?
         invalid_properties.push('invalid value for "base_path", base_path cannot be nil.')
@@ -139,6 +200,7 @@ module PulpNpmClient
     # 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 @base_path.nil?
       return false if @name.nil?
       true
@@ -150,13 +212,18 @@ module PulpNpmClient
       return true if self.equal?(o)
       self.class == o.class &&
           pulp_href == o.pulp_href &&
+          prn == o.prn &&
           pulp_created == o.pulp_created &&
+          pulp_last_updated == o.pulp_last_updated &&
           base_path == o.base_path &&
           base_url == o.base_url &&
           content_guard == o.content_guard &&
+          no_content_change_since == o.no_content_change_since &&
+          hidden == o.hidden &&
           pulp_labels == o.pulp_labels &&
           name == o.name &&
-          repository == o.repository
+          repository == o.repository &&
+          remote == o.remote
     end
 
     # @see the `==` method
@@ -168,44 +235,40 @@ module PulpNpmClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [pulp_href, pulp_created, base_path, base_url, content_guard, pulp_labels, name, repository].hash
+      [pulp_href, prn, pulp_created, pulp_last_updated, base_path, base_url, content_guard, no_content_change_since, hidden, pulp_labels, name, repository, remote].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)
-      new.build_from_hash(attributes)
-    end
-
-    # Builds the object from hash
-    # @param [Hash] attributes Model attributes in the form of hash
-    # @return [Object] Returns the model itself
-    def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
-      self.class.openapi_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
+      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[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+          if attributes[attribute_map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
           end
-        elsif !attributes[self.class.attribute_map[key]].nil?
-          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end # or else data not found in attributes(hash), not an issue as the data can be optional
+        elsif !attributes[attribute_map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
+        end
       end
-
-      self
+      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 _deserialize(type, value)
+    def self._deserialize(type, value)
       case type.to_sym
-      when :DateTime
-        DateTime.parse(value)
+      when :Time
+        Time.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -235,7 +298,9 @@ module PulpNpmClient
           end
         end
       else # model
-        PulpNpmClient.const_get(type).build_from_hash(value)
+        # models (e.g. Pet) or oneOf
+        klass = PulpNpmClient.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
 
@@ -261,7 +326,7 @@ module PulpNpmClient
           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
@@ -284,5 +349,7 @@ module PulpNpmClient
         value
       end
     end
+
   end
+
 end