babl-json 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dec3c593ea00b70b6d191739c4c84b1d78492fa
-  data.tar.gz: f9bcac08981d7ed996443692bd7f8752b402bab2
+  metadata.gz: de6e2596717bacec917c4ccb9b293676ba32f7b5
+  data.tar.gz: 2756b7fd36d5fdc9c661d0a1341f1353d6200260
 SHA512:
-  metadata.gz: 15ed5dc2e9baf8cb6b94e178e9a8d743c719d73b229d4e33312525f3e743976702bcba8bc7b90069f17e2ddb8b49d4efaccb9a5518e111686847d8adc6c24f3e
-  data.tar.gz: d18b19d2550f3cac80d054474c3d85b60eb1be7f4ddf2e43172477f5b05b3f4a01f535adfe2f322e60dee0d69265b1162757d7886159dbd52474e1395fc7d6e8
+  metadata.gz: 78ebc4868c41208e176f32637aa781c292ec6025612b988edb88a20ed9a640e250d942864789be496687651c19208df26335e5d2c9959307900c96a304886ea8
+  data.tar.gz: 6f1fb869d2345fabc61d52eb4065b5d2202e641afdd1d344b7218c6cdd70f1de4b3c3b919019b1fb8328e176c116c5614ae8aeff25b99b2d3305148f4b10a0b7

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # BABL Changelog
 
+## 0.2.3 (July 21, 2017)
+- Try to simplify JSON-Schema when types are specified.
+- Cut out dependency on [Values](https://github.com/tcrayford/Values).
+
 ## 0.2.2 (July 13, 2017)
 
 - Added four typing operators: `integer`, `number`, `string` and `boolean`.

data/README.md

@@ -1,6 +1,8 @@
-# BABL #
+![BABL Logo](https://github.com/getbannerman/babl/raw/master/logo-babl.png)
 
 [![Build Status](https://travis-ci.org/getbannerman/babl.svg?branch=master)](https://travis-ci.org/getbannerman/babl)
+[![Gem](https://img.shields.io/gem/v/babl-json.svg)](https://rubygems.org/gems/babl-json)
+[![Downloads](https://img.shields.io/gem/dt/babl-json.svg)](https://rubygems.org/gems/babl-json)
 
 BABL (Bannerman API Builder Language) is a templating langage for generating JSON in APIs.
 
@@ -24,7 +26,7 @@ BABL template:
 ```ruby
 object(
     document: object(
-        :id, :title
+        :id, :title,
 
         owner: _.nullable.object(:id, :name),
         authors: _.each.object(:id, :name),

data/babl.gemspec

@@ -21,5 +21,4 @@ Gem::Specification.new do |gem|
     gem.add_development_dependency 'json-schema', '~> 2.8'
 
     gem.add_dependency 'oj', '~> 3.0'
-    gem.add_dependency 'values', '~> 1.8'
 end

data/lib/babl/nodes/create_pin.rb

@@ -1,9 +1,9 @@
 require 'babl/utils/hash'
-require 'values'
+require 'babl/utils/value'
 
 module Babl
     module Nodes
-        class CreatePin < ::Value.new(:node, :ref)
+        class CreatePin < Utils::Value.new(:node, :ref)
             def render(ctx)
                 node.render(ctx.create_pin(ref))
             end

data/lib/babl/nodes/dep.rb

@@ -1,9 +1,9 @@
 require 'babl/utils/hash'
-require 'values'
+require 'babl/utils/value'
 
 module Babl
     module Nodes
-        class Dep < ::Value.new(:node, :path)
+        class Dep < Utils::Value.new(:node, :path)
             def initialize(node, path)
                 super(node, canonicalize(path))
             end

data/lib/babl/nodes/each.rb

@@ -1,10 +1,10 @@
 require 'babl/schema/dyn_array'
 require 'babl/errors'
-require 'values'
+require 'babl/utils/value'
 
 module Babl
     module Nodes
-        class Each < ::Value.new(:node)
+        class Each < Utils::Value.new(:node)
             def dependencies
                 { __each__: node.dependencies }
             end

data/lib/babl/nodes/fixed_array.rb

@@ -1,10 +1,10 @@
 require 'babl/utils/hash'
 require 'babl/schema/fixed_array'
-require 'values'
+require 'babl/utils/value'
 
 module Babl
     module Nodes
-        class FixedArray < ::Value.new(:nodes)
+        class FixedArray < Utils::Value.new(:nodes)
             def schema
                 Schema::FixedArray.new(nodes.map(&:schema))
             end

data/lib/babl/nodes/goto_pin.rb

@@ -1,9 +1,9 @@
 require 'babl/utils/hash'
-require 'values'
+require 'babl/utils/value'
 
 module Babl
     module Nodes
-        class GotoPin < ::Value.new(:node, :ref)
+        class GotoPin < Utils::Value.new(:node, :ref)
             def dependencies
                 {}
             end

data/lib/babl/nodes/merge.rb

@@ -1,10 +1,10 @@
 require 'babl/utils/hash'
 require 'babl/errors'
-require 'values'
+require 'babl/utils/value'
 
 module Babl
     module Nodes
-        class Merge < ::Value.new(:nodes)
+        class Merge < Utils::Value.new(:nodes)
             def dependencies
                 nodes.map(&:dependencies).reduce({}) { |a, b| Babl::Utils::Hash.deep_merge(a, b) }
             end
@@ -64,7 +64,7 @@ module Babl
                     .map do |name, properties|
                     Schema::Object::Property.new(
                         name,
-                        Schema::AnyOf.canonical(properties.map(&:value)),
+                        Schema::AnyOf.canonicalized(properties.map(&:value)),
                         properties.size == all_docs.size && properties.all?(&:required)
                     )
                 end
@@ -89,7 +89,7 @@ module Babl
             def allow_anything(property)
                 Schema::Object::Property.new(
                     property.name,
-                    Schema::AnyOf.canonical([property.value, Schema::Anything.instance]),
+                    Schema::AnyOf.canonicalized([property.value, Schema::Anything.instance]),
                     property.required
                 )
             end

data/lib/babl/nodes/nav.rb

@@ -1,8 +1,8 @@
-require 'values'
+require 'babl/utils/value'
 
 module Babl
     module Nodes
-        class Nav < ::Value.new(:through, :node)
+        class Nav < Utils::Value.new(:through, :node)
             def dependencies
                 { through => node.dependencies }
             end

data/lib/babl/nodes/object.rb

@@ -1,10 +1,10 @@
 require 'babl/utils/hash'
 require 'babl/schema/object'
-require 'values'
+require 'babl/utils/value'
 
 module Babl
     module Nodes
-        class Object < ::Value.new(:nodes)
+        class Object < Utils::Value.new(:nodes)
             def dependencies
                 nodes.values.map(&:dependencies).reduce({}) { |a, b| Babl::Utils::Hash.deep_merge(a, b) }
             end

data/lib/babl/nodes/parent.rb

@@ -1,13 +1,13 @@
 require 'babl/utils/ref'
 require 'babl/errors'
-require 'values'
+require 'babl/utils/value'
 
 module Babl
     module Nodes
-        class Parent < ::Value.new(:node)
+        class Parent < Utils::Value.new(:node)
             PARENT_MARKER = Utils::Ref.new
 
-            class Resolver < ::Value.new(:node)
+            class Resolver < Utils::Value.new(:node)
                 def dependencies
                     backpropagate_dependencies(node.dependencies)
                 end

data/lib/babl/nodes/static.rb

@@ -1,10 +1,10 @@
 require 'babl/nodes/terminal_value'
 require 'babl/schema/static'
-require 'values'
+require 'babl/utils/value'
 
 module Babl
     module Nodes
-        class Static < ::Value.new(:value)
+        class Static < Utils::Value.new(:value)
             def schema
                 Schema::Static.new(value)
             end

data/lib/babl/nodes/switch.rb

@@ -1,11 +1,11 @@
 require 'babl/utils/hash'
 require 'babl/schema/any_of'
 require 'babl/errors'
-require 'values'
+require 'babl/utils/value'
 
 module Babl
     module Nodes
-        class Switch < ::Value.new(:nodes)
+        class Switch < Utils::Value.new(:nodes)
             def dependencies
                 (nodes.values + nodes.keys).map(&:dependencies)
                     .reduce({}) { |a, b| Babl::Utils::Hash.deep_merge(a, b) }
@@ -17,7 +17,7 @@ module Babl
             end
 
             def schema
-                Schema::AnyOf.canonical(nodes.values.map(&:schema))
+                Schema::AnyOf.canonicalized(nodes.values.map(&:schema))
             end
 
             def render(ctx)

data/lib/babl/nodes/typed.rb

@@ -1,13 +1,15 @@
-require 'values'
+require 'babl/utils/value'
 require 'babl/schema/typed'
 
 module Babl
     module Nodes
-        class Typed < ::Value.new(:types, :schema, :node)
-            BOOLEAN = method(:new).curry(3).call([TrueClass, FalseClass], Schema::Typed::BOOLEAN)
-            INTEGER = method(:new).curry(3).call([Integer], Schema::Typed::INTEGER)
-            NUMBER = method(:new).curry(3).call([Numeric], Schema::Typed::NUMBER)
-            STRING = method(:new).curry(3).call([String], Schema::Typed::STRING)
+        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)
 
             def dependencies
                 node.dependencies
@@ -19,10 +21,8 @@ module Babl
 
             def render(ctx)
                 value = node.render(ctx)
-                unless types.any? { |type| type === value }
-                    raise Errors::RenderingError, "Expected type '#{schema.type}': #{value}\n#{ctx.formatted_stack}"
-                end
-                value
+                return value if schema.classes.any? { |clazz| clazz === value }
+                raise Errors::RenderingError, "Expected type '#{schema.type}': #{value}\n#{ctx.formatted_stack}"
             end
 
             private

data/lib/babl/nodes/with.rb

@@ -1,9 +1,9 @@
 require 'babl/utils/hash'
-require 'values'
+require 'babl/utils/value'
 
 module Babl
     module Nodes
-        class With < ::Value.new(:node, :nodes, :block)
+        class With < Utils::Value.new(:node, :nodes, :block)
             def schema
                 node.schema
             end

data/lib/babl/rendering/compiled_template.rb

@@ -1,10 +1,10 @@
 require 'oj'
 require 'babl/rendering/context'
-require 'values'
+require 'babl/utils/value'
 
 module Babl
     module Rendering
-        class CompiledTemplate < ::Value.new(:node, :dependencies, :preloader, :pretty, :json_schema)
+        class CompiledTemplate < Utils::Value.new(:node, :dependencies, :preloader, :pretty, :json_schema)
             def json(root)
                 data = render(root)
                 ::Oj.dump(data, indent: pretty ? 4 : 0, mode: :strict)

data/lib/babl/schema/any_of.rb

@@ -1,11 +1,11 @@
-require 'values'
+require 'babl/utils/value'
 require 'set'
 require 'babl/schema/static'
 require 'babl/schema/object'
 
 module Babl
     module Schema
-        class AnyOf < ::Value.new(:choice_set)
+        class AnyOf < Utils::Value.new(:choice_set)
             attr_reader :choices
 
             def initialize(choices)
@@ -22,6 +22,8 @@ module Babl
             # schema.
             def simplify
                 simplify_single ||
+                    simplify_boolean ||
+                    simplify_typed_and_static ||
                     simplify_nullability ||
                     simplify_empty_array ||
                     simplify_push_down_dyn_array ||
@@ -30,7 +32,7 @@ module Babl
                     self
             end
 
-            def self.canonical(choices)
+            def self.canonicalized(choices)
                 new(choices).simplify
             end
 
@@ -41,20 +43,44 @@ module Babl
                 choices.size == 1 ? choices.first : nil
             end
 
-            # Try to merge null with another Anything
+            # Anything is nullable, so AnyOf[null, Anything] can be replaced by Anything
+            # (in general, everything can be merged into Anything but I decided not to do it in order
+            # to retain as much information as possible)
             def simplify_nullability
-                AnyOf.canonical(choices - [Static::NULL]) if ([Static::NULL, Anything.instance] - choices).empty?
+                return unless choice_set.include?(Static::NULL) && choice_set.include?(Anything.instance)
+                AnyOf.canonicalized(choice_set - [Static::NULL])
+            end
+
+            # AnyOf[true, false] is just boolean
+            def simplify_boolean
+                return unless choice_set.include?(Static::TRUE) && choice_set.include?(Static::FALSE)
+                AnyOf.canonicalized(choice_set - [Static::TRUE, Static::FALSE] + [Typed::BOOLEAN])
+            end
+
+            # AnyOf[string, 'a string instance', 'another string'] is just string
+            # AnyOf[boolean, true, false] is just boolean
+            # AnyOf[number, 2, 3.1] is just number
+            # AnyOf[integer, 2, 1] is just integer
+            def simplify_typed_and_static
+                choices.each do |typed|
+                    next unless Typed === typed
+                    instances = choices.select { |instance|
+                        Static === instance && typed.classes.any? { |clazz| clazz === instance.value }
+                    }
+                    next if instances.empty?
+                    return AnyOf.canonicalized(choice_set - instances)
+                end
+                nil
             end
 
             # An always empty FixedArray is just a special case of a DynArray
             # We can get rid of the former and only keep the DynArray
             def simplify_empty_array
-                return unless choices.include?(FixedArray::EMPTY)
-                others = choices - [FixedArray::EMPTY]
-                others.each do |other|
+                return unless choice_set.include?(FixedArray::EMPTY)
+                choice_set.each do |other|
                     next unless DynArray === other
                     new_other = DynArray.new(other.item)
-                    return AnyOf.canonical(others - [other] + [new_other])
+                    return AnyOf.canonicalized(choice_set - [other, FixedArray::EMPTY] + [new_other])
                 end
                 nil
             end
@@ -63,12 +89,13 @@ module Babl
             # removed.
             def simplify_dyn_and_fixed_array
                 fixed_arrays = choices.select { |s| FixedArray === s && s.items.uniq.size == 1 }
+                return if fixed_arrays.empty?
 
                 choices.each do |dyn|
                     next unless DynArray === dyn
                     fixed_arrays.each do |fixed|
                         new_dyn = DynArray.new(dyn.item)
-                        return AnyOf.canonical(choices - [fixed, dyn] + [new_dyn]) if dyn.item == fixed.items.first
+                        return AnyOf.canonicalized(choice_set - [fixed, dyn] + [new_dyn]) if dyn.item == fixed.items.first
                     end
                 end
 
@@ -79,11 +106,15 @@ module Babl
             # having a different type, then AnyOf can be pushed down to this property.
             def simplify_many_objects_only_one_difference
                 choices.each_with_index { |obj1, index1|
+                    next unless Object === obj1
+
                     choices.each_with_index { |obj2, index2|
-                        next if index2 <= index1
-                        next unless Object === obj1 && Object === obj2 && obj1.additional == obj2.additional
-                        next unless obj1.properties.map { |p| [p.name, p.required] }.to_set ==
-                                obj2.properties.map { |p| [p.name, p.required] }.to_set
+                        break if index2 >= index1
+
+                        next unless Object === obj2 &&
+                                obj1.additional == obj2.additional &&
+                                obj1.properties.map { |p| [p.name, p.required] }.to_set ==
+                                        obj2.properties.map { |p| [p.name, p.required] }.to_set
 
                         diff1 = obj1.properties - obj2.properties
                         diff2 = obj2.properties - obj1.properties
@@ -95,14 +126,14 @@ module Babl
                                 next property unless property == diff1.first
                                 Object::Property.new(
                                     property.name,
-                                    AnyOf.canonical([diff1.first.value, diff2.first.value]),
+                                    AnyOf.canonicalized([diff1.first.value, diff2.first.value]),
                                     property.required
                                 )
                             },
                             obj1.additional
                         )
 
-                        return AnyOf.canonical(choices - [obj1, obj2] + [merged])
+                        return AnyOf.canonicalized(choice_set - [obj1, obj2] + [merged])
                     }
                 }
 
@@ -112,11 +143,12 @@ 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|
+                    next unless DynArray === arr1
                     choices.each_with_index { |arr2, index2|
-                        next if index2 <= index1
-                        next unless DynArray === arr1 && DynArray === arr2
-                        new_arr = DynArray.new(AnyOf.canonical([arr1.item, arr2.item]))
-                        return AnyOf.canonical(choices - [arr1, arr2] + [new_arr])
+                        break if index2 >= index1
+                        next unless DynArray === arr2
+                        new_arr = DynArray.new(AnyOf.canonicalized([arr1.item, arr2.item]))
+                        return AnyOf.canonicalized(choice_set - [arr1, arr2] + [new_arr])
                     }
                 }
                 nil

data/lib/babl/schema/dyn_array.rb

@@ -1,8 +1,8 @@
-require 'values'
+require 'babl/utils/value'
 
 module Babl
     module Schema
-        class DynArray < ::Value.new(:item)
+        class DynArray < Utils::Value.new(:item)
             def json
                 { type: 'array', items: item.json }
             end

data/lib/babl/schema/fixed_array.rb

@@ -1,8 +1,8 @@
-require 'values'
+require 'babl/utils/value'
 
 module Babl
     module Schema
-        class FixedArray < ::Value.new(:items)
+        class FixedArray < Utils::Value.new(:items)
             EMPTY = new([])
 
             def json

data/lib/babl/schema/object.rb

@@ -1,9 +1,9 @@
-require 'values'
+require 'babl/utils/value'
 require 'set'
 
 module Babl
     module Schema
-        class Object < ::Value.new(:property_set, :additional)
+        class Object < Utils::Value.new(:property_set, :additional)
             attr_reader :properties
 
             def initialize(properties, additional)
@@ -14,7 +14,7 @@ module Babl
             EMPTY = new([], false)
             EMPTY_WITH_ADDITIONAL = new([], true)
 
-            class Property < ::Value.new(:name, :value, :required)
+            class Property < Utils::Value.new(:name, :value, :required)
                 def initialize(name, value, required)
                     super(name, value, required)
                 end

data/lib/babl/schema/static.rb

@@ -1,9 +1,11 @@
-require 'values'
+require 'babl/utils/value'
 
 module Babl
     module Schema
-        class Static < ::Value.new(:value)
+        class Static < Utils::Value.new(:value)
             NULL = new(nil)
+            TRUE = new(true)
+            FALSE = new(false)
 
             def json
                 return { type: 'null' } if value.nil?

data/lib/babl/schema/typed.rb

@@ -1,12 +1,12 @@
-require 'values'
+require 'babl/utils/value'
 
 module Babl
     module Schema
-        class Typed < ::Value.new(:type)
-            INTEGER = new('integer')
-            BOOLEAN = new('boolean')
-            NUMBER = new('number')
-            STRING = new('string')
+        class Typed < Utils::Value.new(:type, :classes)
+            INTEGER = new('integer', [::Integer])
+            BOOLEAN = new('boolean', [::TrueClass, ::FalseClass])
+            NUMBER = new('number', [::Numeric])
+            STRING = new('string', [::String])
 
             def json
                 { type: type }

data/lib/babl/utils/value.rb

@@ -0,0 +1,37 @@
+module Babl
+    module Utils
+        # Construct deeply immutable value objects
+        # Similar to Struct, but:
+        # - Properties are assumed deeply immutable (#hash is assumed constant)
+        # - Constructor requires all arguments
+        # - #== has the same meaning as #eql?
+        class Value
+            def self.new(*fields)
+                ::Class.new(::Struct.new(:_cached_hash, *fields)) do
+                    field_aliases = ::Array.new(fields.size) { |i| "v#{i}" }
+                    const_set(:FIELDS, fields.map(&:to_sym))
+                    class_eval <<-RUBY
+                        def initialize(#{field_aliases.join(',')})
+                            super(#{['nil', field_aliases].join(',')})
+                            hash
+                            freeze
+                        end
+
+                        def hash
+                            self._cached_hash ||= super
+                        end
+
+                        def ==(other)
+                            eql?(other)
+                        end
+
+                        def self.with(hash = {})
+                            raise ::ArgumentError unless ::Hash === hash && (hash.keys - FIELDS).empty?
+                            new(*FIELDS.map { |f| hash.fetch(f) })
+                        end
+                    RUBY
+                end
+            end
+        end
+    end
+end

data/lib/babl/version.rb

@@ -1,3 +1,3 @@
 module Babl
-    VERSION = '0.2.2'
+    VERSION = '0.2.3'
 end

data/spec/operators/switch_spec.rb

@@ -113,9 +113,38 @@ describe Babl::Operators::Switch do
             it { expect(schema).to eq s_any_of(s_null, s_dyn_array(s_any_of(s_static('a'), s_static('c'), s_static('b')))) }
         end
 
+        context 'switch between true and false' do
+            template { switch(1 => true, 2 => false) }
+            it { expect(schema).to eq s_boolean }
+        end
+
+        context 'switch between true and a string' do
+            template { switch(1 => true, 3 => string) }
+            it { expect(schema).to eq s_any_of(s_static(true), s_string) }
+        end
+
+        context 'switch between any string and a specific string' do
+            template { switch(1 => string, 3 => 'lol') }
+            it { expect(schema).to eq s_string }
+        end
+
+        context 'switch between any boolean and a specific boolean' do
+            template { switch(1 => boolean, 3 => true) }
+            it { expect(schema).to eq s_boolean }
+        end
+
+        context 'switch between a specific float, specific integer and any number' do
+            template { switch(1 => 1.2, 2 => 2, 3 => number) }
+            it { expect(schema).to eq s_number }
+        end
+
+        context 'switch between a specific float, specific integer and any integer' do
+            template { switch(1 => 1.2, 2 => 2, 3 => integer) }
+            it { expect(schema).to eq s_any_of(s_integer, s_static(1.2)) }
+        end
+
         context 'with dependencies' do
             template { nav(:test).switch(nav(:keke) => parent.nav(:lol)) }
-
             it { expect(dependencies).to eq(test: { keke: {} }, lol: {}) }
         end
     end

data/spec/spec_helper/schema_utils.rb

@@ -3,7 +3,7 @@ require 'babl'
 module SpecHelper
     module SchemaUtils
         def s_any_of(*args)
-            Babl::Schema::AnyOf.canonical(args)
+            Babl::Schema::AnyOf.canonicalized(args)
         end
 
         def s_anything

data/spec/utils/value_spec.rb

@@ -0,0 +1,54 @@
+require 'babl/utils/value'
+
+describe Babl::Utils::Value do
+    let(:clazz) { described_class.new(:val1) }
+    let(:inst1) { clazz.new([1]) }
+    let(:inst2) { clazz.new([1]) }
+
+    it { expect(inst1).to eq inst2 }
+    it { expect(inst1).to eql inst2 }
+    it { expect(inst1.hash).to eq inst2.hash }
+
+    describe 'immutability' do
+        it { expect { inst1.val1 = 2 }.to raise_error ::RuntimeError }
+    end
+
+    describe 'test when not equal' do
+        before { inst2.val1 << 3 }
+
+        it { expect(inst1).not_to eq inst2 }
+        it { expect(inst1.hash).to eq inst2.hash }
+    end
+
+    describe 'use hash for equality test' do
+        let(:inst1dup) { inst1.dup }
+
+        it { expect(inst1dup).to eq inst1 }
+
+        context do
+            before { inst1dup._cached_hash = 42 }
+            it { expect(inst1dup).not_to eq inst1 }
+            it { expect(inst1dup).not_to eq inst2 }
+        end
+    end
+
+    describe 'ensure eql? behavior' do
+        let(:inst1) { clazz.new(1.0) }
+        let(:inst2) { clazz.new(1) }
+
+        it { expect(inst1).not_to eql inst2 }
+        it { expect(inst1).not_to eq inst2 }
+    end
+
+    describe 'no property' do
+        let(:clazz1) { described_class.new }
+        let(:clazz2) { described_class.new }
+
+        let(:clazz1_inst1) { clazz1.new }
+        let(:clazz1_inst2) { clazz1.new }
+        let(:clazz2_inst1) { clazz2.new }
+
+        it { expect(clazz1_inst1).to eq clazz1_inst2 }
+        it { expect(clazz1_inst1).not_to eq clazz2_inst1 }
+    end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: babl-json
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Frederic Terrazzoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-13 00:00:00.000000000 Z
+date: 2017-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: values
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
 description: JSON templating on steroids
 email:
 - frederic.terrazzoni@gmail.com
@@ -164,7 +150,9 @@ files:
 - lib/babl/template.rb
 - lib/babl/utils/hash.rb
 - lib/babl/utils/ref.rb
+- lib/babl/utils/value.rb
 - lib/babl/version.rb
+- logo-babl.png
 - spec/operators/array_spec.rb
 - spec/operators/call_spec.rb
 - spec/operators/continue_spec.rb
@@ -189,6 +177,7 @@ files:
 - spec/spec_helper.rb
 - spec/spec_helper/operator_testing.rb
 - spec/spec_helper/schema_utils.rb
+- spec/utils/value_spec.rb
 homepage: https://github.com/getbannerman/babl
 licenses:
 - MIT
@@ -238,3 +227,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/spec_helper/operator_testing.rb
 - spec/spec_helper/schema_utils.rb
+- spec/utils/value_spec.rb