babl-json 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 871e1b12d52df06d65775112f9ff0f13aa42dfab
-  data.tar.gz: 72c86a1b58a6469be3dddbdf01e49b087abee471
+  metadata.gz: 4f2f029a652582cac66cd36e290f5cda18388ed5
+  data.tar.gz: 44aabe9259b3b4c91147578e2a0c4528a45f3248
 SHA512:
-  metadata.gz: b32c9e4b2eec50edd2f427b4e05c7e6bc45220d22bfbef3c7d1f87387b6487f63068001f9385b82becaad66f0a9725e65d81e9eff321430544b251f4d4ecda41
-  data.tar.gz: 2d80756fd150ed750c5639a0a65187dba8ae4c58f64c0dfde2d2e80d859db1897322f1b126573522a799ce6b1b74a46aa63db7318632a0f27d43b18a6f7f79fb
+  metadata.gz: 0d6199f5bd49ba5e467902e79ca254cf97dba01b21d92141ab451786c0fdba79a5701743f2c4f2766a9928924dd91bd8073c17f0d1542c83f3fbb047d852db31
+  data.tar.gz: 25c6e56a337e7eb69bd085a3454ef1183dbe489e372f9970be1ec1d8591b0b2df959d6790d69f3ac269c4735444ab5022233d635fe58d9ad6ea5aa922c035173

data/lib/babl/nodes/terminal_value.rb

@@ -32,10 +32,11 @@ module Babl
 
             def render_object(obj, stack = nil)
                 case obj
-                when ::String, ::Numeric, ::NilClass, ::TrueClass, ::FalseClass then obj
+                when ::String, ::Integer, ::NilClass, ::TrueClass, ::FalseClass then obj
+                when ::Numeric then obj.to_f
+                when ::Symbol then obj.to_s
                 when ::Hash then render_hash(obj, stack || [])
                 when ::Array then render_array(obj, stack || [])
-                when ::Symbol then obj.to_s
                 else raise TerminalValueError.new("Only primitives can be serialized: #{obj}", stack || [])
                 end
             end

data/lib/babl/nodes/typed.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 require 'babl/utils'
 require 'babl/schema'
+require 'babl/nodes/terminal_value'
 
 module Babl
     module Nodes
@@ -20,7 +21,9 @@ module Babl
 
             def render(ctx)
                 value = ctx.object
-                return value if schema.classes.any? { |clazz| clazz === value }
+                if schema.classes.any? { |clazz| clazz === value }
+                    return ::Numeric === value ? TerminalValue.instance.render_object(value) : value
+                end
                 raise Errors::RenderingError, "Expected type '#{schema.type}': #{value}\n#{ctx.formatted_stack}"
             end
 

data/lib/babl/operators/static.rb

@@ -8,10 +8,12 @@ module Babl
             module DSL
                 # Create a static JSON value
                 def static(val)
-                    case val
+                    sanitized_val = Nodes::TerminalValue.instance.render_object(val)
+
+                    case sanitized_val
                     when ::String, ::Numeric, ::NilClass, ::TrueClass, ::FalseClass
-                        construct_terminal { Nodes::Constant.new(val, Schema::Primitive.new(val)) }
-                    else call(Nodes::TerminalValue.instance.render_object(val))
+                        construct_terminal { Nodes::Constant.new(sanitized_val, Schema::Primitive.new(sanitized_val)) }
+                    else call(sanitized_val)
                     end
                 rescue Errors::RenderingError => exception
                     raise Errors::InvalidTemplate, exception.message

data/lib/babl/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Babl
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: babl-json
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Frederic Terrazzoni