activecube-graphql 0.1.16 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f44937cd21cc7bbe8d77a097c5d355691574a2c0510b6ed3f2c0f602056166eb
-  data.tar.gz: 8244907400ae4e304d73a494d40576f1c1fc187f173f6fb2bd96ff1bf315b62d
+  metadata.gz: f40dfd438429b751590b990dd74293efaeddf44196408376568622b031996077
+  data.tar.gz: d457c6825398059230abacccf5c65d166929fb8feb69a3ef93abb1ff4bf99de3
 SHA512:
-  metadata.gz: 9096d95623776426039afa5b9d05dccf1873afa1beac11d83c4050ad12e8a12ae3e8b352f452735f4b45562ec9c7ec1c80fa486e8b83e2357bbded5d63fa74ae
-  data.tar.gz: 3bc0b34cdc95c96cbcf910520b7f8718da54dba79cb08cf60798cce57feeb1b6688529efead6030f08c05dcd03f10eaeabd9bcc48b5b3c8e329c32981e8e2cbb
+  metadata.gz: cd77b677c65d9ae5be1bd4b918aeb235ff0c077a0ab04e57efbbac9dac4df1fe579bdcb382dd1c6205ff0efc2bbc9c213e93bb3f3eb2377a287a8967b4a23496
+  data.tar.gz: 2de88d604b46cea71e7a8fe8e714ac84b060089484bdf2b7c8dbe9192eabff1cce191726d5268cde9e7673378bfd91ed0b18b2d190c6f23984bce029708e53a3

data/.idea/activecube-graphql.iml

@@ -11,15 +11,15 @@
     </content>
     <orderEntry type="jdk" jdkName="RVM: ruby-2.6.3" jdkType="RUBY_SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="activecube (v0.1.28, RVM: ruby-2.6.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="activecube (v0.1.30, RVM: ruby-2.6.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="activemodel (v6.0.3.1, RVM: ruby-2.6.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="activerecord (v6.0.3.1, RVM: ruby-2.6.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="activesupport (v6.0.3.1, RVM: ruby-2.6.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="bundler (v1.17.3, RVM: ruby-2.6.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="concurrent-ruby (v1.1.7, RVM: ruby-2.6.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.3, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="graphql (v1.11.0, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="i18n (v1.8.5, RVM: ruby-2.6.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="graphql (v1.12.4, RVM: ruby-2.6.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="i18n (v1.8.6, RVM: ruby-2.6.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="minitest (v5.14.2, RVM: ruby-2.6.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rake (v13.0.1, RVM: ruby-2.6.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rspec (v3.9.0, RVM: ruby-2.6.3) [gem]" level="application" />
@@ -28,7 +28,35 @@
     <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.9.1, RVM: ruby-2.6.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.9.3, RVM: ruby-2.6.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="thread_safe (v0.3.6, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="tzinfo (v1.2.7, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="zeitwerk (v2.4.0, RVM: ruby-2.6.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="tzinfo (v1.2.9, RVM: ruby-2.6.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="zeitwerk (v2.4.2, RVM: ruby-2.6.3) [gem]" level="application" />
+  </component>
+  <component name="RakeTasksCache">
+    <option name="myRootTask">
+      <RakeTaskImpl id="rake">
+        <subtasks>
+          <RakeTaskImpl description="Build activecube-graphql-0.1.19.gem into the pkg directory" fullCommand="build" id="build" />
+          <RakeTaskImpl description="Remove any temporary products" fullCommand="clean" id="clean" />
+          <RakeTaskImpl description="Remove any generated files" fullCommand="clobber" id="clobber" />
+          <RakeTaskImpl description="Build and install activecube-graphql-0.1.19.gem into system gems" fullCommand="install" id="install" />
+          <RakeTaskImpl id="install">
+            <subtasks>
+              <RakeTaskImpl description="Build and install activecube-graphql-0.1.19.gem into system gems without network access" fullCommand="install:local" id="local" />
+            </subtasks>
+          </RakeTaskImpl>
+          <RakeTaskImpl description="Create tag v0.1.19 and build and push activecube-graphql-0.1.19.gem to rubygems.org" fullCommand="release[remote]" id="release[remote]" />
+          <RakeTaskImpl description="Run RSpec code examples" fullCommand="spec" id="spec" />
+          <RakeTaskImpl description="" fullCommand="default" id="default" />
+          <RakeTaskImpl description="" fullCommand="release" id="release" />
+          <RakeTaskImpl id="release">
+            <subtasks>
+              <RakeTaskImpl description="" fullCommand="release:guard_clean" id="guard_clean" />
+              <RakeTaskImpl description="" fullCommand="release:rubygem_push" id="rubygem_push" />
+              <RakeTaskImpl description="" fullCommand="release:source_control_push" id="source_control_push" />
+            </subtasks>
+          </RakeTaskImpl>
+        </subtasks>
+      </RakeTaskImpl>
+    </option>
   </component>
 </module>

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    activecube-graphql (0.1.15)
+    activecube-graphql (0.1.19)
       activecube (~> 0.1.28)
       graphql (~> 1.10)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activecube (0.1.28)
+    activecube (0.1.30)
       activerecord (>= 5.2)
     activemodel (6.0.3.1)
       activesupport (= 6.0.3.1)
@@ -23,8 +23,8 @@ GEM
       zeitwerk (~> 2.2, >= 2.2.2)
     concurrent-ruby (1.1.7)
     diff-lcs (1.3)
-    graphql (1.11.0)
-    i18n (1.8.5)
+    graphql (1.12.4)
+    i18n (1.8.6)
       concurrent-ruby (~> 1.0)
     minitest (5.14.2)
     rake (13.0.1)
@@ -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.9)
       thread_safe (~> 0.1)
-    zeitwerk (2.4.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby

data/lib/activecube/graphql/cube_field.rb

@@ -49,6 +49,7 @@ module Activecube
       def execute_query tree, ctx
         cube_query = tree.build_query
         ctx[:sql_io].puts(cube_query.to_sql) if ctx[:sql_io].respond_to?(:puts)
+        cube_query.user_agent = ctx[:sql_user_agent] || 'Ruby/Activecube Graphql'
         cube_query.query
       end
 

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/version.rb

@@ -1,5 +1,5 @@
 module Activecube
   module Graphql
-    VERSION = "0.1.16"
+    VERSION = "0.1.20"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activecube-graphql
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.20
 platform: ruby
 authors:
 - Aleksey Studnev
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-03 00:00:00.000000000 Z
+date: 2021-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activecube
@@ -114,7 +114,7 @@ homepage: https://github.com/bitquery/activecube-graphql
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.4
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Multi-Dimensional Queries using GraphQL
 test_files: []