activecube-graphql 0.1.25 → 0.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2e6172c07df1e643e9bc1f37d505e3ccc31e58cfd1741ee37850eba6ffc6dfb
-  data.tar.gz: b6aab3e06f0d78cfc455b1e834f93b0f79d411e93127da6983444297b8ebb3b0
+  metadata.gz: 5388716d32a65066a03ff46e088d03ea333bb61d43c9630e48e0441f2a6ff8c8
+  data.tar.gz: 5f8eaff96b4d8424d248118cbcfcd2f5922a55f901e833bfbdae5c4e6e0f1667
 SHA512:
-  metadata.gz: 633d43b3712caafd333bd12aafb953ad9f02c9aa0b904bac7a7d6f4271dbe36c01af9a5a638dcc0174ed8f610af4dda70c2f6f9950283f97fe5b2fa7b86709ff
-  data.tar.gz: c88d7d9910fb014e558019e34f964143e0631bcf9cb07b3dae7f0df3f898db994d1cd55cb7308f5395f55b85ee7887b7e5942f628e5d5fe59a53411c92217706
+  metadata.gz: 2adec53fd1eb35a284454ba5776435111b4c2f1762da3f251dee1986e046f441436f37eba468c7fb4c91ee11316821c025a2d7e3d2bd13495020cae80c39afb1
+  data.tar.gz: 965542f1e000bb11167015c1b2f0614e58122583c134f46523175b18aa69eee8aaa8b2b0be454168986e6c6ce97a7aa6ba68ca0f1aa90113b478e2b367ce7b5a

data/lib/activecube/graphql/cube_field.rb

@@ -48,12 +48,7 @@ module Activecube
       def execute_query tree, ctx, object
         cube_query = tree.build_query
         cube_query = object.append_cube_query(cube_query) if object.respond_to?(:append_cube_query)
-
-        stats = ctx[:stats]
-        cube_query.stats = stats
-
-        sql_io = stats.sql_io
-        sql_io.puts(cube_query.to_sql) if sql_io.respond_to?(:puts)
+        cube_query.stats = ctx[:stats]
         cube_query.query
       end
 

data/lib/activecube/graphql/parse_tree.rb

@@ -8,21 +8,19 @@ module Activecube
         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
+        attr_reader :arguments, :cube, :parent, :name, :definition, :key,
+                    :children, :metric, :dimension, :field, :type_name
+
         def initialize cube, context_node, parent = nil
 
           @cube = cube
           @parent = parent
+          @type_name = context_node.definition.type.try(:of_type).try(:name) || context_node.definition.type.try(:name)
 
           @name = context_node.name
           @key = parent ? (parent.key ? "#{parent.key}.#{name}" : KEY_FIELD_PREFIX+name ) : nil
 
-          @context_node = context_node
-          @ast_node = context_node.ast_node
-
-          @arguments =  sort_node_arguments ast_node, context_node.arguments.to_h
-
+          @arguments =  sort_node_arguments context_node
 
           if parent
             @definition = context_node.definitions.first.name
@@ -38,14 +36,15 @@ module Activecube
           end
 
           @children = context_node.typed_children.values.map(&:values).flatten.uniq(&:name).
-              select{|child| child.name!=TYPENAME || union? }.
+              select{|child| child.name!=TYPENAME || union?(context_node) }.
               collect do |child|
             Element.new cube, child, self
           end
 
         end
 
-        def sort_node_arguments ast_node, arguments
+        def sort_node_arguments context_node
+          arguments = context_node.arguments.to_h
           if (options = arguments['options']).kind_of?(Hash)
             if opt_keys_args = context_node.ast_node.arguments.detect{|x| x.name=='options'}.value.try(:arguments)
               options_keys = opt_keys_args.map{|x|
@@ -68,10 +67,20 @@ module Activecube
           arguments
         end
 
-        def union?
+        def union? context_node
           context_node.return_type.kind_of? GraphQL::UnionType
         end
 
+        def as_json options = {}
+          {
+            cube: cube.name,
+            name: name,
+            definition: definition,
+            key: key,
+            children: children
+          }
+        end
+
         def append_query query
           if parent
 
@@ -126,7 +135,7 @@ module Activecube
 
         def converted_field_array method, values
           case method
-            when :desc,:asc
+            when :desc, :desc_by_integer, :asc, :asc_by_integer
               values.collect{|v| KEY_FIELD_PREFIX + v}
             when :limit_by
               values.merge({each: KEY_FIELD_PREFIX + values[:each]})

data/lib/activecube/graphql/response_builder.rb

@@ -9,8 +9,8 @@ module Activecube::Graphql
         @row = row
       end
 
-      def convert_type node_type, value
-        case node_type
+      def convert_type type_name, value
+        case type_name
             when 'Boolean' then
               value==1
             else
@@ -24,125 +24,135 @@ module Activecube::Graphql
 
     end
 
+    class ResponseClassRegistry
 
-    attr_reader :response, :response_class
-    def initialize tree, response
-      @response = response
-      @key_map = Hash[response.columns.map.with_index{|key,index| [key, index]}]
-      @response_class = build_response_class tree.root
-    end
+      include Singleton
 
-    def map &block
-      raise Activecube::InputArgumentError, "Block expected on map of root response" unless block_given?
-      response.rows.map do |row|
-        block.call response_class.new row
+      def initialize
+        @registry = {}
       end
-    end
 
-    def build_response_class from_element
+      def get_response_class element, key_map
+        key = element.to_json + key_map.to_json
+        @registry[key] ||= build_response_class(element,key_map)
+      end
+
+      def build_response_class from_element, key_map
 
-      response_class = Class.new Response
+        response_class = Class.new Response
 
-      from_element.children.group_by(&:definition).each{|definition, elements|
+        from_element.children.group_by(&:definition).each{|definition, elements|
 
-        if elements.count==1
-          element = elements.first
-          if element.children.empty?
-            simple_value response_class, definition, element
-          elsif element.metric
-            array_value response_class, definition, element
+          if elements.count==1
+            element = elements.first
+            if element.children.empty?
+              simple_value response_class, definition, element, key_map
+            elsif element.metric
+              array_value response_class, definition, element, key_map
+            else
+              sub_element response_class, definition, element, key_map
+            end
           else
-            sub_element response_class, definition, element
+            match_elements response_class, definition, elements, key_map
           end
-        else
-          match_elements response_class, definition, elements
-        end
 
-      }
+        }
 
-      response_class
+        response_class
 
-    end
+      end
 
-    private
-
-    def match_elements response_class, definition, elements
-
-      index = Hash[elements.collect { |element|
-        value = if element.children.empty?
-                  [@key_map[element.key], element.context_node.definition.type.name]
-                else
-                  build_response_class element
-                end
-        [element.name, value]
-      }]
-
-      response_class.class_eval do
-        define_method definition.underscore do |ast_node:, **rest_of_options|
-          key = ast_node.alias || ast_node.name
-          if (value = index[key]).kind_of? Class
-            value.new @row
-          elsif value.kind_of? Array
-            convert_type value.second, @row[value.first]
-          else
-            raise Activecube::InputArgumentError, "Unexpected request to #{definition} by key #{key}"
+
+      def match_elements response_class, definition, elements, key_map
+
+        index = Hash[elements.collect { |element|
+          value = if element.children.empty?
+                    [key_map[element.key], element.type_name]
+                  else
+                    get_response_class element, key_map
+                  end
+          [element.name, value]
+        }]
+
+        response_class.class_eval do
+          define_method definition.underscore do |ast_node:, **rest_of_options|
+            key = ast_node.alias || ast_node.name
+            if (value = index[key]).kind_of? Class
+              value.new @row
+            elsif value.kind_of? Array
+              convert_type value.second, @row[value.first]
+            else
+              raise Activecube::InputArgumentError, "Unexpected request to #{definition} by key #{key}"
+            end
           end
         end
-      end
 
-    end
+      end
 
-    def sub_element response_class, definition, element
-      subclass = build_response_class element
-      response_class.class_eval do
-        define_method definition.underscore do |**rest_of_options|
-          subclass.new @row
+      def sub_element response_class, definition, element, key_map
+        subclass = get_response_class element, key_map
+        response_class.class_eval do
+          define_method definition.underscore do |**rest_of_options|
+            subclass.new @row
+          end
         end
       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 = node_type element
-      response_class.class_eval do
-        define_method definition.underscore do |**rest_of_options|
-          convert_type node_type, @row[index]
+      def simple_value response_class, definition, element, key_map
+        index = key_map[element.key]
+        type_name = element.type_name
+        response_class.class_eval do
+          define_method definition.underscore do |**rest_of_options|
+            convert_type type_name, @row[index]
+          end
         end
       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[
+      def array_value response_class, definition, element, key_map
+        index = key_map[element.key]
+        array_element_type = if element.children.empty?
+                               element.type_name
+                             else
+                               tuple = element.metric.definition.class.tuple
+                               element.children.collect{|a| [ a.name, a.type_name, 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
-          }
+              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
 
+    attr_reader :response, :response_class
+    def initialize tree, response
+      @response = response
+      key_map = Hash[response.columns.map.with_index{|key,index| [key, index]}]
+      @response_class = ResponseClassRegistry.instance.get_response_class tree.root, key_map
     end
 
+    def map &block
+      raise Activecube::InputArgumentError, "Block expected on map of root response" unless block_given?
+      response.rows.map do |row|
+        block.call response_class.new row
+      end
+    end
+
+
   end
 end

data/lib/activecube/graphql/version.rb

@@ -1,5 +1,5 @@
 module Activecube
   module Graphql
-    VERSION = "0.1.25"
+    VERSION = "0.1.28"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activecube-graphql
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.28
 platform: ruby
 authors:
 - Aleksey Studnev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-18 00:00:00.000000000 Z
+date: 2022-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activecube