babl-json 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de6e2596717bacec917c4ccb9b293676ba32f7b5
-  data.tar.gz: 2756b7fd36d5fdc9c661d0a1341f1353d6200260
+  metadata.gz: 89d572b099ed6dd5b4f7a8d330d62b82f2c614a9
+  data.tar.gz: a5a54bfc4ea3d28cba05a5285f401faa5708546c
 SHA512:
-  metadata.gz: 78ebc4868c41208e176f32637aa781c292ec6025612b988edb88a20ed9a640e250d942864789be496687651c19208df26335e5d2c9959307900c96a304886ea8
-  data.tar.gz: 6f1fb869d2345fabc61d52eb4065b5d2202e641afdd1d344b7218c6cdd70f1de4b3c3b919019b1fb8328e176c116c5614ae8aeff25b99b2d3305148f4b10a0b7
+  metadata.gz: 80a16645c833210146dd440920895f9d0a53bbea5a06b213ec5c50d396dcf059f3378bbb5da6b23771a035e99abe833c55125a731f92b7d22664216e1883105e
+  data.tar.gz: 14926b91b5690491bd9ae7d69123950167bfe823bda592ad6ac72e9dccf009dee817ad74f6176cd7bdee85f343bee10928059a804b65ea4701c547d241683c89

data/lib/babl.rb

@@ -1,8 +1,8 @@
 require 'babl/railtie' if defined?(Rails)
 require 'babl/template'
 require 'babl/version'
-require 'babl/rendering/noop_preloader'
-require 'babl/operators/partial'
+require 'babl/rendering'
+require 'babl/operators'
 
 module Babl
     class Config

data/lib/babl/builder.rb

@@ -0,0 +1,2 @@
+require 'babl/builder/chain_builder'
+require 'babl/builder/template_base'

data/lib/babl/builder/chain_builder.rb

@@ -1,5 +1,4 @@
-require 'babl/nodes/internal_value'
-require 'babl/nodes/terminal_value'
+require 'babl/nodes'
 require 'babl/errors'
 
 module Babl

data/lib/babl/builder/template_base.rb

@@ -1,7 +1,6 @@
-require 'babl/nodes/terminal_value'
-require 'babl/builder/chain_builder'
-require 'babl/rendering/compiled_template'
-require 'babl/rendering/noop_preloader'
+require 'babl/nodes'
+require 'babl/builder'
+require 'babl/rendering'
 
 module Babl
     module Builder

data/lib/babl/nodes.rb

@@ -0,0 +1,15 @@
+require 'babl/nodes/create_pin'
+require 'babl/nodes/dep'
+require 'babl/nodes/each'
+require 'babl/nodes/fixed_array'
+require 'babl/nodes/goto_pin'
+require 'babl/nodes/internal_value'
+require 'babl/nodes/merge'
+require 'babl/nodes/nav'
+require 'babl/nodes/object'
+require 'babl/nodes/parent'
+require 'babl/nodes/static'
+require 'babl/nodes/switch'
+require 'babl/nodes/terminal_value'
+require 'babl/nodes/typed'
+require 'babl/nodes/with'

data/lib/babl/nodes/create_pin.rb

@@ -1,5 +1,4 @@
-require 'babl/utils/hash'
-require 'babl/utils/value'
+require 'babl/utils'
 
 module Babl
     module Nodes

data/lib/babl/nodes/dep.rb

@@ -1,5 +1,4 @@
-require 'babl/utils/hash'
-require 'babl/utils/value'
+require 'babl/utils'
 
 module Babl
     module Nodes

data/lib/babl/nodes/each.rb

@@ -1,6 +1,6 @@
-require 'babl/schema/dyn_array'
+require 'babl/schema'
 require 'babl/errors'
-require 'babl/utils/value'
+require 'babl/utils'
 
 module Babl
     module Nodes

data/lib/babl/nodes/fixed_array.rb

@@ -1,6 +1,5 @@
-require 'babl/utils/hash'
-require 'babl/schema/fixed_array'
-require 'babl/utils/value'
+require 'babl/schema'
+require 'babl/utils'
 
 module Babl
     module Nodes

data/lib/babl/nodes/goto_pin.rb

@@ -1,5 +1,4 @@
-require 'babl/utils/hash'
-require 'babl/utils/value'
+require 'babl/utils'
 
 module Babl
     module Nodes

data/lib/babl/nodes/internal_value.rb

@@ -1,5 +1,5 @@
-require 'singleton'
 require 'babl/errors'
+require 'singleton'
 
 module Babl
     module Nodes

data/lib/babl/nodes/merge.rb

@@ -1,6 +1,6 @@
-require 'babl/utils/hash'
 require 'babl/errors'
-require 'babl/utils/value'
+require 'babl/utils'
+require 'babl/schema'
 
 module Babl
     module Nodes
@@ -28,12 +28,19 @@ module Babl
 
             # Merge two documentations together
             def merge_doc(doc1, doc2)
-                doc1 = Schema::Object::EMPTY if Schema::Static::NULL == doc1
-                doc2 = Schema::Object::EMPTY if Schema::Static::NULL == doc2
-
                 case
-                when Schema::AnyOf === doc1 || Schema::AnyOf === doc2
-                    merge_extended(doc1, doc2)
+                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)
+                    })
+                when Schema::AnyOf === doc2
+                    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
@@ -45,34 +52,6 @@ module Babl
                 end
             end
 
-            # Merge two documention when Schema::AnyOf is involved either
-            # on left, right or both sides.
-            def merge_extended(doc1, doc2)
-                # Ensure doc1 & doc2 are both Schema::AnyOf
-                choices1 = Schema::AnyOf === doc1 ? doc1.choices : [doc1]
-                choices2 = Schema::AnyOf === doc2 ? doc2.choices : [doc2]
-
-                # Generate all possible combinations
-                all_docs = choices1.product(choices2)
-                    .map { |choice1, choice2| merge_doc(choice1, choice2) }
-
-                # Analyze each property accross all combination to
-                # generate a Schema::Object::Property filled with
-                # accurate information.
-                final_properties = all_docs.flat_map(&:properties)
-                    .group_by(&:name)
-                    .map do |name, properties|
-                    Schema::Object::Property.new(
-                        name,
-                        Schema::AnyOf.canonicalized(properties.map(&:value)),
-                        properties.size == all_docs.size && properties.all?(&:required)
-                    )
-                end
-
-                # Generate the final Schema::Object
-                Schema::Object.new(final_properties, all_docs.any?(&:additional))
-            end
-
             # Merge two Schema::Object
             def merge_object(doc1, doc2)
                 additional = doc1.additional || doc2.additional

data/lib/babl/nodes/nav.rb

@@ -1,4 +1,4 @@
-require 'babl/utils/value'
+require 'babl/utils'
 
 module Babl
     module Nodes

data/lib/babl/nodes/object.rb

@@ -1,6 +1,5 @@
-require 'babl/utils/hash'
-require 'babl/schema/object'
-require 'babl/utils/value'
+require 'babl/schema'
+require 'babl/utils'
 
 module Babl
     module Nodes
@@ -19,7 +18,9 @@ module Babl
             end
 
             def render(ctx)
-                nodes.map { |k, v| [k, v.render(ctx)] }.to_h
+                out = {}
+                nodes.each { |k, v| out[k] = v.render(ctx) }
+                out
             end
         end
     end

data/lib/babl/nodes/parent.rb

@@ -1,6 +1,5 @@
-require 'babl/utils/ref'
 require 'babl/errors'
-require 'babl/utils/value'
+require 'babl/utils'
 
 module Babl
     module Nodes

data/lib/babl/nodes/static.rb

@@ -1,6 +1,5 @@
-require 'babl/nodes/terminal_value'
-require 'babl/schema/static'
-require 'babl/utils/value'
+require 'babl/schema'
+require 'babl/utils'
 
 module Babl
     module Nodes

data/lib/babl/nodes/switch.rb

@@ -1,7 +1,6 @@
-require 'babl/utils/hash'
-require 'babl/schema/any_of'
+require 'babl/schema'
 require 'babl/errors'
-require 'babl/utils/value'
+require 'babl/utils'
 
 module Babl
     module Nodes

data/lib/babl/nodes/terminal_value.rb

@@ -1,6 +1,6 @@
-require 'singleton'
-require 'babl/schema/anything'
+require 'babl/schema'
 require 'babl/errors'
+require 'singleton'
 
 module Babl
     module Nodes
@@ -28,12 +28,12 @@ module Babl
                 raise Errors::RenderingError, "#{e.message}\n" + ctx.formatted_stack(e.babl_stack), e.backtrace
             end
 
-            def render_object(obj, stack = [])
+            def render_object(obj, stack = nil)
                 case obj
-                when String, Numeric, NilClass, TrueClass, FalseClass then obj
-                when Hash then render_hash(obj, stack)
-                when Array then render_array(obj, stack)
-                else raise TerminalValueError.new("Only primitives can be serialized: #{obj}", stack)
+                when ::String, ::Numeric, ::NilClass, ::TrueClass, ::FalseClass then obj
+                when ::Hash then render_hash(obj, stack || [])
+                when ::Array then render_array(obj, stack || [])
+                else raise TerminalValueError.new("Only primitives can be serialized: #{obj}", stack || [])
                 end
             end
 
@@ -49,18 +49,23 @@ module Babl
             end
 
             def render_hash(hash, stack)
-                hash.map { |k, v|
+                out = {}
+                hash.each { |k, v|
                     key = render_key(k, stack)
                     stack.push key
-                    out = [key, render_object(v, stack)]
+                    out[key] = render_object(v, stack)
                     stack.pop
-                    out
-                }.to_h
+                }
+                out
             end
 
             def render_key(key, stack)
                 case key
-                when Symbol, String, Numeric, NilClass, TrueClass, FalseClass then :"#{key}"
+                when ::Symbol then key
+                when ::String then key.to_sym
+                when ::TrueClass then :true
+                when ::FalseClass then :false
+                when ::Numeric, ::NilClass then :"#{key}"
                 else raise TerminalValueError.new("Invalid key for JSON object: #{key}", stack)
                 end
             end

data/lib/babl/nodes/typed.rb

@@ -1,5 +1,5 @@
-require 'babl/utils/value'
-require 'babl/schema/typed'
+require 'babl/utils'
+require 'babl/schema'
 
 module Babl
     module Nodes

data/lib/babl/nodes/with.rb

@@ -1,5 +1,4 @@
-require 'babl/utils/hash'
-require 'babl/utils/value'
+require 'babl/utils'
 
 module Babl
     module Nodes

data/lib/babl/operators.rb

@@ -0,0 +1,21 @@
+require 'babl/operators/array'
+require 'babl/operators/call'
+require 'babl/operators/continue'
+require 'babl/operators/default'
+require 'babl/operators/dep'
+require 'babl/operators/each'
+require 'babl/operators/enter'
+require 'babl/operators/extends'
+require 'babl/operators/merge'
+require 'babl/operators/nav'
+require 'babl/operators/null'
+require 'babl/operators/nullable'
+require 'babl/operators/object'
+require 'babl/operators/parent'
+require 'babl/operators/partial'
+require 'babl/operators/pin'
+require 'babl/operators/source'
+require 'babl/operators/static'
+require 'babl/operators/switch'
+require 'babl/operators/typed'
+require 'babl/operators/with'

data/lib/babl/operators/array.rb

@@ -1,5 +1,4 @@
-require 'babl/nodes/fixed_array'
-require 'babl/nodes/terminal_value'
+require 'babl/nodes'
 
 module Babl
     module Operators

data/lib/babl/operators/dep.rb

@@ -1,4 +1,4 @@
-require 'babl/nodes/dep'
+require 'babl/nodes'
 
 module Babl
     module Operators

data/lib/babl/operators/each.rb

@@ -1,4 +1,4 @@
-require 'babl/nodes/each'
+require 'babl/nodes'
 
 module Babl
     module Operators

data/lib/babl/operators/enter.rb

@@ -1,4 +1,5 @@
 require 'babl/errors'
+require 'babl/nodes'
 
 module Babl
     module Operators

data/lib/babl/operators/merge.rb

@@ -1,5 +1,4 @@
-require 'babl/nodes/merge'
-require 'babl/nodes/terminal_value'
+require 'babl/nodes'
 
 module Babl
     module Operators

data/lib/babl/operators/nav.rb

@@ -1,4 +1,4 @@
-require 'babl/nodes/nav'
+require 'babl/nodes'
 
 module Babl
     module Operators

data/lib/babl/operators/object.rb

@@ -1,5 +1,4 @@
-require 'babl/nodes/object'
-require 'babl/nodes/terminal_value'
+require 'babl/nodes'
 require 'babl/errors'
 
 module Babl

data/lib/babl/operators/parent.rb

@@ -1,4 +1,4 @@
-require 'babl/nodes/parent'
+require 'babl/nodes'
 
 module Babl
     module Operators

data/lib/babl/operators/partial.rb

@@ -31,7 +31,7 @@ module Babl
 
                 def initialize(search_path)
                     @search_path = search_path
-                    raise 'Invalid search path' unless search_path
+                    raise Errors::InvalidTemplate, 'Invalid search path' unless search_path
                 end
 
                 def find(partial_name)

data/lib/babl/operators/pin.rb

@@ -1,6 +1,5 @@
-require 'babl/nodes/create_pin'
-require 'babl/nodes/goto_pin'
-require 'babl/utils/ref'
+require 'babl/nodes'
+require 'babl/utils'
 require 'babl/errors'
 
 module Babl

data/lib/babl/operators/static.rb

@@ -1,5 +1,4 @@
-require 'babl/nodes/static'
-require 'babl/nodes/terminal_value'
+require 'babl/nodes'
 require 'babl/errors'
 
 module Babl
@@ -9,7 +8,8 @@ module Babl
                 # Create a static JSON value
                 def static(val)
                     case val
-                    when String, Numeric, NilClass, TrueClass, FalseClass then construct_terminal { Nodes::Static.new(val) }
+                    when ::String, ::Numeric, ::NilClass, ::TrueClass, ::FalseClass
+                        construct_terminal { Nodes::Static.new(val) }
                     else call(Nodes::TerminalValue.instance.render_object(val))
                     end
                 rescue Errors::RenderingError => exception

data/lib/babl/operators/switch.rb

@@ -1,6 +1,4 @@
-require 'babl/nodes/switch'
-require 'babl/nodes/internal_value'
-require 'babl/nodes/terminal_value'
+require 'babl/nodes'
 
 module Babl
     module Operators

data/lib/babl/operators/typed.rb

@@ -1,4 +1,4 @@
-require 'babl/nodes/typed'
+require 'babl/nodes'
 
 module Babl
     module Operators