activecube-graphql 0.1.9 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40ff0b342c70ef9d40d3b0d5a10962abb56a4e522f0d0e049cf2f081541ba1a8
-  data.tar.gz: 85f3d371fcac7ca148cadda4c3441d95d6608cac8339dc36b6398dab967d289f
+  metadata.gz: 9d5d6b3307a4e2359db0a37d46649aa58b8baf3e3d0328cbe4db5b6347522e23
+  data.tar.gz: d9c2a2f67151f55e017bd7d9d2e029da88b992d548366912399980a70ed88c3a
 SHA512:
-  metadata.gz: d3bc3d55060c29221aef2279c3d2dad86febef7ba831acdf5f89ae9b541059e9d544214ced2d439bcd8ab1bc08142f3e43caad59633371da5ed1a85c95d379f5
-  data.tar.gz: daecbfad367c123665d3f3355d8214fd66e2f9774b1f09e4555f510e2932fca926548826f09e494d5f63aaf39f9bc2aa7ce04504c712c6e0fc67dd92cce9b4c8
+  metadata.gz: 6aa3fa255855597dce309b1913d2fb2e76fdaa2a849a6de5c23895d10f580d493f8a84c55adccf224b653d01702e91c1e486ffa762b5ae65d0d8602f4aac850f
+  data.tar.gz: 3f76d466793c5575f10b0ba4f2a9b2e0aa832fabbc5706a5880f1a7becd95367f7ece3176e1910594cc1d10f77d84a42acde5427cdfe941933231c8afce4f6a8

data/Gemfile.lock

@@ -1,50 +1,50 @@
 PATH
   remote: .
   specs:
-    activecube-graphql (0.1.8)
-      activecube (~> 0.1.14)
+    activecube-graphql (0.1.13)
+      activecube (~> 0.1.15)
       graphql (~> 1.10)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activecube (0.1.14)
+    activecube (0.1.27)
       activerecord (>= 5.2)
-    activemodel (6.0.2.2)
-      activesupport (= 6.0.2.2)
-    activerecord (6.0.2.2)
-      activemodel (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
-    activesupport (6.0.2.2)
+    activemodel (6.0.3.1)
+      activesupport (= 6.0.3.1)
+    activerecord (6.0.3.1)
+      activemodel (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
+    activesupport (6.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+      zeitwerk (~> 2.2, >= 2.2.2)
     concurrent-ruby (1.1.6)
     diff-lcs (1.3)
-    graphql (1.10.6)
-    i18n (1.8.2)
+    graphql (1.11.0)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.0)
+    minitest (5.14.1)
     rake (13.0.1)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+    rspec-support (3.9.3)
     thread_safe (0.3.6)
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    zeitwerk (2.3.0)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby

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.15'
+  spec.add_runtime_dependency 'activecube', '~> 0.1.28'
   spec.add_runtime_dependency 'graphql', '~> 1.10'
 
   spec.add_development_dependency "bundler", "~> 1.17"

data/lib/activecube/graphql/parse_tree.rb

@@ -28,9 +28,7 @@ module Activecube
               @dimension = parent.dimension
               @field = (parent.field || dimension)[definition.to_sym]
               raise Activecube::InputArgumentError, "#{definition} not implemented for #{key} in cube #{cube.name}" unless @field
-            elsif parent.metric
-              raise Activecube::InputArgumentError, "Unexpected metric #{key} in cube #{cube.name}"
-            else
+            elsif !parent.metric
               if !(@metric = (cube.metrics && cube.metrics[definition.to_sym])) && !(@dimension = (cube.dimensions && cube.dimensions[definition.to_sym]))
                 raise Activecube::InputArgumentError, "Metric or dimension #{definition} for #{key} not defined for cube #{cube.name}"
               end
@@ -126,7 +124,7 @@ module Activecube
           raise Activecube::InputArgumentError,  "Hash expected for selector, #{v} found instead" unless hash.kind_of?(Hash)
           selectors = hash.to_a.collect{|attr, expressions|
             k = attr.to_s.camelize(:lower).to_sym
-            expressions.collect{|expression|
+            (expressions.kind_of?(Array) ? expressions : [expressions]).collect{|expression|
               expression.to_a.collect{|c|
                 operator, arg  = c
                 selector = cube.selectors[k]

data/lib/activecube/graphql/response_builder.rb

@@ -45,6 +45,8 @@ module Activecube::Graphql
           element = elements.first
           if element.children.empty?
             simple_value response_class, definition, element
+          elsif element.metric
+            array_value response_class, definition, element
           else
             sub_element response_class, definition, element
           end
@@ -95,9 +97,13 @@ module Activecube::Graphql
       end
     end
 
+    def node_type element
+      element.context_node.definition.type.try(:of_type).try(:name) || element.context_node.definition.type.try(:name)
+    end
+
     def simple_value response_class, definition, element
       index = @key_map[element.key]
-      node_type = element.context_node.definition.type.name
+      node_type = node_type element
       response_class.class_eval do
         define_method definition.underscore do |**rest_of_options|
           convert_type node_type, @row[index]
@@ -105,6 +111,39 @@ module Activecube::Graphql
       end
     end
 
+    def array_value response_class, definition, element
+      index = @key_map[element.key]
+      array_element_type = if element.children.empty?
+                             node_type element
+                           else
+                             tuple = element.metric.definition.class.tuple
+                             raise "Sizes of tuple #{element.children.size} not expected as in definition #{tuple}" unless tuple && tuple.size==element.children.size
+
+                             element.children.collect{|a|
+                               [a.name, node_type(a)]
+                             }.sort_by{|x| tuple.index x.first.to_sym }
+
+                           end
+
+      response_class.class_eval do
+        define_method definition.underscore do |**rest_of_options|
+          @row[index].map{|array_obj|
+            if array_obj.kind_of?(Array) && array_element_type.kind_of?(Array) && array_obj.size==array_element_type.size
+              Hash[array_obj.each_with_index.map{|obj, index|
+                    etype = array_element_type[index]
+                    [etype.first.underscore, convert_type(etype.second, obj)]
+                  }]
+            elsif !array_obj.kind_of?(Array) && array_element_type.kind_of?(String)
+              convert_type(array_element_type, obj)
+            else
+              raise "Mismatched data in #{array_obj} with #{array_element_type} for #{definition} of #{element.key}"
+            end
+          }
+        end
+      end
+
+
+    end
 
   end
 end

data/lib/activecube/graphql/version.rb

@@ -1,5 +1,5 @@
 module Activecube
   module Graphql
-    VERSION = "0.1.9"
+    VERSION = "0.1.14"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activecube-graphql
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.14
 platform: ruby
 authors:
 - Aleksey Studnev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-16 00:00:00.000000000 Z
+date: 2020-09-09 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.15
+        version: 0.1.28
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.15
+        version: 0.1.28
 - !ruby/object:Gem::Dependency
   name: graphql
   requirement: !ruby/object:Gem::Requirement