graphiti 1.2.9 → 1.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb47455dd399241e2671b63e9087220c7319767a62df3a5ba4742a3f74a26725
-  data.tar.gz: 23900f4fd2949c8b3d3faa848dfa64c36690749906e4c8c8f99945cf48f72aa8
+  metadata.gz: baac052d897009c65c320247e4ff008050b898d700ccab49e08e0e9276fc75ce
+  data.tar.gz: 5d9687d68e3bed0a700f2b534dceedc5989e01b2b9863e4173f5f9bdf277f424
 SHA512:
-  metadata.gz: 91883afe7f0a0cf03c7daf35098d5298673f69f52b69c0aa45c79cc24e20594890c8077a28e4448403616db2693f44893f346377cc31faa2e8644a99cc9dcc18
-  data.tar.gz: f5a371c0b6413c30a9c33080bec055d06eb5464a4b971557059b8db5e69b2c86c2c2a51d580cfe134a85eca483ce8fea61fcb4d924457b2cd2dd35388597f39e
+  metadata.gz: 004d5f12a5dc29edeae1f6a332644580efd30530144d9a850a83cf904b43be16ff30a699bb24fa81e7e6eabca952972ca4cbcce1c3a46d6c1ad5d95d5cc58ddd
+  data.tar.gz: 5927f6e81eb5ec26964549ace950d4667390cd78649c1aebbc10d97810de80e33af83e7dad541e552f09a61419b1682eba2091f4264ad6cc8d92da5f60cf81fb

data/lib/graphiti/resource/configuration.rb

@@ -22,6 +22,7 @@ module Graphiti
         end
 
         def type=(val)
+          val = val && val.to_sym
           if (val = super)
             serializer.type(val)
           end

data/lib/graphiti/resource/persistence.rb

@@ -93,7 +93,7 @@ module Graphiti
 
         run_callbacks :persistence, :update, update_params, meta do
           run_callbacks :attributes, :update, update_params, meta do |params|
-            model_instance = self.class._find(params.merge(id: id)).data
+            model_instance = self.class._find(id: id).data
             call_with_meta(:assign_attributes, model_instance, params, meta)
             model_instance
           end

data/lib/graphiti/scoping/filter.rb

@@ -79,12 +79,18 @@ module Graphiti
     end
 
     def normalize_param(filter, param_value)
-      unless param_value.is_a?(Hash) && param_value.present?
-        param_value = {eq: param_value}
+      type = Types[filter.values[0][:type]][:canonical_name]
+      if param_value.is_a?(Hash) && type == :hash
+        operators_keys = filter.values[0][:operators].keys
+        unless param_value.keys.all? {|k| operators_keys.include?(k)}
+          param_value = { eq: param_value }
+        end
+      elsif !param_value.is_a?(Hash) || param_value.empty?
+        param_value = { eq: param_value }
       end
 
       param_value.map do |operator, value|
-        if Types[filter.values[0][:type]][:canonical_name] == :hash
+        if type == :hash
           value, operator = \
             parse_hash_value(filter, param_value, value, operator)
         end
@@ -136,7 +142,7 @@ module Graphiti
       end
 
       if value.is_a?(String)
-        value = value.gsub("{{{", "{").gsub("}}}", "}")
+        value = value.gsub("{{{", "{").gsub("}}}", "}") unless filter.values[0][:single]
 
         if value.include?("},{") && !filter.values[0][:single]
           value = Util::Hash.split_json(value)

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.2.9"
+  VERSION = "1.2.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.2.10
 platform: ruby
 authors:
 - Lee Richmond
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-30 00:00:00.000000000 Z
+date: 2019-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable