activefacts-cql 1.9.2 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30db45e11c4c9ce85b6a9aa204f715132a176ad3
-  data.tar.gz: 63c5421ac7be511ac2be9f9470597cd25267140d
+  metadata.gz: b7b7e191eaad678aeb89be0ca8743eb90dfe8d5b
+  data.tar.gz: 3a777616625aa25805d2f50ae25cf7633e3a0099
 SHA512:
-  metadata.gz: dc39aeec65e0f3d90a50b74c470d08b18c6714560a6c8662e91f0c29f81e616d890064d1e737dd9e9f75072fe2737970075fa01df541dc30b97d37096fe611ad
-  data.tar.gz: b22fceeb33df66d20d42a09537e0054799d92251b821d5edf54ef8cfcfab0e56df9c9bee676b7602451e2e96fe3d494b95b25e720c1e3f4cbf256adb49653f4b
+  metadata.gz: 88ac4c71766457a0995f1bbddf00a650187fae4eacfe9e3c87ef9648737c72db756e80fab41097980fa70cffb583ccc1211d1bcea9b34fabcee18cab07af18cc
+  data.tar.gz: e1c94deab6e96e52a0a4ec88568f3549181855de3e04fec9a06dc62e318a4317339128e70f7067e6361c701864146d6afb34ed90fc82687c44744ee564f6f6d6

data/activefacts-cql.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.3"
 
-  spec.add_runtime_dependency "activefacts-metamodel", "~> 1", ">= 1.9.17"
+  spec.add_runtime_dependency "activefacts-metamodel", "~> 1", ">= 1.9.20"
   spec.add_runtime_dependency "treetop", [">= 1.4.14", "~> 1.4"]
 end
 

data/lib/activefacts/cql/compiler.rb

@@ -28,10 +28,21 @@ module ActiveFacts
 
       attr_reader :vocabulary
 
-      def initialize filepath, *a
+      def initialize filepath, options = {}
         @filepath = filepath
-        super *a
-        @constellation = ActiveFacts::API::Constellation.new(ActiveFacts::Metamodel)
+        super()
+        if @constellation = options[:constellation]
+          @vocabulary = @constellation.Vocabulary.values[0]
+          @constellation.ValueType.values.each do |object_type|
+            context.object_type(object_type.name, "value type")
+          end
+          @constellation.EntityType.values.each do |object_type|
+            context.object_type(object_type.name, "entity type")
+          end
+        else
+          @constellation = ActiveFacts::API::Constellation.new(ActiveFacts::Metamodel)
+        end
+        @constellation = options[:constellation] || ActiveFacts::API::Constellation.new(ActiveFacts::Metamodel)
         @constellation.loggers << proc{|*k| trace :apilog, k.inspect} if trace(:apilog)
         @language = nil
         @pending_import_topic = nil

data/lib/activefacts/cql/version.rb

@@ -1,5 +1,5 @@
 module ActiveFacts
   module CQL
-    VERSION = "1.9.2"
+    VERSION = "1.9.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activefacts-cql
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.9.3
 platform: ruby
 authors:
 - Clifford Heath
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2017-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,7 +61,7 @@ dependencies:
         version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.17
+        version: 1.9.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -71,7 +71,7 @@ dependencies:
         version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.17
+        version: 1.9.20
 - !ruby/object:Gem::Dependency
   name: treetop
   requirement: !ruby/object:Gem::Requirement