babl-json 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b3d925354aed5c77de3cf7003b305b6de01b71f
-  data.tar.gz: 24ffd681b9f421b971ac5340b1896608cb803313
+  metadata.gz: 2ba3e05ba09552694ee2869f3105feb91ec3459c
+  data.tar.gz: 1c5c24a986f264dc33db0d48a5f0885621c56793
 SHA512:
-  metadata.gz: a935bea9bf8a01a924719526f7d26d1c5bdb016c6e64b3be08ae1040f6126b4aac8cc7dc032c38b7f2f2d1fbfc8ed9a53a091c6f7634b4c4c7b1cd894d7a7f6e
-  data.tar.gz: 1fc88f586cd05f30dbcf2a766611b6bb2208006722b14ab53beceeffcacce5b1cb00397cfb3dab048497cd7f41a944810ab1e229f24c0b254bb2ab124355fabe
+  metadata.gz: 4014ee582da9da899725759eb4b3f0242929c8870f7326de59a5e65416e17b92469dab7cbb7c960ab4d783f696e6aa5d0840cbde14ec0fc7f951de0012e915fd
+  data.tar.gz: e3d4615978a94bd19c48f7089fa0722613b10dc44411f32d9f27cd8dbdf27c18f6dd62f59a9a0880fc22fb74991afbfcb111bb099e090d03f4f2c4523366dd63

data/lib/babl.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/railtie' if defined?(Rails)
 require 'babl/template'
 require 'babl/version'

data/lib/babl/builder.rb

@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 require 'babl/builder/chain_builder'
 require 'babl/builder/template_base'

data/lib/babl/builder/chain_builder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/nodes'
 require 'babl/errors'
 

data/lib/babl/builder/template_base.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/nodes'
 require 'babl/builder'
 require 'babl/rendering'

data/lib/babl/errors.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Babl
     module Errors
         class Base < StandardError; end

data/lib/babl/nodes.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/nodes/create_pin'
 require 'babl/nodes/dep'
 require 'babl/nodes/each'

data/lib/babl/nodes/create_pin.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/utils'
 
 module Babl

data/lib/babl/nodes/dep.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/utils'
 
 module Babl

data/lib/babl/nodes/each.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/schema'
 require 'babl/errors'
 require 'babl/utils'

data/lib/babl/nodes/fixed_array.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/schema'
 require 'babl/utils'
 

data/lib/babl/nodes/goto_pin.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/utils'
 
 module Babl

data/lib/babl/nodes/internal_value.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/errors'
 require 'babl/utils'
 require 'singleton'

data/lib/babl/nodes/merge.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/errors'
 require 'babl/utils'
 require 'babl/schema'
@@ -59,9 +60,9 @@ module Babl
 
                 case
                 when Schema::AnyOf === doc1
-                    Schema::AnyOf.canonicalized(doc1.choices.map { |c| merge_doc(c, doc2) })
+                    Schema::AnyOf.canonicalized(doc1.choice_set.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.choice_set.map { |c| merge_doc(doc1, c) })
                 when Schema::Object === doc1 && Schema::Object === doc2
                     merge_object(doc1, doc2)
                 else raise Errors::InvalidTemplate, 'Only objects can be merged'
@@ -73,8 +74,8 @@ module Babl
                 additional = doc1.additional || doc2.additional
 
                 properties = (
-                    doc1.properties.map { |property| doc2.additional ? anything_property(property) : property } +
-                    doc2.properties
+                    doc1.property_set.map { |property| doc2.additional ? anything_property(property) : property } +
+                    doc2.property_set.to_a
                 ).each_with_object({}) { |property, acc| acc[property.name] = property }.values
 
                 Schema::Object.new(properties, additional)

data/lib/babl/nodes/nav.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/utils'
 
 module Babl
@@ -16,17 +17,17 @@ module Babl
             end
 
             def render(ctx)
-                node.render(ctx.move_forward_block(through) { navigate(ctx.object) })
+                value = begin
+                    ::Hash === ctx.object ? ctx.object.fetch(through) : ctx.object.send(through)
+                rescue StandardError => e
+                    raise Errors::RenderingError, "#{e.message}\n" + ctx.formatted_stack(through), e.backtrace
+                end
+                node.render(ctx.move_forward(value, through))
             end
 
             private
 
             def navigate(object)
-                if ::Hash === object
-                    object.fetch(through)
-                else
-                    object.send(through)
-                end
             end
         end
     end

data/lib/babl/nodes/object.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/schema'
 require 'babl/utils'
 

data/lib/babl/nodes/parent.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/errors'
 require 'babl/utils'
 

data/lib/babl/nodes/static.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/schema'
 require 'babl/utils'
 
@@ -5,7 +6,12 @@ module Babl
     module Nodes
         class Static < Utils::Value.new(:value)
             def schema
-                Schema::Static.new(value)
+                case value
+                when ::NilClass then Schema::Static::NULL
+                when ::TrueClass then Schema::Static::TRUE
+                when ::FalseClass then Schema::Static::FALSE
+                else Schema::Static.new(value)
+                end
             end
 
             def render(_ctx)

data/lib/babl/nodes/switch.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/schema'
 require 'babl/errors'
 require 'babl/utils'

data/lib/babl/nodes/terminal_value.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/schema'
 require 'babl/errors'
 require 'babl/utils'

data/lib/babl/nodes/typed.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/utils'
 require 'babl/schema'
 

data/lib/babl/nodes/with.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/utils'
 
 module Babl
@@ -19,9 +20,12 @@ module Babl
 
             def render(ctx)
                 values = nodes.map { |n| n.render(ctx) }
-                node.render(ctx.move_forward_block(:__block__) do
+                value = begin
                     block.arity.zero? ? ctx.object.instance_exec(&block) : block.call(*values)
-                end)
+                rescue StandardError => e
+                    raise Errors::RenderingError, "#{e.message}\n" + ctx.formatted_stack(:__block__), e.backtrace
+                end
+                node.render(ctx.move_forward(value, :__block__))
             end
         end
     end

data/lib/babl/operators.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/operators/array'
 require 'babl/operators/call'
 require 'babl/operators/continue'

data/lib/babl/operators/array.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/nodes'
 
 module Babl

data/lib/babl/operators/call.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/errors'
 
 module Babl

data/lib/babl/operators/continue.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/errors'
 
 module Babl

data/lib/babl/operators/default.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Babl
     module Operators
         module Default

data/lib/babl/operators/dep.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/nodes'
 
 module Babl

data/lib/babl/operators/each.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/nodes'
 
 module Babl

data/lib/babl/operators/enter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/errors'
 require 'babl/nodes'
 

data/lib/babl/operators/extends.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Babl
     module Operators
         module Extends

data/lib/babl/operators/merge.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/nodes'
 require 'babl/utils'
 

data/lib/babl/operators/nav.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/nodes'
 
 module Babl

data/lib/babl/operators/null.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Babl
     module Operators
         module Null

data/lib/babl/operators/nullable.rb

@@ -1,13 +1,16 @@
+# frozen_string_literal: true
 module Babl
     module Operators
         module Nullable
             module DSL
+                IS_NIL = ->(val) { ::NilClass === val }
+
                 # Nullify the current construction if
                 # the current element is Nil.
                 def nullable
                     source {
                         switch(
-                            nav(&:nil?) => nil,
+                            nav(&IS_NIL) => nil,
                             default => continue
                         )
                     }

data/lib/babl/operators/object.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/nodes'
 require 'babl/errors'
 

data/lib/babl/operators/parent.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/nodes'
 
 module Babl

data/lib/babl/operators/partial.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/errors'
 
 module Babl

data/lib/babl/operators/pin.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/nodes'
 require 'babl/utils'
 require 'babl/errors'

data/lib/babl/operators/source.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Babl
     module Operators
         module Source

data/lib/babl/operators/static.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/nodes'
 require 'babl/errors'
 

data/lib/babl/operators/switch.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/nodes'
 require 'babl/utils'
 

data/lib/babl/operators/typed.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/nodes'
 
 module Babl

data/lib/babl/operators/with.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/nodes'
 
 module Babl

data/lib/babl/railtie.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Babl
     module ActionView
         module Template

data/lib/babl/rendering.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/rendering/compiled_template'
 require 'babl/rendering/noop_preloader'
 require 'babl/rendering/context'

data/lib/babl/rendering/compiled_template.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'oj'
 require 'babl/rendering'
 require 'babl/utils'

data/lib/babl/rendering/context.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/errors'
 require 'babl/utils'
 
@@ -43,16 +44,6 @@ module Babl
                 Context.new(object, key, parent, (pins || Utils::Hash::EMPTY).merge(ref => self))
             end
 
-            # Wrapper around #move_forward navigating into the return value of
-            # the block. However, if an error occurs, it is wrapped in a
-            # RenderingError and the navigation stack trace is added
-            # to the error message.
-            def move_forward_block(key)
-                move_forward(yield, key)
-            rescue StandardError => e
-                raise Errors::RenderingError, "#{e.message}\n" + formatted_stack(key), e.backtrace
-            end
-
             def formatted_stack(*additional_stack_items)
                 stack_trace = ([:__root__] + stack + additional_stack_items).join('.')
                 "BABL @ #{stack_trace}"

data/lib/babl/rendering/noop_preloader.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Babl
     module Rendering
         # BABL uses this preloader by default. It does nothing.

data/lib/babl/schema.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/schema/any_of'
 require 'babl/schema/anything'
 require 'babl/schema/dyn_array'

data/lib/babl/schema/any_of.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/utils'
 require 'babl/schema'
 require 'set'
@@ -5,16 +6,13 @@ require 'set'
 module Babl
     module Schema
         class AnyOf < Utils::Value.new(:choice_set)
-            attr_reader :choices
-
             def initialize(choices)
-                flattened_choices = choices.flat_map { |doc| AnyOf === doc ? doc.choices : [doc] }.uniq
-                @choices = flattened_choices
-                super(flattened_choices.to_set)
+                flattened_choices = choices.flat_map { |doc| AnyOf === doc ? doc.choice_set.to_a : [doc] }.uniq
+                super(flattened_choices.to_set.freeze)
             end
 
             def json
-                { anyOf: choices.map(&:json) }
+                { anyOf: choice_set.map(&:json) }
             end
 
             # Perform simple transformations in order to reduce the size of the generated
@@ -39,7 +37,7 @@ module Babl
 
             # We can completely get rid of the AnyOf element of there is only one possible schema.
             def simplify_single
-                choices.size == 1 ? choices.first : nil
+                choice_set.size == 1 ? choice_set.first : nil
             end
 
             # AnyOf[anything, string, number...] always collapse to anything.
@@ -58,9 +56,9 @@ module Babl
             # AnyOf[number, 2, 3.1] is just number
             # AnyOf[integer, 2, 1] is just integer
             def simplify_typed_and_static
-                choices.each do |typed|
+                choice_set.each do |typed|
                     next unless Typed === typed
-                    instances = choices.select { |instance|
+                    instances = choice_set.select { |instance|
                         Static === instance && typed.classes.any? { |clazz| clazz === instance.value }
                     }
                     next if instances.empty?
@@ -84,10 +82,10 @@ module Babl
             # If the static array is an instance of another dyn array, then the fixed array can be
             # removed.
             def simplify_dyn_and_fixed_array
-                fixed_arrays = choices.select { |s| FixedArray === s && s.items.uniq.size == 1 }
+                fixed_arrays = choice_set.select { |s| FixedArray === s && s.items.uniq.size == 1 }
                 return if fixed_arrays.empty?
 
-                choices.each do |dyn|
+                choice_set.each do |dyn|
                     next unless DynArray === dyn
                     fixed_arrays.each do |fixed|
                         new_dyn = DynArray.new(dyn.item)
@@ -102,15 +100,15 @@ module Babl
             # of the generated schema. On top of that, when the JSON-Schema is translated into Typescript, it produces
             # a much more workable type definition (union of anonymous object types is not practical to use)
             def simplify_merge_objects
-                choices.each_with_index { |obj1, index1|
+                choice_set.each_with_index { |obj1, index1|
                     next unless Object === obj1
 
-                    choices.each_with_index { |obj2, index2|
+                    choice_set.each_with_index { |obj2, index2|
                         break if index2 >= index1
                         next unless Object === obj2
 
-                        obj1props = obj1.properties.map { |p| [p.name, p] }.to_h
-                        obj2props = obj2.properties.map { |p| [p.name, p] }.to_h
+                        obj1props = obj1.property_set.map { |p| [p.name, p] }.to_h
+                        obj2props = obj2.property_set.map { |p| [p.name, p] }.to_h
 
                         # Do not merge properties unless a keyset is almost a subset of the other
                         next unless (obj1props.keys.to_set - obj2props.keys).size <= 1 ||
@@ -147,9 +145,9 @@ module Babl
 
             # Push down the AnyOf to the item if all outputs are of type DynArray
             def simplify_push_down_dyn_array
-                choices.each_with_index { |arr1, index1|
+                choice_set.each_with_index { |arr1, index1|
                     next unless DynArray === arr1
-                    choices.each_with_index { |arr2, index2|
+                    choice_set.each_with_index { |arr2, index2|
                         break if index2 >= index1
                         next unless DynArray === arr2
                         new_arr = DynArray.new(AnyOf.canonicalized([arr1.item, arr2.item]))

data/lib/babl/schema/anything.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/utils'
 require 'singleton'
 

data/lib/babl/schema/dyn_array.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/utils'
 
 module Babl

data/lib/babl/schema/fixed_array.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/utils'
 
 module Babl

data/lib/babl/schema/object.rb

@@ -1,14 +1,12 @@
+# frozen_string_literal: true
 require 'babl/utils'
 require 'set'
 
 module Babl
     module Schema
         class Object < Utils::Value.new(:property_set, :additional)
-            attr_reader :properties
-
             def initialize(properties, additional)
-                @properties = properties
-                super(properties.to_set, additional)
+                super(properties.to_set.freeze, additional)
             end
 
             EMPTY = new([], false)
@@ -22,12 +20,12 @@ module Babl
 
             def json
                 { type: 'object' }.tap { |out|
-                    next if properties.empty?
-                    out[:properties] = properties.map { |property| [property.name, property.value.json] }.to_h
+                    next if property_set.empty?
+                    out[:properties] = property_set.map { |property| [property.name, property.value.json] }.to_h
                     out[:additionalProperties] = additional
-                    required_properties = properties.select(&:required)
+                    required_properties = property_set.select(&:required)
                     next if required_properties.empty?
-                    out[:required] = properties.select(&:required).map(&:name).map(&:to_s)
+                    out[:required] = property_set.select(&:required).map(&:name).map(&:to_s)
                 }
             end
         end

data/lib/babl/schema/static.rb

@@ -1,16 +1,16 @@
+# frozen_string_literal: true
 require 'babl/utils'
 
 module Babl
     module Schema
-        class Static < Utils::Value.new(:value)
+        class Static < Utils::Value.new(:value, :json)
+            def initialize(value)
+                super(value, ::NilClass === value ? { type: 'null' } : { enum: [value] })
+            end
+
             NULL = new(nil)
             TRUE = new(true)
             FALSE = new(false)
-
-            def json
-                return { type: 'null' } if value.nil?
-                { enum: [value] }
-            end
         end
     end
 end

data/lib/babl/schema/typed.rb

@@ -1,16 +1,17 @@
+# frozen_string_literal: true
 require 'babl/utils'
 
 module Babl
     module Schema
-        class Typed < Utils::Value.new(:type, :classes)
+        class Typed < Utils::Value.new(:type, :classes, :json)
+            def initialize(type, classes)
+                super(type.freeze, classes.freeze, { type: type }.freeze)
+            end
+
             INTEGER = new('integer', [::Integer])
             BOOLEAN = new('boolean', [::TrueClass, ::FalseClass])
             NUMBER = new('number', [::Numeric])
             STRING = new('string', [::String])
-
-            def json
-                { type: type }
-            end
         end
     end
 end

data/lib/babl/template.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/builder'
 require 'babl/operators'
 

data/lib/babl/utils.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/utils/hash'
 require 'babl/utils/ref'
 require 'babl/utils/value'

data/lib/babl/utils/hash.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Babl
     module Utils
         class Hash

data/lib/babl/utils/ref.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Babl
     module Utils
         class Ref

data/lib/babl/utils/value.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'babl/utils'
 
 module Babl

data/lib/babl/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Babl
-    VERSION = '0.2.5'
+    VERSION = '0.2.6'
 end

metadata

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