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

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

@@ -1,25 +1,24 @@
 =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 Contact
-    attr_accessor :id
-
     attr_accessor :district
 
     attr_accessor :email
 
+    attr_accessor :id
+
     attr_accessor :name
 
     attr_accessor :phone
@@ -59,9 +58,9 @@ module Clever
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'id' => :'id',
         :'district' => :'district',
         :'email' => :'email',
+        :'id' => :'id',
         :'name' => :'name',
         :'phone' => :'phone',
         :'phone_type' => :'phone_type',
@@ -73,68 +72,87 @@ module Clever
     end
 
     # Attribute type mapping.
-    def self.swagger_types
+    def self.openapi_types
       {
-        :'id' => :'String',
-        :'district' => :'String',
-        :'email' => :'String',
-        :'name' => :'String',
-        :'phone' => :'String',
-        :'phone_type' => :'String',
-        :'relationship' => :'String',
-        :'sis_id' => :'String',
-        :'students' => :'Array<String>',
-        :'type' => :'String'
+        :'district' => :'Object',
+        :'email' => :'Object',
+        :'id' => :'Object',
+        :'name' => :'Object',
+        :'phone' => :'Object',
+        :'phone_type' => :'Object',
+        :'relationship' => :'Object',
+        :'sis_id' => :'Object',
+        :'students' => :'Object',
+        :'type' => :'Object'
       }
     end
 
+    # List of attributes with nullable: true
+    def self.openapi_nullable
+      Set.new([
+        :'email',
+        :'phone',
+        :'phone_type',
+        :'relationship',
+        :'sis_id',
+        :'type'
+      ])
+    end
+  
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
-      return unless attributes.is_a?(Hash)
-
-      # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
-
-      if attributes.has_key?(:'id')
-        self.id = attributes[:'id']
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `Clever::Contact` initialize method"
       end
 
-      if attributes.has_key?(:'district')
+      # 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::Contact`. 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.key?(:'district')
         self.district = attributes[:'district']
       end
 
-      if attributes.has_key?(:'email')
+      if attributes.key?(:'email')
         self.email = attributes[:'email']
       end
 
-      if attributes.has_key?(:'name')
+      if attributes.key?(:'id')
+        self.id = attributes[:'id']
+      end
+
+      if attributes.key?(:'name')
         self.name = attributes[:'name']
       end
 
-      if attributes.has_key?(:'phone')
+      if attributes.key?(:'phone')
         self.phone = attributes[:'phone']
       end
 
-      if attributes.has_key?(:'phone_type')
+      if attributes.key?(:'phone_type')
         self.phone_type = attributes[:'phone_type']
       end
 
-      if attributes.has_key?(:'relationship')
+      if attributes.key?(:'relationship')
         self.relationship = attributes[:'relationship']
       end
 
-      if attributes.has_key?(:'sis_id')
+      if attributes.key?(:'sis_id')
         self.sis_id = attributes[:'sis_id']
       end
 
-      if attributes.has_key?(:'students')
+      if attributes.key?(:'students')
         if (value = attributes[:'students']).is_a?(Array)
           self.students = value
         end
       end
 
-      if attributes.has_key?(:'type')
+      if attributes.key?(:'type')
         self.type = attributes[:'type']
       end
     end
@@ -149,11 +167,11 @@ module Clever
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      phone_type_validator = EnumAttributeValidator.new('String', ['Cell', 'Home', 'Work', 'Other', ''])
+      phone_type_validator = EnumAttributeValidator.new('Object', ['Cell', 'Home', 'Work', 'Other', ''])
       return false unless phone_type_validator.valid?(@phone_type)
-      relationship_validator = EnumAttributeValidator.new('String', ['Parent', 'Grandparent', 'Self', 'Aunt/Uncle', 'Sibling', 'Other', ''])
+      relationship_validator = EnumAttributeValidator.new('Object', ['Parent', 'Grandparent', 'Self', 'Aunt/Uncle', 'Sibling', 'Other', ''])
       return false unless relationship_validator.valid?(@relationship)
-      type_validator = EnumAttributeValidator.new('String', ['Parent/Guardian', 'Emergency', 'Primary', 'Secondary', 'Family', 'Other', ''])
+      type_validator = EnumAttributeValidator.new('Object', ['Parent/Guardian', 'Emergency', 'Primary', 'Secondary', 'Family', 'Other', ''])
       return false unless type_validator.valid?(@type)
       true
     end
@@ -161,9 +179,9 @@ module Clever
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] phone_type Object to be assigned
     def phone_type=(phone_type)
-      validator = EnumAttributeValidator.new('String', ['Cell', 'Home', 'Work', 'Other', ''])
+      validator = EnumAttributeValidator.new('Object', ['Cell', 'Home', 'Work', 'Other', ''])
       unless validator.valid?(phone_type)
-        fail ArgumentError, 'invalid value for "phone_type", must be one of #{validator.allowable_values}.'
+        fail ArgumentError, "invalid value for \"phone_type\", must be one of #{validator.allowable_values}."
       end
       @phone_type = phone_type
     end
@@ -171,9 +189,9 @@ module Clever
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] relationship Object to be assigned
     def relationship=(relationship)
-      validator = EnumAttributeValidator.new('String', ['Parent', 'Grandparent', 'Self', 'Aunt/Uncle', 'Sibling', 'Other', ''])
+      validator = EnumAttributeValidator.new('Object', ['Parent', 'Grandparent', 'Self', 'Aunt/Uncle', 'Sibling', 'Other', ''])
       unless validator.valid?(relationship)
-        fail ArgumentError, 'invalid value for "relationship", must be one of #{validator.allowable_values}.'
+        fail ArgumentError, "invalid value for \"relationship\", must be one of #{validator.allowable_values}."
       end
       @relationship = relationship
     end
@@ -181,9 +199,9 @@ module Clever
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] type Object to be assigned
     def type=(type)
-      validator = EnumAttributeValidator.new('String', ['Parent/Guardian', 'Emergency', 'Primary', 'Secondary', 'Family', 'Other', ''])
+      validator = EnumAttributeValidator.new('Object', ['Parent/Guardian', 'Emergency', 'Primary', 'Secondary', 'Family', 'Other', ''])
       unless validator.valid?(type)
-        fail ArgumentError, 'invalid value for "type", must be one of #{validator.allowable_values}.'
+        fail ArgumentError, "invalid value for \"type\", must be one of #{validator.allowable_values}."
       end
       @type = type
     end
@@ -193,9 +211,9 @@ module Clever
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
-          id == o.id &&
           district == o.district &&
           email == o.email &&
+          id == o.id &&
           name == o.name &&
           phone == o.phone &&
           phone_type == o.phone_type &&
@@ -212,9 +230,16 @@ module Clever
     end
 
     # Calculates hash code according to all attributes.
-    # @return [Fixnum] Hash code
+    # @return [Integer] Hash code
     def hash
-      [id, district, email, name, phone, phone_type, relationship, sis_id, students, type].hash
+      [district, email, id, name, phone, phone_type, relationship, sis_id, students, type].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
@@ -222,7 +247,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
@@ -231,7 +256,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
@@ -253,7 +280,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
@@ -274,8 +301,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
 
@@ -297,7 +323,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
@@ -319,7 +349,5 @@ module Clever
       else
         value
       end
-    end
-
-  end
+    end  end
 end

data/lib/clever-ruby/models/contact_object.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
       {
-        :'object' => :'Contact'
+        :'object' => :'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::ContactObject` 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::ContactObject`. 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?(:'object')
+      if attributes.key?(:'object')
         self.object = attributes[:'object']
       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
       [object].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/contact_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'
@@ -24,21 +23,34 @@ module Clever
     end
 
     # Attribute type mapping.
-    def self.swagger_types
+    def self.openapi_types
       {
-        :'data' => :'Contact'
+        :'data' => :'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::ContactResponse` 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::ContactResponse`. 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')
         self.data = attributes[:'data']
       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
       [data].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