graphiti_gql 0.2.24 → 0.2.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 696f200f2ac54b136b21b4b8f237cddfddf742d73da51b73c2513dbb7c0cc60a
-  data.tar.gz: 914867efbf89a58b33de2e28b65c253577852cedf146e8f2050e2330d9534cdf
+  metadata.gz: 8f6c4549cfff9295d8c6736efb65d443c8f189ca8c333b70ba24a764fa689b53
+  data.tar.gz: 71f1989c21eb48dde565f6523f798c8bd66080b572a51a00579768d29a1e87b9
 SHA512:
-  metadata.gz: cfa86ca259696ca32ba303b5bf4abb8064c7d60b179ef106a136da1a292d0721ec81a12242d9a0ba993c69dae93c0367350354475b13132aead992380bf129af
-  data.tar.gz: 56a9db45d32242003eb8a9e9cb74f6efc96c92f9889abc93c8b038f6e07a3d5dbe836bfd84d4c4e053d3ff46bfbacf5676408ba95c10b357463a5e6034ac51c2
+  metadata.gz: 3879d099e79a23726bf32320d45a999dbfc4b6a7b2fe00982e330a6fc0ffb5cbe0c1940ae03dd18ef542eb26cf47ae9e14684a647dc21529a971e1986aef1184
+  data.tar.gz: d985550be802a4206905cd4980fb5f6c434fb6aad517915602d67c6b7eb6efdab70ee8f699fe7b8dde6e97bc9bee36b5a081525505ae0c6a09aa9bbf84e97129

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    graphiti_gql (0.2.23)
+    graphiti_gql (0.2.27)
       activemodel (> 6.0, < 8.0)
       graphiti (~> 1.3.9)
       graphql (~> 2.0)
@@ -21,9 +21,9 @@ GEM
     coderay (1.1.3)
     concurrent-ruby (1.1.10)
     diff-lcs (1.5.0)
-    dry-container (0.10.0)
+    dry-container (0.10.1)
       concurrent-ruby (~> 1.0)
-    dry-core (0.8.0)
+    dry-core (0.8.1)
       concurrent-ruby (~> 1.0)
     dry-inflector (0.3.0)
     dry-logic (1.2.0)

data/lib/graphiti_gql/exception_handler.rb

@@ -0,0 +1,52 @@
+module GraphitiGql
+  class ExceptionHandler
+    attr_reader :error, :context, :field
+    class_attribute :registry, :log, :notify, :default_message, :default_code
+
+    self.registry = {}
+    self.default_message = "We're sorry, something went wrong."
+    self.default_code = 500
+
+    def self.register_exception(err, opts)
+      registry[err] = opts
+    end
+
+    register_exception Graphiti::Errors::RecordNotFound, code: 404
+    register_exception Graphiti::Errors::SingularSideload, code: 400
+    register_exception Graphiti::Errors::InvalidAttributeAccess, code: 403
+    register_exception GraphitiGql::Errors::UnsupportedLast, code: 400
+
+    def initialize(err, obj, args, ctx, field)
+      @error = err
+      @obj = obj
+      @args = args
+      @context = ctx
+      @field = field
+      @config = get_config(err)
+    end
+
+    def notify
+      # noop
+    end
+
+    def log
+      # noop
+    end
+
+    def handle
+      notify if @config[:notify] != false
+      log if @config[:log] != false
+
+      message = @config[:message] ? err.message : default_message
+      code = @config[:code] || default_code
+      raise GraphQL::ExecutionError.new(message, extensions: { code: code })
+    end
+
+    private
+
+    def get_config(error)
+      registered = registry.find { |e, _| error.is_a?(e) }
+      registered ? registered[1] : {}
+    end
+  end
+end

data/lib/graphiti_gql/graphiti_hax.rb

@@ -88,7 +88,14 @@ module GraphitiGql
       end
 
       def filter(name, *args, &blk)
+        is_bool = (filters[name] && filters[name][:type] == :boolean) ||
+          args[0] == :boolean
+        opts = args.length == 1 ? args[0] : args[1]
+        boolean_array = is_bool && opts[:single] == false
         super
+        # default behavior is to force single: true
+        filters[name][:single] = false if boolean_array
+       
         opts = args.extract_options!
         if opts[:if]
           attributes[name][:filterable] = opts[:if]
@@ -124,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,
@@ -431,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
@@ -451,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/list_arguments.rb

@@ -54,6 +54,8 @@ module GraphitiGql
           end
         end
         @resource.filters.each_pair do |name, config|
+          next if config[:schema] == false
+
           attr_type = generate_filter_attribute_type(type_name, name, config)
           required = !!config[:required] || required_via_group.include?(name)
           klass.argument name.to_s.camelize(:lower),

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/schema.rb

@@ -36,7 +36,7 @@ module GraphitiGql
       integer: Integer,
       big_integer: GraphQL::Types::BigInt,
       float: Float,
-      boolean: GraphQL::Schema::Member::GraphQLTypeNames::Boolean,
+      boolean: GraphQL::Types::Boolean,
       date: GraphQL::Types::ISO8601Date,
       datetime: GraphQL::Types::ISO8601DateTime,
       precise_datetime: PreciseDatetime,
@@ -101,6 +101,14 @@ module GraphitiGql
       klass.connections.add(ResponseShim, Connection)
       klass.connections.add(Array, ToManyConnection)
       klass.orphan_types [GraphQL::Types::JSON]
+      klass.rescue_from(Exception) do |err, obj, args, ctx, field|
+        if GraphitiGql.config.error_handling
+          handler = GraphitiGql.config.exception_handler
+          handler.new(err, obj, args, ctx, field).handle
+        else
+          raise err
+        end
+      end
       klass
     end
   end

data/lib/graphiti_gql/version.rb

@@ -1,3 +1,3 @@
 module GraphitiGql
-  VERSION = "0.2.24"
+  VERSION = "0.2.27"
 end

data/lib/graphiti_gql.rb

@@ -27,13 +27,22 @@ require "graphiti_gql/schema/fields/to_one"
 require "graphiti_gql/schema/fields/attribute"
 require "graphiti_gql/schema/fields/stats"
 require "graphiti_gql/active_resource"
+require "graphiti_gql/exception_handler"
 require "graphiti_gql/engine" if defined?(Rails)
 
 module GraphitiGql
   class Error < StandardError; end
 
   class Configuration
-    attr_accessor :application_controller
+    attr_accessor :exception_handler, :error_handling
+
+    def exception_handler
+      @exception_handler ||= ExceptionHandler
+    end
+
+    def error_handling
+      @error_handling != false
+    end
   end
 
   def self.schema!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti_gql
 version: !ruby/object:Gem::Version
-  version: 0.2.24
+  version: 0.2.27
 platform: ruby
 authors:
 - Lee Richmond
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-11 00:00:00.000000000 Z
+date: 2022-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -146,6 +146,7 @@ files:
 - lib/graphiti_gql/active_resource.rb
 - lib/graphiti_gql/engine.rb
 - lib/graphiti_gql/errors.rb
+- lib/graphiti_gql/exception_handler.rb
 - lib/graphiti_gql/graphiti_hax.rb
 - lib/graphiti_gql/loaders/belongs_to.rb
 - lib/graphiti_gql/loaders/has_many.rb