graphiti 1.0.beta.3 → 1.0.beta.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: daa31821b2ed08b5dcfa8ab650ea11a9a9e60371
-  data.tar.gz: 1ea3ccdc81754648db6814386089a25e0d10818f
+  metadata.gz: 1a9e31bc96fba8e032b7420e7b82b4086c3c240e
+  data.tar.gz: c31c119f8dcce46c9e21822ec7b5214af29b2c2b
 SHA512:
-  metadata.gz: a6733f538d3256a7ca7888c14e499542b0a4c2c5e95c361a7e2ec7f93709b43fc56a92c0a0cfa7a3b809613e793b75dd635a107caebe5781dc78fa53d309e24c
-  data.tar.gz: b3020aaaed2ae56ca5065fe73dfbea1b7b18552f0bb36411858190520ccc71555033c88005b81c6cf092067688cd3100546ba06a4d0071b565a4529c51c7c18e
+  metadata.gz: 132831e66a4d1ad626c6b2a1f12947cd6d6f8df125d522eaeefb8ec3b5b1a178bbef4342d84f768d05ed63f633fc152bcdb965b4e3222e78443c7081e7dd4678
+  data.tar.gz: faa9294d0b29267c092c54ae2ebc61943047f45f54a5ec95dabb64bbe703384a18f0aaf51a92cf112bb3ac0c7625be56a023cab89c1229e40f1a555dba79b94d

data/lib/graphiti.rb

@@ -143,3 +143,25 @@ module Graphiti
 end
 
 require "graphiti/runner"
+
+# Because we set 2 magic variables when processing the graph,
+# as_json will fail on a PORO with stack level too deep
+#
+# #as_json calls #instance_variables, defined in
+# active_support/core_ext/object/instance_variables.rb
+#
+# So, override that to not see these magic vars.
+module InstanceVariableOverride
+  def instance_values
+    values = super
+    if @__graphiti_serializer
+      values.reject! do |v|
+        ['__graphiti_serializer', '__graphiti_resource'].include?(v)
+      end
+    end
+    values
+  end
+end
+class Object
+  prepend InstanceVariableOverride
+end

data/lib/graphiti/resource/sideloading.rb

@@ -31,22 +31,22 @@ module Graphiti
         end
 
         def has_many(name, opts = {}, &blk)
-          opts[:class] = adapter.sideloading_classes[:has_many]
+          opts[:class] ||= adapter.sideloading_classes[:has_many]
           allow_sideload(name, opts, &blk)
         end
 
         def belongs_to(name, opts = {}, &blk)
-          opts[:class] = adapter.sideloading_classes[:belongs_to]
+          opts[:class] ||= adapter.sideloading_classes[:belongs_to]
           allow_sideload(name, opts, &blk)
         end
 
         def has_one(name, opts = {}, &blk)
-          opts[:class] = adapter.sideloading_classes[:has_one]
+          opts[:class] ||= adapter.sideloading_classes[:has_one]
           allow_sideload(name, opts, &blk)
         end
 
         def many_to_many(name, opts = {}, &blk)
-          opts[:class] = adapter.sideloading_classes[:many_to_many]
+          opts[:class] ||= adapter.sideloading_classes[:many_to_many]
           allow_sideload(name, opts, &blk)
         end
 

data/lib/graphiti/util/serializer_relationships.rb

@@ -38,18 +38,19 @@ module Graphiti
       private
 
       def block
-        if _link = link?
-          if @resource_class.validate_endpoints?
-            validate_link! unless @sideload.link_proc
-          end
-        end
-
+        _link = link?
+        _resource_class = @resource_class
         _sl = @sideload
         _data_proc = data_proc
+        _self = self
+        validate_link! if eagerly_validate_links?
+
         proc do
           data { instance_eval(&_data_proc) }
 
           if _link
+            _self.send(:validate_link!) unless _self.send(:eagerly_validate_links?)
+
             if @proxy.query.links?
               link(:related) do
                 ::Graphiti::Util::Link.new(_sl, @object).generate
@@ -74,7 +75,19 @@ module Graphiti
         }
       end
 
+      def eagerly_validate_links?
+        if defined?(::Rails)
+          ::Rails.application.config.eager_load
+        else
+          true
+        end
+      end
+
       def validate_link!
+        return unless link?
+        return unless @resource_class.validate_endpoints?
+        return if @sideload.link_proc
+
         unless Graphiti.config.context_for_endpoint
           raise Errors::Unlinkable.new(@resource_class, @sideload)
         end

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.0.beta.3"
+  VERSION = "1.0.beta.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.0.beta.3
+  version: 1.0.beta.4
 platform: ruby
 authors:
 - Lee Richmond