rack-graphql 1.0.0 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7f00f1a34ea61f6d51c99f959813d95719796d732a61b307a74644c7d1195b0
-  data.tar.gz: 865e223d7fdeba8694b40cbb33ecfaa825d60ee8fffd939baf6d16db0d72a480
+  metadata.gz: ad72995a97636738e4bffab0a6b6e238ff977c235305c7bcae168117de59115d
+  data.tar.gz: a6f19b6371d91d7de8db37f7f40909ef639ffd7b225cfc2f45e6ea16241afd94
 SHA512:
-  metadata.gz: 60abee68f5762fe9aa1b7e0a1ca70e0431bfa898fb6324e2c15fb21b7a3ec67b5957332ab9cf154f73b35620d3efeb35cdfb37a026229c5af9b8611e4253c58f
-  data.tar.gz: e87197a5ce76d2e57be41bcc30efb1b28541ea04e3e19919595a4c639d5b3a9e7ac196f1739378cc0072c535985546ca329726e4da68fc6d451ebf8b93905c21
+  metadata.gz: 8da35ce898800200e1c8b1dfea8c597c551c713c49a7699d42d0a4222b56e36f8aac189029b4b912a719367292ca5bb4a19b2ccffe661c367162ba66126093e7
+  data.tar.gz: 01f8fa1c60af82ecd4e5de10dfb56748c97f10aebcb736402a15bcbeec9e6c92e21fb1013ca2d33312b4191b559ed5c92769d83f0de707a361a922521af8e9cb

data/.dependabot/config.yml

@@ -0,0 +1,18 @@
+version: 1
+
+update_configs:
+  - package_manager: "ruby:bundler"
+    directory: "/"
+    update_schedule: "monthly"
+    commit_message:
+      prefix: "[dependabot]"
+    allowed_updates:
+      - match:
+          update_type: "all"
+    automerged_updates:
+      - match:
+          dependency_type: "development"
+          update_type: "all"
+      - match:
+          dependency_type: "production"
+          update_type: "all"

data/.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,33 @@
+---
+name: Bug report
+about: Create a report to track an issue that has been identified
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Mutation/Query**
+
+**URL and HTTP method (for non-GQL):**
+
+**Sentry or Logs URL:**
+
+**User/authentication details**
+Impacted user name or service account
+
+**Additional context**
+Add any other context about the problem here.

data/.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

data/.github/ISSUE_TEMPLATE/story.md

@@ -0,0 +1,22 @@
+---
+name: New story
+about: Add a new story for implementation
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the solution**
+A clear and concise description of what you want to happen.
+When will this feature be done?
+
+**Describe the users**
+Who are we building this feature for?
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
+Link to any applicable documents describing the feature.
+
+**Designs**
+Link to any applicable designs on Invision.

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,18 @@
+## Description
+<!--- Describe your changes in detail -->
+
+## Related issue(s)
+<!--- GH issue number -->
+
+## Motivation and Context
+<!--- Why is this change required? What problem does it solve? -->
+<!--- If it fixes an open issue, please link to the issue here. -->
+
+## How Has This Been Tested?
+<!--- Please describe in detail how you tested your changes. -->
+
+## Screenshots (if appropriate):
+<!--- Please add any screenshots of the feature. -->
+
+## Related PRs
+<!--- Please add links to any related PRs (backend, component packages, etc). -->

data/.github/workflows/auto-approve.yml

@@ -0,0 +1,16 @@
+# automatically approve PRs submitted by Dependabot
+# this will allow Dependabot to automatically merge dependency update PRs where CI passes
+# from: https://github.com/hmarr/auto-approve-action
+name: Auto approve Dependabot PRs
+
+on:
+  pull_request
+
+jobs:
+  auto-approve:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: hmarr/auto-approve-action@v2.0.0
+      if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
+      with:
+        github-token: "${{ secrets.GITHUB_TOKEN }}"

data/.travis.yml

@@ -3,8 +3,9 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.5.7
-  - 2.6.5
-before_install: gem install bundler -v 2.0.2
+  - 2.6
+  - 2.7
+before_install: gem install bundler
 script:
-  - bundle exec rake
+  - bundle exec rake rubocop
+  - bundle exec rake spec

data/Gemfile.lock

@@ -1,56 +1,63 @@
 PATH
   remote: .
   specs:
-    rack-graphql (1.0.0)
-      graphql (>= 1.9.0)
+    rack-graphql (1.2.4)
+      graphql (~> 1.9)
       oj
-      rack (>= 2.0.0)
+      rack (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
-    coderay (1.1.2)
+    ast (2.4.1)
+    coderay (1.1.3)
     diff-lcs (1.3)
-    graphql (1.9.17)
-    jaro_winkler (1.5.4)
-    method_source (0.9.2)
-    oj (3.10.0)
-    parallel (1.19.1)
-    parser (2.6.5.0)
+    graphql (1.11.1)
+    method_source (1.0.0)
+    oj (3.10.6)
+    parallel (1.19.2)
+    parser (2.7.1.3)
       ast (~> 2.4.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rack (2.0.8)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rainbow (3.0.0)
     rake (13.0.1)
+    regexp_parser (1.7.1)
+    rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
-    rubocop (0.78.0)
-      jaro_winkler (~> 1.5.1)
+    rspec-support (3.9.3)
+    rubocop (0.85.1)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
+      rexml
+      rubocop-ast (>= 0.0.3)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-performance (1.5.1)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.0.3)
+      parser (>= 2.7.0.1)
+    rubocop-performance (1.6.1)
       rubocop (>= 0.71.0)
+    rubocop-rspec (1.40.0)
+      rubocop (>= 0.68.1)
     ruby-progressbar (1.10.1)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.7.0)
 
 PLATFORMS
   ruby
@@ -64,6 +71,7 @@ DEPENDENCIES
   rspec
   rubocop
   rubocop-performance
+  rubocop-rspec
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/Rakefile

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

data/lib/rack_graphql.rb

@@ -1,9 +1,9 @@
-require 'json'
 require 'oj'
 require 'rack'
 require 'graphql'
 
 require 'rack_graphql/version'
+require 'rack_graphql/exceptions'
 require 'rack_graphql/health_response_builder'
 require 'rack_graphql/middleware'
 require 'rack_graphql/application'

data/lib/rack_graphql/application.rb

@@ -1,11 +1,11 @@
 module RackGraphql
   class Application
-    def self.call(schema:, app_name: 'rack-graphql-service', context_handler: nil,
+    def self.call(schema:, app_name: 'rack-graphql-service', logger: nil, context_handler: nil,
       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)
+          run RackGraphql::Middleware.new(schema: schema, context_handler: context_handler, logger: logger)
         end
 
         if health_route

data/lib/rack_graphql/exceptions.rb

@@ -0,0 +1,3 @@
+module RackGraphql
+  AmbiguousParamError = Class.new(ArgumentError)
+end

data/lib/rack_graphql/health_response_builder.rb

@@ -18,13 +18,13 @@ module RackGraphql
     end
 
     def body
-      JSON.generate(
-        status:     :ok,
-        request_ip: request.ip,
-        app_name:   app_name,
-        app_env:    ENV['RACK_ENV'],
-        host:       ENV['HOSTNAME'],
-        revision:   ENV['REVISION']
+      Oj.dump(
+        'status'     => 'ok',
+        'request_ip' => request.ip,
+        'app_name'   => app_name,
+        'app_env'    => ENV['RACK_ENV'],
+        'host'       => ENV['HOSTNAME'],
+        'revision'   => ENV['REVISION']
       )
     end
   end

data/lib/rack_graphql/middleware.rb

@@ -1,7 +1,8 @@
 module RackGraphql
   class Middleware
-    def initialize(schema:, context_handler: nil)
+    def initialize(schema:, logger: nil, context_handler: nil)
       @schema = schema
+      @logger = logger
       @context_handler = context_handler || ->(_) {}
     end
 
@@ -12,14 +13,16 @@ module RackGraphql
 
       return [400, {}, []] unless params.is_a?(Hash)
 
-      variables      = ensure_hash(params['variables'])
+      variables = ensure_hash(params['variables'])
       operation_name = params['operationName']
-      context        = context_handler.call(env)
+      context = context_handler.call(env)
 
+      log("Executing with params: #{params.inspect}, operationName: #{operation_name}, variables: #{variables.inspect}")
       result = execute(params: params, operation_name: operation_name, variables: variables, context: context)
 
       [200, response_headers(result), [response_body(result)]]
-    rescue ArgumentError
+    rescue AmbiguousParamError => e
+      log("Responded with #{e.class} because of #{e.message}")
       [400, { 'Content-Type' => 'application/json' }, [Oj.dump({})]]
     ensure
       ActiveRecord::Base.clear_active_connections! if defined?(ActiveRecord::Base)
@@ -27,14 +30,14 @@ module RackGraphql
 
     private
 
-    attr_reader :schema, :context_handler
+    attr_reader :schema, :logger, :context_handler
 
     def post_request?(env)
       env['REQUEST_METHOD'] == 'POST'
     end
 
     def post_data(env)
-      ::Oj.load(env['rack.input'].gets)
+      ::Oj.load(env['rack.input'].gets.to_s)
     rescue Oj::ParseError
       nil
     end
@@ -48,14 +51,14 @@ module RackGraphql
         begin
           ensure_hash(Oj.load(ambiguous_param))
         rescue Oj::ParseError
-          raise ArgumentError, "Unexpected parameter: #{ambiguous_param}"
+          raise AmbiguousParamError, "Unexpected parameter: #{ambiguous_param}"
         end
       when Hash
         ambiguous_param
       when nil
         {}
       else
-        fail ArgumentError, "Unexpected parameter: #{ambiguous_param}"
+        fail AmbiguousParamError, "Unexpected parameter: #{ambiguous_param}"
       end
     end
 
@@ -116,5 +119,10 @@ module RackGraphql
 
       result.subscription?
     end
+
+    def log(message)
+      return unless logger
+      logger.debug("[rack-graphql] #{message}")
+    end
   end
 end

data/lib/rack_graphql/version.rb

@@ -1,3 +1,3 @@
 module RackGraphql
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.2.4'.freeze
 end

data/rack-graphql.gemspec

@@ -3,14 +3,14 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'rack_graphql/version'
 
 Gem::Specification.new do |spec|
-  spec.name     = 'rack-graphql'
-  spec.version  = RackGraphql::VERSION
-  spec.authors  = ['Krzysztof Knapik', 'RenoFi Engineering Team']
-  spec.email    = ['knapo@knapo.net', 'engineering@renofi.com']
+  spec.name = 'rack-graphql'
+  spec.version = RackGraphql::VERSION
+  spec.authors = ['Krzysztof Knapik', 'RenoFi Engineering Team']
+  spec.email = ['knapo@knapo.net', 'engineering@renofi.com']
 
-  spec.summary  = 'Rack middleware implementing graphql endpoint.'
+  spec.summary = 'Rack middleware implementing graphql endpoint.'
   spec.homepage = 'https://github.com/RenoFi/rack-graphql'
-  spec.license  = 'MIT'
+  spec.license = 'MIT'
 
   spec.metadata['homepage_uri'] = 'https://github.com/RenoFi/rack-graphql'
   spec.metadata['source_code_uri'] = 'https://github.com/RenoFi/rack-graphql'
@@ -18,15 +18,15 @@ Gem::Specification.new do |spec|
   spec.files = Dir.chdir(__dir__) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(bin/|spec/|\.rub)}) }
   end
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir = 'exe'
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.5'
+  spec.required_ruby_version = '>= 2.6'
 
-  spec.add_dependency 'graphql', '>= 1.9.0'
+  spec.add_dependency 'graphql', '~> 1.9'
   spec.add_dependency 'oj'
-  spec.add_dependency 'rack', '>= 2.0.0'
+  spec.add_dependency 'rack', '~> 2.0'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'pry'
@@ -35,4 +35,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'rubocop-performance'
+  spec.add_development_dependency 'rubocop-rspec'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-graphql
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.4
 platform: ruby
 authors:
 - Krzysztof Knapik
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-20 00:00:00.000000000 Z
+date: 2020-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -43,16 +43,16 @@ dependencies:
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -151,6 +151,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  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'
 description: 
 email:
 - knapo@knapo.net
@@ -159,6 +173,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".dependabot/config.yml"
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/config.yml"
+- ".github/ISSUE_TEMPLATE/story.md"
+- ".github/PULL_REQUEST_TEMPLATE.md"
+- ".github/workflows/auto-approve.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -170,6 +190,7 @@ files:
 - lib/rack-graphql.rb
 - lib/rack_graphql.rb
 - lib/rack_graphql/application.rb
+- lib/rack_graphql/exceptions.rb
 - lib/rack_graphql/health_response_builder.rb
 - lib/rack_graphql/middleware.rb
 - lib/rack_graphql/version.rb
@@ -188,14 +209,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Rack middleware implementing graphql endpoint.