babl-json 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f2f029a652582cac66cd36e290f5cda18388ed5
-  data.tar.gz: 44aabe9259b3b4c91147578e2a0c4528a45f3248
+  metadata.gz: 1244f145154a35f410ff91f14de9dbacd4f679c9
+  data.tar.gz: fdc4821e46e72c54c248b33c406850421ec548e4
 SHA512:
-  metadata.gz: 0d6199f5bd49ba5e467902e79ca254cf97dba01b21d92141ab451786c0fdba79a5701743f2c4f2766a9928924dd91bd8073c17f0d1542c83f3fbb047d852db31
-  data.tar.gz: 25c6e56a337e7eb69bd085a3454ef1183dbe489e372f9970be1ec1d8591b0b2df959d6790d69f3ac269c4735444ab5022233d635fe58d9ad6ea5aa922c035173
+  metadata.gz: 7f1256e9d5a21ba6da758a890eba6e8063b94e2a3d9e26d45c55f262ebc9db95eacbef29f7a920ec67d55626e0a23d3c0f76bcd312d41d3f4de729fc742bd9b7
+  data.tar.gz: 47b8265e9078140b733cd81bd77baa1dcf40936362998dd8a85b7ad7a3b891a8ae1849f82be60c638fc6ccc3eb5a03d09b4eed137242575a453240d21e77c93b

data/lib/babl/nodes/merge.rb

@@ -65,12 +65,11 @@ module Babl
                     obj1 = constant_to_object(obj1) if Constant === obj1
                     obj2 = constant_to_object(obj2) if Constant === obj2
 
-                    if Object === obj1 && Object === obj2
-                        new_nodes = nodes.dup
-                        new_nodes[idx] = Object.new(obj1.nodes.merge(obj2.nodes))
-                        new_nodes[idx + 1] = nil
-                        return Merge.new(new_nodes.compact).optimize
-                    end
+                    next unless Object === obj1 && Object === obj2
+                    new_nodes = nodes.dup
+                    new_nodes[idx] = Object.new(obj1.nodes.merge(obj2.nodes))
+                    new_nodes[idx + 1] = nil
+                    return Merge.new(new_nodes.compact).optimize
                 end
                 nil
             end
@@ -87,7 +86,7 @@ module Babl
             AS_OBJECT_MAPPING = {
                 Schema::Anything.instance => Schema::Object::EMPTY_WITH_ADDITIONAL,
                 Schema::Primitive::NULL => Schema::Object::EMPTY
-            }
+            }.freeze
 
             # Merge two documentations together
             def merge_doc(doc1, doc2)
@@ -112,7 +111,17 @@ module Babl
                 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
+                ).each_with_object({}) { |property, acc|
+                    if property.required
+                        acc[property.name] = property
+                    else
+                        acc[property.name] = Schema::Object::Property.new(
+                            property.name,
+                            Schema::AnyOf.canonicalized([property.value, acc[property.name]&.value].compact),
+                            acc[property.name]&.required || false
+                        )
+                    end
+                }.values
 
                 Schema::Object.new(properties, additional)
             end

data/lib/babl/nodes/switch.rb

@@ -3,6 +3,7 @@ require 'babl/schema'
 require 'babl/errors'
 require 'babl/utils'
 require 'babl/nodes/constant'
+require 'set'
 
 module Babl
     module Nodes
@@ -36,11 +37,22 @@ module Babl
                     optimize_falsy_conditions ||
                     optimize_truthy_conditions ||
                     optimize_always_same_outputs ||
+                    optimize_same_conditions ||
                     self
             end
 
             private
 
+            def optimize_same_conditions
+                conds = Set.new
+                new_nodes = nodes.map { |cond, val|
+                    next if conds.include?(cond)
+                    conds << cond
+                    [cond, val]
+                }.compact
+                new_nodes.size == nodes.size ? nil : Switch.new(new_nodes).optimize
+            end
+
             def optimize_always_same_outputs
                 return unless nodes.map(&:first).any? { |node| Constant === node && node.value }
                 return unless nodes.map(&:last).uniq.size == 1

data/lib/babl/nodes/terminal_value.rb

@@ -6,7 +6,7 @@ require 'singleton'
 
 module Babl
     module Nodes
-        # A TerminalValue node is always implicitely added to the end of the
+        # A TerminalValue node is always implicitly added to the end of the
         # chain during compilation. It basically ensures that the output contains only
         # primitives, arrays and hashes.
         class TerminalValue
@@ -71,8 +71,10 @@ module Babl
                 case key
                 when ::Symbol then key
                 when ::String then key.to_sym
+                # rubocop:disable Lint/BooleanSymbol
                 when ::TrueClass then :true
                 when ::FalseClass then :false
+                # rubocop:enable Lint/BooleanSymbol
                 when ::Numeric, ::NilClass then :"#{key}"
                 else raise TerminalValueError.new("Invalid key for JSON object: #{key}", stack)
                 end

data/lib/babl/operators/enter.rb

@@ -11,7 +11,7 @@ module Babl
                 def enter
                     construct_node(key: nil, continue: nil) { |node, context|
                         key = context[:key]
-                        raise Errors::InvalidTemplate, "No key to enter into" unless key
+                        raise Errors::InvalidTemplate, 'No key to enter into' unless key
                         Nodes::Nav.new(key, node)
                     }
                 end

data/lib/babl/operators/object.rb

@@ -8,7 +8,7 @@ module Babl
             module DSL
                 # Create a JSON object node with static structure
                 def object(*attrs, **nested)
-                    (attrs.map(&:to_sym) + nested.keys).group_by(&:itself).values.each do |keys|
+                    (attrs.map(&:to_sym) + nested.keys).group_by(&:itself).each_value do |keys|
                         raise Errors::InvalidTemplate, "Duplicate key in object(): #{keys.first}" if keys.size > 1
                     end
 

data/lib/babl/operators/partial.rb

@@ -8,7 +8,7 @@ module Babl
                 # Load a partial template given its name
                 # A 'lookup_context' must be defined
                 def partial(partial_name)
-                    raise Errors::InvalidTemplate, "Cannot use partial without lookup context" unless lookup_context
+                    raise Errors::InvalidTemplate, 'Cannot use partial without lookup context' unless lookup_context
 
                     path, source, partial_lookup_context = lookup_context.find(partial_name)
                     raise Errors::InvalidTemplate, "Cannot find partial '#{partial_name}'" unless path

data/lib/babl/railtie.rb

@@ -42,7 +42,7 @@ module Babl
     end
 
     class Railtie < Rails::Railtie
-        initializer "babl.initialize" do
+        initializer 'babl.initialize' do
             ActiveSupport.on_load(:action_view) do
                 ::ActionView::Template.register_template_handler(:babl, Babl::ActionView::TemplateHandler)
             end

data/lib/babl/schema/any_of.rb

@@ -110,25 +110,19 @@ module Babl
                         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 ||
-                                (obj2props.keys.to_set - obj1props.keys).size <= 1
-
                         # Try to detect a discrimitive property (inspired from Typescript's discriminative union),
-                        # We will abort the merging process unless all the other properties are exactly the same.
-                        discriminator = obj1props.find { |name, p1|
+                        # We will abort the merging process if there is one
+                        next if obj1props.any? { |name, p1|
                             p2 = obj2props[name]
                             next name if p2 && Primitive === p2.value &&
                                     Primitive === p1.value &&
                                     p1.value.value != p2.value.value
-                        }&.first
+                        }
 
                         new_properties = (obj1props.keys + obj2props.keys).uniq.map { |name|
                             p1 = obj1props[name]
                             p2 = obj2props[name]
 
-                            break if discriminator && discriminator != name && p1 != p2
-
                             Object::Property.new(
                                 name,
                                 AnyOf.canonicalized([p1&.value, p2&.value].compact),
@@ -136,7 +130,6 @@ module Babl
                             )
                         }
 
-                        next unless new_properties
                         new_obj = Object.new(new_properties, obj1.additional || obj2.additional)
                         return AnyOf.canonicalized(choice_set - [obj1, obj2] + [new_obj])
                     }

data/lib/babl/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: babl-json
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Frederic Terrazzoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-04 00:00:00.000000000 Z
+date: 2017-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.48'
+        version: '0.50'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.48'
+        version: '0.50'
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: rabl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -199,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: JSON templating on steroids