Merge branch 'field-filter-instances' into field-extensions-1.9

Author: rmosolgo

.codeclimate.yml

@@ -1,5 +1,6 @@
 version: "2"
 exclude_patterns:
+  - "spec/"
   - "lib/graphql/language/lexer.rb"
   - "lib/graphql/language/parser.rb"
   # plugin - duplication - is failing on these

.gitignore

@@ -19,3 +19,4 @@ tmp/*
 __*.db
 node_modules/
 OperationStoreClient.js
+spec/integration/tmp

.rubocop.yml

@@ -7,6 +7,7 @@ AllCops:
     - 'gemfiles/**/*'
     - 'tmp/**/*'
     - 'vendor/**/*'
+    - 'spec/integration/tmp/**/*'
 
 # def ...
 # end

.travis.yml

@@ -1,44 +1,29 @@
 ---
 language: ruby
+
 sudo: false
+
 cache:
   - bundler
   - yarn
+
 node_js: "7"
 
 env:
   global:
     - CODECLIMATE_REPO_TOKEN=f5b27b2e25d3f4e199bb2566fb4fd4507144a004c71d4aa33a32c2df5f940333
+
 before_install:
   - gem update --system --no-doc
   - gem install bundler
 
 rvm:
-- 2.2.8 # Lowest version officially supported by the gem is 2.2
-- 2.4.3
-
-services:
-  - postgresql
-  - mongodb
-
-before_script:
-  - psql -c 'create database graphql_ruby_test;' -U postgres
-
-gemfile:
-  - gemfiles/rails_3.2.gemfile
-  - gemfiles/rails_4.1.gemfile
-  - gemfiles/rails_4.2.gemfile
-  - gemfiles/rails_5.0.gemfile
-  - gemfiles/rails_5.1.gemfile
-  - gemfiles/rails_5.2.gemfile
-
+  - 2.2.8
 
 matrix:
   include:
   - env:
-      - SYSTEM_TESTS=yes
       - DISPLAY=':99.0'
-    gemfile: gemfiles/rails_5.1.gemfile
     rvm: 2.4.3
     addons:
       apt:
@@ -52,23 +37,39 @@ matrix:
       - unzip chromedriver_linux64.zip && chmod +x chromedriver && sudo mv chromedriver /usr/local/bin
     before_script:
       - sh -e /etc/init.d/xvfb start
-  - env: DATABASE=POSTGRESQL
-    gemfile: gemfiles/rails_5.1.gemfile
-    rvm: 2.4.3
-  - env: WITHOUT_RAILS=yes
-    gemfile: gemfiles/without_rails.gemfile
-    rvm: 2.4.3
-
-  exclude:
-  - rvm: 2.4.3
+    gemfile: spec/dummy/Gemfile
+    script:
+      - cd spec/dummy && bundle exec rails test:system
+  - rvm: 2.2.8
+    gemfile: Gemfile
+  - rvm: 2.2.8
     gemfile: gemfiles/rails_3.2.gemfile
-  - rvm: 2.4.3
+  - rvm: 2.2.8
     gemfile: gemfiles/rails_4.1.gemfile
-  - rvm: 2.4.3
-    gemfile: gemfiles/rails_4.2.gemfile
   - rvm: 2.2.8
+    gemfile: gemfiles/rails_4.2.gemfile
+  - rvm: 2.4.3
     gemfile: gemfiles/rails_5.0.gemfile
-  - rvm: 2.2.8
+  - rvm: 2.4.3
     gemfile: gemfiles/rails_5.1.gemfile
-  - rvm: 2.2.8
+  - rvm: 2.4.3
     gemfile: gemfiles/rails_5.2.gemfile
+  - rvm: 2.4.3
+    gemfile: gemfiles/mongoid_7.gemfile
+    services:
+      - mongodb
+  - rvm: 2.4.3
+    gemfile: gemfiles/mongoid_6.gemfile
+    services:
+      - mongodb
+  - rvm: 2.4.3
+    gemfile: gemfiles/mongoid_5.gemfile
+    services:
+      - mongodb
+  - env: DATABASE=POSTGRESQL
+    rvm: 2.4.3
+    gemfile: gemfiles/rails_5.2_postgresql.gemfile
+    services:
+      - postgresql
+    before_script:
+      - psql -c 'create database graphql_ruby_test;' -U postgres

Appraisals

@@ -1,44 +1,76 @@
 # frozen_string_literal: true
 appraise 'rails_3.2' do
-  gem "rails", "3.2.22.5"
+  gem 'rails', '3.2.22.5', require: 'rails/all'
   gem 'activerecord', '~> 3.2.21'
   gem 'actionpack', '~> 3.2.21'
   gem 'test-unit'
+  gem 'sqlite3', platform: :ruby
+  gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
+  gem 'sequel'
 end
 
 appraise 'rails_4.1' do
-  gem "rails", "~> 4.1"
+  gem 'rails', '~> 4.1', require: 'rails/all'
   gem 'activerecord', '~> 4.1.10'
   gem 'actionpack', '~> 4.1.10'
   gem 'test-unit'
+  gem 'sqlite3', platform: :ruby
+  gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
+  gem 'sequel'
 end
 
 appraise 'rails_4.2' do
-  gem "rails", "~> 4.2"
+  gem 'rails', '~> 4.2', require: 'rails/all'
   gem 'activerecord', '~> 4.2.4'
   gem 'actionpack', '~> 4.2.4'
   gem 'concurrent-ruby', '1.0.0'
+  gem 'sqlite3', platform: :ruby
+  gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
+  gem 'sequel'
 end
 
 appraise 'rails_5.0' do
-  gem "rails", "~> 5.0"
+  gem 'rails', '~> 5.0', require: 'rails/all'
   gem 'activerecord', '~> 5.0.0'
   gem 'actionpack', '~> 5.0.0'
+  gem 'sqlite3', platform: :ruby
+  gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
+  gem 'sequel'
 end
 
 appraise 'rails_5.1' do
-  gem 'rails', '~> 5.1.0'
+  gem 'rails', '~> 5.1.0', require: 'rails/all'
   # Required for testing action cable
   gem 'puma'
   # Required for system tests
-  gem 'capybara'
+  gem 'capybara', '~> 2.13'
   gem 'selenium-webdriver'
+  gem 'sqlite3', platform: :ruby
+  gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
+  gem 'sequel'
 end
 
-appraise "rails_5.2" do
-  gem 'rails', '~> 5.2.0'
+appraise 'rails_5.2' do
+  gem 'rails', '~> 5.2.0', require: 'rails/all'
+  gem 'sqlite3', platform: :ruby
+  gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
+  gem 'sequel'
 end
 
-appraise 'without_rails' do
-  gem "globalid"
+appraise 'rails_5.2_postgresql' do
+  gem 'rails', '~> 5.2.0', require: 'rails/all'
+  gem 'pg', platform: :ruby
+  gem 'sequel'
+end
+
+appraise 'mongoid_7' do
+  gem 'mongoid', '~> 7.0.1'
+end
+
+appraise 'mongoid_6' do
+  gem 'mongoid', '~> 6.4.1'
+end
+
+appraise 'mongoid_5' do
+  gem 'mongoid', '~> 5.4.0'
 end

CHANGELOG-pro.md

@@ -8,6 +8,24 @@
 
 ### Bug Fix
 
+## 1.7.10 (10 Aug 2018)
+
+### New Features
+
+- Update `PunditIntegration` for arguments, unions, interfaces and mutations
+
+## 1.7.9 (9 Aug 2018)
+
+### New Features
+
+- Add a new `PunditIntegration` which leverages the built-in authorization methods
+
+## 1.7.8 (10 July 2018)
+
+### Bug Fix
+
+- Authorization: fix scoping lists of abstract type when there's no `#scope` method on the strategy
+
 ## 1.7.7 (10 May 2018)
 
 ### Bug Fix

CHANGELOG.md

@@ -8,6 +8,90 @@
 
 ### Bug fixes
 
+## 1.8.7 (9 Aug 2018)
+
+### Breaking changes
+
+- Some mutation authorization hooks added in 1.8.5 were changed, see #1736 and #1737. Roughly:
+
+  - `before_prepare` was changed to `#ready?`
+  - `validate_*` hooks were replaced with a single `#authorized?` method
+
+### Bug fixes
+
+- Argument default values include nested default values #1728
+- Clean up duplciate method defs #1739
+
+### New features
+
+- Built-in support for Mongoid 5, 6, 7 #1754
+- Mutation `#ready?` and `#authorized?` may halt flow and/or return data #1736, #1737
+- Add `.scope_items(items, ctx)` hook for filtering lists
+- Add `#default_graphql_name` for overriding default logic #1729
+- Add `#add_argument` for building schemas #1732
+- Cursors are decoded using `urlsafe_decode64` to future-proof for urlsafe cursors #1748
+
+## 1.8.6 (31 July 2018)
+
+### Breaking changes
+
+- Only allow Objects to implement actual Interfaces #1715. Use `include` instead for plain Ruby modules.
+- Revert extending interface methods onto Objects #1716. If you were taking advantage of this feature, you can create a plain Ruby module with the functionality and include it in both the interface and object.
+
+### Deprecations
+
+### New features
+
+- Support string descriptions (from June 2018 GraphQL spec) #1725
+- Add some accessors to Schema members #1722
+- Yield argument for definition block with arity of one #1714
+- Yield field for definition blocks with arity of one #1712
+- Support grouping by "endpoint" with skylight instrumentation #1663
+- Validation: Don't traverse irep if no handlers are registered #1696
+- Add `nodes_field` option to `edge_type` to hide nodes field #1693
+- Add `GraphQL::Types::ISO8601DateTime` to documentation #1694
+- Conditional Analyzers #1690
+- Improve error messages in `ActionCableSubscriptions` #1675
+- Add Prometheus tracing #1672
+- Add `map` to `InputObject` #1669
+
+### Bug fixes
+
+- Improve the mutation generator #1718
+- Fix method inheritance for interfaces #1709
+- Fix Interface inheritance chain #1686
+- Fix require in `tracing.rb` #1685
+- Remove delegate for `FieldResolutionContext#schema` #1682
+- Remove duplicated `object_class` method #1667
+
+## 1.8.5 (10 July 2018)
+
+### Breaking changes
+
+- GraphQL validation errors now include `"filename"` if the parsed document had a `filename` #1618
+
+### Deprecations
+
+- `TypeKind#resolves?` is deprecated in favor of `TypeKind#abstract?` #1619
+
+### New features
+
+- Add Mutation loading/authorization system #1609
+- Interface `definition_methods` are inherited by object type classes #1635
+- include `"filename"` in GraphQL errors if the parsed document has a filename #1618
+- Add `Schema::InputObject#empty?` #1651
+- require `ISO8601DateTime` by default #1660
+- Support `extend` in the parser #1620
+- Improve generator to have nicer error handling in development
+
+### Bug fixes
+
+- Fix `@skip`/`@include` with default value of `false` #1617
+- Fix lists of abstract types with promises #1613
+- Don't check the type of `nil` when it's in a list #1610
+- Fix NoMethodError when `variables: nil` is passed to `execute(...)` #1661
+- Objects returned from `Schema.unauthorized_objects` are properly wrapped by their type proxies #1662
+
 ## 1.8.4 (21 June 2018)
 
 ### New features

Gemfile

@@ -1,18 +1,9 @@
 # frozen_string_literal: true
 source "https://rubygems.org"
+
 gemspec
 
-gem 'rails'
 gem 'bootsnap' # required by the Rails apps generated in tests
 gem 'ruby-prof', platform: :ruby
-gem 'sqlite3', platform: :ruby
-gem 'pg', "< 1.0", platform: :ruby
-gem 'mongoid'
 gem 'pry'
 gem 'pry-stack_explorer', platform: :ruby
-gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
-
-group :jekyll_plugins do
-  gem "jekyll-algolia"
-  gem "jekyll-redirect-from"
-end