Merge branch '1.9-dev' into urlsafe_base64

Author: rmosolgo

.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,47 +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
-  - gemfiles/mongoid_5.gemfile
-  - gemfiles/mongoid_6.gemfile
-  - gemfiles/mongoid_7.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:
@@ -55,29 +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.2.8
-    gemfile: gemfiles/mongoid_5.gemfile
-  - rvm: 2.2.8
-    gemfile: gemfiles/mongoid_6.gemfile
-  - rvm: 2.2.8
+  - 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,46 +1,66 @@
 # 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', '~> 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'
+  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

CHANGELOG-pro.md

@@ -8,6 +8,24 @@
 
 ### Bug Fix
 
+## 1.7.12 (29 Aug 2018)
+
+### New Features
+
+- Add `GraphQL::Pro::CanCanIntegration` which leverages GraphQL-Ruby's built-in auth
+
+## 1.7.11 (21 Aug 2018)
+
+### Bug Fix
+
+- `PunditIntegration`: Don't try to authorize loaded objects when they're `nil`
+
+## 1.7.10 (10 Aug 2018)
+
+### New Features
+
+- Update `PunditIntegration` for arguments, unions, interfaces and mutations
+
 ## 1.7.9 (9 Aug 2018)
 
 ### New Features

CHANGELOG.md

@@ -8,6 +8,21 @@
 
 ### Bug fixes
 
+## 1.8.8 (27 Aug 2018)
+
+### Bug fixes
+
+- When using `RelayClassicMutation`, `client_mutation_id` will no longer be passed to `authorized?` method #1771
+- Fix issue in schema upgrader script which would cause `.to_non_null_type` calls in type definition to be ignored #1783
+- Ensure enum values respond to `graphql_name` #1792
+- Fix infinite resolution bug that could occur when an exception not inheriting from `StandardError` is thrown #1804
+
+### New features
+
+- Add `#path` method to schema members #1766
+- Add `as:` argument to allow overriding the name of the argument when using `loads:` #1773
+- Add support for list of IDs when using `loads:` in an argument definition #1797
+
 ## 1.8.7 (9 Aug 2018)
 
 ### Breaking changes

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

Rakefile

@@ -6,23 +6,27 @@ require "rake/testtask"
 require_relative "guides/_tasks/site"
 require_relative "lib/graphql/rake_task/validate"
 
+Bundler.require
+
 Rake::TestTask.new do |t|
   t.libs << "spec" << "lib"
 
-  if ENV["WITHOUT_RAILS"] == "yes"
-    t.test_files = Dir['spec/**/*_spec.rb'].reject do |f|
-      f.end_with?('_generator_spec.rb') ||
-        f.end_with?('input_object_type_spec.rb') ||
-        f.end_with?('variables_spec.rb') ||
-        f.end_with?('relation_connection_spec.rb') ||
-        f.end_with?('node_spec.rb') ||
-        f.end_with?('connection_instrumentation_spec.rb') ||
-        f.end_with?('graphql/schema_spec.rb') ||
-        f.end_with?('graphql/tracing/active_support_notifications_tracing_spec.rb') ||
-        f.start_with?('spec/graphql/relay/')
+  exclude_integrations = []
+  ['Mongoid', 'Rails'].each do |integration|
+    begin
+      Object.const_get(integration)
+    rescue NameError
+      exclude_integrations << integration.downcase
+    end
+  end
+
+  t.test_files = Dir['spec/**/*_spec.rb'].reject do |f|
+    next unless f.start_with?("spec/integration/")
+    excluded = exclude_integrations.any? do |integration|
+      f.start_with?("spec/integration/#{integration}/")
     end
-  else
-    t.pattern = "spec/**/*_spec.rb"
+    puts "+ #{f}" unless excluded
+    excluded
   end
 
   t.warning = false
@@ -94,7 +98,8 @@ namespace :test do
   desc "Run system tests for ActionCable subscriptions"
   task :system do
     success = Dir.chdir("spec/dummy") do
-      system("bin/rails test:system")
+      system("bundle install")
+      system("bundle exec bin/rails test:system")
     end
     success || abort
   end

gemfiles/mongoid_5.gemfile

@@ -2,14 +2,10 @@
 
 source "https://rubygems.org"
 
-gem "rails"
 gem "bootsnap"
 gem "ruby-prof", platform: :ruby
-gem "sqlite3", platform: :ruby
-gem "pg", "< 1.0", platform: :ruby
-gem "mongoid", "~> 5.4.0"
 gem "pry"
 gem "pry-stack_explorer", platform: :ruby
-gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
+gem "mongoid", "~> 5.4.0"
 
 gemspec path: "../"

gemfiles/mongoid_6.gemfile

@@ -2,14 +2,10 @@
 
 source "https://rubygems.org"
 
-gem "rails"
 gem "bootsnap"
 gem "ruby-prof", platform: :ruby
-gem "sqlite3", platform: :ruby
-gem "pg", "< 1.0", platform: :ruby
-gem "mongoid", "~> 6.4.1"
 gem "pry"
 gem "pry-stack_explorer", platform: :ruby
-gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
+gem "mongoid", "~> 6.4.1"
 
 gemspec path: "../"