[pull] master from rmosolgo:master

CHANGELOG-pro.md

@@ -8,6 +8,12 @@
 
 ### Bug Fix
 
+### 1.8.2 (22 Oct 2018)
+
+### Bug Fix
+
+- Support `NULLS LAST` in stable cursors
+
 ### 1.8.1 (16 Oct 2018)
 
 ### Bug Fix

graphql.gemspec

@@ -46,4 +46,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "yard"
   s.add_development_dependency "jekyll-algolia" if RUBY_VERSION >= '2.3.0'
   s.add_development_dependency "jekyll-redirect-from" if RUBY_VERSION >= '2.3.0'
+  s.add_development_dependency "m", "~> 1.5.0"
 end

guides/development.md

@@ -47,6 +47,13 @@ bundle exec rake test TEST=spec/graphql/query_spec.rb
 # run tests in `query_spec.rb` only
 ```
 
+Alternatively, you can run a __specific file__ with the [m](https://github.com/qrush/m) gem:
+
+```
+m spec/graphql/query_spec.rb
+# run tests in `query_spec.rb` only
+```
+
 You can focus on a __specific example__ with `focus`:
 
 ```ruby

guides/javascript_client/apollo_subscriptions.md

@@ -37,6 +37,10 @@ import { ApolloLink } from 'apollo-link';
 import { ApolloClient } from 'apollo-client';
 import { HttpLink } from 'apollo-link-http';
 import { InMemoryCache } from 'apollo-cache-inmemory';
+
+// Load PusherLink from graphql-ruby-client
+import PusherLink from 'graphql-ruby-client/subscriptions/PusherLink';
+
 // Load Pusher and create a client
 import Pusher from "pusher-js"
 var pusherClient = new Pusher("your-app-key", { cluster: "us2" })

guides/pro/checksums/graphql-pro-1.8.2.txt

@@ -0,0 +1 @@
+78623f5ef2359e170dc04eaaf1b5397b74082f962b35bda766e2574218ad55c2b490884f1f76e7bd66acd091f68539b6ecf5f8eedc63190c26aeedb976278562

guides/type_definitions/extensions.md

@@ -121,6 +121,45 @@ end
 
 Now, `AuthorizedField.new(*args, &block).to_graphql` will be used to create `GraphQL::Field`s.
 
+### Customizing Connections
+
+Connections may be customized in a similar way to Fields.
+
+- Create a new class extending 'GraphQL::Types::Relay::BaseConnection'
+- Assign it to your object/interface type with `connection_type_class(MyCustomConnection)`
+
+For example, you can create a custom connection:
+
+```ruby
+class MyCustomConnection < GraphQL::Types::Relay::BaseConnection
+  field :total_count, Integer, null: false
+
+  def total_count
+    object.nodes.size
+  end
+end
+```
+
+Then, pass the field class as `connection_type_class(...)` wherever it should be used:
+
+```ruby
+module Types
+  class BaseObject < GraphQL::Schema::Object
+    # Use this class for defining connections
+    connection_type_class MyCustomConnection
+  end
+end
+```
+
+Now, all type classes that extend `BaseObject` will have a connection_type with the additional field `totalCount`.
+
+### Customizing Edges
+
+Edges may be customized in a similar way to Connections.
+
+- Create a new class extending 'GraphQL::Types::Relay::BaseEdge'
+- Assign it to your object/interface type with `edge_type_class(MyCustomEdge)`
+
 ### Customizing Arguments
 
 Arguments may be customized in a similar way to Fields.

javascript_client/subscriptions/PusherLink.js

@@ -34,7 +34,8 @@
 //     // Do something with `data` and/or `errors`
 //   }})
 //
-import {ApolloLink, Observable} from "apollo-link"
+var ApolloLink = require("apollo-link").ApolloLink
+var Observable = require("apollo-link").Observable
 
 class PusherLink extends ApolloLink {
   constructor(options) {
@@ -88,4 +89,4 @@ class PusherLink extends ApolloLink {
   }
 }
 
-export default PusherLink
+module.exports = PusherLink

lib/graphql/schema.rb

@@ -656,7 +656,6 @@ class << self
         :execute, :multiplex,
         :static_validator, :introspection_system,
         :query_analyzers, :tracers, :instrumenters,
-        :query_execution_strategy, :mutation_execution_strategy, :subscription_execution_strategy,
         :validate, :multiplex_analyzers, :lazy?, :lazy_method_name, :after_lazy, :sync_lazy,
         # Configuration
         :max_complexity=, :max_depth=,
@@ -709,6 +708,9 @@ def to_graphql
         schema_defn.query_analyzers << GraphQL::Authorization::Analyzer
         schema_defn.middleware.concat(defined_middleware)
         schema_defn.multiplex_analyzers.concat(defined_multiplex_analyzers)
+        schema_defn.query_execution_strategy = query_execution_strategy
+        schema_defn.mutation_execution_strategy = mutation_execution_strategy
+        schema_defn.subscription_execution_strategy = subscription_execution_strategy
         defined_instrumenters.each do |step, insts|
           insts.each do |inst|
             schema_defn.instrumenters[step] << inst
@@ -789,6 +791,30 @@ def default_max_page_size(new_default_max_page_size = nil)
         end
       end
 
+      def query_execution_strategy(new_query_execution_strategy = nil)
+        if new_query_execution_strategy
+          @query_execution_strategy = new_query_execution_strategy
+        else
+          @query_execution_strategy || self.default_execution_strategy
+        end
+      end
+
+      def mutation_execution_strategy(new_mutation_execution_strategy = nil)
+        if new_mutation_execution_strategy
+          @mutation_execution_strategy = new_mutation_execution_strategy
+        else
+          @mutation_execution_strategy || self.default_execution_strategy
+        end
+      end
+
+      def subscription_execution_strategy(new_subscription_execution_strategy = nil)
+        if new_subscription_execution_strategy
+          @subscription_execution_strategy = new_subscription_execution_strategy
+        else
+          @subscription_execution_strategy || self.default_execution_strategy
+        end
+      end
+
       def max_complexity(max_complexity = nil)
         if max_complexity
           @max_complexity = max_complexity

spec/spec_helper.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'rubygems'
+require 'bundler'
 Bundler.require
 
 # Print full backtrace for failiures:
@@ -10,6 +11,7 @@
 CodeClimate::TestReporter.start
 
 require "graphql"
+require "rake"
 require "graphql/rake_task"
 require "benchmark"
 require "pry"