graphql-errors 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5ee73a9e584baf90ba0f71fae3e818708232268f87eb5042e10890d3f261dc5
-  data.tar.gz: 7f0341ca0b3af1f912f57fae80db5a9f2023a59efc781fd6f028b9e8e973c19e
+  metadata.gz: dab4208b219514517e1f78887dfe928b89f0151b0f44afeea8ecae88e61f61f4
+  data.tar.gz: deea1e3419629c3238b31fe286c67dd84002c1029efd2eb3ff7f2b2208956d28
 SHA512:
-  metadata.gz: 61a1a30582caccc372d2a4aafd0c17cc81012f77d3ad147665726320cea121f457f6ff9fa5866c806940b68f922c1a3ee376777c330fa2ad817a7c31efd1df6e
-  data.tar.gz: e0d49d3a319fae588deb6dfb6069b34bf2d23b9b0f2c431ebe23876a346fda2fd017ff53b97f10923130c5e7397835276fbb0746cab47c8094db5c055c86eeea
+  metadata.gz: f219b4cac2aab9ab621e4c84543048a50e494109dc7dcb13067d1eb45f3086110db6fa97962c09da5d53776be4f6e37eb7407cc9f915838bcbad7fe8f9ad9ee4
+  data.tar.gz: a4f1e762e57d2043aa139730487376fdb6938b246522a407162188858df03926982a7bcc937369386691605137873a9cad46a3e0b66b7b8a6068fbde9b019b2b

data/.travis.yml

@@ -5,3 +5,9 @@ rvm:
 env:
   - COVERALLS_RUN_LOCALLY=true
 before_install: gem install bundler -v 1.15.3
+matrix:
+  include:
+    - gemfile: graphql-1.7.gemfile
+      env: GRAPHQL_RUBY_VERSION=1_7
+    - gemfile: graphql-1.8.gemfile
+      env: GRAPHQL_RUBY_VERSION=1_8

data/CHANGELOG.md

@@ -8,10 +8,14 @@ one of the following labels: `Added`, `Changed`, `Deprecated`,
 to manage the versions of this gem so
 that you can set version constraints properly.
 
-#### [Unreleased](https://github.com/exAspArk/graphql-errors/compare/v0.2.0...HEAD)
+#### [Unreleased](https://github.com/exAspArk/graphql-errors/compare/v0.3.0...HEAD)
 
 * WIP
 
+#### [v0.3.0](https://github.com/exAspArk/graphql-errors/compare/v0.2.0...v0.3.0) – 2018-12-17
+
+* `Added`: handle errors from lazy resolvers. [#14](https://github.com/exAspArk/graphql-errors/pull/14)
+
 #### [v0.2.0](https://github.com/exAspArk/graphql-errors/compare/v0.1.0...v0.2.0) – 2018-03-15
 
 * `Added`: `object, argument, context` to rescue_from. [#8](https://github.com/exAspArk/graphql-errors/pull/8)

data/Gemfile

@@ -1,8 +1,9 @@
 source "https://rubygems.org"
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+gem 'pry'
 
-gem 'coveralls', require: false
+gem 'graphql', '~> 1.8.4'
+gem 'batch-loader', '~> 1.2'
 
 # Specify your gem's dependencies in graphql-errors.gemspec
 gemspec

data/README.md

@@ -2,7 +2,6 @@
 
 [![Build Status](https://travis-ci.org/exAspArk/graphql-errors.svg?branch=master)](https://travis-ci.org/exAspArk/graphql-errors)
 [![Coverage Status](https://coveralls.io/repos/github/exAspArk/graphql-errors/badge.svg?branch=master)](https://coveralls.io/github/exAspArk/graphql-errors?branch=master)
-[![Code Climate](https://img.shields.io/codeclimate/github/exAspArk/graphql-errors.svg)](https://codeclimate.com/github/exAspArk/graphql-errors)
 [![Downloads](https://img.shields.io/gem/dt/graphql-errors.svg)](https://rubygems.org/gems/graphql-errors)
 [![Latest Version](https://img.shields.io/gem/v/graphql-errors.svg)](https://rubygems.org/gems/graphql-errors)
 
@@ -17,6 +16,7 @@ This gem provides a simple error handling for [graphql-ruby](https://github.com/
 
 * Error handling for each field.
 * Logic inside the `rescue_from` block, similarly to Rails.
+* Catching exceptions by ancestors, e.g. `CustomError` with `rescue_from StandardError`.
 * Per schema configuration.
 * No dependencies.
 

data/graphql-1.7.gemfile

@@ -0,0 +1,9 @@
+source "https://rubygems.org"
+
+gem "pry"
+gem 'coveralls'
+gem 'batch-loader', '~> 1.2'
+
+gem "graphql", "~> 1.7.14"
+
+gemspec

data/graphql-1.8.gemfile

@@ -0,0 +1,9 @@
+source "https://rubygems.org"
+
+gem "pry"
+gem 'coveralls'
+gem 'batch-loader', '~> 1.2'
+
+gem "graphql", "~> 1.8.4"
+
+gemspec

data/lib/graphql/errors.rb

@@ -23,19 +23,21 @@ module GraphQL
 
     def instrument(_type, field)
       old_resolve_proc = field.resolve_proc
-      new_resolve_proc = ->(object, arguments, context) do
-        begin
-          old_resolve_proc.call(object, arguments, context)
-        rescue => exception
-          if handler = find_handler(exception)
-            handler.call(exception, object, arguments, context)
-          else
-            raise exception
-          end
-        end
+
+      new_resolve_proc = lambda do |obj, args, ctx|
+        wrap_proc(obj, args, ctx, old_resolve_proc)
+      end
+
+      old_lazy_resolve_proc = field.lazy_resolve_proc
+
+      new_lazy_resolve_proc = lambda do |obj, args, ctx|
+        wrap_proc(obj, args, ctx, old_lazy_resolve_proc)
       end
 
-      field.redefine { resolve(new_resolve_proc) }
+      field.redefine do
+        resolve(new_resolve_proc)
+        lazy_resolve(new_lazy_resolve_proc)
+      end
     end
 
     def rescue_from(*classes, &block)
@@ -49,6 +51,18 @@ module GraphQL
 
     private
 
+    def wrap_proc(object, arguments, context, old_proc)
+      begin
+        old_proc.call(object, arguments, context)
+      rescue => exception
+        if handler = find_handler(exception)
+          handler.call(exception, object, arguments, context)
+        else
+          raise exception
+        end
+      end
+    end
+
     def find_handler(exception)
       @handler_by_class.each do |klass, handler|
         return handler if exception.is_a?(klass)

data/lib/graphql/errors/version.rb

@@ -2,6 +2,6 @@
 
 module GraphQL
   class Errors
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-errors
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - exAspArk
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-15 00:00:00.000000000 Z
+date: 2018-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -105,6 +105,8 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- graphql-1.7.gemfile
+- graphql-1.8.gemfile
 - graphql-errors.gemspec
 - images/universe.png
 - lib/graphql/errors.rb