activecube-graphql 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 992470f7a32c278749b214f1ca73dece8ec582286fcc97d379b16a7f1775b455
-  data.tar.gz: df5e4a79dff0740f6c37b3e08a7ebec7b73fd214c41b70b9a46c78d2fad1d13c
+  metadata.gz: 80f8414694cc16fa1db6913ad933d52f60878aafe90ba54ca6cc4be1d45afa93
+  data.tar.gz: ae5c10601123efac43763ed74fd9560e175af8cef858f7450f9e5b0ed4375a02
 SHA512:
-  metadata.gz: 223daebf247315236a08e766250661dcbf6d09891b2993c40f059b626b0a7ad23757b3fae948419259ea01235d7ee0f3e3c6407b587217a38d8efeef06bddbe3
-  data.tar.gz: d4d084eb7d84489972e03fdde6bf715e25ff85d5e825cfd0de5af998bad72127dc7f35fa779b20d3925b760966d984b16ecc0b70601bf8440f0cfee9deae36b5
+  metadata.gz: 32e56685b2f44640f6636aaf1ceff09178a575bdd58103204a032e9d96c9b355c15ef156c34ca8ac240d24b57ba2ff734e97dca416bc6ae72416f3211f09af48
+  data.tar.gz: fca9fe6ebce5a9c7f48d47f9cf787615367e6c85660daa4d2986e1b3e48df4f7ca092230edeacc156cc402350de675d044441ebeabbb2c327977e9e4054af599

data/.idea/activecube-graphql.iml

@@ -11,14 +11,13 @@
     </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.3, RVM: ruby-2.6.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="activemodel (v6.0.2.1, RVM: ruby-2.6.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="activerecord (v6.0.2.1, RVM: ruby-2.6.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="activesupport (v6.0.2.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.6, 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.10.3, RVM: ruby-2.6.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="graphql (v1.10.4, RVM: ruby-2.6.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="i18n (v1.8.2, RVM: ruby-2.6.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="minitest (v5.14.0, RVM: ruby-2.6.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rake (v10.5.0, RVM: ruby-2.6.3) [gem]" level="application" />

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    activecube-graphql (0.1.1)
+    activecube-graphql (0.1.2)
       activecube (~> 0.1.3)
       graphql (~> 1.9)
 

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.3'
+  spec.add_runtime_dependency 'activecube', '~> 0.1.4'
   spec.add_runtime_dependency 'graphql', '~> 1.9'
 
   spec.add_development_dependency "bundler", "~> 1.17"

data/lib/activecube/graphql/cube_field.rb

@@ -31,8 +31,12 @@ module Activecube
 
         database = obj.object.kind_of?(Hash) && obj.object[:database]
         response = database ? cube.connected_to(database: database) do
-          execute_query(tree)
-        end : execute_query(tree)
+          execute_query(tree, ctx)
+        end : execute_query(tree, ctx)
+
+        if ctx[:stat_io].respond_to?(:puts) && response.respond_to?(:statistics)
+          ctx[:stat_io].puts(response.statistics)
+        end
 
         ResponseBuilder.new tree, response
 
@@ -42,9 +46,9 @@ module Activecube
 
       private
 
-      def execute_query tree
+      def execute_query tree, ctx
         cube_query = tree.build_query
-        puts cube_query.to_sql
+        ctx[:sql_io].puts(cube_query.to_sql) if ctx[:sql_io].respond_to?(:puts)
         cube_query.query
       end
 

data/lib/activecube/graphql/parse_tree.rb

@@ -5,7 +5,7 @@ module Activecube
       class Element
 
         attr_reader :arguments, :ast_node, :cube, :parent, :name, :definition, :key,
-                    :children, :metric, :dimension, :field
+                    :children, :metric, :dimension, :field, :context_node
         def initialize cube, context_node, parent = nil
 
           @cube = cube
@@ -14,6 +14,7 @@ module Activecube
           @name = context_node.name
           @key = parent ? (parent.key ? "#{parent.key}.#{name}" : name ) : nil
 
+          @context_node = context_node
           @arguments =  context_node.arguments.to_h
 
           @ast_node = context_node.ast_node
@@ -45,8 +46,12 @@ module Activecube
 
             if metric
               query = query.measure({key => apply_args(metric)})
-            elsif dimension && children.empty?
-              query = query.slice({key => apply_args(field || dimension)})
+            elsif dimension
+              if children.empty?
+                query = query.slice({key => apply_args(field || dimension)})
+              elsif !arguments.empty?
+                query = apply_args query
+              end
             end
 
           else

data/lib/activecube/graphql/response_builder.rb

@@ -9,6 +9,15 @@ module Activecube::Graphql
         @row = row
       end
 
+      def convert_type node_type, value
+        case node_type
+            when 'Boolean' then
+              value==1
+            else
+              value
+        end
+      end
+
     end
 
 
@@ -55,7 +64,7 @@ module Activecube::Graphql
 
       index = Hash[elements.collect { |element|
         value = if element.children.empty?
-                  @key_map[element.key]
+                  [@key_map[element.key], element.context_node.definition.type.name]
                 else
                   build_response_class element
                 end
@@ -67,8 +76,8 @@ module Activecube::Graphql
           key = ast_node.alias || ast_node.name
           if (value = index[key]).kind_of? Class
             value.new @row
-          elsif value.kind_of? Integer
-            @row[value]
+          elsif value.kind_of? Array
+            convert_type value.second, @row[value.first]
           else
             raise ArgumentError, "Unexpected request to #{definition} by key #{key}"
           end
@@ -88,14 +97,14 @@ module Activecube::Graphql
 
     def simple_value response_class, definition, element
       index = @key_map[element.key]
+      node_type = element.context_node.definition.type.name
       response_class.class_eval do
         define_method definition.underscore do |**rest_of_options|
-          @row[index]
+          convert_type node_type, @row[index]
         end
       end
     end
 
 
-
   end
 end

data/lib/activecube/graphql/version.rb

@@ -1,5 +1,5 @@
 module Activecube
   module Graphql
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activecube-graphql
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Aleksey Studnev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-24 00:00:00.000000000 Z
+date: 2020-03-03 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.3
+        version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: graphql
   requirement: !ruby/object:Gem::Requirement