activecube-graphql 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80f8414694cc16fa1db6913ad933d52f60878aafe90ba54ca6cc4be1d45afa93
-  data.tar.gz: ae5c10601123efac43763ed74fd9560e175af8cef858f7450f9e5b0ed4375a02
+  metadata.gz: 2ed85d52c033c1583b68facda265c638cebfa60dafc16340a0a01cc613710bab
+  data.tar.gz: 6f1b2a6423147dab70874c09f12c0ffb2d2518e6fdaf23a2cf671593d119e384
 SHA512:
-  metadata.gz: 32e56685b2f44640f6636aaf1ceff09178a575bdd58103204a032e9d96c9b355c15ef156c34ca8ac240d24b57ba2ff734e97dca416bc6ae72416f3211f09af48
-  data.tar.gz: fca9fe6ebce5a9c7f48d47f9cf787615367e6c85660daa4d2986e1b3e48df4f7ca092230edeacc156cc402350de675d044441ebeabbb2c327977e9e4054af599
+  metadata.gz: 0ef7d2cc43ab3f904dc3af7f20d299d55a41554dc439dc579e4727028df9c91026b3653e5ec6735eea9ddf5d8f2d7854fc284bc4a247bcdcc74beb2f7ad18d89
+  data.tar.gz: 464c8ace544405043f115b5bf91015b19301b3c149d537746888da962a00d60e3bb602183faeae82ab3c04e8234096d2c88d707bff333513fbcdb4b390fc4289

data/.gitignore

@@ -1,3 +1,4 @@
+/.idea/
 /.bundle/
 /.yardoc
 /_yardoc/

data/.idea/activecube-graphql.iml

@@ -11,6 +11,7 @@
     </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.4, 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" />
@@ -20,7 +21,7 @@
     <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" />
+    <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" />
     <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.9.1, RVM: ruby-2.6.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.9.0, RVM: ruby-2.6.3) [gem]" level="application" />

data/Gemfile.lock

@@ -2,13 +2,13 @@ PATH
   remote: .
   specs:
     activecube-graphql (0.1.2)
-      activecube (~> 0.1.3)
+      activecube (~> 0.1.4)
       graphql (~> 1.9)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activecube (0.1.3)
+    activecube (0.1.4)
       activerecord (>= 5.2)
     activemodel (6.0.2.1)
       activesupport (= 6.0.2.1)
@@ -23,11 +23,11 @@ GEM
       zeitwerk (~> 2.2)
     concurrent-ruby (1.1.6)
     diff-lcs (1.3)
-    graphql (1.10.3)
+    graphql (1.10.4)
     i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     minitest (5.14.0)
-    rake (10.5.0)
+    rake (13.0.1)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -52,7 +52,7 @@ PLATFORMS
 DEPENDENCIES
   activecube-graphql!
   bundler (~> 1.17)
-  rake (~> 10.0)
+  rake (>= 13.0)
   rspec (~> 3.0)
 
 BUNDLED WITH

data/activecube-graphql.gemspec

@@ -28,6 +28,6 @@ to query cubes}
   spec.add_runtime_dependency 'graphql', '~> 1.9'
 
   spec.add_development_dependency "bundler", "~> 1.17"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", ">= 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/activecube/graphql/parse_tree.rb

@@ -4,6 +4,8 @@ module Activecube
 
       class Element
 
+        TYPENAME = '__typename'
+
         attr_reader :arguments, :ast_node, :cube, :parent, :name, :definition, :key,
                     :children, :metric, :dimension, :field, :context_node
         def initialize cube, context_node, parent = nil
@@ -34,7 +36,9 @@ module Activecube
             end
           end
 
-          @children = context_node.typed_children.values.map(&:values).flatten.collect do |child|
+          @children = context_node.typed_children.values.map(&:values).flatten.
+              select{|child| child.name!=TYPENAME}.
+              collect do |child|
             Element.new cube, child, self
           end
 

data/lib/activecube/graphql/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activecube-graphql
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Aleksey Studnev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-03 00:00:00.000000000 Z
+date: 2020-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activecube
@@ -56,16 +56,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement