finitio 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01d0b7cc775a7a49d837efeb5649b844b495a324
-  data.tar.gz: 6ba20d99543010822f871f13c7134d458000fabb
+  metadata.gz: 46d8b55dce1f11c02ca0a953a8688fe6f6e66851
+  data.tar.gz: 9278c34a8fc3e05e89b05a9925539dabfbbc1ca5
 SHA512:
-  metadata.gz: c0ae0a3ddfb5f74be525b87d6aa6f70b766b67528f6971a03ac578260736d411793d18498b851477669b85b174c1a53d43bca4bbd56ce6983669ead477869e0c
-  data.tar.gz: 187708343da19fb59b3cb711c94fc58f14dff12dfef6435525d455704edc5c7af403dddd76772cf54591467ae79ba47e9eb3bdee1af2560436d961e536cda1c4
+  metadata.gz: dfc507bf5246aa52b6d54743ff88aad279e2aa0c8bcef499740484e13c977ebfdc751e3d0a3ca2d1daa48fc50fe565b9e98e74b6ee28edea4b5892f2091d4f14
+  data.tar.gz: ac994264f34c3c161c7a1a962ce57c28be8fc18235737cd9000ba26ff3b661fcca6fe16ec0e9e382cfb228093b010f9637c25ecf886f9ac88705d3941140693f

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.5.1 / 2017-01-08
+
+* Disable memoization in parser because it leads to terrible performance
+  issues on some schemas.
+* Avoid alternatives on high-level rules (Union, SubType) to prevent many
+  fallbacks that kill performance without memoization enabled.
+
 # 0.5.1 / 2015-09-22
 
 * Enabled memoization in parser to avoid very long parsing time on complex

data/lib/finitio/syntax.rb

@@ -17,18 +17,18 @@ module Finitio
     end
 
     def self.ast(source)
-      parse(source, root: "system", memoize: true).to_ast
+      parse(source, root: "system").to_ast
     end
 
     def self.compile(source, cpl = nil)
       cpl = Compilation.coerce(cpl)
-      parse(source, root: "system", memoize: true).compile(cpl)
+      parse(source, root: "system").compile(cpl)
       cpl.resolve_proxies!.system
     end
 
     def self.compile_type(source, cpl = nil)
       cpl = Compilation.coerce(cpl)
-      parse(source, root: "type", memoize: true).compile(cpl)
+      parse(source, root: "type").compile(cpl)
     end
 
   end # module Syntax

data/lib/finitio/syntax/type/sub_type.rb

@@ -7,12 +7,19 @@ module Finitio
 
       def compile(factory)
         s = rel_type.compile(factory)
-        c = constraint_def.compile(factory)
-        factory.subtype(s, c)
+        if c = constraint_def
+          factory.subtype(s, c.compile(factory))
+        else
+          s
+        end
       end
 
       def to_ast
-        [:sub_type, rel_type.to_ast] + constraint_def.to_ast
+        if c = constraint_def
+          [:sub_type, rel_type.to_ast] + constraint_def.to_ast
+        else
+          rel_type.to_ast
+        end
       end
 
     end # module SubType

data/lib/finitio/syntax/type/union_type.rb

@@ -5,11 +5,12 @@ module Finitio
 
       def compile(factory)
         cds = captures[:sub_type].map{|x| x.compile(factory) }
-        factory.union(cds)
+        cds.size == 1 ? cds.first : factory.union(cds)
       end
 
       def to_ast
-        captures[:sub_type].map(&:to_ast).unshift(:union_type)
+        cds = captures[:sub_type].map(&:to_ast)
+        cds.size == 1 ? cds.first : cds.unshift(:union_type)
       end
 
     end # module UnionType

data/lib/finitio/syntax/types.citrus

@@ -22,15 +22,13 @@ grammar Finitio::Syntax::Types
   # union and sub types
 
   rule union_type
-      (sub_type (pipe sub_type)+)
-      <Finitio::Syntax::UnionType>
-    | sub_type
+    (sub_type (pipe sub_type)*)
+    <Finitio::Syntax::UnionType>
   end
 
   rule sub_type
-      (rel_type constraint_def)
-      <Finitio::Syntax::SubType>
-    | rel_type
+    (rel_type constraint_def?)
+    <Finitio::Syntax::SubType>
   end
 
   rule constraint_def

data/lib/finitio/type/hash_based_type.rb

@@ -52,7 +52,7 @@ module Finitio
   protected
 
     def looks_a_tuple?(value)
-      value.is_a?(Hash) or value.respond_to?(:fetch)
+      value.is_a?(Hash) or [:keys, :fetch].all?{|k| value.respond_to?(k) }
     end
 
     def attr_names

data/lib/finitio/version.rb

@@ -3,7 +3,7 @@ module Finitio
 
     MAJOR = 0
     MINOR = 5
-    TINY  = 1
+    TINY  = 2
 
     def self.to_s
       [ MAJOR, MINOR, TINY ].join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: finitio
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-22 00:00:00.000000000 Z
+date: 2017-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus