Update lib/devcycle-ruby-server-sdk/api/client.rb

Co-authored-by: Copilot <[email protected]>

Author: jsalaber

lib/devcycle-ruby-server-sdk/api/client.rb

@@ -325,20 +325,26 @@ def variable_with_http_info(key, user, default, opts = {})
         if @api_client.config.debugging
           @api_client.config.logger.debug "API called: DevCycle::Client#variable\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
         end
-        if default && data.type && data.type.to_s != default.class.name
-          eval = { reason: DevCycle::EVAL_REASONS::DEFAULT, details: DevCycle::DEFAULT_REASON_DETAILS::TYPE_MISMATCH }
-          return Variable.new(key: key, value: default, isDefaulted: true, eval: eval)
+        if default && data.type
+          api_type_to_ruby_class = {
+            'Boolean' => [TrueClass, FalseClass],
+            'Number' => [Integer, Float],
+            'String' => [String],
+            'JSON' => [Hash]
+          }
+          ruby_classes = api_type_to_ruby_class[data.type.to_s]
+          unless ruby_classes && ruby_classes.any? { |klass| default.is_a?(klass) }
+            eval = { reason: DevCycle::EVAL_REASONS::DEFAULT, details: DevCycle::DEFAULT_REASON_DETAILS::TYPE_MISMATCH }
+            return Variable.new(key: key, value: default, isDefaulted: true, eval: eval)
+          end
         end
         return data
       rescue ApiError => error
         if error.code == 404
-          eval = { reason: DevCycle::EVAL_REASONS::DEFAULT, details: DevCycle::DEFAULT_REASON_DETAILS::MISSING_VARIABLE }
-        else
           @api_client.config.logger.error("Failed to retrieve variable value: #{error.message}")
-          eval = { reason: DevCycle::EVAL_REASONS::DEFAULT, details: DevCycle::DEFAULT_REASON_DETAILS::ERROR }
         end
 
-        return Variable.new(key: key, value: default, isDefaulted: true, eval: eval)
+        return Variable.new(key: key, value: default, isDefaulted: true, eval: { reason: DevCycle::EVAL_REASONS::DEFAULT, details: DevCycle::DEFAULT_REASON_DETAILS::ERROR })
       end 
     end
 

spec/api/devcycle_api_spec.rb

@@ -72,7 +72,7 @@
       result = @api_instance.variable(@user, "ruby-example-tests-default", false)
       expect(result.isDefaulted).to eq true
       expect(result.eval[:reason]).to eq "DEFAULT"
-      expect(result.eval[:details]).to eq "Missing Variable"
+      expect(result.eval[:details]).to eq "Error"
 
       result = @api_instance.variable_value(@user, "ruby-example-tests-default", true)
       expect(result).to eq true
@@ -94,10 +94,50 @@
       result = @api_instance.variable_value(@user, "test", true)
       expect(result).to eq true
 
+      result = @api_instance.variable(@user, "test-number-variable", 0)
+      expect(result.isDefaulted).to eq false
+      expect(result.value).to eq 123
+
+      result = @api_instance.variable(@user, "test-number-variable", 0)
+      expect(result.isDefaulted).to eq false
+      expect(result.value).to eq 123
+
+      result = @api_instance.variable(@user, "test-float-variable", 0.0)
+      expect(result.isDefaulted).to eq false
+      expect(result.value).to eq 4.56
+
+      result = @api_instance.variable(@user, "test-string-variable", "")
+      expect(result.isDefaulted).to eq false
+      expect(result.value).to eq "on"
+
+      result = @api_instance.variable(@user, "test-json-variable", {})
+      expect(result.isDefaulted).to eq false
+      expect(result.value).to eq({:message => "a"})
+
       result = @api_instance.variable(@user, "test", "false")
       expect(result.isDefaulted).to eq true
       expect(result.eval[:reason]).to eq "DEFAULT"
       expect(result.eval[:details]).to eq "Variable Type Mismatch"
+
+      result = @api_instance.variable(@user, "test-number-variable", "123")
+      expect(result.isDefaulted).to eq true
+      expect(result.eval[:reason]).to eq "DEFAULT"
+      expect(result.eval[:details]).to eq "Variable Type Mismatch"
+
+      result = @api_instance.variable(@user, "test-number-variable", true)
+      expect(result.isDefaulted).to eq true
+      expect(result.eval[:reason]).to eq "DEFAULT"
+      expect(result.eval[:details]).to eq "Variable Type Mismatch"
+
+      result = @api_instance.variable(@user, "test-string-variable", true)
+      expect(result.isDefaulted).to eq true
+      expect(result.eval[:reason]).to eq "DEFAULT"
+      expect(result.eval[:details]).to eq "Variable Type Mismatch"
+
+      result = @api_instance.variable(@user, "test-json-variable", "on")
+      expect(result.isDefaulted).to eq true
+      expect(result.eval[:reason]).to eq "DEFAULT"
+      expect(result.eval[:details]).to eq "Variable Type Mismatch" 
     end
   end