activecube-graphql 0.1.12 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7a79d0cc089791e544c599ba8559634a8a074546060c2c2920df07f2e8ff0a3
-  data.tar.gz: a4b0e37c0f583a3f4661c393a42e0ce35ae2bcc25e062f433edcc355ac9df5b2
+  metadata.gz: 0e5804255ea980d0ad5383c66eeeaded38f3007606d2d881e67d9f82b39568ac
+  data.tar.gz: 1629c4328d4fff2a208e148e8801e6e382cd14a83efb913f3d883fe685b5f254
 SHA512:
-  metadata.gz: e83c2195dabe965975f69e01833434eb0ed0b5ec81cbee5a6209ab8e0388d975d605316adc88626552bb344fdd0ea118ee9cc9fba305bf51df2afb43b34a7406
-  data.tar.gz: 3f2c1161a22d9dd83afac7e02c0323d56a3fc1ca1e8ed83f7bfa8f3661061caa1364860661a3e10fc3f9fbc1b78bcc400ab989e5aec3fc677f4508f4eda3c69e
+  metadata.gz: 9345993f7fd7a1dd3cabd1a5b8e5c61aec452af852ed6896a17f1342e21580f9d80ad520195344da9e4fae748345bee04beb7b17a261635856f409919f7e0a1e
+  data.tar.gz: 558e40e26f530f0ea791f6aad3c94475f1be91dc99647542498b4215a082f5c332004ec7dfbaef9e4a25658eb9b1f805dfdb035f80ca887cdd07744f4ac5ac4c

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    activecube-graphql (0.1.11)
-      activecube (~> 0.1.15)
+    activecube-graphql (0.1.16)
+      activecube (~> 0.1.30)
       graphql (~> 1.10)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activecube (0.1.24)
+    activecube (0.1.30)
       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.3)
+    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
@@ -100,12 +98,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,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.12"
+    VERSION = "0.1.17"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activecube-graphql
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.17
 platform: ruby
 authors:
 - Aleksey Studnev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-16 00:00:00.000000000 Z
+date: 2020-11-30 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