graphql-rails_logger 1.0.0 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 718affecc756a81b55c2a9184d6c548d280494d4
-  data.tar.gz: 890ecf5d194cba6d4a032f4bf62838c2d061b9df
+SHA256:
+  metadata.gz: ec122c5449dca8d9c4ad3cbfcf566b3fb326f3dda9e4ab873780a4789e716ae4
+  data.tar.gz: 37797d6232ce4e3befc9138d71a9fea3596d8b888f13917eb5221ef9c8709187
 SHA512:
-  metadata.gz: bcc3afed83c469732b55749ff531892aa6d8cca7d311ef67e9a6183a8e480598b98c84b6695865986304cb9b342e0124d22224ca81aefcbcb7170e3935c1253b
-  data.tar.gz: e6b26301123958355ee9a82da0d04a9f30a8697b2693fee5b76ae925cf9a94ce62179b9ec7122274022a2c89422303324503be428ff160d82a3db752418c230d
+  metadata.gz: 52b519e43fd717f8235ec0ab27014cacec433561560b87c17288e657d0109f71aae30ccd0966c7cd0cabca534c586d349030616a3f411a3fa188e490e161b1a7
+  data.tar.gz: 44f1c66f08bdfbdfd5f6089ebbe1e9e0a25dc5e26528e4c93dfe69e0beb75e1f413a5a249084bb584841fe977f1a8d9398b7d0478571fbe2ff38113e9f28faf9

data/README.md

@@ -28,6 +28,7 @@ And then execute:
 By default this gem formats params only for `GraphqlController#execute`.
 
 If you want to change this behaviour, add `config/initializers/graphql_rails_logger.rb` file and set proper controller and actions like this:
+
 ```ruby
 GraphQL::RailsLogger.configure do |config|
   config.white_list = {
@@ -44,6 +45,14 @@ GraphQL::RailsLogger.configure do |config|
 end
 ```
 
+The theme can be configured as well.  The theme is applied using the [rouge](https://github.com/jneen/rouge) gem, where all available options can be found.  The default value is `Rouge::Themes::ThankfulEyes.new`.
+
+```ruby
+GraphQL::RailsLogger.configure do |config|
+  config.theme = Rouge::Themes::Pastie.new
+end
+```
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/jetruby/graphql-rails_logger. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/graphql-rails_logger.gemspec

@@ -16,12 +16,14 @@ 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'
-  spec.add_dependency 'rails', '~> 5.0' # 5 because not tested with 4
+
+  # 5 because not tested with 4
+  spec.add_dependency 'actionpack', '> 5.0'
+  spec.add_dependency 'activesupport', '> 5.0'
+  spec.add_dependency 'railties', '> 5.0'
 
   spec.add_development_dependency 'bundler', '~> 1.15'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/graphql/rails_logger/configuration.rb

@@ -1,7 +1,9 @@
+require 'rouge'
+
 module GraphQL
   module RailsLogger
     class Configuration
-      attr_accessor :skip_introspection_query, :white_list
+      attr_accessor :skip_introspection_query, :white_list, :theme
 
       def initialize
         @skip_introspection_query = nil
@@ -10,6 +12,8 @@ module GraphQL
         @white_list = {
           'GraphqlController' => %w[execute]
         }
+
+        @theme = Rouge::Themes::ThankfulEyes.new
       end
     end
   end

data/lib/graphql/rails_logger/subscriber.rb

@@ -1,6 +1,7 @@
 require 'graphql/rails_logger/configuration'
 require 'action_controller/log_subscriber'
 require 'rouge'
+require 'pp'
 
 module GraphQL
   module RailsLogger
@@ -30,23 +31,40 @@ module GraphQL
         info "Processing by #{payload[:controller]}##{payload[:action]} as #{format}"
 
         if config.white_list.fetch(payload[:controller], []).include?(payload[:action])
-          formatter = Rouge::Formatters::Terminal256.new
+          formatter = Rouge::Formatters::Terminal256.new(config.theme)
           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.0.0'.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.0.0
+  version: 1.2.3
 platform: ruby
 authors:
 - JetRuby
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-01-13 00:00:00.000000000 Z
+date: 2021-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rouge
@@ -25,17 +25,45 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
@@ -69,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:
@@ -95,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
@@ -110,9 +136,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.3
+signing_key:
 specification_version: 4
 summary: Pretty logger for Rails + GraphQL applications.
 test_files: []