rack-graphql 2.0.0.rc → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1075eb9d4a87a4e94b555c8b7f60a6a36c8369b2ff0d60a8e7be9db675f47494
-  data.tar.gz: ae1137154106d644ee012734ed0d5d21ac11412fb55a4ba12394bdc26e57b873
+  metadata.gz: 47a62b744316bad0bebd1d5016bd506a8927322cce95d4df7b81bf93b480d779
+  data.tar.gz: 3a42f2f0f8886a628b6f8f0cebf3d268ad5ec668e267f949c10da364d15df805
 SHA512:
-  metadata.gz: 2eeb4e9eed9cf0030651c30d6ef16bb53f14ece2cf2f94c36f162d13d3732fe53e699e64b59d2d807b2d64386453d21627f3f718a50db99e10ab74f1fa2c9c20
-  data.tar.gz: efe2f531123d657e2480a08f4d0b898d9cda4fea50bbe9422faaeb4fc0d4d3ddec13c93c54c4aae5a9792d7bece88652cb35bdeca82bfdbdf315f6c9df724427
+  metadata.gz: 41be36de74a80a87ff07a876f5e6e2b1a428438786693e10b61815faf9d98477cd8e959729ce0063cea0c7bb9d37fcf5d75fd42f7ef6339da45162739525d18d
+  data.tar.gz: 7714e9edd009252d252350e9704dd46ec70c859e05a646537b8f86ef30e9be4dcb56b8389d2d7334c471d1cd25df430d82694f99941ee5715a163676e488f6cf

data/CHANGELOG.md

@@ -1,6 +1,18 @@
 # CHANGELOG
 
-## 2.0.0.rc - 2020-09-11
+## 2.2.1 - 2020-09-14
+
+- Rename `source_app` to `app_name` in error payload.
+
+## 2.2.0 - 2020-09-14
+
+- Add `source_app` to error payload.
+
+## 2.1.0 - 2020-09-14
+
+- Add `log_exception_backtrace` option to `RackGraphql::Application`
+
+## 2.0.0 - 2020-09-14
 
 - Catch all exceptions raised by the app respond with 500 status codea and json content type
 - Add ability to not log exception backtrace with `RackGraphql.log_exception_backtrace = false`

data/Gemfile.lock

@@ -1,15 +1,16 @@
 PATH
   remote: .
   specs:
-    rack-graphql (2.0.0.rc)
-      graphql (~> 1.9)
+    rack-graphql (2.2.1)
+      graphql (~> 1.11)
       oj
-      rack (~> 2.0)
+      rack (~> 2.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.1)
+    awesome_print (1.8.0)
     coderay (1.1.3)
     diff-lcs (1.4.4)
     graphql (1.11.4)
@@ -63,6 +64,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  awesome_print
   bundler
   pry
   rack-graphql!

data/README.md

@@ -23,11 +23,12 @@ Add following to your `config.ru` file:
 
 ```ruby
 run RackGraphql::Application.call(
-  schema: YourGraqphqlSchema,                 # required
-  app_name: 'your-service-name',              # optional, used for health endpoint content
-  context_handler: YourGraphqlContextHandler, # optional, empty `proc` by default
-  health_route: true,                         # optional, true by default
-  logger: A9n.logger,                         # optional, not set by default
+  schema: YourGraqphqlSchema,                    # required
+  app_name: 'your-service-name',                 # optional, used for health endpoint content
+  context_handler: YourGraphqlContextHandler,    # optional, empty `proc` by default
+  log_exception_backtrace: !A9n.env.production?, # optional, `true` default
+  health_route: true,                             # optional, true by default
+  logger: A9n.logger,                            # optional, not set by default
 )
 ```
 

data/Rakefile

@@ -5,4 +5,4 @@ require 'rubocop/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new
 
-task default: %i[rubocop:auto_correct spec]
+task default: %i[spec rubocop:auto_correct]

data/lib/rack_graphql/application.rb

@@ -1,11 +1,24 @@
 module RackGraphql
   class Application
-    def self.call(schema:, app_name: 'rack-graphql-service', logger: nil, context_handler: nil,
-      health_route: true, health_response_builder: RackGraphql::HealthResponseBuilder)
+    def self.call(
+      schema:,
+      app_name: 'rack-graphql-service',
+      logger: nil,
+      context_handler: nil,
+      log_exception_backtrace: RackGraphql.log_exception_backtrace,
+      health_route: true,
+      health_response_builder: RackGraphql::HealthResponseBuilder
+    )
 
       ::Rack::Builder.new do
         map '/graphql' do
-          run RackGraphql::Middleware.new(schema: schema, context_handler: context_handler, logger: logger)
+          run RackGraphql::Middleware.new(
+            app_name: app_name,
+            schema: schema,
+            context_handler: context_handler,
+            logger: logger,
+            log_exception_backtrace: log_exception_backtrace,
+          )
         end
 
         if health_route

data/lib/rack_graphql/middleware.rb

@@ -1,9 +1,11 @@
 module RackGraphql
   class Middleware
-    def initialize(schema:, logger: nil, context_handler: nil)
+    def initialize(schema:, app_name: nil, context_handler: nil, logger: nil, log_exception_backtrace: RackGraphql.log_exception_backtrace)
       @schema = schema
-      @logger = logger
+      @app_name = app_name
       @context_handler = context_handler || ->(_) {}
+      @logger = logger
+      @log_exception_backtrace = log_exception_backtrace
     end
 
     def call(env)
@@ -45,7 +47,7 @@ module RackGraphql
       [
         500,
         { 'Content-Type' => 'application/json' },
-        [Oj.dump(errors: [{ message: exception_string }])]
+        [Oj.dump('errors' => [exception_hash(e)])]
       ]
     ensure
       ActiveRecord::Base.clear_active_connections! if defined?(ActiveRecord::Base)
@@ -53,7 +55,7 @@ module RackGraphql
 
     private
 
-    attr_reader :schema, :logger, :context_handler
+    attr_reader :schema, :app_name, :logger, :context_handler, :log_exception_backtrace
 
     def post_request?(env)
       env['REQUEST_METHOD'] == 'POST'
@@ -151,8 +153,16 @@ module RackGraphql
     # Based on https://github.com/rack/rack/blob/master/lib/rack/show_exceptions.rb
     def dump_exception(exception)
       string = "#{exception.class}: #{exception.message}\n"
-      string << exception.backtrace.map { |l| "\t#{l}" }.join("\n") if RackGraphql.log_exception_backtrace
+      string << exception.backtrace.map { |l| "\t#{l}" }.join("\n") if log_exception_backtrace
       string
     end
+
+    def exception_hash(exception)
+      {
+        'app_name' => app_name,
+        'message' => "#{exception.class}: #{exception.message}",
+        'backtrace' => log_exception_backtrace ? exception.backtrace : "[FILTERED]"
+      }
+    end
   end
 end

data/lib/rack_graphql/version.rb

@@ -1,3 +1,3 @@
 module RackGraphql
-  VERSION = '2.0.0.rc'.freeze
+  VERSION = '2.2.1'.freeze
 end

data/rack-graphql.gemspec

@@ -24,10 +24,11 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.6'
 
-  spec.add_dependency 'graphql', '~> 1.9'
+  spec.add_dependency 'graphql', '~> 1.11'
   spec.add_dependency 'oj'
-  spec.add_dependency 'rack', '~> 2.0'
+  spec.add_dependency 'rack', '~> 2.2'
 
+  spec.add_development_dependency 'awesome_print'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rack-test'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-graphql
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc
+  version: 2.2.1
 platform: ruby
 authors:
 - Krzysztof Knapik
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-11 00:00:00.000000000 Z
+date: 2020-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -45,14 +45,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -213,9 +227,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.2
 signing_key: