activecube-graphql 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42579bf672a307cc6a4c48285c98d07ada9aae3547300f00880d6444d6ae55d0
-  data.tar.gz: f7d5dc893fd074bc2f37b065b46e0113a3f0107a7dfe850f50e5b5967af70db0
+  metadata.gz: 40ff0b342c70ef9d40d3b0d5a10962abb56a4e522f0d0e049cf2f081541ba1a8
+  data.tar.gz: 85f3d371fcac7ca148cadda4c3441d95d6608cac8339dc36b6398dab967d289f
 SHA512:
-  metadata.gz: 5ec2fea9a92f5ae829e118965daf2e60a51041e7cb2eedb0a1e2634cc8ea6b37656c34399891d37cfc456ff938831ea5ad92ab3e7c650bd05e41eefd6f66064d
-  data.tar.gz: f86cd4c3bb22b28b6ec6298e1d5b0fbbb6c33712956aa8a8124784e74016ea84e65b36094375afeb842f935643dabe3db5260cf279005f4d34c311db219582ce
+  metadata.gz: d3bc3d55060c29221aef2279c3d2dad86febef7ba831acdf5f89ae9b541059e9d544214ced2d439bcd8ab1bc08142f3e43caad59633371da5ed1a85c95d379f5
+  data.tar.gz: daecbfad367c123665d3f3355d8214fd66e2f9774b1f09e4555f510e2932fca926548826f09e494d5f63aaf39f9bc2aa7ce04504c712c6e0fc67dd92cce9b4c8

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.14'
+  spec.add_runtime_dependency 'activecube', '~> 0.1.15'
   spec.add_runtime_dependency 'graphql', '~> 1.10'
 
   spec.add_development_dependency "bundler", "~> 1.17"

data/lib/activecube/graphql/parse_tree.rb

@@ -74,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
@@ -112,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.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/version.rb

@@ -1,5 +1,5 @@
 module Activecube
   module Graphql
-    VERSION = "0.1.8"
+    VERSION = "0.1.9"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activecube-graphql
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Aleksey Studnev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-15 00:00:00.000000000 Z
+date: 2020-04-16 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.14
+        version: 0.1.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.14
+        version: 0.1.15
 - !ruby/object:Gem::Dependency
   name: graphql
   requirement: !ruby/object:Gem::Requirement