babl-json 0.5.8 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dec8dc9599589b5511a86e459172421352ab0b44
-  data.tar.gz: 966a0cc10f570cdb0078b97092da6aa2778644f5
+  metadata.gz: 329322cf3fa5b7e83cad065409efcd8889146f0f
+  data.tar.gz: 4b492ee8bc38517fcd1c2e138631e95301ea655f
 SHA512:
-  metadata.gz: 43e8e8ea87c8edea34b825faa3f0bc35104e3485fda08a9a6096f57e14d2dfa1a387e533ebfbf75f4597e29ac0eb0c92755e0fbcefb96fa7c62fb7a916b25bc5
-  data.tar.gz: 9341db37ffed4346b12c2d9487aa6c094ae3b4125ea635b7854c0427a8cd1e133e7ace096cadcfa384f5838ebb52704285d3e9d2053be9fb70a8e10aabf8be2d
+  metadata.gz: 3a0b504aa4bfdd699fe1c7bb5d2e42096329d503fe439878a13c9bbe6239f30de74a3c68fbb4d1d2309ec6f3b87a254117489f8d6d874c4d83e8b0daba00952a
+  data.tar.gz: ae23a4755c56670770efdcc4dfa1abf1fed22ef6b48ce954cf2d726908c9652d768571ee8a735eee79606ab0c8ad83c6991a90e753b2ff73fc427f3de6ef2539

data/lib/babl/nodes/constant.rb

@@ -5,6 +5,10 @@ require 'babl/utils'
 module Babl
     module Nodes
         class Constant < Utils::Value.new(:value, :schema)
+            NULL = new(nil, Schema::Primitive::NULL)
+            TRUE = new(true, Schema::Primitive::TRUE)
+            FALSE = new(false, Schema::Primitive::FALSE)
+
             def render(_frame)
                 value
             end

data/lib/babl/nodes/each.rb

@@ -35,8 +35,9 @@ module Babl
                     raise Errors::RenderingError, "Not enumerable : #{collection.inspect}\n#{frame.formatted_stack}"
                 end
 
-                collection.map.with_index do |value, idx|
-                    frame.move_forward(value, idx) do |new_frame|
+                idx = -1
+                collection.map do |value|
+                    frame.move_forward(value, idx += 1) do |new_frame|
                         node.render(new_frame)
                     end
                 end

data/lib/babl/nodes/with.rb

@@ -43,18 +43,31 @@ module Babl
             end
 
             def render(frame)
-                values = nodes.map { |n| n.render(frame) }
-
-                value = begin
-                    block.call(*values)
-                rescue StandardError => e
-                    raise Errors::RenderingError, "#{e.message}\n" + frame.formatted_stack(:__block__), e.backtrace
-                end
+                # When there is only 0 or 1 input node, we can avoid the allocation of an array
+                value =
+                    case nodes.size
+                    when 0
+                        rescue_errors(frame) { block.call }
+                    when 1
+                        input = nodes.first.render(frame)
+                        rescue_errors(frame) { block.call(input) }
+                    else
+                        inputs = nodes.map { |node| node.render(frame) }
+                        rescue_errors(frame) { block.call(*inputs) }
+                    end
 
                 frame.move_forward(value, :__block__) do |new_frame|
                     node.render(new_frame)
                 end
             end
+
+            private
+
+            def rescue_errors(frame)
+                yield
+            rescue StandardError => e
+                raise Errors::RenderingError, "#{e.message}\n" + frame.formatted_stack(:__block__), e.backtrace
+            end
         end
     end
 end

data/lib/babl/operators/static.rb

@@ -11,11 +11,15 @@ module Babl
                     sanitized_val = Nodes::TerminalValue.instance.render_object(val)
 
                     case sanitized_val
-                    when ::String, ::Numeric, ::NilClass, ::TrueClass, ::FalseClass
+                    when ::String, ::Numeric
                         frozen_val = sanitized_val.dup.freeze
-                        construct_terminal {
-                            Nodes::Constant.new(frozen_val, Schema::Primitive.new(frozen_val))
-                        }
+                        construct_terminal { Nodes::Constant.new(frozen_val, Schema::Primitive.new(frozen_val)) }
+                    when ::NilClass
+                        construct_terminal { Nodes::Constant::NULL }
+                    when ::TrueClass
+                        construct_terminal { Nodes::Constant::TRUE }
+                    when ::FalseClass
+                        construct_terminal { Nodes::Constant::FALSE }
                     else call(sanitized_val)
                     end
                 rescue Errors::RenderingError => exception

data/lib/babl/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: babl-json
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors:
 - Frederic Terrazzoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-17 00:00:00.000000000 Z
+date: 2018-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls
@@ -98,16 +98,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.57'
+        version: '0.58'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.57'
+        version: '0.58'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement