lib/graphiti/resource/sideloading.rb in graphiti-1.0.alpha.24 vs lib/graphiti/resource/sideloading.rb in graphiti-1.0.alpha.25

@@ -15,11 +15,11 @@
           sideload = klass.new(name, opts)
           if parent = opts[:parent]
             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
 
         def apply_sideloads_to_serializer
@@ -101,9 +101,13 @@
               memo |= sl.resource.class.association_types(memo)
             end
           end
 
           memo
+        end
+
+        def rails_autoloading?
+          defined?(::Rails) && !::Rails.application.config.eager_load
         end
       end
     end
   end
 end