rack-graphql 2.0.0.rc2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 404f5193946ee5d9dabc5aeedd7a36506a3594ccedca888e38b3f9abc4a25929
-  data.tar.gz: 9f702646a34bbc872cf74fd4889049b0258b9a6c0ec159b4f18e75d79b3f3e2c
+  metadata.gz: 19eaa68b6aad14dfbfe885f5853e1697a81549d278508ea3ba997894b160f686
+  data.tar.gz: 68e94bab40fbf24668dd55074698128e3f8014208a1fa8e6fa82330584bc4a29
 SHA512:
-  metadata.gz: 1b9293e01c37cfc1a2c459b7d022793f422c8004bc505378faf88dff831325599bb8b4d4f2c095d7f9665ff94624e79cb0adbb4e59860f4150c1b7faa3eae0c0
-  data.tar.gz: 82b068ff658f4aea8372666f3cb42f9c837a551ace9977009870de9078e101981e9afa3e8f6b6cdca7ee3f96998e62f983a7bd33b2cbc0fff3c15da5bb80c43d
+  metadata.gz: a349fc1e92684778a146af524b4e179cf10abbbe156b5a7f28b44d8860a008c7b18b2159f59327b9bbe4de20c2caa5eed7ecc908031e71b175a7ba850a01cfc6
+  data.tar.gz: 3d6ad7f221c8606175778807a7c5d09f3a534c9131eea1d8bf350552146fdec1517a3499cb073dc1295738fa849bc6721285101769e7c01049ea713ac32ab88b

data/CHANGELOG.md

@@ -1,6 +1,22 @@
 # CHANGELOG
 
-## 2.0.0.rc - 2020-09-11
+## 2.3.0 - 2020-09-39
+
+- Add `error_status_code_map` option to `RackGraphql::Application`. It allows for return custom http code when specific errors are raised.
+
+## 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,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rack-graphql (2.0.0.rc2)
+    rack-graphql (2.3.0)
       graphql (~> 1.11)
       oj
       rack (~> 2.2)
@@ -10,13 +10,14 @@ 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)
     method_source (1.0.0)
     oj (3.10.14)
     parallel (1.19.2)
-    parser (2.7.1.4)
+    parser (2.7.1.5)
       ast (~> 2.4.1)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -26,7 +27,7 @@ GEM
       rack (>= 1.0, < 3)
     rainbow (3.0.0)
     rake (13.0.1)
-    regexp_parser (1.7.1)
+    regexp_parser (1.8.1)
     rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
@@ -41,19 +42,20 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
-    rubocop (0.90.0)
+    rubocop (0.92.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.1)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.7)
       rexml
-      rubocop-ast (>= 0.3.0, < 1.0)
+      rubocop-ast (>= 0.5.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.3.0)
-      parser (>= 2.7.1.4)
-    rubocop-performance (1.8.0)
+    rubocop-ast (0.7.1)
+      parser (>= 2.7.1.5)
+    rubocop-performance (1.8.1)
       rubocop (>= 0.87.0)
+      rubocop-ast (>= 0.4.0)
     rubocop-rspec (1.43.2)
       rubocop (~> 0.87)
     ruby-progressbar (1.10.1)
@@ -63,6 +65,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,26 @@
 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,
+      error_status_code_map: {}
+    )
 
       ::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,
+            error_status_code_map: error_status_code_map,
+          )
         end
 
         if health_route

data/lib/rack_graphql/middleware.rb

@@ -1,9 +1,22 @@
 module RackGraphql
   class Middleware
-    def initialize(schema:, logger: nil, context_handler: nil)
+    DEFAULT_ERROR_STATUS_CODE = 500
+
+    def initialize(
+      schema:,
+      app_name: nil,
+      context_handler: nil,
+      logger: nil,
+      log_exception_backtrace: RackGraphql.log_exception_backtrace,
+      error_status_code_map: {}
+    )
+
       @schema = schema
-      @logger = logger
+      @app_name = app_name
       @context_handler = context_handler || ->(_) {}
+      @logger = logger
+      @log_exception_backtrace = log_exception_backtrace
+      @error_status_code_map = error_status_code_map
     end
 
     def call(env)
@@ -43,9 +56,9 @@ module RackGraphql
       env[Rack::RACK_ERRORS].puts(exception_string)
       env[Rack::RACK_ERRORS].flush
       [
-        500,
+        error_status_code_map[e.class] || DEFAULT_ERROR_STATUS_CODE,
         { 'Content-Type' => 'application/json' },
-        [Oj.dump(errors: [exception_hash(e)])]
+        [Oj.dump('errors' => [exception_hash(e)])]
       ]
     ensure
       ActiveRecord::Base.clear_active_connections! if defined?(ActiveRecord::Base)
@@ -53,7 +66,7 @@ module RackGraphql
 
     private
 
-    attr_reader :schema, :logger, :context_handler
+    attr_reader :schema, :app_name, :logger, :context_handler, :log_exception_backtrace, :error_status_code_map
 
     def post_request?(env)
       env['REQUEST_METHOD'] == 'POST'
@@ -151,14 +164,15 @@ 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)
       {
-        message: "#{exception.class}: #{exception.message}",
-        backtrace: RackGraphql.log_exception_backtrace ? exception.backtrace : "[FILTERED]"
+        'app_name' => app_name,
+        'message' => "#{exception.class}: #{exception.message}",
+        'backtrace' => log_exception_backtrace ? exception.backtrace : "[FILTERED]"
       }
     end
   end

data/lib/rack_graphql/version.rb

@@ -1,3 +1,3 @@
 module RackGraphql
-  VERSION = '2.0.0.rc2'.freeze
+  VERSION = '2.3.0'.freeze
 end

data/rack-graphql.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'oj'
   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.rc2
+  version: 2.3.0
 platform: ruby
 authors:
 - Krzysztof Knapik
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-14 00:00:00.000000000 Z
+date: 2020-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -53,6 +53,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         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: