activecube-graphql 0.1.7 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5907c942a7c6ff67df9c067b511f3fa12ecd28786501c171c254a8208fea8ae
-  data.tar.gz: af6cf1ab5742653b86e3773b38524b67320de944f34eb1f5fce54eca209d02b7
+  metadata.gz: d7a79d0cc089791e544c599ba8559634a8a074546060c2c2920df07f2e8ff0a3
+  data.tar.gz: a4b0e37c0f583a3f4661c393a42e0ce35ae2bcc25e062f433edcc355ac9df5b2
 SHA512:
-  metadata.gz: f6a8e54da43f0eef1f7c6c0ea75f726deeb2fa8f190ecda6d2aed61ceac6d8d42d9eb5641d60eae32ee5e993183c89cc0bc201af71800e498dccab00f1a68bf2
-  data.tar.gz: b5aae1ee51c0964faaf8eed002d8906db458493270b692e396771560e3e54ea4f977c087a922eadcecc10e6b34d3602deccce2cde2588c920216d98014d8b4d1
+  metadata.gz: e83c2195dabe965975f69e01833434eb0ed0b5ec81cbee5a6209ab8e0388d975d605316adc88626552bb344fdd0ea118ee9cc9fba305bf51df2afb43b34a7406
+  data.tar.gz: 3f2c1161a22d9dd83afac7e02c0323d56a3fc1ca1e8ed83f7bfa8f3661061caa1364860661a3e10fc3f9fbc1b78bcc400ab989e5aec3fc677f4508f4eda3c69e

data/Gemfile.lock

@@ -1,48 +1,48 @@
 PATH
   remote: .
   specs:
-    activecube-graphql (0.1.6)
-      activecube (~> 0.1.6)
-      graphql (~> 1.9)
+    activecube-graphql (0.1.11)
+      activecube (~> 0.1.15)
+      graphql (~> 1.10)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activecube (0.1.6)
+    activecube (0.1.24)
       activerecord (>= 5.2)
-    activemodel (6.0.2.1)
-      activesupport (= 6.0.2.1)
-    activerecord (6.0.2.1)
-      activemodel (= 6.0.2.1)
-      activesupport (= 6.0.2.1)
-    activesupport (6.0.2.1)
+    activemodel (6.0.3.1)
+      activesupport (= 6.0.3.1)
+    activerecord (6.0.3.1)
+      activemodel (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
+    activesupport (6.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+      zeitwerk (~> 2.2, >= 2.2.2)
     concurrent-ruby (1.1.6)
     diff-lcs (1.3)
-    graphql (1.10.4)
-    i18n (1.8.2)
+    graphql (1.10.10)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.0)
+    minitest (5.14.1)
     rake (13.0.1)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+    rspec-support (3.9.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.6)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     zeitwerk (2.3.0)
 

data/activecube-graphql.gemspec

@@ -24,8 +24,8 @@ 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.6'
-  spec.add_runtime_dependency 'graphql', '~> 1.9'
+  spec.add_runtime_dependency 'activecube', '~> 0.1.15'
+  spec.add_runtime_dependency 'graphql', '~> 1.10'
 
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", ">= 13.0"

data/lib/activecube/graphql/parse_tree.rb

@@ -5,6 +5,7 @@ module Activecube
       class Element
 
         TYPENAME = '__typename'
+        KEY_FIELD_PREFIX = '_aq.'
 
         attr_reader :arguments, :ast_node, :cube, :parent, :name, :definition, :key,
                     :children, :metric, :dimension, :field, :context_node
@@ -14,7 +15,7 @@ module Activecube
           @parent = parent
 
           @name = context_node.name
-          @key = parent ? (parent.key ? "#{parent.key}.#{name}" : name ) : nil
+          @key = parent ? (parent.key ? "#{parent.key}.#{name}" : KEY_FIELD_PREFIX+name ) : nil
 
           @context_node = context_node
           @arguments =  context_node.arguments.to_h
@@ -73,10 +74,15 @@ module Activecube
           query
         end
 
+        private
+
         def apply_args element, args = self.arguments
           args && args.each_pair do |key, value|
             k = key.to_sym
-            if element.respond_to?(:selectors) && (selector =  cube.selectors[k])
+            has_selectors = element.respond_to?(:selectors)
+            if has_selectors && k==:any
+              element = apply_or_selector element, value
+            elsif has_selectors && (selector =  cube.selectors[k])
               if value.kind_of? Hash
                 element = apply_selector element, k, value
               elsif value.kind_of? Array
@@ -85,7 +91,7 @@ module Activecube
                 element = element.when( selector.eq(value) )
               end
             elsif element.respond_to? k
-              element = element.send(k, *value)
+              element = element.send(k, *converted_field_array(k, value))
             else
               raise Activecube::InputArgumentError, "Field #{k} is not implemented for #{element}"
             end
@@ -94,6 +100,14 @@ 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
+        end
+
         def apply_selector element, k, hash
           hash.each_pair do |operator, arg|
             selector = cube.selectors[k]
@@ -103,7 +117,28 @@ module Activecube
           element
         end
 
-        private
+        def apply_or_selector element, value
+          selectors = value.collect{|v| make_selector v }.compact
+          element.when( Activecube::Query::Selector.or(selectors) )
+        end
+
+        def make_selector hash
+          raise Activecube::InputArgumentError,  "Hash expected for selector, #{v} found instead" unless hash.kind_of?(Hash)
+          selectors = hash.to_a.collect{|attr, expressions|
+            k = attr.to_s.camelize(:lower).to_sym
+            (expressions.kind_of?(Array) ? expressions : [expressions]).collect{|expression|
+              expression.to_a.collect{|c|
+                operator, arg  = c
+                selector = cube.selectors[k]
+                raise Activecube::InputArgumentError, "Selector not found for '#{k}'" unless selector
+                raise Activecube::InputArgumentError, "#{selector} does not handle method '#{operator}' '#{k}'" unless selector.respond_to?(operator)
+                selector.send(operator, arg) unless arg.nil?
+                selector
+              }
+            }
+          }.flatten
+          Activecube::Query::Selector.and(selectors)
+        end
 
         def apply_to_array(element, k, selector, value)
 

data/lib/activecube/graphql/response_builder.rb

@@ -97,7 +97,7 @@ module Activecube::Graphql
 
     def simple_value response_class, definition, element
       index = @key_map[element.key]
-      node_type = element.context_node.definition.type.name
+      node_type = element.context_node.definition.type.try(:of_type).try(:name)
       response_class.class_eval do
         define_method definition.underscore do |**rest_of_options|
           convert_type node_type, @row[index]

data/lib/activecube/graphql/version.rb

@@ -1,5 +1,5 @@
 module Activecube
   module Graphql
-    VERSION = "0.1.7"
+    VERSION = "0.1.12"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activecube-graphql
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.12
 platform: ruby
 authors:
 - Aleksey Studnev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-24 00:00:00.000000000 Z
+date: 2020-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activecube
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.1.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.1.15
 - !ruby/object:Gem::Dependency
   name: graphql
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement