activecube-graphql 0.1.11 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8eb63554a3e90082f91904ad35afbe20c7bebc24bd926806d03fec739aec1adb
-  data.tar.gz: c13255fd323b39d072e2e11588ea2622b11b154449f5c9ff09c6522bfccb83aa
+  metadata.gz: f44937cd21cc7bbe8d77a097c5d355691574a2c0510b6ed3f2c0f602056166eb
+  data.tar.gz: 8244907400ae4e304d73a494d40576f1c1fc187f173f6fb2bd96ff1bf315b62d
 SHA512:
-  metadata.gz: ade7aa2115c6a7c77a75c0533acfa22beb0da606c8864e788c78ec822842b856a40b22778088297486369cd2c450d8c26588595bc40a213da51154e2d5a2ec30
-  data.tar.gz: dcaa69ace4692de68f56e34ca78b66da9fedb9a530b3595f444da3b75e0fc4a33d00c43a63075d103dc72d328518700d39af52919e6f421485aa1bc7470d7697
+  metadata.gz: 9096d95623776426039afa5b9d05dccf1873afa1beac11d83c4050ad12e8a12ae3e8b352f452735f4b45562ec9c7ec1c80fa486e8b83e2357bbded5d63fa74ae
+  data.tar.gz: 3bc0b34cdc95c96cbcf910520b7f8718da54dba79cb08cf60798cce57feeb1b6688529efead6030f08c05dcd03f10eaeabd9bcc48b5b3c8e329c32981e8e2cbb

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    activecube-graphql (0.1.10)
-      activecube (~> 0.1.15)
+    activecube-graphql (0.1.15)
+      activecube (~> 0.1.28)
       graphql (~> 1.10)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activecube (0.1.19)
+    activecube (0.1.28)
       activerecord (>= 5.2)
     activemodel (6.0.3.1)
       activesupport (= 6.0.3.1)
@@ -21,12 +21,12 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.7)
     diff-lcs (1.3)
-    graphql (1.10.10)
-    i18n (1.8.2)
+    graphql (1.11.0)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.1)
+    minitest (5.14.2)
     rake (13.0.1)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -44,7 +44,7 @@ GEM
     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

@@ -18,6 +18,10 @@ module Activecube::Graphql
         end
       end
 
+      def __typename
+        raise Activecube::InputArgumentError, "Add __typename to the element for UNION or INTERFACE entity to resolve the type"
+      end
+
     end
 
 
@@ -45,6 +49,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 +101,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.try(:of_type).try(: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 +115,34 @@ 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
+                             element.children.collect{|a| [ a.name, node_type(a), tuple.index(a.name.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)
+              Hash[
+                  array_element_type.map{|etype|
+                    [etype.first.underscore, convert_type(etype.second, array_obj[etype.third])]
+                  }]
+            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.11"
+    VERSION = "0.1.16"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activecube-graphql
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.16
 platform: ruby
 authors:
 - Aleksey Studnev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-17 00:00:00.000000000 Z
+date: 2020-10-03 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