graphql-rails_logger 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40575fbb699f19b2d53ebc889e24e4faa81a7234260dc0bcee0e3c341384afa6
-  data.tar.gz: 786acc0de584b668d66c88239bb3b567622e494f15ed83b53f2ccc9ec0ba421f
+  metadata.gz: ec122c5449dca8d9c4ad3cbfcf566b3fb326f3dda9e4ab873780a4789e716ae4
+  data.tar.gz: 37797d6232ce4e3befc9138d71a9fea3596d8b888f13917eb5221ef9c8709187
 SHA512:
-  metadata.gz: 2bc6e83e96609f049f26e4086c38c0a9552a809bf991e3e6c9ad646d0949a7ed23b3f4e5738d075cfcdfe549d582c41af9c6b313dbf1fd0b7e7ce1269b7f213e
-  data.tar.gz: 543404c254c0350335ece8b7107309000678dcd03dc14663f92020568f691927644c47a1c7795bb348c2464819469fecc0644176dbc6773f91755f2c1d89bb52
+  metadata.gz: 52b519e43fd717f8235ec0ab27014cacec433561560b87c17288e657d0109f71aae30ccd0966c7cd0cabca534c586d349030616a3f411a3fa188e490e161b1a7
+  data.tar.gz: 44f1c66f08bdfbdfd5f6089ebbe1e9e0a25dc5e26528e4c93dfe69e0beb75e1f413a5a249084bb584841fe977f1a8d9398b7d0478571fbe2ff38113e9f28faf9

data/graphql-rails_logger.gemspec

@@ -16,8 +16,6 @@ Gem::Specification.new do |spec|
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = 'bin'
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
   spec.add_dependency 'rouge', '~> 3.0'

data/lib/graphql/rails_logger/subscriber.rb

@@ -35,19 +35,36 @@ module GraphQL
           query_lexer = Rouge::Lexers::GraphQL.new
           variables_lexer = Rouge::Lexers::Ruby.new
 
-          (params['_json'] || [params.slice('query', 'variables')]).each do |data|
+          (params['_json'] || [params.slice('query', 'variables', 'extensions')]).each do |data|
 
             next if config.skip_introspection_query && data['query'].index(/query IntrospectionQuery/)
 
-            query = data['query'].lines.map { |line| "  #{line}" }.join.chomp # add indentation
-            variables = PP.pp(data['variables'] || {}, '')
-            info "  Variables: #{formatter.format(variables_lexer.lex(variables))}"
-            info formatter.format(query_lexer.lex(query))
+            # Cleanup and indent params for logging
+            query = indent(data.fetch('query', ''))
+            variables = indent(pretty(data.fetch('variables', '')))
+            extensions = indent(pretty(data.fetch('extensions', '')))
+
+            info "\nVariables:\n#{formatter.format(variables_lexer.lex(variables))}" if variables.present?
+            info "\nQuery:\n#{formatter.format(query_lexer.lex(query))}" if query.present?
+            info "\nExtensions:\n#{formatter.format(variables_lexer.lex(extensions))}" if extensions.present?
           end
         else
-          info "  Parameters: #{params.inspect}" unless params.empty?
+          info "\nParameters:\n#{params.inspect}" unless params.empty?
         end
       end
+
+      private
+
+      def indent(data)
+        data.lines.map { |line| "  #{line}" }.join.chomp
+      end
+
+      def pretty(data)
+        return '' if data.blank?
+
+        data = JSON.parse(data) if data.is_a?(String)
+        PP.pp(data, '')
+      end
     end
   end
 end

data/lib/graphql/rails_logger/version.rb

@@ -1,5 +1,5 @@
 module GraphQL
   module RailsLogger
-    VERSION = '1.2.2'.freeze
+    VERSION = '1.2.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-rails_logger
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - JetRuby
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-21 00:00:00.000000000 Z
+date: 2021-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rouge
@@ -97,9 +97,7 @@ dependencies:
 description: Display GraphQL queries in a more readable format.
 email:
 - engineering@jetruby.com
-executables:
-- console
-- setup
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -123,7 +121,7 @@ homepage: https://github.com/jetruby/graphql-rails_logger
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -138,9 +136,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.7.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Pretty logger for Rails + GraphQL applications.
 test_files: []