fix(crystal): update samples

Author: n-rodriguez

samples/client/petstore/crystal/src/petstore/models/category.cr

@@ -35,8 +35,8 @@ module Petstore
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array(String).new
-      pattern = Regexp.new(/^[a-zA-Z0-9]+[a-zA-Z0-9\.\-_]*[a-zA-Z0-9]+$/)
-      if !@name.nil? && @name !~ pattern
+      pattern = /^[a-zA-Z0-9]+[a-zA-Z0-9\.\-_]*[a-zA-Z0-9]+$/
+      if !@name.nil? && @name.try &.!~ pattern
         invalid_properties.push("invalid value for \"name\", must conform to the pattern #{pattern}.")
       end
 
@@ -46,14 +46,14 @@ module Petstore
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      return false if !@name.nil? && @name !~ Regexp.new(/^[a-zA-Z0-9]+[a-zA-Z0-9\.\-_]*[a-zA-Z0-9]+$/)
+      return false if !@name.nil? && @name.try &.!~ /^[a-zA-Z0-9]+[a-zA-Z0-9\.\-_]*[a-zA-Z0-9]+$/
       true
     end
 
     # Custom attribute writer method with validation
     # @param [Object] name Value to be assigned
     def name=(name)
-      pattern = Regexp.new(/^[a-zA-Z0-9]+[a-zA-Z0-9\.\-_]*[a-zA-Z0-9]+$/)
+      pattern = /^[a-zA-Z0-9]+[a-zA-Z0-9\.\-_]*[a-zA-Z0-9]+$/
       if !name.nil? && name !~ pattern
         raise ArgumentError.new("invalid value for \"name\", must conform to the pattern #{pattern}.")
       end

samples/client/petstore/crystal/src/petstore/models/format_test.cr

@@ -79,66 +79,66 @@ module Petstore
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array(String).new
-      if !@integer.nil? && @integer > 100
+      if !@integer.nil? && @integer.try &.> 100
         invalid_properties.push("invalid value for \"integer\", must be smaller than or equal to 100.")
       end
 
-      if !@integer.nil? && @integer < 10
+      if !@integer.nil? && @integer.try &.< 10
         invalid_properties.push("invalid value for \"integer\", must be greater than or equal to 10.")
       end
 
-      if !@int32.nil? && @int32 > 200
+      if !@int32.nil? && @int32.try &.> 200
         invalid_properties.push("invalid value for \"int32\", must be smaller than or equal to 200.")
       end
 
-      if !@int32.nil? && @int32 < 20
+      if !@int32.nil? && @int32.try &.< 20
         invalid_properties.push("invalid value for \"int32\", must be greater than or equal to 20.")
       end
 
-      if @number > 543.2
+      if @number.try &.> 543.2
         invalid_properties.push("invalid value for \"number\", must be smaller than or equal to 543.2.")
       end
 
-      if @number < 32.1
+      if @number.try &.< 32.1
         invalid_properties.push("invalid value for \"number\", must be greater than or equal to 32.1.")
       end
 
-      if !@float.nil? && @float > 987.6
+      if !@float.nil? && @float.try &.> 987.6
         invalid_properties.push("invalid value for \"float\", must be smaller than or equal to 987.6.")
       end
 
-      if !@float.nil? && @float < 54.3
+      if !@float.nil? && @float.try &.< 54.3
         invalid_properties.push("invalid value for \"float\", must be greater than or equal to 54.3.")
       end
 
-      if !@double.nil? && @double > 123.4
+      if !@double.nil? && @double.try &.> 123.4
         invalid_properties.push("invalid value for \"double\", must be smaller than or equal to 123.4.")
       end
 
-      if !@double.nil? && @double < 67.8
+      if !@double.nil? && @double.try &.< 67.8
         invalid_properties.push("invalid value for \"double\", must be greater than or equal to 67.8.")
       end
 
-      pattern = Regexp.new(/[a-z]/i)
-      if !@string.nil? && @string !~ pattern
+      pattern = /[a-z]/i
+      if !@string.nil? && @string.try &.!~ pattern
         invalid_properties.push("invalid value for \"string\", must conform to the pattern #{pattern}.")
       end
 
-      if @password.to_s.size > 64
+      if @password.try &.to_s.try &.size.try &.> 64
         invalid_properties.push("invalid value for \"password\", the character length must be smaller than or equal to 64.")
       end
 
-      if @password.to_s.size < 10
+      if @password.try &.to_s.try &.size.try &.< 10
         invalid_properties.push("invalid value for \"password\", the character length must be greater than or equal to 10.")
       end
 
-      pattern = Regexp.new(/^\d{10}$/)
-      if !@pattern_with_digits.nil? && @pattern_with_digits !~ pattern
+      pattern = /^\d{10}$/
+      if !@pattern_with_digits.nil? && @pattern_with_digits.try &.!~ pattern
         invalid_properties.push("invalid value for \"pattern_with_digits\", must conform to the pattern #{pattern}.")
       end
 
-      pattern = Regexp.new(/^image_\d{1,3}$/i)
-      if !@pattern_with_digits_and_delimiter.nil? && @pattern_with_digits_and_delimiter !~ pattern
+      pattern = /^image_\d{1,3}$/i
+      if !@pattern_with_digits_and_delimiter.nil? && @pattern_with_digits_and_delimiter.try &.!~ pattern
         invalid_properties.push("invalid value for \"pattern_with_digits_and_delimiter\", must conform to the pattern #{pattern}.")
       end
 
@@ -148,21 +148,21 @@ module Petstore
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      return false if !@integer.nil? && @integer > 100
-      return false if !@integer.nil? && @integer < 10
-      return false if !@int32.nil? && @int32 > 200
-      return false if !@int32.nil? && @int32 < 20
-      return false if @number > 543.2
-      return false if @number < 32.1
-      return false if !@float.nil? && @float > 987.6
-      return false if !@float.nil? && @float < 54.3
-      return false if !@double.nil? && @double > 123.4
-      return false if !@double.nil? && @double < 67.8
-      return false if !@string.nil? && @string !~ Regexp.new(/[a-z]/i)
-      return false if @password.to_s.size > 64
-      return false if @password.to_s.size < 10
-      return false if !@pattern_with_digits.nil? && @pattern_with_digits !~ Regexp.new(/^\d{10}$/)
-      return false if !@pattern_with_digits_and_delimiter.nil? && @pattern_with_digits_and_delimiter !~ Regexp.new(/^image_\d{1,3}$/i)
+      return false if !@integer.nil? && @integer.try &.> 100
+      return false if !@integer.nil? && @integer.try &.< 10
+      return false if !@int32.nil? && @int32.try &.> 200
+      return false if !@int32.nil? && @int32.try &.< 20
+      return false if @number.try &.> 543.2
+      return false if @number.try &.< 32.1
+      return false if !@float.nil? && @float.try &.> 987.6
+      return false if !@float.nil? && @float.try &.< 54.3
+      return false if !@double.nil? && @double.try &.> 123.4
+      return false if !@double.nil? && @double.try &.< 67.8
+      return false if !@string.nil? && @string.try &.!~ /[a-z]/i
+      return false if @password.try &.to_s.try &.size.try &.> 64
+      return false if @password.try &.to_s.try &.size.try &.< 10
+      return false if !@pattern_with_digits.nil? && @pattern_with_digits.try &.!~ /^\d{10}$/
+      return false if !@pattern_with_digits_and_delimiter.nil? && @pattern_with_digits_and_delimiter.try &.!~ /^image_\d{1,3}$/i
       true
     end
 
@@ -239,7 +239,7 @@ module Petstore
     # Custom attribute writer method with validation
     # @param [Object] string Value to be assigned
     def string=(string)
-      pattern = Regexp.new(/[a-z]/i)
+      pattern = /[a-z]/i
       if !string.nil? && string !~ pattern
         raise ArgumentError.new("invalid value for \"string\", must conform to the pattern #{pattern}.")
       end
@@ -264,7 +264,7 @@ module Petstore
     # Custom attribute writer method with validation
     # @param [Object] pattern_with_digits Value to be assigned
     def pattern_with_digits=(pattern_with_digits)
-      pattern = Regexp.new(/^\d{10}$/)
+      pattern = /^\d{10}$/
       if !pattern_with_digits.nil? && pattern_with_digits !~ pattern
         raise ArgumentError.new("invalid value for \"pattern_with_digits\", must conform to the pattern #{pattern}.")
       end
@@ -275,7 +275,7 @@ module Petstore
     # Custom attribute writer method with validation
     # @param [Object] pattern_with_digits_and_delimiter Value to be assigned
     def pattern_with_digits_and_delimiter=(pattern_with_digits_and_delimiter)
-      pattern = Regexp.new(/^image_\d{1,3}$/i)
+      pattern = /^image_\d{1,3}$/i
       if !pattern_with_digits_and_delimiter.nil? && pattern_with_digits_and_delimiter !~ pattern
         raise ArgumentError.new("invalid value for \"pattern_with_digits_and_delimiter\", must conform to the pattern #{pattern}.")
       end

samples/client/petstore/crystal/src/petstore/models/order.cr

@@ -39,29 +39,42 @@ module Petstore
     @[JSON::Field(key: "complete", type: Bool?, default: false, nillable: true, emit_null: false)]
     property complete : Bool?
 
-    class EnumAttributeValidator
-      getter datatype : String
-      getter allowable_values : Array(String)
-
-      def initialize(datatype, allowable_values)
-        @datatype = datatype
-        @allowable_values = allowable_values.map do |value|
-          case datatype.to_s
-          when /Integer/i
-            value.to_i
-          when /Float/i
-            value.to_f
-          else
-            value
-          end
+    abstract class EnumAttributeValidator
+      def valid?(value)
+        !value || @allowable_values.includes?(value)
+      end
+
+      def message
+        "invalid value for \"#{@attribute}\", must be one of #{@allowable_values}."
+      end
+
+      def to(_type, value)
+        case _type
+        when Int32
+          value.to_i32
+        when Int64
+          value.to_i64
+        when Float32
+          value.to_f32
+        when Float64
+          value.to_f64
+        else
+          value.to_s
         end
       end
+    end
 
-      def valid?(value)
-        !value || allowable_values.includes?(value)
+    class EnumAttributeValidatorForStatus < EnumAttributeValidator
+      @attribute : String
+      @allowable_values : Array(Int32 | Int64 | Float32 | Float64 | String)
+
+      def initialize
+        @attribute = "status"
+        @allowable_values = ["placed", "approved", "delivered"].map { |value| to(String, value)}
       end
     end
 
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(@id : Int64? = nil, @pet_id : Int64? = nil, @quantity : Int32? = nil, @ship_date : Time? = nil, @status : String? = nil, @complete : Bool? = nil)
@@ -71,23 +84,29 @@ module Petstore
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array(String).new
+      status_validator = EnumAttributeValidatorForStatus.new
+      if !status_validator.valid?(@status)
+        message = status_validator.message
+        invalid_properties.push(message)
+      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?
-      status_validator = EnumAttributeValidator.new("String", ["placed", "approved", "delivered"])
+      status_validator = EnumAttributeValidatorForStatus.new
       return false unless status_validator.valid?(@status)
       true
     end
 
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] status Object to be assigned
     def status=(status)
-      validator = EnumAttributeValidator.new("String", ["placed", "approved", "delivered"])
+      validator = EnumAttributeValidatorForStatus.new
       unless validator.valid?(status)
-        raise ArgumentError.new("invalid value for \"status\", must be one of #{validator.allowable_values}.")
+        raise ArgumentError.new(validator.message)
       end
       @status = status
     end

samples/client/petstore/crystal/src/petstore/models/pet.cr

@@ -40,29 +40,42 @@ module Petstore
     @[JSON::Field(key: "status", type: String?, nillable: true, emit_null: false)]
     property status : String?
 
-    class EnumAttributeValidator
-      getter datatype : String
-      getter allowable_values : Array(String)
-
-      def initialize(datatype, allowable_values)
-        @datatype = datatype
-        @allowable_values = allowable_values.map do |value|
-          case datatype.to_s
-          when /Integer/i
-            value.to_i
-          when /Float/i
-            value.to_f
-          else
-            value
-          end
+    abstract class EnumAttributeValidator
+      def valid?(value)
+        !value || @allowable_values.includes?(value)
+      end
+
+      def message
+        "invalid value for \"#{@attribute}\", must be one of #{@allowable_values}."
+      end
+
+      def to(_type, value)
+        case _type
+        when Int32
+          value.to_i32
+        when Int64
+          value.to_i64
+        when Float32
+          value.to_f32
+        when Float64
+          value.to_f64
+        else
+          value.to_s
         end
       end
+    end
 
-      def valid?(value)
-        !value || allowable_values.includes?(value)
+    class EnumAttributeValidatorForStatus < EnumAttributeValidator
+      @attribute : String
+      @allowable_values : Array(Int32 | Int64 | Float32 | Float64 | String)
+
+      def initialize
+        @attribute = "status"
+        @allowable_values = ["available", "pending", "sold"].map { |value| to(String, value)}
       end
     end
 
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(@name : String, @photo_urls : Array(String), @id : Int64? = nil, @category : Category? = nil, @tags : Array(Tag)? = nil, @status : String? = nil)
@@ -72,23 +85,29 @@ module Petstore
     # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array(String).new
+      status_validator = EnumAttributeValidatorForStatus.new
+      if !status_validator.valid?(@status)
+        message = status_validator.message
+        invalid_properties.push(message)
+      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?
-      status_validator = EnumAttributeValidator.new("String", ["available", "pending", "sold"])
+      status_validator = EnumAttributeValidatorForStatus.new
       return false unless status_validator.valid?(@status)
       true
     end
 
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] status Object to be assigned
     def status=(status)
-      validator = EnumAttributeValidator.new("String", ["available", "pending", "sold"])
+      validator = EnumAttributeValidatorForStatus.new
       unless validator.valid?(status)
-        raise ArgumentError.new("invalid value for \"status\", must be one of #{validator.allowable_values}.")
+        raise ArgumentError.new(validator.message)
       end
       @status = status
     end