jsonapi-resources 0.9.10 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9816e49477b147fc42c02b35d8c1aad887e4c63eb650126348b19394b64d928c
-  data.tar.gz: b51da82be18f62e5b2c4bfb020c868188cae095a034e2ba15ee38e3f070f6e98
+  metadata.gz: eb4334bc31d044c34bc94da87c16e9e3aa91b9289b18bd13690ae2f3ff179f56
+  data.tar.gz: 621418ce69f3d7de1d5874f0fcc85549cd80ea5d9798ed610a92571d126773da
 SHA512:
-  metadata.gz: cc15b04b0d93c68f6dd57c60d484a1a6551b2c39e2e06ddba49a8ddf5c68ae19b7dc7a3dcb2884a8bc4e864646ebfb5e3a7c692d539be7ba6133af167e6ba136
-  data.tar.gz: c03455abd5cf211999922f061e0483e76d12c4a7fdf097f39fdc4afdcb4f45b0e0438ba77ff9c16d462d429a6bbe407a22b84490b7a6a7eb41c81d5f308801e2
+  metadata.gz: 6dff4f41d1dcb5452bddb882de80519a393e0e74f09aab94f1b0afc334c609603ffe3edfab252fdfcdfb859d8a053000bda275fd98d483bab88ca58cce9441a1
+  data.tar.gz: 4a19057381f81e6699dc689fc34331bac63df876ff3033d33f38ddbba9cf09aeecf0eaa09eb7a762cad489b7242f94985a76175ab92399ced5f45774d43bc18a

data/lib/jsonapi/link_builder.rb

@@ -105,16 +105,19 @@ module JSONAPI
     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
 

data/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 @@ module JSONAPI
       end
 
       def default_attribute_options
-        { format: :default }
+        DEFAULT_ATTRIBUTE_OPTIONS
       end
 
       def relationship(*attrs)
@@ -1133,7 +1136,7 @@ module JSONAPI
         if name == 'JSONAPI::Resource'
           ''
         else
-          name =~ /::[^:]+\Z/ ? ($`.freeze.gsub('::', '/') + '/').underscore : ''
+          name =~ MODULE_PATH_REGEXP ? ($`.freeze.gsub('::', '/') + '/').underscore : ''
         end
       end
 
@@ -1351,7 +1354,8 @@ module JSONAPI
               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

data/lib/jsonapi/resource_serializer.rb

@@ -287,7 +287,6 @@ 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)
           ro = relationship_object(source, relationship, include_linkage)
           hash[format_key(name)] = ro unless ro.blank?
@@ -300,6 +299,7 @@ module JSONAPI
           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 @@ module JSONAPI
 
     # 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

data/lib/jsonapi/resources/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-resources
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors:
 - Dan Gebhardt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-09 00:00:00.000000000 Z
+date: 2019-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.17.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.17.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +123,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: memory_profiler
+  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
@@ -230,8 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       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.