jsonapi-resources 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9d5578a1c15d0e7c0c5726406827aa473dd39349
-  data.tar.gz: 6ded3ed7fc3b01a7811d8a58159cb54c27ec7e26
+SHA256:
+  metadata.gz: aca973f2c9c1164fc79771cc71b363be15d07159cbe8d2b273d63886fee30b05
+  data.tar.gz: cdd800dde1c3f08d6b7c1d6f904f7519f0168c7585a4a9e6b8d4ecf89e834e1c
 SHA512:
-  metadata.gz: 72967c7e6284bc8c0e667fae9899173dc985d4ebd7986a4aa891d4b17154b6c337bd7784acee269224aae5b5f97040d80a6e74db85fd2068155ce8fdadd5fc84
-  data.tar.gz: 1146acf9b97328aef64efb8a6ed675b3a5e1378a08eeb18fc85f91f548dcf821ec939a9e70271ff3d2fd6ff8e0cfb30de60df2d08ba91ce59858361cdc4e3819
+  metadata.gz: 509137860c1e0a0a842a15ebeb580e229cc0636623ebc3d70aef2d752979bd066dc6ba2268bbdad483acdc1a5c25701c62eb9876b796effa80dd2e841fd4ef4d
+  data.tar.gz: b9dfc40e043337a749502f70f790e9280bf08e8a267bf0181e48522b27f58b8d1205cce28bc7e866adc6c566399cc313f3442a4aba86b1a6ef256e36b0f50873

data/lib/jsonapi/processor.rb

@@ -197,7 +197,7 @@ module JSONAPI
           (paginator && paginator.class.requires_record_count) ||
           (JSONAPI.configuration.top_level_meta_include_page_count))
         related_resource_records = source_resource.public_send("records_for_" + relationship_type)
-        records = resource_klass.filter_records(verified_filters, {},
+        records = resource_klass.filter_records(verified_filters, rel_opts,
                                                 related_resource_records)
 
         record_count = resource_klass.count_records(records)

data/lib/jsonapi/request_parser.rb

@@ -251,34 +251,41 @@ module JSONAPI
       end
 
       filters.each do |key, value|
-        filter_method, included_resource_name =
-          key.to_s.split('.').map { |k| unformat_key(k) }.reverse
 
-        if included_resource_name
-          relationship = resource_klass._relationship(included_resource_name || '')
+        unformatted_key = unformat_key(key)
+        if resource_klass._allowed_filter?(unformatted_key)
+          @filters[unformatted_key] = value
+        elsif unformatted_key.to_s.include?('.')
+          parse_relationship_filter(unformatted_key, value)
+        else
+          return @errors.concat(Exceptions::FilterNotAllowed.new(unformatted_key).errors)
+        end
+      end
+    end
 
-          unless relationship
-            return @errors.concat(Exceptions::FilterNotAllowed.new(filter_method).errors)
-          end
+    def parse_relationship_filter(key, value)
+      included_resource_name, filter_method = key.to_s.split('.')
+      filter_method = filter_method.to_sym if filter_method.present?
 
-          unless  relationship.resource_klass._allowed_filter?(filter_method)
-            return @errors.concat(Exceptions::FilterNotAllowed.new(filter_method).errors)
-          end
+      if included_resource_name
+        relationship = resource_klass._relationship(included_resource_name || '')
 
-          unless @include_directives.include_config(relationship.name.to_sym).present?
-            return @errors.concat(Exceptions::FilterNotAllowed.new(filter_method).errors)
-          end
+        unless relationship
+          return @errors.concat(Exceptions::FilterNotAllowed.new(filter_method).errors)
+        end
 
-          verified_filter = relationship.resource_klass.verify_filters(filter_method => value)
-          @include_directives.merge_filter(relationship.name, verified_filter)
-          next
-        else
-          unless resource_klass._allowed_filter?(filter_method)
-            return @errors.concat(Exceptions::FilterNotAllowed.new(filter_method).errors)
-          end
+        unless  relationship.resource_klass._allowed_filter?(filter_method)
+          return @errors.concat(Exceptions::FilterNotAllowed.new(filter_method).errors)
+        end
 
-          @filters[filter_method] = value
+        unless @include_directives.try(:include_config, relationship.name.to_sym).present?
+          return @errors.concat(Exceptions::FilterNotAllowed.new(filter_method).errors)
         end
+
+        verified_filter = relationship.resource_klass.verify_filters(filter_method => value)
+        @include_directives.merge_filter(relationship.name, verified_filter)
+      else
+        return @errors.concat(Exceptions::FilterNotAllowed.new(filter_method).errors)
       end
     end
 
@@ -521,20 +528,40 @@ module JSONAPI
 
       links_object = parse_to_many_links_object(linkage)
 
-      # Since we do not yet support polymorphic to_many relationships we will raise an error if the type does not match the
-      # relationship's type.
-      # ToDo: Support Polymorphic relationships
-
       if links_object.length == 0
         add_result.call([])
       else
-        if links_object.length > 1 || !links_object.has_key?(unformat_key(relationship.type).to_s)
-          fail JSONAPI::Exceptions::TypeMismatch.new(links_object[:type])
-        end
+        if relationship.polymorphic?
+          polymorphic_results = []
+
+          links_object.each_pair do |type, keys|
+            resource = self.resource_klass || Resource
+            type_name = unformat_key(type).to_s
+
+            relationship_resource_klass = resource.resource_for(relationship.class_name)
+            relationship_klass = relationship_resource_klass._model_class
+
+            linkage_object_resource_klass = resource.resource_for(type_name)
+            linkage_object_klass = linkage_object_resource_klass._model_class
+
+            unless linkage_object_klass == relationship_klass || linkage_object_klass.in?(relationship_klass.subclasses)
+              fail JSONAPI::Exceptions::TypeMismatch.new(type_name)
+            end
+
+            relationship_ids = relationship_resource_klass.verify_keys(keys, @context)
+             polymorphic_results << { type: type, ids: relationship_ids }
+          end
+
+          add_result.call polymorphic_results
+        else
+          relationship_type = unformat_key(relationship.type).to_s
+
+          if links_object.length > 1 || !links_object.has_key?(relationship_type)
+            fail JSONAPI::Exceptions::TypeMismatch.new(links_object[:type])
+          end
 
-        links_object.each_pair do |type, keys|
-          relationship_resource = Resource.resource_for(@resource_klass.module_path + unformat_key(type).to_s)
-          add_result.call relationship_resource.verify_keys(keys, @context)
+          relationship_resource = Resource.resource_for(@resource_klass.module_path + relationship_type)
+          add_result.call relationship_resource.verify_keys(links_object[relationship_type], @context)
         end
       end
     end

data/lib/jsonapi/resource.rb

@@ -302,6 +302,26 @@ module JSONAPI
         to_add = relationship_key_values - (relationship_key_values & existing)
         _create_to_many_links(relationship_type, to_add, {})
 
+        @reload_needed = true
+      elsif relationship.polymorphic?
+        relationship_key_values.each do |relationship_key_value|
+          relationship_resource_klass = self.class.resource_for(relationship_key_value[:type])
+          ids = relationship_key_value[:ids]
+
+          related_records = relationship_resource_klass
+            .records(options)
+            .where({relationship_resource_klass._primary_key => ids})
+
+          missed_ids = ids - related_records.pluck(relationship_resource_klass._primary_key)
+
+          if missed_ids.present?
+            fail JSONAPI::Exceptions::RecordNotFound.new(missed_ids)
+          end
+
+          relation_name = relationship.relation_name(context: @context)
+          @model.send("#{relation_name}") << related_records
+        end
+
         @reload_needed = true
       else
         send("#{relationship.foreign_key}=", relationship_key_values)
@@ -565,7 +585,14 @@ module JSONAPI
         _add_relationship(Relationship::ToMany, *attrs)
       end
 
+      # @model_class is inherited from superclass, and this causes some issues:
+      # ```
+      # CarResource._model_class #=> Vehicle # it should be Car
+      # ```
+      # so in order to invoke the right class from subclasses,
+      # we should call this method to override it.
       def model_name(model, options = {})
+        @model_class = nil
         @_model_name = model.to_sym
 
         model_hint(model: @_model_name, resource: self) unless options[:add_model_hint] == false

data/lib/jsonapi/resource_serializer.rb

@@ -394,12 +394,16 @@ module JSONAPI
 
     def to_many_linkage(source, relationship)
       linkage = []
+      include_config = include_directives.include_config(relationship.name.to_sym) if include_directives
+      include_filters = include_config[:include_filters] if include_config
+      options = { filters: include_filters || {} }
+
       linkage_types_and_values = if source.preloaded_fragments.has_key?(format_key(relationship.name))
         source.preloaded_fragments[format_key(relationship.name)].map do |_, resource|
           [relationship.type, resource.id]
         end
       elsif relationship.polymorphic?
-        assoc = source._model.public_send(relationship.name)
+        assoc = source.public_send("records_for_#{relationship.name}", options)
         # Avoid hitting the database again for values already pre-loaded
         if assoc.respond_to?(:loaded?) and assoc.loaded?
           assoc.map do |obj|
@@ -411,9 +415,6 @@ module JSONAPI
           end
         end
       else
-        include_config = include_directives.include_config(relationship.name.to_sym) if include_directives
-        include_filters = include_config[:include_filters] if include_config
-        options = { filters: include_filters || {} }
         source.public_send(relationship.name, options).map do |value|
           [relationship.type, value.id]
         end

data/lib/jsonapi/resources/version.rb

@@ -1,5 +1,5 @@
 module JSONAPI
   module Resources
-    VERSION = '0.9.5'
+    VERSION = '0.9.6'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-resources
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Dan Gebhardt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-09 00:00:00.000000000 Z
+date: 2019-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,6 +109,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -217,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Easily support JSON API in Rails.