Merge branch 'release-0-9' into fix--link-builder-on-root-engine

Author: benebrice

.travis.yml

@@ -5,8 +5,7 @@ env:
   - "RAILS_VERSION=5.0.7.2"
   - "RAILS_VERSION=5.1.7"
   - "RAILS_VERSION=5.2.3"
-#  - "RAILS_VERSION=6.0.0.beta1"
-#  - "RAILS_VERSION=master"
+  - "RAILS_VERSION=6.0.0"
 rvm:
   - 2.3.8
   - 2.4.7
@@ -19,5 +18,9 @@ matrix:
   exclude:
     - rvm: 2.6.4
       env: "RAILS_VERSION=4.2.11"
+    - rvm: 2.3.8
+      env: "RAILS_VERSION=6.0.0"
+    - rvm: 2.4.7
+      env: "RAILS_VERSION=6.0.0"
 before_install:
-  - gem install bundler --version 1.17.3
+  - gem install bundler --version 1.17.3

Gemfile

@@ -2,22 +2,26 @@ source 'https://rubygems.org'
 
 gemspec
 
-platforms :ruby do
-  gem 'sqlite3', '1.3.10'
-end
-
 platforms :jruby do
   gem 'activerecord-jdbcsqlite3-adapter'
 end
 
 version = ENV['RAILS_VERSION'] || 'default'
 
+platforms :ruby do
+  if version.start_with?('4.2', '5.0')
+    gem 'sqlite3', '~> 1.3.13'
+  else
+    gem 'sqlite3', '~> 1.4'
+  end
+end
+
 case version
 when 'master'
   gem 'railties', { git: 'https://github.com/rails/rails.git' }
   gem 'arel', { git: 'https://github.com/rails/arel.git' }
 when 'default'
-  gem 'railties', '>= 5.0'
+  gem 'railties', '>= 6.0'
 else
   gem 'railties', "~> #{version}"
 end

jsonapi-resources.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'concurrent-ruby-ext'
   spec.add_development_dependency 'database_cleaner'
+  spec.add_development_dependency 'memory_profiler'
   spec.add_dependency 'activerecord', '>= 4.1'
   spec.add_dependency 'railties', '>= 4.1'
   spec.add_dependency 'concurrent-ruby'

lib/jsonapi/link_builder.rb

@@ -105,16 +105,19 @@ def format_route(route)
     end
 
     def formatted_module_path_from_class(klass)
-      scopes = if @engine
-                 module_scopes_from_class(klass)[1..-1]
-               else
-                 module_scopes_from_class(klass)
-               end
-
-      unless scopes.empty?
-        "/#{ scopes.map {|scope| format_route(scope.to_s.underscore)}.compact.join('/') }/"
-      else
-        "/"
+      @_module_path_cache ||= {}
+      @_module_path_cache[klass] ||= begin
+        scopes = if @engine
+                   module_scopes_from_class(klass)[1..-1]
+                 else
+                   module_scopes_from_class(klass)
+                 end
+
+        unless scopes.empty?
+          "/#{ scopes.map {|scope| format_route(scope.to_s.underscore)}.compact.join('/') }/"
+        else
+          "/"
+        end
       end
     end
 

lib/jsonapi/resource.rb

@@ -5,6 +5,9 @@ module JSONAPI
   class Resource
     include Callbacks
 
+    DEFAULT_ATTRIBUTE_OPTIONS = { format: :default }.freeze
+    MODULE_PATH_REGEXP = /::[^:]+\Z/.freeze
+
     attr_reader :context
 
     define_jsonapi_resources_callbacks :create,
@@ -555,7 +558,7 @@ def attribute(attribute_name, options = {})
       end
 
       def default_attribute_options
-        { format: :default }
+        DEFAULT_ATTRIBUTE_OPTIONS
       end
 
       def relationship(*attrs)
@@ -1133,7 +1136,7 @@ def module_path
         if name == 'JSONAPI::Resource'
           ''
         else
-          name =~ /::[^:]+\Z/ ? ($`.freeze.gsub('::', '/') + '/').underscore : ''
+          name =~ MODULE_PATH_REGEXP ? ($`.freeze.gsub('::', '/') + '/').underscore : ''
         end
       end
 
@@ -1351,7 +1354,8 @@ def preload_included_fragments(resources, records, serializer, options)
               rel_id = row[index+1]
               assoc_rels = res.preloaded_fragments[rel_name]
               if index == path.length - 1
-                assoc_rels[rel_id] = target_resources[klass.name].fetch(rel_id)
+                association_res = target_resources[klass.name].fetch(rel_id, nil)
+                assoc_rels[rel_id] = association_res if association_res
               else
                 res = assoc_rels[rel_id]
               end

lib/jsonapi/resource_serializer.rb

@@ -287,7 +287,6 @@ def relationships_hash(source, fetchable_fields, include_directives = {})
         include_linkage = ia && ia[:include]
         include_linked_children = ia && !ia[:include_related].empty?
 
-        options = { filters: ia && ia[:include_filters] || {} }
         if field_set.include?(name)
           ro = relationship_object(source, relationship, include_linkage)
           hash[format_key(name)] = ro unless ro.blank?
@@ -300,6 +299,7 @@ def relationships_hash(source, fetchable_fields, include_directives = {})
           resources = if source.preloaded_fragments.has_key?(format_key(name))
             source.preloaded_fragments[format_key(name)].values
           else
+            options = { filters: ia && ia[:include_filters] || {} }
             [source.public_send(name, options)].flatten(1).compact
           end
           resources.each do |resource|
@@ -468,16 +468,20 @@ def relationship_object(source, relationship, include_linkage = false)
 
     # Extracts the foreign key value for a to_one relationship.
     def foreign_key_value(source, relationship)
-      related_resource_id = if source.preloaded_fragments.has_key?(format_key(relationship.name))
-        source.preloaded_fragments[format_key(relationship.name)].values.first.try(:id)
-      elsif source.respond_to?("#{relationship.name}_id")
-        # If you have direct access to the underlying id, you don't have to load the relationship
-        # which can save quite a lot of time when loading a lot of data.
-        # This does not apply to e.g. has_one :through relationships.
-        source.public_send("#{relationship.name}_id")
-      else
-        source.public_send(relationship.name).try(:id)
-      end
+      # If you have changed the key_name, don't even try to look at `"#{relationship.name}_id"`
+      # just load the association and call the custom key_name
+      foreign_key_type_changed = relationship.options[:foreign_key_type_changed] || false
+      related_resource_id =
+        if source.preloaded_fragments.has_key?(format_key(relationship.name))
+          source.preloaded_fragments[format_key(relationship.name)].values.first.try(:id)
+        elsif !foreign_key_type_changed && source.respond_to?("#{relationship.name}_id")
+          # If you have direct access to the underlying id, you don't have to load the relationship
+          # which can save quite a lot of time when loading a lot of data.
+          # This does not apply to e.g. has_one :through relationships.
+          source.public_send("#{relationship.name}_id")
+        else
+          source.public_send(relationship.name).try(:id)
+        end
       return nil unless related_resource_id
       @id_formatter.format(related_resource_id)
     end

lib/jsonapi/resources/version.rb

@@ -1,5 +1,5 @@
 module JSONAPI
   module Resources
-    VERSION = '0.9.10'
+    VERSION = '0.9.11'
   end
 end

test/benchmark/request_benchmark.rb

@@ -7,15 +7,15 @@ def setup
   end
 
   def bench_large_index_request_uncached
-    10.times do
+    100.times do
       assert_jsonapi_get '/api/v2/books?include=bookComments,bookComments.author'
     end
   end
 
   def bench_large_index_request_caching
     cache = ActiveSupport::Cache::MemoryStore.new
     with_resource_caching(cache) do
-      10.times do
+      100.times do
         assert_jsonapi_get '/api/v2/books?include=bookComments,bookComments.author'
       end
     end

test/test_helper.rb

@@ -24,6 +24,7 @@
 require 'minitest/mock'
 require 'jsonapi-resources'
 require 'pry'
+require 'memory_profiler'
 
 require File.expand_path('../helpers/value_matchers', __FILE__)
 require File.expand_path('../helpers/assertions', __FILE__)
@@ -470,7 +471,8 @@ class ActionDispatch::IntegrationTest
   fixtures :all
 
   def assert_jsonapi_response(expected_status, msg = nil)
-    assert_equal JSONAPI::MEDIA_TYPE, response.content_type
+    media_type = Rails::VERSION::MAJOR >= 6 ? response.media_type : response.content_type
+    assert_equal JSONAPI::MEDIA_TYPE, media_type
     if status != expected_status && status >= 400
       pp json_response rescue nil
     end
@@ -638,6 +640,9 @@ def self.run_one_method(klass, method_name, reporter)
       end
     end
     puts
+    if ENV["MEMORY_PROFILER"]
+      MemoryProfiler.report(allow_files: 'lib/jsonapi') { super(klass, method_name, reporter) }.pretty_print
+    end
   end
 end