activecube-graphql 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70fc67a7b3e554daec4571dbf025259ea90a132e86fc50d631322c2a39a75631
-  data.tar.gz: 0eb39688b70e8a042ef2f39f21f4909e934037001cb42f67370fb5d162ce85df
+  metadata.gz: 992470f7a32c278749b214f1ca73dece8ec582286fcc97d379b16a7f1775b455
+  data.tar.gz: df5e4a79dff0740f6c37b3e08a7ebec7b73fd214c41b70b9a46c78d2fad1d13c
 SHA512:
-  metadata.gz: 780293f1d8ead61547734a77c2222449388a6af845fc5c73d5f19e7cb0b9e5cc0f8d7ac048584ad0f16b3ec6b1e3cb58fa0f81b661616ebcefa50370a4fc0c6b
-  data.tar.gz: 14e018eaa4b571fd3d630cabb9cc1ef2ec51fbbf1650391c69c3f6ded87ed5c9699d77e4b47a4c28547e590e2ab3a7433065a432b0df6d69b70947bd797d227e
+  metadata.gz: 223daebf247315236a08e766250661dcbf6d09891b2993c40f059b626b0a7ad23757b3fae948419259ea01235d7ee0f3e3c6407b587217a38d8efeef06bddbe3
+  data.tar.gz: d4d084eb7d84489972e03fdde6bf715e25ff85d5e825cfd0de5af998bad72127dc7f35fa779b20d3925b760966d984b16ecc0b70601bf8440f0cfee9deae36b5

data/.idea/activecube-graphql.iml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="RUBY_MODULE" version="4">
+  <component name="ModuleRunConfigurationManager">
+    <shared />
+  </component>
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/features" isTestSource="true" />
@@ -8,7 +11,7 @@
     </content>
     <orderEntry type="jdk" jdkName="RVM: ruby-2.6.3" jdkType="RUBY_SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="activecube (v0.1.2, RVM: ruby-2.6.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="activecube (v0.1.3, RVM: ruby-2.6.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="activemodel (v6.0.2.1, RVM: ruby-2.6.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="activerecord (v6.0.2.1, RVM: ruby-2.6.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="activesupport (v6.0.2.1, RVM: ruby-2.6.3) [gem]" level="application" />

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    activecube-graphql (0.1.0)
-      activecube (~> 0.1.2)
+    activecube-graphql (0.1.1)
+      activecube (~> 0.1.3)
       graphql (~> 1.9)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activecube (0.1.2)
+    activecube (0.1.3)
       activerecord (>= 5.2)
     activemodel (6.0.2.1)
       activesupport (= 6.0.2.1)

data/activecube-graphql.gemspec

@@ -24,7 +24,7 @@ to query cubes}
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'activecube', '~> 0.1.2'
+  spec.add_runtime_dependency 'activecube', '~> 0.1.3'
   spec.add_runtime_dependency 'graphql', '~> 1.9'
 
   spec.add_development_dependency "bundler", "~> 1.17"

data/lib/activecube/graphql/parse_tree.rb

@@ -21,9 +21,11 @@ module Activecube
           if parent
             @definition = context_node.definitions.first.name
             if parent.dimension
-              @field = @definition
+              @dimension = parent.dimension
+              @field = (parent.field || dimension)[definition.to_sym]
+              raise ArgumentError, "#{definition} not implemented for #{key} in cube #{cube.name}" unless @field
             elsif parent.metric
-              raise ArgumentError, "Unexpected metric #{key}  for cube #{cube.name}"
+              raise ArgumentError, "Unexpected metric #{key} in cube #{cube.name}"
             else
               if !(@metric = cube.metrics[definition.to_sym]) && !(@dimension = cube.dimensions[definition.to_sym])
                 raise ArgumentError, "Metric or dimension #{definition} for #{key} not defined for cube #{cube.name}"
@@ -42,11 +44,9 @@ module Activecube
           if parent
 
             if metric
-              query = measure(metric, query)
-            end
-
-            if dimension
-              query = slice(dimension, query)
+              query = query.measure({key => apply_args(metric)})
+            elsif dimension && children.empty?
+              query = query.slice({key => apply_args(field || dimension)})
             end
 
           else
@@ -61,20 +61,6 @@ module Activecube
           query
         end
 
-        def measure metric, query
-          query.measure({key => apply_args(metric)})
-        end
-
-        def slice dimension, query
-          if children.empty?
-            query.slice({key => apply_args(dimension)})
-          else
-            query.slice Hash[children.collect do |field|
-              [field.key, field.apply_args(dimension[field.field.to_sym])]
-            end]
-          end
-        end
-
         def apply_args element, args = self.arguments
           args && args.each_pair do |key, value|
             k = key.to_sym

data/lib/activecube/graphql/version.rb

@@ -1,5 +1,5 @@
 module Activecube
   module Graphql
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activecube-graphql
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Aleksey Studnev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-22 00:00:00.000000000 Z
+date: 2020-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activecube
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: graphql
   requirement: !ruby/object:Gem::Requirement