graphiti 1.0.rc.24 → 1.0.rc.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: d67c2cb973db323b43cb172e2de8a2b99e363643aaaaf32fe3dfb40136c495d7
-  data.tar.gz: a2c8f90f58a5d87fa1ec7bba822c0ac8b4e50a59d7ad1d3f0b71e031d97084d8
+SHA1:
+  metadata.gz: e884b31c1356a0471c275c586c112935b69872da
+  data.tar.gz: 25eeb1ca3e2186817db8484953cbac18224218b6
 SHA512:
-  metadata.gz: 8b08c3eb3a4ab96dfeb1af6642004c1b22d052fd6d3e0d897ee9dc8ddbc84430b49623c819fab06e4744673d5fa61e8b4b289df2d79f0853a79b2d1fc4f7c9d7
-  data.tar.gz: 05c816f48067d09d0d7f498c0dbdd5011d4552d1c720e947bf72513d3a761dec0425ef4d138f49de056833fd1c9998582a8bfabc9d5a26a9889ba91ffb2d605c
+  metadata.gz: 8d02eeef86bd4c3762dfa56d78fca03612aed3471ae7718e0ec68fedae6349837938fcc18355bdb15b0fac4512b9144c6dea769ec6a04eaa7c1ec9e39a2812a5
+  data.tar.gz: a3260d15370a82010a353fec35c597de65bf66b355747fe3ba80a4be098e0a47c0f876ffa5b40c4ccd9c732ab443d4f9a110bc36619c9691434a9d500a8b62fb

data/lib/graphiti/scoping/filter.rb

@@ -45,20 +45,22 @@ module Graphiti
     def each_filter
       filter_param.each_pair do |param_name, param_value|
         filter = find_filter!(param_name)
-        value, operator = normalize_param(filter, param_value)
-        operator = operator.to_s.gsub("!", "not_").to_sym
-        validate_operator(filter, operator)
 
-        type = Types[filter.values[0][:type]]
-        unless type[:canonical_name] == :hash || !value.is_a?(String)
-          value = parse_string_value(filter.values[0], value)
+        normalize_param(filter, param_value).each do |operator, value|
+          operator = operator.to_s.gsub("!", "not_").to_sym
+          validate_operator(filter, operator)
+
+          type = Types[filter.values[0][:type]]
+          unless type[:canonical_name] == :hash || !value.is_a?(String)
+            value = parse_string_value(filter.values[0], value)
+          end
+          validate_singular(resource, filter, value)
+          value = coerce_types(filter.values[0], param_name.to_sym, value)
+          validate_allowlist(resource, filter, value)
+          validate_denylist(resource, filter, value)
+          value = value[0] if filter.values[0][:single]
+          yield filter, operator, value
         end
-        validate_singular(resource, filter, value)
-        value = coerce_types(filter.values[0], param_name.to_sym, value)
-        validate_allowlist(resource, filter, value)
-        validate_denylist(resource, filter, value)
-        value = value[0] if filter.values[0][:single]
-        yield filter, operator, value
       end
     end
 
@@ -79,17 +81,16 @@ module Graphiti
       unless param_value.is_a?(Hash) && param_value.present?
         param_value = {eq: param_value}
       end
-      value = param_value.values.first
-      operator = param_value.keys.first
 
-      if Types[filter.values[0][:type]][:canonical_name] == :hash
-        value, operator = \
-          parse_hash_value(filter, param_value, value, operator)
-      else
-        value = param_value.values.first
+      param_value.map do |operator, value|
+        if Types[filter.values[0][:type]][:canonical_name] == :hash
+          value, operator = \
+            parse_hash_value(filter, param_value, value, operator)
+        end
+
+        [operator, value]
       end
 
-      [value, operator]
     end
 
     def validate_operator(filter, operator)

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.0.rc.24"
+  VERSION = "1.0.rc.25"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.0.rc.24
+  version: 1.0.rc.25
 platform: ruby
 authors:
 - Lee Richmond
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-15 00:00:00.000000000 Z
+date: 2019-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable
@@ -332,7 +332,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Easily build jsonapi.org-compatible APIs