activecube-graphql 0.1.14 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d5d6b3307a4e2359db0a37d46649aa58b8baf3e3d0328cbe4db5b6347522e23
-  data.tar.gz: d9c2a2f67151f55e017bd7d9d2e029da88b992d548366912399980a70ed88c3a
+  metadata.gz: b25aea2427a180585cadd733facfca3fd3b97c6b409caf4bbc0c19242811e1ab
+  data.tar.gz: 83ad80ea19246880867da2b9ff022ef7610ae44e8833b9371afd3a4c94bc601e
 SHA512:
-  metadata.gz: 6aa3fa255855597dce309b1913d2fb2e76fdaa2a849a6de5c23895d10f580d493f8a84c55adccf224b653d01702e91c1e486ffa762b5ae65d0d8602f4aac850f
-  data.tar.gz: 3f76d466793c5575f10b0ba4f2a9b2e0aa832fabbc5706a5880f1a7becd95367f7ece3176e1910594cc1d10f77d84a42acde5427cdfe941933231c8afce4f6a8
+  metadata.gz: 59e2e1038ec25b78146307ba94b9290c2d505039b3354ad3d7b7d30ee8fc2ba899bb78e1c9a5a3f417be0f9a1bc0bd442cce271680d2469d475c4b63c8b8ad6c
+  data.tar.gz: 17765551a7dac697c1d2a4a05106621b68da6c331646da30f646d7e5b49e0f7065ddc74fa2efde7b22cd80da2b1257451beea765305813e6e6c18e0ee5c8aaee

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    activecube-graphql (0.1.13)
-      activecube (~> 0.1.15)
+    activecube-graphql (0.1.18)
+      activecube (~> 0.1.28)
       graphql (~> 1.10)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activecube (0.1.27)
+    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.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)
@@ -42,9 +42,9 @@ GEM
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.7)
+    tzinfo (1.2.8)
       thread_safe (~> 0.1)
-    zeitwerk (2.4.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby

data/lib/activecube/graphql/parse_tree.rb

@@ -6,6 +6,7 @@ module Activecube
 
         TYPENAME = '__typename'
         KEY_FIELD_PREFIX = '_aq.'
+        NULLABLE_OPERATORS = [:eq,:not_eq,:is,:not]
 
         attr_reader :arguments, :ast_node, :cube, :parent, :name, :definition, :key,
                     :children, :metric, :dimension, :field, :context_node
@@ -18,10 +19,11 @@ 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
@@ -43,6 +45,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
@@ -98,23 +116,31 @@ 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
           hash.each_pair do |operator, arg|
             selector = cube.selectors[k]
             raise Activecube::InputArgumentError, "#{selector} does not handle method '#{operator}' for #{element} '#{k}'" unless selector.respond_to?(operator)
-            element = element.when( selector.send(operator, arg) ) unless arg.nil?
+            element = element.when( selector.send(operator, arg) ) if applicable_operator?(operator, arg)
           end
           element
         end
 
+        def applicable_operator? operator, arg
+          !arg.nil? || NULLABLE_OPERATORS.include?(operator)
+        end
+
         def apply_or_selector element, value
           selectors = value.collect{|v| make_selector v }.compact
           element.when( Activecube::Query::Selector.or(selectors) )

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
 
 
@@ -117,21 +121,16 @@ module Activecube::Graphql
                              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 }
-
+                             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) && 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)]
+            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)

data/lib/activecube/graphql/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activecube-graphql
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.19
 platform: ruby
 authors:
 - Aleksey Studnev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-09 00:00:00.000000000 Z
+date: 2020-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activecube