jsonapi-resources 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b9c37e4c95b76725a1cd1c63fe6f065dc56eb04
-  data.tar.gz: c206e1fec888ce0031ad4c2c5d26a2519a82791c
+  metadata.gz: a96ed78c48c0357091b76f35918aa4dbb3d21d55
+  data.tar.gz: d9ac26a835068ae65a3d567b642cdf0f705eac63
 SHA512:
-  metadata.gz: c8f727dc37c485ba63ccb9de5abfa3903ea3369c4ea1a7175d796d00a63b971913672d5c33b0685b87b873ba586e1caba4b1a5ce5761961151a7bf4287c6ff63
-  data.tar.gz: c5c6a4dc06ad88949d1d18ffbc23b0447a8843c9e658ae386d3eb510af36448de75f749b6f20076b46f1b294802dbc1366f25ed0bbfd5fb6a6861676cb464d16
+  metadata.gz: 10d478f7821349ef9618ad3378b177b1237ffe91110779c66a8f2e6ed7d8ad93f8da87cfaddab0e5b167222a290c27047af02e6a652dfed8927c69c2ee9ea57e
+  data.tar.gz: 9436fd76c957786a7faa1abfa1e8d0c05fdaec3530a9c0e456687e67a1a411ac5a4df4e3164551610d1fea7e8c6dc0dca21f6a3fae9f8b29bc1364f6d3f8943a

data/lib/jsonapi/include_directives.rb

@@ -40,6 +40,16 @@ module JSONAPI
       delve_paths(get_includes(@include_directives_hash, false))
     end
 
+    def merge_filter(relation, filter)
+      config = include_config(relation.to_sym)
+      config[:include_filters] ||= {}
+      config[:include_filters].merge!(filter)
+    end
+
+    def include_config(relation)
+      @include_directives_hash[:include_related][relation]
+    end
+
     private
 
     def get_related(current_path)

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(filters, {},
+        records = resource_klass.filter_records(verified_filters, {},
                                                 related_resource_records)
 
         record_count = resource_klass.count_records(records)

data/lib/jsonapi/request_parser.rb

@@ -76,6 +76,8 @@ module JSONAPI
     def setup_show_action(params)
       parse_fields(params[:fields])
       parse_include_directives(params[:include])
+      parse_filters(params[:filter])
+
       @id = params[:id]
       add_show_operation
     end
@@ -232,7 +234,7 @@ module JSONAPI
         @include_directives = JSONAPI::IncludeDirectives.new(@resource_klass, result)
       rescue JSONAPI::Exceptions::InvalidInclude => e
         @errors.concat(e.errors)
-        @include_directives = {}
+        @include_directives = JSONAPI::IncludeDirectives.new(@resource_klass, [])
       end
     end
 
@@ -249,11 +251,33 @@ module JSONAPI
       end
 
       filters.each do |key, value|
-        filter = unformat_key(key)
-        if @resource_klass._allowed_filter?(filter)
-          @filters[filter] = 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 || '')
+
+          unless relationship
+            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
+
+          unless @include_directives.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)
+          next
         else
-          fail JSONAPI::Exceptions::FilterNotAllowed.new(filter)
+          unless resource_klass._allowed_filter?(filter_method)
+            return @errors.concat(Exceptions::FilterNotAllowed.new(filter_method).errors)
+          end
+
+          @filters[filter_method] = value
         end
       end
     end

data/lib/jsonapi/resource.rb

@@ -732,9 +732,30 @@ module JSONAPI
         records
       end
 
+      def apply_included_resources_filters(records, options = {})
+        include_directives = options[:include_directives]
+        return records unless include_directives
+        related_directives = include_directives.include_directives.fetch(:include_related)
+        related_directives.reduce(records) do |memo, (relationship_name, config)|
+          relationship = _relationship(relationship_name)
+          next memo unless relationship && relationship.is_a?(JSONAPI::Relationship::ToMany)
+          filtering_resource = relationship.resource_klass
+
+          # Don't try to merge where clauses when relation isn't already being joined to query.
+          next memo unless config[:include_in_join]
+
+          filters = config[:include_filters]
+          next memo unless filters
+
+          rel_records = filtering_resource.apply_filters(filtering_resource.records(options), filters, options).references(relationship_name)
+          memo.merge(rel_records)
+        end
+      end
+
       def filter_records(filters, options, records = records(options))
         records = apply_filters(records, filters, options)
-        apply_includes(records, options)
+        records = apply_includes(records, options)
+        apply_included_resources_filters(records, options)
       end
 
       def sort_records(records, order_options, context = {})
@@ -1256,7 +1277,7 @@ module JSONAPI
         quoted_attrs = attrs.map do |attr|
           quoted_table = conn.quote_table_name(attr.relation.table_alias || attr.relation.name)
           quoted_column = conn.quote_column_name(attr.name)
-          "#{quoted_table}.#{quoted_column}"
+          Arel.sql("#{quoted_table}.#{quoted_column}")
         end
         relation.pluck(*quoted_attrs)
       end

data/lib/jsonapi/resource_serializer.rb

@@ -287,6 +287,7 @@ module JSONAPI
         include_linkage = ia && ia[:include]
         include_linked_children = ia && !ia[:include_related].empty?
 
+        options = { filters: ia && ia[:include_filters] || {} }
         if field_set.include?(name)
           hash[format_key(name)] = link_object(source, relationship, include_linkage)
         end
@@ -298,7 +299,7 @@ module JSONAPI
           resources = if source.preloaded_fragments.has_key?(format_key(name))
             source.preloaded_fragments[format_key(name)].values
           else
-            [source.public_send(name)].flatten(1).compact
+            [source.public_send(name, options)].flatten(1).compact
           end
           resources.each do |resource|
             next if self_referential_and_already_in_source(resource)
@@ -410,7 +411,10 @@ module JSONAPI
           end
         end
       else
-        source.public_send(relationship.name).map do |value|
+        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
       end

data/lib/jsonapi/resources/version.rb

@@ -1,5 +1,5 @@
 module JSONAPI
   module Resources
-    VERSION = '0.9.3'
+    VERSION = '0.9.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-resources
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Dan Gebhardt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-31 00:00:00.000000000 Z
+date: 2019-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -217,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Easily support JSON API in Rails.