commonlit-clever-ruby 2.1.6.beta1 → 2.1.6.beta2

data/lib/clever-ruby/models/courses_response.rb

@@ -1,13 +1,12 @@
 =begin
-#Data API
+#Clever API
 
-#Serves the Clever Data API
+#The Clever API
 
 OpenAPI spec version: 2.1.0
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.37
-
+Swagger Codegen version: 3.0.51
 =end
 
 require 'date'
@@ -27,28 +26,41 @@ module Clever
     end
 
     # Attribute type mapping.
-    def self.swagger_types
+    def self.openapi_types
       {
-        :'data' => :'Array<CourseResponse>',
-        :'links' => :'Array<Link>'
+        :'data' => :'Object',
+        :'links' => :'Object'
       }
     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 = {})
-      return unless attributes.is_a?(Hash)
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `Clever::CoursesResponse` initialize method"
+      end
 
-      # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+      # check to see if the attribute exists and convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h|
+        if (!self.class.attribute_map.key?(k.to_sym))
+          fail ArgumentError, "`#{k}` is not a valid attribute in `Clever::CoursesResponse`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+        end
+        h[k.to_sym] = v
+      }
 
-      if attributes.has_key?(:'data')
+      if attributes.key?(:'data')
         if (value = attributes[:'data']).is_a?(Array)
           self.data = value
         end
       end
 
-      if attributes.has_key?(:'links')
+      if attributes.key?(:'links')
         if (value = attributes[:'links']).is_a?(Array)
           self.links = value
         end
@@ -84,17 +96,24 @@ module Clever
     end
 
     # Calculates hash code according to all attributes.
-    # @return [Fixnum] Hash code
+    # @return [Integer] Hash code
     def hash
       [data, links].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.swagger_types.each_pair do |key, type|
+      self.class.openapi_types.each_pair do |key, type|
         if 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
@@ -103,7 +122,9 @@ module Clever
           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[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+          self.send("#{key}=", nil)
+        end
       end
 
       self
@@ -125,7 +146,7 @@ module Clever
         value.to_i
       when :Float
         value.to_f
-      when :BOOLEAN
+      when :Boolean
         if value.to_s =~ /\A(true|t|yes|y|1)\z/i
           true
         else
@@ -146,8 +167,7 @@ module Clever
           end
         end
       else # model
-        temp_model = Clever.const_get(type).new
-        temp_model.build_from_hash(value)
+        Clever.const_get(type).build_from_hash(value)
       end
     end
 
@@ -169,7 +189,11 @@ module Clever
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil?
+        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
@@ -191,7 +215,5 @@ module Clever
       else
         value
       end
-    end
-
-  end
+    end  end
 end

data/lib/clever-ruby/models/credentials.rb

@@ -1,13 +1,12 @@
 =begin
-#Data API
+#Clever API
 
-#Serves the Clever Data API
+#The Clever API
 
 OpenAPI spec version: 2.1.0
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.37
-
+Swagger Codegen version: 3.0.51
 =end
 
 require 'date'
@@ -24,21 +23,34 @@ module Clever
     end
 
     # Attribute type mapping.
-    def self.swagger_types
+    def self.openapi_types
       {
-        :'district_username' => :'String'
+        :'district_username' => :'Object'
       }
     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 = {})
-      return unless attributes.is_a?(Hash)
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `Clever::Credentials` initialize method"
+      end
 
-      # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+      # check to see if the attribute exists and convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h|
+        if (!self.class.attribute_map.key?(k.to_sym))
+          fail ArgumentError, "`#{k}` is not a valid attribute in `Clever::Credentials`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+        end
+        h[k.to_sym] = v
+      }
 
-      if attributes.has_key?(:'district_username')
+      if attributes.key?(:'district_username')
         self.district_username = attributes[:'district_username']
       end
     end
@@ -71,17 +83,24 @@ module Clever
     end
 
     # Calculates hash code according to all attributes.
-    # @return [Fixnum] Hash code
+    # @return [Integer] Hash code
     def hash
       [district_username].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.swagger_types.each_pair do |key, type|
+      self.class.openapi_types.each_pair do |key, type|
         if 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
@@ -90,7 +109,9 @@ module Clever
           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[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+          self.send("#{key}=", nil)
+        end
       end
 
       self
@@ -112,7 +133,7 @@ module Clever
         value.to_i
       when :Float
         value.to_f
-      when :BOOLEAN
+      when :Boolean
         if value.to_s =~ /\A(true|t|yes|y|1)\z/i
           true
         else
@@ -133,8 +154,7 @@ module Clever
           end
         end
       else # model
-        temp_model = Clever.const_get(type).new
-        temp_model.build_from_hash(value)
+        Clever.const_get(type).build_from_hash(value)
       end
     end
 
@@ -156,7 +176,11 @@ module Clever
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil?
+        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
@@ -178,7 +202,5 @@ module Clever
       else
         value
       end
-    end
-
-  end
+    end  end
 end

data/lib/clever-ruby/models/district.rb

@@ -1,46 +1,45 @@
 =begin
-#Data API
+#Clever API
 
-#Serves the Clever Data API
+#The Clever API
 
 OpenAPI spec version: 2.1.0
 
 Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.4.37
-
+Swagger Codegen version: 3.0.51
 =end
 
 require 'date'
 
 module Clever
   class District
-    attr_accessor :id
+    attr_accessor :district_contact
 
-    attr_accessor :name
+    attr_accessor :error
 
-    attr_accessor :mdr_number
+    attr_accessor :id
 
-    attr_accessor :nces_id
+    attr_accessor :last_sync
 
-    attr_accessor :sis_type
+    attr_accessor :launch_date
 
-    attr_accessor :state
+    attr_accessor :login_methods
 
-    attr_accessor :last_sync
+    attr_accessor :mdr_number
 
-    attr_accessor :error
+    attr_accessor :name
 
-    attr_accessor :pause_start
+    attr_accessor :nces_id
 
     attr_accessor :pause_end
 
-    attr_accessor :launch_date
+    attr_accessor :pause_start
 
     attr_accessor :portal_url
 
-    attr_accessor :login_methods
+    attr_accessor :sis_type
 
-    attr_accessor :district_contact
+    attr_accessor :state
 
     class EnumAttributeValidator
       attr_reader :datatype
@@ -67,107 +66,126 @@ module Clever
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
+        :'district_contact' => :'district_contact',
+        :'error' => :'error',
         :'id' => :'id',
-        :'name' => :'name',
+        :'last_sync' => :'last_sync',
+        :'launch_date' => :'launch_date',
+        :'login_methods' => :'login_methods',
         :'mdr_number' => :'mdr_number',
+        :'name' => :'name',
         :'nces_id' => :'nces_id',
-        :'sis_type' => :'sis_type',
-        :'state' => :'state',
-        :'last_sync' => :'last_sync',
-        :'error' => :'error',
-        :'pause_start' => :'pause_start',
         :'pause_end' => :'pause_end',
-        :'launch_date' => :'launch_date',
+        :'pause_start' => :'pause_start',
         :'portal_url' => :'portal_url',
-        :'login_methods' => :'login_methods',
-        :'district_contact' => :'district_contact'
+        :'sis_type' => :'sis_type',
+        :'state' => :'state'
       }
     end
 
     # Attribute type mapping.
-    def self.swagger_types
+    def self.openapi_types
       {
-        :'id' => :'String',
-        :'name' => :'String',
-        :'mdr_number' => :'String',
-        :'nces_id' => :'String',
-        :'sis_type' => :'String',
-        :'state' => :'String',
-        :'last_sync' => :'String',
-        :'error' => :'String',
-        :'pause_start' => :'String',
-        :'pause_end' => :'String',
-        :'launch_date' => :'String',
-        :'portal_url' => :'String',
-        :'login_methods' => :'Array<String>',
-        :'district_contact' => :'DistrictAdmin'
+        :'district_contact' => :'Object',
+        :'error' => :'Object',
+        :'id' => :'Object',
+        :'last_sync' => :'Object',
+        :'launch_date' => :'Object',
+        :'login_methods' => :'Object',
+        :'mdr_number' => :'Object',
+        :'name' => :'Object',
+        :'nces_id' => :'Object',
+        :'pause_end' => :'Object',
+        :'pause_start' => :'Object',
+        :'portal_url' => :'Object',
+        :'sis_type' => :'Object',
+        :'state' => :'Object'
       }
     end
 
+    # List of attributes with nullable: true
+    def self.openapi_nullable
+      Set.new([
+        :'last_sync',
+        :'mdr_number',
+        :'nces_id',
+        :'pause_end',
+        :'pause_start',
+        :'state'
+      ])
+    end
+  
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
-      return unless attributes.is_a?(Hash)
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `Clever::District` initialize method"
+      end
 
-      # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+      # check to see if the attribute exists and convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h|
+        if (!self.class.attribute_map.key?(k.to_sym))
+          fail ArgumentError, "`#{k}` is not a valid attribute in `Clever::District`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+        end
+        h[k.to_sym] = v
+      }
 
-      if attributes.has_key?(:'id')
-        self.id = attributes[:'id']
+      if attributes.key?(:'district_contact')
+        self.district_contact = attributes[:'district_contact']
       end
 
-      if attributes.has_key?(:'name')
-        self.name = attributes[:'name']
+      if attributes.key?(:'error')
+        self.error = attributes[:'error']
       end
 
-      if attributes.has_key?(:'mdr_number')
-        self.mdr_number = attributes[:'mdr_number']
+      if attributes.key?(:'id')
+        self.id = attributes[:'id']
       end
 
-      if attributes.has_key?(:'nces_id')
-        self.nces_id = attributes[:'nces_id']
+      if attributes.key?(:'last_sync')
+        self.last_sync = attributes[:'last_sync']
       end
 
-      if attributes.has_key?(:'sis_type')
-        self.sis_type = attributes[:'sis_type']
+      if attributes.key?(:'launch_date')
+        self.launch_date = attributes[:'launch_date']
       end
 
-      if attributes.has_key?(:'state')
-        self.state = attributes[:'state']
+      if attributes.key?(:'login_methods')
+        if (value = attributes[:'login_methods']).is_a?(Array)
+          self.login_methods = value
+        end
       end
 
-      if attributes.has_key?(:'last_sync')
-        self.last_sync = attributes[:'last_sync']
+      if attributes.key?(:'mdr_number')
+        self.mdr_number = attributes[:'mdr_number']
       end
 
-      if attributes.has_key?(:'error')
-        self.error = attributes[:'error']
+      if attributes.key?(:'name')
+        self.name = attributes[:'name']
       end
 
-      if attributes.has_key?(:'pause_start')
-        self.pause_start = attributes[:'pause_start']
+      if attributes.key?(:'nces_id')
+        self.nces_id = attributes[:'nces_id']
       end
 
-      if attributes.has_key?(:'pause_end')
+      if attributes.key?(:'pause_end')
         self.pause_end = attributes[:'pause_end']
       end
 
-      if attributes.has_key?(:'launch_date')
-        self.launch_date = attributes[:'launch_date']
+      if attributes.key?(:'pause_start')
+        self.pause_start = attributes[:'pause_start']
       end
 
-      if attributes.has_key?(:'portal_url')
+      if attributes.key?(:'portal_url')
         self.portal_url = attributes[:'portal_url']
       end
 
-      if attributes.has_key?(:'login_methods')
-        if (value = attributes[:'login_methods']).is_a?(Array)
-          self.login_methods = value
-        end
+      if attributes.key?(:'sis_type')
+        self.sis_type = attributes[:'sis_type']
       end
 
-      if attributes.has_key?(:'district_contact')
-        self.district_contact = attributes[:'district_contact']
+      if attributes.key?(:'state')
+        self.state = attributes[:'state']
       end
     end
 
@@ -181,7 +199,7 @@ module Clever
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      state_validator = EnumAttributeValidator.new('String', ['running', 'pending', 'error', 'paused', '', 'success'])
+      state_validator = EnumAttributeValidator.new('Object', ['running', 'pending', 'error', 'paused', '', 'success'])
       return false unless state_validator.valid?(@state)
       true
     end
@@ -189,9 +207,9 @@ module Clever
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] state Object to be assigned
     def state=(state)
-      validator = EnumAttributeValidator.new('String', ['running', 'pending', 'error', 'paused', '', 'success'])
+      validator = EnumAttributeValidator.new('Object', ['running', 'pending', 'error', 'paused', '', 'success'])
       unless validator.valid?(state)
-        fail ArgumentError, 'invalid value for "state", must be one of #{validator.allowable_values}.'
+        fail ArgumentError, "invalid value for \"state\", must be one of #{validator.allowable_values}."
       end
       @state = state
     end
@@ -201,20 +219,20 @@ module Clever
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+          district_contact == o.district_contact &&
+          error == o.error &&
           id == o.id &&
-          name == o.name &&
+          last_sync == o.last_sync &&
+          launch_date == o.launch_date &&
+          login_methods == o.login_methods &&
           mdr_number == o.mdr_number &&
+          name == o.name &&
           nces_id == o.nces_id &&
-          sis_type == o.sis_type &&
-          state == o.state &&
-          last_sync == o.last_sync &&
-          error == o.error &&
-          pause_start == o.pause_start &&
           pause_end == o.pause_end &&
-          launch_date == o.launch_date &&
+          pause_start == o.pause_start &&
           portal_url == o.portal_url &&
-          login_methods == o.login_methods &&
-          district_contact == o.district_contact
+          sis_type == o.sis_type &&
+          state == o.state
     end
 
     # @see the `==` method
@@ -224,9 +242,16 @@ module Clever
     end
 
     # Calculates hash code according to all attributes.
-    # @return [Fixnum] Hash code
+    # @return [Integer] Hash code
     def hash
-      [id, name, mdr_number, nces_id, sis_type, state, last_sync, error, pause_start, pause_end, launch_date, portal_url, login_methods, district_contact].hash
+      [district_contact, error, id, last_sync, launch_date, login_methods, mdr_number, name, nces_id, pause_end, pause_start, portal_url, sis_type, state].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
@@ -234,7 +259,7 @@ module Clever
     # @return [Object] Returns the model itself
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
-      self.class.swagger_types.each_pair do |key, type|
+      self.class.openapi_types.each_pair do |key, type|
         if 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
@@ -243,7 +268,9 @@ module Clever
           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[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+          self.send("#{key}=", nil)
+        end
       end
 
       self
@@ -265,7 +292,7 @@ module Clever
         value.to_i
       when :Float
         value.to_f
-      when :BOOLEAN
+      when :Boolean
         if value.to_s =~ /\A(true|t|yes|y|1)\z/i
           true
         else
@@ -286,8 +313,7 @@ module Clever
           end
         end
       else # model
-        temp_model = Clever.const_get(type).new
-        temp_model.build_from_hash(value)
+        Clever.const_get(type).build_from_hash(value)
       end
     end
 
@@ -309,7 +335,11 @@ module Clever
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil?
+        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
@@ -331,7 +361,5 @@ module Clever
       else
         value
       end
-    end
-
-  end
+    end  end
 end