graphiti 1.0.beta.14 → 1.0.beta.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4ff13da582bf6e68e92f1b694d9fe17e4674e49
-  data.tar.gz: ff7d0c4a107bfaa7680edcc821572df7a3a38c1a
+  metadata.gz: e06792e034635555f5687496aebef2ed8e0eac93
+  data.tar.gz: c3d10077cc25cff01a1adf79059dc3c3b6ee213d
 SHA512:
-  metadata.gz: 32f81168be3c5b9207c0a8d5143f2efbaff904aade2161dea0cbf4af9f19b723a43f725283dce5116ae3cd30a3a46ff678d55f7cedea0f134b29a7faacfa41e1
-  data.tar.gz: 9cb0bb2e85f0d98555ad5f2092a4800758e84377221e4ef47666f70c2966414f76376e8068dbb2871ea5c18d2ca89c21c5c50415ff311768ac0eeb57f35da486
+  metadata.gz: 4cba835660dc04c71d333703860acd47eb408a463bc1cdb5c4d29d75d0904ee680fddceb6497490fd4c47effaadef6bd65ddb3285984931f999d950073e8a894
+  data.tar.gz: 1d3f3b288997909c4763966ce32dab8cf4998f56a29122c630a3f953741e471d2bb5bcfa56676c710007f2a51eaff1948593d5619270c4f606093fa5ce886052

data/lib/graphiti/adapters/active_record.rb

@@ -207,8 +207,8 @@ module Graphiti
 
           children.each do |child|
             if association_type == :many_to_many &&
-                !parent.send(association_name).exists?(child.id) &&
-                [:create, :update].include?(Graphiti.context[:namespace])
+                [:create, :update].include?(Graphiti.context[:namespace]) &&
+                !parent.send(association_name).exists?(child.id)
               parent.send(association_name) << child
             else
               target = association.instance_variable_get(:@target)

data/lib/graphiti/adapters/active_record/many_to_many_sideload.rb

@@ -45,7 +45,7 @@ class Graphiti::Adapters::ActiveRecord::ManyToManySideload < Graphiti::Sideload:
 
   def parent_reflection
     parent_model = parent_resource_class.model
-    parent_model.reflections[name.to_s]
+    parent_model.reflections[association_name.to_s]
   end
 
   def infer_foreign_key

data/lib/graphiti/errors.rb

@@ -16,6 +16,21 @@ The adapter #{@adapter.class} does not implement method '#{@method}', which was
       end
     end
 
+    class UnsupportedOperator < Base
+      def initialize(resource, filter_name, supported, operator)
+        @resource = resource
+        @filter_name = filter_name
+        @supported = supported
+        @operator = operator
+      end
+
+      def message
+        <<-MSG
+#{@resource.class}: Tried to filter #{@filter_name.inspect} on operator #{@operator.inspect}, but not supported! Supported operators are #{@supported}.
+        MSG
+      end
+    end
+
     class UnwritableRelationship < Base
       def initialize(resource, sideload)
         @resource = resource

data/lib/graphiti/hash_renderer.rb

@@ -44,11 +44,11 @@ module Graphiti
     def to_hash(serializers, opts)
       {}.tap do |hash|
         if serializers.is_a?(Array)
-          hash[@resource.type] = serializers.map do |s|
+          hash[:data] = serializers.map do |s|
             s.to_hash(opts)
           end
         else
-          hash[@resource.type] = serializers.to_hash(opts)
+          hash[:data] = serializers.to_hash(opts)
         end
       end
     end

data/lib/graphiti/query.rb

@@ -152,7 +152,7 @@ module Graphiti
                 hash[k.to_sym] = v.to_i
               end
             elsif nested?(name)
-              hash.merge!(value)
+              hash[name.to_s.split('.').last.to_sym] = value
             elsif top_level? && [:number, :size].include?(name.to_sym)
               hash[name.to_sym] = value.to_i
             end

data/lib/graphiti/scoping/filter.rb

@@ -73,6 +73,7 @@ module Graphiti
       filter_param.each_pair do |param_name, param_value|
         filter = find_filter!(param_name)
         value, operator = normalize_param(filter, param_value)
+        validate_operator(filter, operator)
         value  = parse_string_value(filter.values[0], value) if value.is_a?(String)
         validate_singular(resource, filter, value)
         value = coerce_types(filter.values[0], param_name.to_sym, value)
@@ -111,6 +112,14 @@ module Graphiti
       [value, operator]
     end
 
+    def validate_operator(filter, operator)
+      supported = filter.values[0][:operators].keys
+      unless supported.include?(operator)
+        raise Errors::UnsupportedOperator.new \
+          resource, filter.keys[0], supported, operator
+      end
+    end
+
     def validate_singular(resource, filter, value)
       if filter.values[0][:single] && value.is_a?(Array)
         raise Errors::SingularFilter.new(resource, filter, value)

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.0.beta.14"
+  VERSION = "1.0.beta.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.0.beta.14
+  version: 1.0.beta.15
 platform: ruby
 authors:
 - Lee Richmond
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-12 00:00:00.000000000 Z
+date: 2018-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable