activecube-graphql 0.1.13 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69d003fbb6f3968b2e25390e2b4177fd46ec075415f47644f7a0947237800275
-  data.tar.gz: a46404f52537cb50f19f2ccc99af7a0f866742e0ef27297b1606ea3cface3fee
+  metadata.gz: e0a0c3d679275e13036022bd91bc90e45b4ccc5377dbaa5415ad51342bb71d05
+  data.tar.gz: 7e8ee20d8897e6f95cbff7b30ee5b636f9d0e312c0d4c9d70b2975021a2437e1
 SHA512:
-  metadata.gz: b9021ccee3198ebd7bc25aed42bee1b13689da056a5100e56a42d99ee7dc7dac1d5f8213c412ff972a1149ee39c0b5f88b928c30922919d77113b7fe022de774
-  data.tar.gz: 67b421e11ae30b5127da95da2f964683fb389b7d527cc2429272f30139e90a9256854442534d0846eb58408c38517160558a66e31ad15de630ef753e97489869
+  metadata.gz: c403314bb0f2a551eec6f5bb33838d94e800863894e722500ee807606710e3ed78fda64e8db30f466b20657c4b67924efb07a2498018b6c5007e4ff3504191be
+  data.tar.gz: 120af633c5a5dc2de1e0e14d6f2a12fd3858e3a08cb1452c0c3398dc235e7e837cd90b8c00c438079155646e3d0917b1951e14a95d658f5b87944fcbc60f4d83

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    activecube-graphql (0.1.12)
-      activecube (~> 0.1.15)
+    activecube-graphql (0.1.17)
+      activecube (~> 0.1.28)
       graphql (~> 1.10)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activecube (0.1.26)
+    activecube (0.1.29)
       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.11.0)
-    i18n (1.8.3)
+    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.1)
+    zeitwerk (2.4.1)
 
 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

@@ -18,19 +18,18 @@ module Activecube
           @key = parent ? (parent.key ? "#{parent.key}.#{name}" : KEY_FIELD_PREFIX+name ) : nil
 
           @context_node = context_node
-          @arguments =  context_node.arguments.to_h
-
           @ast_node = context_node.ast_node
 
+          @arguments =  sort_node_arguments ast_node, context_node.arguments.to_h
+
+
           if parent
             @definition = context_node.definitions.first.name
             if parent.dimension
               @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
@@ -45,6 +44,22 @@ module Activecube
 
         end
 
+        def sort_node_arguments ast_node, arguments
+          if (options = arguments['options']).kind_of?(Hash)
+            options_keys = context_node.ast_node.arguments.detect{|x| x.name=='options'}.value.arguments.map{|x|
+              x.name.underscore.to_sym
+            }
+            arguments['options'] = Hash[
+                options_keys.collect{|key|
+                  raise "Unmatched key #{key}" unless options[key]
+                  [key, options[key]]
+                }
+
+            ]
+          end
+          arguments
+        end
+
         def union?
           context_node.return_type.kind_of? GraphQL::UnionType
         end
@@ -100,12 +115,16 @@ module Activecube
           element
         end
 
+
         def converted_field_array method, values
-          if [:desc,:asc].include?(method)
-            values.collect{|v| KEY_FIELD_PREFIX + v}
-          else
-            values
-          end
+          case method
+            when :desc,:asc
+              values.collect{|v| KEY_FIELD_PREFIX + v}
+            when :limit_by
+              values.merge({each: KEY_FIELD_PREFIX + values[:each]})
+            else
+              values
+            end
         end
 
         def apply_selector element, k, hash

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,10 +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) ||
-            element.context_node.definition.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]
@@ -106,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.13"
+    VERSION = "0.1.18"
   end
 end

metadata

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