graphiti_gql 0.2.25 → 0.2.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae5d9ce0fe34ef8d53204f8c292b5d09cb58c821ec413804a169e3a562061ad2
-  data.tar.gz: 02fc540e3203efe6311fba2d30c3b8b75308103cffe4b5df1f01b29dac804e74
+  metadata.gz: 00d26d5be2b1e9f1f277e0d0922faec91599f72a28fabe77ff16fb1f2ae6870f
+  data.tar.gz: a868703b6bf2a2fbf88464396f0fe17ba836ffc183cee22e2aad06b5bd6a1223
 SHA512:
-  metadata.gz: e01483c436cbc15cb0c80598725a16440ba0254242554c9a2401c4dd72ca5cd4b847941fe3d02da7a4d023640b7ca20824e2537a04654dc2d46c192e53885863
-  data.tar.gz: 13478f1634bcb76c13cf9aef90c036fb5636a55c72643db21e854cca9679c4c735e848c6245e73d2194374fa54ee34eecda4cc17240f5cbe491acf14a0ef9db9
+  metadata.gz: 02f91817b443a31d0eaa280316ddd1ab18691936e401c431a38354370f8a6a1b435076fa022df6d37041f35e08d06fb99fc8104aa957cca4e3b9507bba828117
+  data.tar.gz: 94ca96b977800303c54ecf61fabfeeca65c4b839fc1ae501e6192fdbb30af86181a1aada59d64a47339c28ff3ca4e5469d071a27db9280a59e8c0b339b0f70f6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    graphiti_gql (0.2.25)
+    graphiti_gql (0.2.26)
       activemodel (> 6.0, < 8.0)
       graphiti (~> 1.3.9)
       graphql (~> 2.0)

data/lib/graphiti_gql/graphiti_hax.rb

@@ -131,7 +131,7 @@ module GraphitiGql
 
       def value_object(name, opts = {})
         opts[:array] ||= false
-        opts[:null] ||= true
+        opts[:null] = true if opts[:null] != false
         config[:value_objects][name] = Graphiti::ValueObjectAssociation.new(
           name,
           parent_resource_class: self,
@@ -438,6 +438,7 @@ module GraphitiGql
 
     def resolve(*args)
       results = super
+      raise Graphiti::Errors::InvalidResolve unless results.is_a?(Array)
       results.reverse! if @query.hash[:reverse]
       results
     end
@@ -458,6 +459,24 @@ module GraphitiGql
   end
 end
 
+class Graphiti::Errors::InvalidResolve < Graphiti::Errors::Base
+  def message
+    "Resource#resolve must always return an array"
+  end
+end
+
+class Graphiti::Errors::InvalidValueObject < Graphiti::Errors::Base
+  def initialize(resource, name, value)
+    @resource = resource
+    @name = name
+    @value = value
+  end
+
+  def message
+    "#{@resource} - value object '#{@name}' configured with array: true but returned non-array: #{@value.inspect}"
+  end
+end
+
 class Graphiti::ValueObjectAssociation
   attr_reader :name,
     :parent_resource_class,

data/lib/graphiti_gql/schema/resource_type.rb

@@ -44,12 +44,14 @@ module GraphitiGql
             end
 
             result = vo_resource_class.all({ parent: object }).to_a
-            if result.is_a?(Array) && !_array
-              result = result.first
-            end
-            if result == object || result == [object]
+            default_behavior = result == [object]
+            result = result.first if !_array
+            if default_behavior
               method_name = vo_association.alias.presence || name
               result = object.send(method_name)
+              if _array && !result.is_a?(Array)
+                raise Graphiti::Errors::InvalidValueObject.new(resource, name, result)
+              end
             end
             result
           end

data/lib/graphiti_gql/version.rb

@@ -1,3 +1,3 @@
 module GraphitiGql
-  VERSION = "0.2.25"
+  VERSION = "0.2.26"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti_gql
 version: !ruby/object:Gem::Version
-  version: 0.2.25
+  version: 0.2.26
 platform: ruby
 authors:
 - Lee Richmond
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-12 00:00:00.000000000 Z
+date: 2022-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql