jsonapi-resources 0.10.0.beta7 → 0.10.0.beta8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 600d53bfd0a54392487da779289e4c6296ca68b39429863c0f49e2a740236311
-  data.tar.gz: 7c04975340f8632e652e022888500db99fdea792000df8450a59a83c2c780ded
+  metadata.gz: c8058151c97ec20cfa1d8d1606c19a0c24094fb7f70e27970772d5e0df5cc96b
+  data.tar.gz: 24604b487e967e5e24260e5d30d8a3f5891c6bf3fd1b1d8554a2f4eced9f503f
 SHA512:
-  metadata.gz: 903579db17ede3765982689be35254ed7315e1877bbf4f15c4f00a94a5829dbaeddb99326e617244233e2249b7fe3d6ba89d89c1a8902e2b03a88b3d18c65fe6
-  data.tar.gz: a905f778a2ab6c7a64ea32f218f53b70bab84a087af8e86c09234800172a693dab199ffcd9a724afe3c0d3b88eb368b7cfc6edc8ef66f1fa7f01dd54bbcc6a7b
+  metadata.gz: 9f486e212c1a44a440d4dad9b94c822a72e4080eca619e3838e8f4d1237223c882abf7f19c35cfa98af90a30d5f5799f79272f4393b0d8453134f7942fb14333
+  data.tar.gz: 299ed1970270e8d69deea9a5a4fe6f67909a915c0c76f1d0608b3ce0ff3d82dbe1676a74082677e65ff9f0cbfa4ba97dc4be88ef46ffe52bac8e42b36810fedf

data/lib/jsonapi/active_relation/join_manager.rb

@@ -154,13 +154,13 @@ module JSONAPI
               next
             end
 
-           records, join_node = self.class.get_join_arel_node(records, options) {|records, options|
-              records  = related_resource_klass.join_relationship(
-                  records: records,
-                  resource_type: related_resource_klass._type,
-                  join_type: join_type,
-                  relationship: relationship,
-                  options: options)
+            records, join_node = self.class.get_join_arel_node(records, options) {|records, options|
+              related_resource_klass.join_relationship(
+                records: records,
+                resource_type: related_resource_klass._type,
+                join_type: join_type,
+                relationship: relationship,
+                options: options)
             }
 
             details = {alias: self.class.alias_from_arel_node(join_node), join_type: join_type}

data/lib/jsonapi/active_relation_resource.rb

@@ -155,7 +155,7 @@ module JSONAPI
 
         fragments = {}
         rows = records.pluck(*pluck_fields)
-        rows.collect do |row|
+        rows.each do |row|
           rid = JSONAPI::ResourceIdentity.new(resource_klass, pluck_fields.length == 1 ? row : row[0])
 
           fragments[rid] ||= JSONAPI::ResourceFragment.new(rid)
@@ -181,6 +181,10 @@ module JSONAPI
           end
         end
 
+        if JSONAPI.configuration.warn_on_performance_issues && (rows.length > fragments.length)
+          warn "Performance issue detected: `#{self.name.to_s}.records` returned non-normalized results in `#{self.name.to_s}.find_fragments`."
+        end
+
         fragments
       end
 

data/lib/jsonapi/basic_resource.rb

@@ -453,6 +453,9 @@ module JSONAPI
 
         subclass._routed = false
         subclass._warned_missing_route = false
+
+        subclass._clear_cached_attribute_options
+        subclass._clear_fields_cache
       end
 
       def rebuild_relationships(relationships)
@@ -527,6 +530,9 @@ module JSONAPI
       end
 
       def attribute(attribute_name, options = {})
+        _clear_cached_attribute_options
+        _clear_fields_cache
+
         attr = attribute_name.to_sym
 
         check_reserved_attribute_name(attr)
@@ -693,7 +699,7 @@ module JSONAPI
       end
 
       def fields
-        _relationships.keys | _attributes.keys
+        @_fields_cache ||= _relationships.keys | _attributes.keys
       end
 
       def resources_for(records, context)
@@ -826,7 +832,7 @@ module JSONAPI
 
       # quasi private class methods
       def _attribute_options(attr)
-        default_attribute_options.merge(@_attributes[attr])
+        @_cached_attribute_options[attr] ||= default_attribute_options.merge(@_attributes[attr])
       end
 
       def _attribute_delegated_name(attr)
@@ -1063,6 +1069,8 @@ module JSONAPI
       end
 
       def _add_relationship(klass, *attrs)
+        _clear_fields_cache
+
         options = attrs.extract_options!
         options[:parent_resource] = self
 
@@ -1107,6 +1115,14 @@ module JSONAPI
         @_relationships[name] = relationship_object
       end
 
+      def _clear_cached_attribute_options
+        @_cached_attribute_options = {}
+      end
+
+      def _clear_fields_cache
+        @_fields_cache = nil
+      end
+
       private
 
       def check_reserved_resource_name(type, name)

data/lib/jsonapi/configuration.rb

@@ -10,6 +10,7 @@ module JSONAPI
                 :raise_if_parameters_not_allowed,
                 :warn_on_route_setup_issues,
                 :warn_on_missing_routes,
+                :warn_on_performance_issues,
                 :default_allow_include_to_one,
                 :default_allow_include_to_many,
                 :allow_sort,
@@ -60,6 +61,7 @@ module JSONAPI
 
       self.warn_on_route_setup_issues = true
       self.warn_on_missing_routes = true
+      self.warn_on_performance_issues = true
 
       # :none, :offset, :paged, or a custom paginator name
       self.default_paginator = :none
@@ -272,6 +274,8 @@ module JSONAPI
 
     attr_writer :warn_on_missing_routes
 
+    attr_writer :warn_on_performance_issues
+
     attr_writer :use_relationship_reflection
 
     attr_writer :resource_cache

data/lib/jsonapi/link_builder.rb

@@ -123,16 +123,16 @@ module JSONAPI
     end
 
     def resources_path(source_klass)
-      formatted_module_path_from_class(source_klass) + format_route(source_klass._type.to_s)
+      @_resources_path ||= {}
+      @_resources_path[source_klass] ||= formatted_module_path_from_class(source_klass) + format_route(source_klass._type.to_s)
     end
 
     def resource_path(source)
-      url = "#{resources_path(source.class)}"
-
-      unless source.class.singleton?
-        url = "#{url}/#{source.id}"
+      if source.class.singleton?
+        resources_path(source.class)
+      else
+        "#{resources_path(source.class)}/#{source.id}"
       end
-      url
     end
 
     def resource_url(source)

data/lib/jsonapi/resource_serializer.rb

@@ -230,7 +230,7 @@ module JSONAPI
     end
 
     def custom_generation_options
-      {
+      @_custom_generation_options ||= {
         serializer: self,
         serialization_options: @serialization_options
       }

data/lib/jsonapi/resources/version.rb

@@ -1,5 +1,5 @@
 module JSONAPI
   module Resources
-    VERSION = '0.10.0.beta7'
+    VERSION = '0.10.0.beta8'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-resources
 version: !ruby/object:Gem::Version
-  version: 0.10.0.beta7
+  version: 0.10.0.beta8
 platform: ruby
 authors:
 - Dan Gebhardt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-11 00:00:00.000000000 Z
+date: 2019-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler