jsonapi_compliable 0.11.6 → 0.11.7

data/docs/top-level-namespace.html

@@ -100,7 +100,7 @@
 </div>
 
       <div id="footer">
-  Generated on Thu May  3 15:52:17 2018 by
+  Generated on Mon May  7 09:24:11 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.9 (ruby-2.3.0).
 </div>

data/lib/jsonapi_compliable/configuration.rb

@@ -4,11 +4,22 @@ module JsonapiCompliable
     # @return [Boolean] Should we raise when the client requests a relationship not defined on the server?
     #   Defaults to true.
     attr_accessor :raise_on_missing_sideload
+    # @return [Boolean] Concurrently fetch sideloads? This is *experimental* and may be removed.
+    #   Defaults to false
+    attr_accessor :experimental_concurrency
 
     # Set defaults
     # @api private
     def initialize
       @raise_on_missing_sideload = true
+      @experimental_concurrency = false
+    end
+
+    # @api private
+    def experimental_concurrency=(val)
+      if val && !defined?(Concurrent::Promise)
+        raise "You must add the concurrent-ruby gem to opt-in to experimental concurrency"
+      end
     end
   end
 end

data/lib/jsonapi_compliable/scope.rb

@@ -81,6 +81,9 @@ module JsonapiCompliable
     def sideload(results, includes)
       return if results == []
 
+      concurrent = ::JsonapiCompliable.config.experimental_concurrency
+      promises = []
+
       includes.each_pair do |name, nested|
         sideload = @resource.sideload(name)
 
@@ -91,7 +94,25 @@ module JsonapiCompliable
           end
         else
           namespace = Util::Sideload.namespace(@namespace, sideload.name)
-          sideload.resolve(results, @query, namespace)
+          resolve_sideload = -> { sideload.resolve(results, @query, namespace) }
+          if concurrent
+            promises << Concurrent::Promise.execute(&resolve_sideload)
+          else
+            resolve_sideload.call
+          end
+        end
+      end
+
+      if concurrent
+        # Wait for all promises to finish
+        while !promises.all? { |p| p.fulfilled? || p.rejected? }
+          sleep 0.01
+        end
+        # Re-raise the error with correct stacktrace
+        # OPTION** to avoid failing here?? if so need serializable patch
+        # to avoid loading data when association not loaded
+        if rejected = promises.find(&:rejected?)
+          raise rejected.reason
         end
       end
     end

data/lib/jsonapi_compliable/util/render_options.rb

@@ -15,6 +15,7 @@ module JsonapiCompliable
         fields = query_hash[:fields].dup
         extra_fields = query_hash[:extra_fields]
 
+        # Ensure fields doesnt clobber extra fields
         if extra_fields.any? && fields.any?
           extra_fields.each { |k,v| fields[k] = fields[k].to_a + v }
         end

data/lib/jsonapi_compliable/version.rb

@@ -1,3 +1,3 @@
 module JsonapiCompliable
-  VERSION = "0.11.6"
+  VERSION = "0.11.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi_compliable
 version: !ruby/object:Gem::Version
-  version: 0.11.6
+  version: 0.11.7
 platform: ruby
 authors:
 - Lee Richmond
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-04 00:00:00.000000000 Z
+date: 2018-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable