graphiti 1.0.alpha.24 → 1.0.alpha.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67b89c099870abde2d636eb3808e813b96610f82
-  data.tar.gz: f8324c6a127cb1fe844b3913ec08ebe8f84da57d
+  metadata.gz: 11c4f6ec02d7b26ada772125aa0a6f93adef149c
+  data.tar.gz: ff61a24878530f72a9347dee1666e3c00daedb9d
 SHA512:
-  metadata.gz: 15474cfc1554159f641a0dff3eded7760cf9c4b0c56f869b2bab9f85006c2e24208206e056614991f0a047779e8ecd772e98d4182ecc4c808e41d1ef4b3e2e68
-  data.tar.gz: d26dcca3b5eca5158e74b6def93463420ba607552d31e48bfcc546e38dab92880abf13fe04abb6740128a4c918622e801cee5f0562262ece84815678ea36b5fb
+  metadata.gz: 9f39008d0879c9cae9fb68f4e259603783d873983cceb93d1fd1dfc424f9a62fdf2ad803b00229ed27fe8986d4eb6ab80ac34a2c23a5a80b730e1b85bc8e6c3f
+  data.tar.gz: 95fd32a819cd3f40965c636dc3235c996cce23621d4881aca88f9e083801f52b3473094b637dc241b382a6573dd2ad76e8d5137384a8333c732b7b503c56871b

data/lib/graphiti.rb

@@ -130,9 +130,11 @@ module Graphiti
   # When we add a sideload, we need to do configuration, such as
   # adding the relationship to the Resource's serializer.
   # However, the sideload's Resource class may not be loaded yet.
-  # This is not a problem with Rails autoloading, but is a problem
-  # outside Rails.
-  # In these cases, load every Resource class then call Graphiti.setup!
+  #
+  # This is not a problem when Rails autoloading, but is a problem
+  # when *eager* loading, or not using Rails.
+  #
+  # So, load every Resource class then call Graphiti.setup!
   def self.setup!
     resources.each do |r|
       r.apply_sideloads_to_serializer

data/lib/graphiti/railtie.rb

@@ -9,6 +9,13 @@ module Graphiti
     end
 
     initializer 'graphiti.init' do
+      if ::Rails.application.config.eager_load
+        config.after_initialize do |app|
+          ::Rails.application.reload_routes!
+          Graphiti.setup!
+        end
+      end
+
       if Mime[:jsonapi].nil? # rails 4
         Mime::Type.register('application/vnd.api+json', :jsonapi)
       end

data/lib/graphiti/resource/sideloading.rb

@@ -17,7 +17,7 @@ module Graphiti
             parent.children[name] = sideload
           else
             config[:sideloads][name] = sideload
-            apply_sideloads_to_serializer if sideload.resource_class_loaded?
+            apply_sideloads_to_serializer if rails_autoloading?
           end
           sideload
         end
@@ -104,6 +104,10 @@ module Graphiti
 
           memo
         end
+
+        def rails_autoloading?
+          defined?(::Rails) && !::Rails.application.config.eager_load
+        end
       end
     end
   end

data/lib/graphiti/util/serializer_relationships.rb

@@ -103,7 +103,7 @@ module Graphiti
           @sideload.link? &&
             @sideload.children.values.all? { |c| !c.resource.endpoint.nil? }
         else
-          @sideload.link? && @sideload.resource.endpoint
+          !!(@sideload.link? && @sideload.resource.endpoint)
         end
       end
     end

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.0.alpha.24"
+  VERSION = "1.0.alpha.25"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.0.alpha.24
+  version: 1.0.alpha.25
 platform: ruby
 authors:
 - Lee Richmond