babl-json 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89d572b099ed6dd5b4f7a8d330d62b82f2c614a9
-  data.tar.gz: a5a54bfc4ea3d28cba05a5285f401faa5708546c
+  metadata.gz: 3b3d925354aed5c77de3cf7003b305b6de01b71f
+  data.tar.gz: 24ffd681b9f421b971ac5340b1896608cb803313
 SHA512:
-  metadata.gz: 80a16645c833210146dd440920895f9d0a53bbea5a06b213ec5c50d396dcf059f3378bbb5da6b23771a035e99abe833c55125a731f92b7d22664216e1883105e
-  data.tar.gz: 14926b91b5690491bd9ae7d69123950167bfe823bda592ad6ac72e9dccf009dee817ad74f6176cd7bdee85f343bee10928059a804b65ea4701c547d241683c89
+  metadata.gz: a935bea9bf8a01a924719526f7d26d1c5bdb016c6e64b3be08ae1040f6126b4aac8cc7dc032c38b7f2f2d1fbfc8ed9a53a091c6f7634b4c4c7b1cd894d7a7f6e
+  data.tar.gz: 1fc88f586cd05f30dbcf2a766611b6bb2208006722b14ab53beceeffcacce5b1cb00397cfb3dab048497cd7f41a944810ab1e229f24c0b254bb2ab124355fabe

data/lib/babl/nodes/create_pin.rb

@@ -12,7 +12,7 @@ module Babl
             end
 
             def dependencies
-                Babl::Utils::Hash.deep_merge(node.dependencies, node.pinned_dependencies[ref] || {})
+                Babl::Utils::Hash.deep_merge(node.dependencies, node.pinned_dependencies[ref] || Utils::Hash::EMPTY)
             end
 
             def pinned_dependencies

data/lib/babl/nodes/dep.rb

@@ -27,9 +27,9 @@ module Babl
 
             def canonicalize(path)
                 case path
-                when ::Array then path.reduce({}) { |a, p| a.merge(canonicalize(p)) }
+                when ::Array then path.reduce(Utils::Hash::EMPTY) { |a, p| a.merge(canonicalize(p)) }
                 when ::Hash then path.map { |k, v| [k.to_sym, canonicalize(v)] }.to_h
-                else { path.to_sym => {} }
+                else { path.to_sym => Utils::Hash::EMPTY }
                 end
             end
         end

data/lib/babl/nodes/fixed_array.rb

@@ -9,11 +9,11 @@ module Babl
             end
 
             def dependencies
-                nodes.map(&:dependencies).reduce({}) { |a, b| Babl::Utils::Hash.deep_merge(a, b) }
+                nodes.map(&:dependencies).reduce(Utils::Hash::EMPTY) { |a, b| Babl::Utils::Hash.deep_merge(a, b) }
             end
 
             def pinned_dependencies
-                nodes.map(&:pinned_dependencies).reduce({}) { |a, b| Babl::Utils::Hash.deep_merge(a, b) }
+                nodes.map(&:pinned_dependencies).reduce(Utils::Hash::EMPTY) { |a, b| Babl::Utils::Hash.deep_merge(a, b) }
             end
 
             def render(ctx)

data/lib/babl/nodes/goto_pin.rb

@@ -4,7 +4,7 @@ module Babl
     module Nodes
         class GotoPin < Utils::Value.new(:node, :ref)
             def dependencies
-                {}
+                Utils::Hash::EMPTY
             end
 
             def pinned_dependencies

data/lib/babl/nodes/internal_value.rb

@@ -1,4 +1,5 @@
 require 'babl/errors'
+require 'babl/utils'
 require 'singleton'
 
 module Babl
@@ -16,11 +17,11 @@ module Babl
             end
 
             def dependencies
-                {}
+                Utils::Hash::EMPTY
             end
 
             def pinned_dependencies
-                {}
+                Utils::Hash::EMPTY
             end
 
             def render(ctx)

data/lib/babl/nodes/merge.rb

@@ -6,11 +6,11 @@ module Babl
     module Nodes
         class Merge < Utils::Value.new(:nodes)
             def dependencies
-                nodes.map(&:dependencies).reduce({}) { |a, b| Babl::Utils::Hash.deep_merge(a, b) }
+                nodes.map(&:dependencies).reduce(Utils::Hash::EMPTY) { |a, b| Babl::Utils::Hash.deep_merge(a, b) }
             end
 
             def pinned_dependencies
-                nodes.map(&:pinned_dependencies).reduce({}) { |a, b| Babl::Utils::Hash.deep_merge(a, b) }
+                nodes.map(&:pinned_dependencies).reduce(Utils::Hash::EMPTY) { |a, b| Babl::Utils::Hash.deep_merge(a, b) }
             end
 
             def schema
@@ -24,31 +24,47 @@ module Babl
                 }
             end
 
+            def self.build(nodes)
+                return new(nodes) if nodes.empty?
+                return nodes.first if nodes.size == 1 && Object === nodes.first
+
+                expanded = nodes.flat_map { |node| Merge === node ? node.nodes : [node] }
+                out = []
+                op1 = nil
+                op2 = expanded[0]
+                expanded.drop(1).each do |elm|
+                    op1 = op2
+                    op2 = elm
+                    if Object === op1 && Object === op2
+                        op2 = Object.new(op1.nodes.merge(op2.nodes))
+                        op1 = nil
+                    end
+                    out << op1 if op1
+                end
+                out << op2 if op2
+                new(out)
+            end
+
             private
 
+            AS_OBJECT_MAPPING = {
+                Schema::Anything.instance => Schema::Object::EMPTY_WITH_ADDITIONAL,
+                Schema::Static::NULL => Schema::Object::EMPTY
+            }
+
             # Merge two documentations together
             def merge_doc(doc1, doc2)
+                doc1 = AS_OBJECT_MAPPING[doc1] || doc1
+                doc2 = AS_OBJECT_MAPPING[doc2] || doc2
+
                 case
-                when Schema::Static::NULL == doc1
-                    merge_doc(Schema::Object::EMPTY, doc2)
-                when Schema::Static::NULL == doc2
-                    merge_doc(doc1, Schema::Object::EMPTY)
                 when Schema::AnyOf === doc1
-                    Schema::AnyOf.canonicalized(doc1.choices.map { |c|
-                        merge_doc(c, doc2)
-                    })
+                    Schema::AnyOf.canonicalized(doc1.choices.map { |c| merge_doc(c, doc2) })
                 when Schema::AnyOf === doc2
-                    Schema::AnyOf.canonicalized(doc2.choices.map { |c|
-                        merge_doc(doc1, c)
-                    })
+                    Schema::AnyOf.canonicalized(doc2.choices.map { |c| merge_doc(doc1, c) })
                 when Schema::Object === doc1 && Schema::Object === doc2
                     merge_object(doc1, doc2)
-                when Schema::Object === doc1 && Schema::Anything === doc2
-                    merge_object(doc1, Schema::Object::EMPTY_WITH_ADDITIONAL)
-                when Schema::Anything === doc1 && Schema::Object === doc2
-                    merge_object(Schema::Object::EMPTY_WITH_ADDITIONAL, doc2)
-                else
-                    raise Errors::InvalidTemplate, 'Only objects can be merged'
+                else raise Errors::InvalidTemplate, 'Only objects can be merged'
                 end
             end
 
@@ -57,7 +73,7 @@ module Babl
                 additional = doc1.additional || doc2.additional
 
                 properties = (
-                    doc1.properties.map { |property| doc2.additional ? allow_anything(property) : property } +
+                    doc1.properties.map { |property| doc2.additional ? anything_property(property) : property } +
                     doc2.properties
                 ).each_with_object({}) { |property, acc| acc[property.name] = property }.values
 
@@ -65,12 +81,8 @@ module Babl
             end
 
             # Rewrite a property to allow Schema::Anything as value
-            def allow_anything(property)
-                Schema::Object::Property.new(
-                    property.name,
-                    Schema::AnyOf.canonicalized([property.value, Schema::Anything.instance]),
-                    property.required
-                )
+            def anything_property(property)
+                Schema::Object::Property.new(property.name, Schema::Anything.instance, property.required)
             end
         end
     end

data/lib/babl/nodes/object.rb

@@ -5,11 +5,12 @@ module Babl
     module Nodes
         class Object < Utils::Value.new(:nodes)
             def dependencies
-                nodes.values.map(&:dependencies).reduce({}) { |a, b| Babl::Utils::Hash.deep_merge(a, b) }
+                nodes.values.map(&:dependencies).reduce(Utils::Hash::EMPTY) { |a, b| Babl::Utils::Hash.deep_merge(a, b) }
             end
 
             def pinned_dependencies
-                nodes.values.map(&:pinned_dependencies).reduce({}) { |a, b| Babl::Utils::Hash.deep_merge(a, b) }
+                nodes.values.map(&:pinned_dependencies)
+                    .reduce(Utils::Hash::EMPTY) { |a, b| Babl::Utils::Hash.deep_merge(a, b) }
             end
 
             def schema

data/lib/babl/nodes/parent.rb

@@ -32,12 +32,12 @@ module Babl
                 end
 
                 def backpropagate_dependencies_one_level(deps)
-                    deps.reduce({}) do |out, (k, v)|
+                    deps.reduce(Utils::Hash::EMPTY) do |out, (k, v)|
                         next out if k == PARENT_MARKER
 
                         Babl::Utils::Hash.deep_merge(
                             Babl::Utils::Hash.deep_merge(out, k => backpropagate_dependencies_one_level(v)),
-                            v[PARENT_MARKER] || {}
+                            v[PARENT_MARKER] || Utils::Hash::EMPTY
                         )
                     end
                 end

data/lib/babl/nodes/static.rb

@@ -13,11 +13,11 @@ module Babl
             end
 
             def dependencies
-                {}
+                Utils::Hash::EMPTY
             end
 
             def pinned_dependencies
-                {}
+                Utils::Hash::EMPTY
             end
 
             private

data/lib/babl/nodes/switch.rb

@@ -7,12 +7,12 @@ module Babl
         class Switch < Utils::Value.new(:nodes)
             def dependencies
                 (nodes.values + nodes.keys).map(&:dependencies)
-                    .reduce({}) { |a, b| Babl::Utils::Hash.deep_merge(a, b) }
+                    .reduce(Utils::Hash::EMPTY) { |a, b| Babl::Utils::Hash.deep_merge(a, b) }
             end
 
             def pinned_dependencies
                 (nodes.values + nodes.keys).map(&:pinned_dependencies)
-                    .reduce({}) { |a, b| Babl::Utils::Hash.deep_merge(a, b) }
+                    .reduce(Utils::Hash::EMPTY) { |a, b| Babl::Utils::Hash.deep_merge(a, b) }
             end
 
             def schema

data/lib/babl/nodes/terminal_value.rb

@@ -1,5 +1,6 @@
 require 'babl/schema'
 require 'babl/errors'
+require 'babl/utils'
 require 'singleton'
 
 module Babl
@@ -15,11 +16,11 @@ module Babl
             end
 
             def dependencies
-                {}
+                Utils::Hash::EMPTY
             end
 
             def pinned_dependencies
-                {}
+                Utils::Hash::EMPTY
             end
 
             def render(ctx)

data/lib/babl/nodes/typed.rb

@@ -3,40 +3,25 @@ require 'babl/schema'
 
 module Babl
     module Nodes
-        class Typed < Utils::Value.new(:schema, :node)
-            CURRIED = method(:new).curry(2)
-
-            BOOLEAN = CURRIED.call(Schema::Typed::BOOLEAN)
-            INTEGER = CURRIED.call(Schema::Typed::INTEGER)
-            NUMBER = CURRIED.call(Schema::Typed::NUMBER)
-            STRING = CURRIED.call(Schema::Typed::STRING)
+        class Typed < Utils::Value.new(:schema)
+            BOOLEAN = new(Schema::Typed::BOOLEAN)
+            INTEGER = new(Schema::Typed::INTEGER)
+            NUMBER = new(Schema::Typed::NUMBER)
+            STRING = new(Schema::Typed::STRING)
 
             def dependencies
-                node.dependencies
+                Utils::Hash::EMPTY
             end
 
             def pinned_dependencies
-                node.pinned_dependencies
+                Utils::Hash::EMPTY
             end
 
             def render(ctx)
-                value = node.render(ctx)
+                value = ctx.object
                 return value if schema.classes.any? { |clazz| clazz === value }
                 raise Errors::RenderingError, "Expected type '#{schema.type}': #{value}\n#{ctx.formatted_stack}"
             end
-
-            private
-
-            def initialize(*)
-                super
-                check_type_compatibility
-            end
-
-            def check_type_compatibility
-                return if schema == node.schema
-                return if node.schema == Schema::Anything.instance
-                raise Errors::InvalidTemplate, "Type cannot be '#{schema.type}' in this context"
-            end
         end
     end
 end

data/lib/babl/nodes/with.rb

@@ -9,11 +9,12 @@ module Babl
 
             def dependencies
                 # Dependencies of 'node' are explicitely ignored
-                nodes.map(&:dependencies).reduce({}) { |a, b| Babl::Utils::Hash.deep_merge(a, b) }
+                nodes.map(&:dependencies).reduce(Utils::Hash::EMPTY) { |a, b| Babl::Utils::Hash.deep_merge(a, b) }
             end
 
             def pinned_dependencies
-                (nodes + [node]).map(&:pinned_dependencies).reduce({}) { |a, b| Babl::Utils::Hash.deep_merge(a, b) }
+                (nodes + [node]).map(&:pinned_dependencies)
+                    .reduce(Utils::Hash::EMPTY) { |a, b| Babl::Utils::Hash.deep_merge(a, b) }
             end
 
             def render(ctx)

data/lib/babl/operators/merge.rb

@@ -1,4 +1,5 @@
 require 'babl/nodes'
+require 'babl/utils'
 
 module Babl
     module Operators
@@ -6,10 +7,10 @@ module Babl
             module DSL
                 # Merge multiple JSON objects (non-deep)
                 def merge(*templates)
-                    return call({}) if templates.empty?
+                    return call(Utils::Hash::EMPTY) if templates.empty?
 
                     construct_terminal { |context|
-                        Nodes::Merge.new(
+                        Nodes::Merge.build(
                             templates.map { |t|
                                 unscoped.call(t).builder.precompile(
                                     Nodes::TerminalValue.instance,

data/lib/babl/operators/switch.rb

@@ -1,11 +1,12 @@
 require 'babl/nodes'
+require 'babl/utils'
 
 module Babl
     module Operators
         module Switch
             module DSL
                 # Conditional switching between different templates
-                def switch(conds = {})
+                def switch(conds = Utils::Hash::EMPTY)
                     construct_node(continue: nil) { |node, context|
                         nodes = conds.map { |cond, value|
                             cond_node = unscoped.call(cond).builder

data/lib/babl/operators/typed.rb

@@ -5,19 +5,19 @@ module Babl
         module Typed
             module DSL
                 def integer
-                    construct_node(continue: nil) { |node| Nodes::Typed::INTEGER.call(node) }
+                    construct_terminal { Nodes::Typed::INTEGER }
                 end
 
                 def number
-                    construct_node(continue: nil) { |node| Nodes::Typed::NUMBER.call(node) }
+                    construct_terminal { Nodes::Typed::NUMBER }
                 end
 
                 def string
-                    construct_node(continue: nil) { |node| Nodes::Typed::STRING.call(node) }
+                    construct_terminal { Nodes::Typed::STRING }
                 end
 
                 def boolean
-                    construct_node(continue: nil) { |node| Nodes::Typed::BOOLEAN.call(node) }
+                    construct_terminal { Nodes::Typed::BOOLEAN }
                 end
             end
         end

data/lib/babl/rendering/context.rb

@@ -1,4 +1,5 @@
 require 'babl/errors'
+require 'babl/utils'
 
 module Babl
     module Rendering
@@ -34,12 +35,12 @@ module Babl
             def goto_pin(ref)
                 pin = pins&.[](ref)
                 raise Errors::RenderingError, 'Pin reference cannot be used here' unless pin
-                Context.new(pin.object, pin.key, pin.parent, (pin.pins || {}).merge(pins))
+                Context.new(pin.object, pin.key, pin.parent, (pin.pins || Utils::Hash::EMPTY).merge(pins))
             end
 
             # Associate a pin to current context
             def create_pin(ref)
-                Context.new(object, key, parent, (pins || {}).merge(ref => self))
+                Context.new(object, key, parent, (pins || Utils::Hash::EMPTY).merge(ref => self))
             end
 
             # Wrapper around #move_forward navigating into the return value of

data/lib/babl/schema/anything.rb

@@ -1,3 +1,4 @@
+require 'babl/utils'
 require 'singleton'
 
 module Babl
@@ -6,7 +7,7 @@ module Babl
             include Singleton
 
             def json
-                {}
+                Utils::Hash::EMPTY
             end
         end
     end

data/lib/babl/utils/hash.rb

@@ -1,6 +1,8 @@
 module Babl
     module Utils
         class Hash
+            EMPTY = {}.freeze
+
             # Source: http://stackoverflow.com/a/9381776/1434017 (Jon M)
             def self.deep_merge(first, second)
                 merger = proc { |_key, v1, v2| ::Hash === v1 && ::Hash === v2 ? v1.merge(v2, &merger) : v2 }

data/lib/babl/utils/value.rb

@@ -1,3 +1,5 @@
+require 'babl/utils'
+
 module Babl
     module Utils
         # Construct deeply immutable value objects
@@ -25,7 +27,7 @@ module Babl
                             eql?(other)
                         end
 
-                        def self.with(hash = {})
+                        def self.with(hash = Utils::Hash::EMPTY)
                             raise ::ArgumentError unless ::Hash === hash && (hash.keys - FIELDS).empty?
                             new(*FIELDS.map { |f| hash.fetch(f) })
                         end

data/lib/babl/version.rb

@@ -1,3 +1,3 @@
 module Babl
-    VERSION = '0.2.4'
+    VERSION = '0.2.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: babl-json
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Frederic Terrazzoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-17 00:00:00.000000000 Z
+date: 2017-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry