activecube-graphql 0.1.22 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ff3d9f5f10865d312810addf9b8b2b02d5e1da42bfb450c6b6a2d1c6c245720
-  data.tar.gz: 958384371784f96feeddce3d9e3219bd6355138939d11c7e6be49810e5eea98a
+  metadata.gz: 86d15d0f813318ca884475efeb1807649823451ebc17d530663346ebe111e802
+  data.tar.gz: 37c3a63ae71aa2a1da0db220452eb26cde9c020e131b8f5b873ffd31432902b4
 SHA512:
-  metadata.gz: 50a5432f0a2d372b4ee9ae646675c79c6e2e42dddc0b68dc06147308fa995f18bde07b3d8d29f094f734acb73010945d86c822d346248e8f9fbf20fb923eff03
-  data.tar.gz: 7a51f2c654add24b517266bd6de37d7e96fce3f4b298fd026959f23c163e972c00733fe2c5a7054757ec8c1fc3604026836654249e401024c2a1fac1170d2805
+  metadata.gz: 61a6651dcaee022002a2d748b4f4ad325d49d1d5cd03891c99948cf6f42394abb867ed8108f933b979e799f8c576e572745794d1c75055c3d9af9d3ccccf5ad0
+  data.tar.gz: 1d0e73fa705c9277c8109f96e30a295018cefc5a4c7a636b621e3ed4d68d5e37f32eccbd725d49933f870ac4bcfb9950267657368d44effef5d4419f5c78ae85

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    activecube-graphql (0.1.21)
+    activecube-graphql (0.1.23)
       activecube (~> 0.1.28)
       graphql (~> 1.10)
 

data/lib/activecube/graphql/cube_field.rb

@@ -34,8 +34,8 @@ module Activecube
           (object.respond_to?(:database) && object.database)
 
         response = database ? cube.connected_to(database: database) do
-          execute_query(tree, ctx)
-        end : execute_query(tree, ctx)
+          execute_query(tree, ctx, object)
+        end : execute_query(tree, ctx, object)
 
         if ctx[:stat_io].respond_to?(:puts) && response.respond_to?(:statistics)
           ctx[:stat_io].puts(response.statistics)
@@ -49,8 +49,9 @@ module Activecube
 
       private
 
-      def execute_query tree, ctx
+      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)
         cube_query.user_agent = ctx[:sql_user_agent] || 'Ruby/Activecube Graphql'
 
         ctx[:sql_io].puts(cube_query.to_sql) if ctx[:sql_io].respond_to?(:puts)

data/lib/activecube/graphql/parse_tree.rb

@@ -47,9 +47,16 @@ module Activecube
 
         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
-            }
+            if opt_keys_args = context_node.ast_node.arguments.detect{|x| x.name=='options'}.value.try(:arguments)
+              options_keys = opt_keys_args.map{|x|
+                x.name.underscore.to_sym
+              }
+            elsif opt_keys_args_opt_name = context_node.ast_node.arguments.detect{|x| x.name=='options'}.value.try(:name)
+              options_keys = context_node.query.variables[opt_keys_args_opt_name].arguments.argument_values.map{|x, y|
+                x.underscore.to_sym
+              }
+            end
+
             arguments['options'] = Hash[
                 options_keys.collect{|key|
                   raise "Unmatched key #{key}" unless options[key]

data/lib/activecube/graphql/version.rb

@@ -1,5 +1,5 @@
 module Activecube
   module Graphql
-    VERSION = "0.1.22"
+    VERSION = "0.1.24"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activecube-graphql
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.24
 platform: ruby
 authors:
 - Aleksey Studnev
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-24 00:00:00.000000000 Z
+date: 2021-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activecube