jsonapi-resources 0.10.0.beta9 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46a8c66a46d4472b937170a49042d8562590625617e7cacf7ffeea41a82833f6
-  data.tar.gz: '056962b1332867b7d5c787c896ab27b09dbc20f32fc1e393bab92926368d0d4e'
+  metadata.gz: f0373c84cc7d1e7fa2da86da83b30db06192824ecd5261718d167ddcbd7d3c3d
+  data.tar.gz: 4f2667a8a42ed1a4c91100979e047a0fafedc0467d84bd13e487fc7cb8baf60d
 SHA512:
-  metadata.gz: 7054515d6f28adb20a7df94f9fe85a70cd7489f3e75a89eca4daa6b7c75d056a34512fe825dc9c2b12ca4c2e3e0bc0ca10f3db27586e91b757b06bd72b04dad1
-  data.tar.gz: 99514c00fa4f01507f38a60c8c62796790116e60406bee10666c83fef3072a572b03a33a4a9867741064ed60d1337e9c73f83a4c7d52fd8483821bac0958ef9b
+  metadata.gz: 6d080b0c4fcd192780be59c59158149081d7873301e36870335df9e362cc025d58b471d5677c7ba53c0d1b90c299cd41dea8975239fbd0510cdf0a9eb6a39cfb
+  data.tar.gz: 726d7c41751b41f79e1dfa6c6e6f4cd85d35c2a4e713d6836f8e1e8e8b275c74c62053fb1e95b278e6821732e81159cacdd6424482a182bc577ff56c0af767df

data/lib/jsonapi/active_relation_resource.rb

@@ -153,6 +153,11 @@ module JSONAPI
           pluck_fields << Arel.sql("#{concat_table_field(resource_table_alias, model_field[:name])} AS #{resource_table_alias}_#{model_field[:name]}")
         end
 
+        sort_fields = options.dig(:_relation_helper_options, :sort_fields)
+        sort_fields.try(:each) do |field|
+          pluck_fields << Arel.sql(field)
+        end
+
         fragments = {}
         rows = records.pluck(*pluck_fields)
         rows.each do |row|
@@ -390,7 +395,7 @@ module JSONAPI
                                                        sort_criteria: sort_criteria,
                                                        filters: filters)
 
-        paginator = options[:paginator] if source_rids.count == 1
+        paginator = options[:paginator]
 
         records = apply_request_settings_to_records(records: records_for_source_to_related(options),
                                resource_klass: resource_klass,
@@ -445,6 +450,11 @@ module JSONAPI
           pluck_fields << Arel.sql("#{concat_table_field(resource_table_alias, model_field[:name])} AS #{resource_table_alias}_#{model_field[:name]}")
         end
 
+        sort_fields = options.dig(:_relation_helper_options, :sort_fields)
+        sort_fields.try(:each) do |field|
+          pluck_fields << Arel.sql(field)
+        end
+
         fragments = {}
         rows = records.distinct.pluck(*pluck_fields)
         rows.each do |row|
@@ -515,7 +525,7 @@ module JSONAPI
                                                        relationships: linkage_relationships,
                                                        filters: filters)
 
-        paginator = options[:paginator] if source_rids.count == 1
+        paginator = options[:paginator]
 
         # Note: We will sort by the source table. Without using unions we can't sort on a polymorphic relationship
         # in any manner that makes sense
@@ -680,24 +690,23 @@ module JSONAPI
                                             paginator: nil,
                                             options: {})
 
-        opts = options.dup
-        records = resource_klass.apply_joins(records, join_manager, opts)
+        options[:_relation_helper_options] = { join_manager: join_manager, sort_fields: [] }
+
+        records = resource_klass.apply_joins(records, join_manager, options)
 
         if primary_keys
           records = records.where(_primary_key => primary_keys)
         end
 
-        opts[:join_manager] = join_manager
-
         unless filters.empty?
-          records = resource_klass.filter_records(records, filters, opts)
+          records = resource_klass.filter_records(records, filters, options)
         end
 
         if sort_primary
           records = records.order(_primary_key => :asc)
         else
           order_options = resource_klass.construct_order_options(sort_criteria)
-          records = resource_klass.sort_records(records, order_options, opts)
+          records = resource_klass.sort_records(records, order_options, options)
         end
 
         if paginator
@@ -731,19 +740,23 @@ module JSONAPI
 
         strategy = _allowed_sort.fetch(field.to_sym, {})[:apply]
 
+        options[:_relation_helper_options] ||= {}
+        options[:_relation_helper_options][:sort_fields] ||= []
+
         if strategy
           records = call_method_or_proc(strategy, records, direction, context)
         else
-          join_manager = options[:join_manager]
-
-          records = records.order(Arel.sql("#{get_aliased_field(field, join_manager)} #{direction}"))
+          join_manager = options.dig(:_relation_helper_options, :join_manager)
+          sort_field = join_manager ? get_aliased_field(field, join_manager) : field
+          options[:_relation_helper_options][:sort_fields].push("#{sort_field}")
+          records = records.order(Arel.sql("#{sort_field} #{direction}"))
         end
         records
       end
 
       # Assumes ActiveRecord's counting. Override if you need a different counting method
       def count_records(records)
-        if Rails::VERSION::MAJOR >= 5 && ActiveRecord::VERSION::MINOR >= 1
+        if (Rails::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR >= 1) || Rails::VERSION::MAJOR >= 6
           records.count(:all)
         else
           records.count
@@ -825,8 +838,9 @@ module JSONAPI
         if strategy
           records = call_method_or_proc(strategy, records, value, options)
         else
-          join_manager = options[:join_manager]
-          records = records.where(Arel.sql(get_aliased_field(filter, join_manager)) => value)
+          join_manager = options.dig(:_relation_helper_options, :join_manager)
+          field = join_manager ? get_aliased_field(filter, join_manager) : filter
+          records = records.where(Arel.sql(field) => value)
         end
 
         records

data/lib/jsonapi/acts_as_resource_controller.rb

@@ -189,7 +189,7 @@ module JSONAPI
       end
     end
 
-  def media_types_for(header)
+    def media_types_for(header)
       (request.headers[header] || '')
         .scan(MEDIA_TYPE_MATCHER)
         .to_a

data/lib/jsonapi/configuration.rb

@@ -18,7 +18,7 @@ module JSONAPI
                 :default_paginator,
                 :default_page_size,
                 :maximum_page_size,
-                :default_processor_klass,
+                :default_processor_klass_name,
                 :use_text_errors,
                 :top_level_links_include_pagination,
                 :top_level_meta_include_record_count,
@@ -110,7 +110,7 @@ module JSONAPI
 
       # The default Operation Processor to use if one is not defined specifically
       # for a Resource.
-      self.default_processor_klass = JSONAPI::Processor
+      self.default_processor_klass_name = 'JSONAPI::Processor'
 
       # Allows transactions for creating and updating records
       # Set this to false if your backend does not support transactions (e.g. Mongodb)
@@ -225,9 +225,19 @@ module JSONAPI
     end
 
     def default_processor_klass=(default_processor_klass)
+      ActiveSupport::Deprecation.warn('`default_processor_klass` has been replaced by `default_processor_klass_name`.')
       @default_processor_klass = default_processor_klass
     end
 
+    def default_processor_klass
+      @default_processor_klass ||= default_processor_klass_name.safe_constantize
+    end
+
+    def default_processor_klass_name=(default_processor_klass_name)
+      @default_processor_klass = nil
+      @default_processor_klass_name = default_processor_klass_name
+    end
+
     def allow_include=(allow_include)
       ActiveSupport::Deprecation.warn('`allow_include` has been replaced by `default_allow_include_to_one` and `default_allow_include_to_many` options.')
       @default_allow_include_to_one = allow_include

data/lib/jsonapi/processor.rb

@@ -101,6 +101,7 @@ module JSONAPI
                                        include_directives,
                                        find_options)
 
+      fail JSONAPI::Exceptions::RecordNotFound.new(id) if resource_set.resource_klasses.empty?
       resource_set.populate!(serializer, context, find_options)
 
       return JSONAPI::ResourceSetOperationResult.new(:ok, resource_set, result_options)
@@ -391,7 +392,7 @@ module JSONAPI
       primary_resource_id_tree = PrimaryResourceIdTree.new
       primary_resource_id_tree.add_resource_fragments(fragments, include_related)
 
-      load_included(resource_klass, primary_resource_id_tree, include_related, options.except(:filters, :sort_criteria))
+      load_included(resource_klass, primary_resource_id_tree, include_related, options)
 
       primary_resource_id_tree
     end
@@ -405,7 +406,7 @@ module JSONAPI
       primary_resource_id_tree = PrimaryResourceIdTree.new
       primary_resource_id_tree.add_resource_fragments(fragments, include_related)
 
-      load_included(resource_klass, primary_resource_id_tree, include_related, options.except(:filters, :sort_criteria))
+      load_included(resource_klass, primary_resource_id_tree, include_related, options)
 
       primary_resource_id_tree
     end
@@ -421,7 +422,7 @@ module JSONAPI
       primary_resource_id_tree = PrimaryResourceIdTree.new
       primary_resource_id_tree.add_resource_fragments(fragments, include_related)
 
-      load_included(resource_klass, primary_resource_id_tree, include_related, options.except(:filters, :sort_criteria))
+      load_included(resource_klass, primary_resource_id_tree, include_related, options)
 
       primary_resource_id_tree
     end
@@ -433,7 +434,7 @@ module JSONAPI
         relationship = resource_klass._relationship(key)
         relationship_name = relationship.name.to_sym
 
-        find_related_resource_options = options.dup
+        find_related_resource_options = options.except(:filters, :sort_criteria, :paginator)
         find_related_resource_options[:sort_criteria] = relationship.resource_klass.default_sort
         find_related_resource_options[:cache] = resource_klass.caching?
 

data/lib/jsonapi/request_parser.rb

@@ -418,7 +418,7 @@ module JSONAPI
         sorts = sort_criteria
       elsif sort_criteria.is_a?(String)
         begin
-          raw = URI.unescape(sort_criteria)
+          raw = URI.decode_www_form_component(sort_criteria)
           sorts = CSV.parse_line(raw)
         rescue CSV::MalformedCSVError
           fail JSONAPI::Exceptions::InvalidSortCriteria.new(format_key(resource_klass._type), raw)

data/lib/jsonapi/resource_controller_metal.rb

@@ -5,10 +5,10 @@ module JSONAPI
       ActionController::Rendering,
       ActionController::Renderers::All,
       ActionController::StrongParameters,
-      ActionController::ForceSSL,
+      Gem::Requirement.new('< 6.1').satisfied_by?(ActionPack.gem_version) ? ActionController::ForceSSL : nil,
       ActionController::Instrumentation,
       JSONAPI::ActsAsResourceController
-    ].freeze
+    ].compact.freeze
 
     # Note, the url_helpers are not loaded. This will prevent links from being generated for resources, and warnings
     # will be emitted. Link support can be added by including `Rails.application.routes.url_helpers`, and links

data/lib/jsonapi/resource_set.rb

@@ -47,7 +47,6 @@ module JSONAPI
             )
           )
         else
-          missed_resource_ids[resource_klass] ||= {}
           missed_resource_ids[resource_klass] = @resource_klasses[resource_klass].keys
         end
       end

data/lib/jsonapi/resources/version.rb

@@ -1,5 +1,5 @@
 module JSONAPI
   module Resources
-    VERSION = '0.10.0.beta9'
+    VERSION = '0.10.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-resources
 version: !ruby/object:Gem::Version
-  version: 0.10.0.beta9
+  version: 0.10.4
 platform: ruby
 authors:
 - Dan Gebhardt
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-17 00:00:00.000000000 Z
+date: 2021-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.17.3
+        version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.17.3
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -243,12 +243,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Easily support JSON API in Rails.