graphql 1.6.7 → 1.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf91ec48fafdc82dbda6deb667fab007e575f2a3
-  data.tar.gz: 32ae2960557c969bee15e14552727d22c782a858
+  metadata.gz: '056695dd78098e5adfe501785c8e7e111cb8bc2d'
+  data.tar.gz: 5ef5aa896020c5b149c1960a5e870d8f13e4a2f8
 SHA512:
-  metadata.gz: 60b47807f1b5c868f300f173b7191522b6361d9ebd4cf0ad3fc52842da586f500d223cf1df9f719e1902f191d918fd1f5f6fef14dab7d686a853e1a49b58a09a
-  data.tar.gz: 0c3bf0b9fdfd281603ce140af59e7b75542ad8b992ac247b676876b0ca14586b1ede1462490cc1ed33236ec6e6643b67cdd4e1e724b75321972a73cfcdd1f07e
+  metadata.gz: 50d4e93b57572c9a3cce63468b0e6b23daca8f61a97120e5899613018c1bdfc4fe9ecade9b8906e4243c383a55f636b37d066e52d14310c002911e7e7c3c086f
+  data.tar.gz: 63d326d4a3ea184e7840308d6841afb7af3336d570f9d8362ffdad5d0e351016e0d67c72bf9ec62e3629a5ce768bf4fe1b92bc0873b7effa47b37aa3f370f7f9

data/lib/generators/graphql/templates/mutation_type.erb

@@ -1,5 +1,11 @@
 Types::MutationType = GraphQL::ObjectType.define do
   name "Mutation"
 
-  # TODO: Add Mutations as fields
+  # TODO: Remove me
+  field :testField, types.String do
+    description "An example field added by the generator"
+    resolve ->(obj, args, ctx) {
+      "Hello World!"
+    }
+  end
 end

data/lib/graphql.rb

@@ -5,22 +5,28 @@ require "set"
 require "singleton"
 
 module GraphQL
-  # Ruby stdlib was pretty busted until this fix:
-  # https://github.com/ruby/ruby/commit/46c0e79bb5b96c45c166ef62f8e585f528862abb#diff-43adf0e587a50dbaf51764a262008d40
-  module Delegate
-    def def_delegators(accessor, *method_names)
-      method_names.each do |method_name|
-        class_eval <<-RUBY
-        def #{method_name}(*args)
-          if block_given?
-            #{accessor}.#{method_name}(*args, &Proc.new)
-          else
-            #{accessor}.#{method_name}(*args)
+  if RUBY_VERSION == "2.4.0"
+    # Ruby stdlib was pretty busted until this fix:
+    # https://bugs.ruby-lang.org/issues/13111
+    # https://github.com/ruby/ruby/commit/46c0e79bb5b96c45c166ef62f8e585f528862abb#diff-43adf0e587a50dbaf51764a262008d40
+    module Delegate
+      def def_delegators(accessor, *method_names)
+        method_names.each do |method_name|
+          class_eval <<-RUBY
+          def #{method_name}(*args)
+            if block_given?
+              #{accessor}.#{method_name}(*args, &Proc.new)
+            else
+              #{accessor}.#{method_name}(*args)
+            end
           end
+          RUBY
         end
-        RUBY
       end
     end
+  else
+    require "forwardable"
+    Delegate = Forwardable
   end
 
   class Error < StandardError

data/lib/graphql/enum_type.rb

@@ -138,11 +138,26 @@ module GraphQL
       accepts_definitions(*ATTRIBUTES)
       attr_accessor(*ATTRIBUTES)
       ensure_defined(*ATTRIBUTES)
+
+      def name=(new_name)
+        # Validate that the name is correct
+        unless new_name =~ /^[_a-zA-Z][_a-zA-Z0-9]*$/
+          raise(
+            GraphQL::EnumType::InvalidEnumNameError,
+            "Names must match /^[_a-zA-Z][_a-zA-Z0-9]*$/ but '#{new_name}' does not"
+          )
+        end
+
+        @name = new_name
+      end
     end
 
     class UnresolvedValueError < GraphQL::Error
     end
 
+    class InvalidEnumNameError < GraphQL::Error
+    end
+
     private
 
     # Get the underlying value for this enum value

data/lib/graphql/field.rb

@@ -205,6 +205,7 @@ module GraphQL
       @relay_node_field = false
       @connection = false
       @connection_max_page_size = nil
+      @edge_class = nil
     end
 
     def initialize_copy(other)

data/lib/graphql/non_null_type.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 module GraphQL
+  class DoubleNonNullTypeError < GraphQL::Error
+  end
+
   # A non-null type modifies another type.
   #
   # Non-null types can be created with `!` (`InnerType!`)
@@ -34,6 +37,13 @@ module GraphQL
 
     attr_reader :of_type
     def initialize(of_type:)
+      if of_type.is_a?(GraphQL::NonNullType)
+        raise(
+          DoubleNonNullTypeError,
+          "You tried to add a non-null constraint twice (!! instead of !)"
+        )
+      end
+
       super()
       @of_type = of_type
     end

data/lib/graphql/query.rb

@@ -44,6 +44,7 @@ module GraphQL
 
     # @return [String, nil] The name of the operation to run (may be inferred)
     def selected_operation_name
+      return nil unless selected_operation
       selected_operation.name
     end
 
@@ -161,7 +162,10 @@ module GraphQL
     end
 
     def irep_selection
-      @selection ||= internal_representation.operation_definitions[selected_operation.name]
+      @selection ||= begin
+        return nil unless selected_operation
+        internal_representation.operation_definitions[selected_operation.name]
+      end
     end
 
     # Node-level cache for calculating arguments. Used during execution and query analysis.

data/lib/graphql/relay/relation_connection.rb

@@ -24,11 +24,11 @@ module GraphQL
       end
 
       def has_next_page
-        !!(first && sliced_nodes_count > first)
+        !!(first && paged_nodes_length >= first && sliced_nodes_count > first)
       end
 
       def has_previous_page
-        !!(last && sliced_nodes_count > last)
+        !!(last && paged_nodes_length >= last && sliced_nodes_count > last)
       end
 
       def first
@@ -68,7 +68,8 @@ module GraphQL
               items = items.offset(offset).limit(last)
             end
           else
-            offset = (relation_offset(items) || 0) + relation_count(items) - last
+            slice_count = relation_count(items)
+            offset = (relation_offset(items) || 0) + slice_count - [last, slice_count].min
             items = items.offset(offset).limit(last)
           end
         end
@@ -121,17 +122,26 @@ module GraphQL
 
         if before && after
           if offset_from_cursor(after) < offset_from_cursor(before)
-            @sliced_nodes = @sliced_nodes.limit(offset_from_cursor(before) - offset_from_cursor(after) - 1)
+            @sliced_nodes = limit_nodes(@sliced_nodes,  offset_from_cursor(before) - offset_from_cursor(after) - 1)
           else
-            @sliced_nodes = @sliced_nodes.limit(0)
+            @sliced_nodes = limit_nodes(@sliced_nodes, 0)
           end
+
         elsif before
-          @sliced_nodes = @sliced_nodes.limit(offset_from_cursor(before) - 1)
+          @sliced_nodes = limit_nodes(@sliced_nodes, offset_from_cursor(before) - 1)
         end
 
         @sliced_nodes
       end
 
+      def limit_nodes(sliced_nodes, limit)
+        if limit > 0 || defined?(ActiveRecord::Relation) && sliced_nodes.is_a?(ActiveRecord::Relation)
+          sliced_nodes.limit(limit)
+        else
+          sliced_nodes.where(false)
+        end
+      end
+
       def sliced_nodes_count
         return @sliced_nodes_count if defined? @sliced_nodes_count
 
@@ -147,6 +157,14 @@ module GraphQL
         return @paged_nodes_array if defined?(@paged_nodes_array)
         @paged_nodes_array = paged_nodes.to_a
       end
+
+      def paged_nodes_length
+        if paged_nodes.respond_to?(:length)
+          paged_nodes.length
+        else
+          paged_nodes_array.length
+        end
+      end
     end
 
     if defined?(ActiveRecord::Relation)

data/lib/graphql/schema/build_from_definition.rb

@@ -280,6 +280,9 @@ module GraphQL
               resolve: ->(obj, args, ctx) { default_resolve.call(field, obj, args, ctx) },
               deprecation_reason: build_deprecation_reason(field_definition.directives),
             )
+
+            type_name = resolve_type_name(field_definition.type)
+            field.connection = type_name.end_with?("Connection")
             [field_definition.name, field]
           end
         end
@@ -294,6 +297,15 @@ module GraphQL
           end
           type
         end
+
+        def resolve_type_name(type)
+          case type
+          when GraphQL::Language::Nodes::TypeName
+            return type.name
+          else
+            resolve_type_name(type.of_type)
+          end
+        end
       end
 
       private_constant :Builder

data/lib/graphql/schema/traversal.rb

@@ -29,6 +29,7 @@ module GraphQL
       def visit(member, context_description)
         case member
         when GraphQL::Schema
+          member.directives.each { |name, directive| visit(directive, "Directive #{name}") }
           # Find the starting points, then visit them
           visit_roots = [member.query, member.mutation, member.subscription]
           if @introspection
@@ -37,6 +38,10 @@ module GraphQL
           visit_roots.concat(member.orphan_types)
           visit_roots.compact!
           visit_roots.each { |t| visit(t, t.name) }
+        when GraphQL::Directive
+          member.arguments.each do |name, argument|
+            visit(argument.type, "Directive argument #{member.name}.#{name}")
+          end
         when GraphQL::BaseType
           type_defn = member.unwrap
           prev_type = @type_map[type_defn.name]

data/lib/graphql/static_validation/rules/arguments_are_defined.rb

@@ -7,7 +7,7 @@ module GraphQL
         if argument_defn.nil?
           kind_of_node = node_type(parent)
           error_arg_name = parent_name(parent, defn)
-          context.errors << message("#{kind_of_node} '#{error_arg_name}' doesn't accept argument '#{node.name}'", parent, context: context)
+          context.errors << message("#{kind_of_node} '#{error_arg_name}' doesn't accept argument '#{node.name}'", node, context: context)
           GraphQL::Language::Visitor::SKIP
         else
           nil

data/lib/graphql/static_validation/rules/variable_usages_are_allowed.rb

@@ -53,7 +53,13 @@ module GraphQL
           return
         end
         if !ast_var.default_value.nil?
-          var_type = GraphQL::NonNullType.new(of_type: var_type)
+          unless var_type.is_a?(GraphQL::NonNullType)
+            # If the value is required, but the argument is not,
+            # and yet there's a non-nil default, then we impliclty
+            # make the argument also a required type.
+
+            var_type = GraphQL::NonNullType.new(of_type: var_type)
+          end
         end
 
         arg_defn = arguments[arg_node.name]

data/lib/graphql/unresolved_type_error.rb

@@ -24,7 +24,10 @@ module GraphQL
       @parent_type = parent_type
       @resolved_type = resolved_type
       @possible_types = possible_types
-      message = %|The value from "#{field.name}" on "#{parent_type}" could not be resolved to "#{field.type}". (Received: #{resolved_type.inspect}, Expected: [#{possible_types.map(&:inspect).join(", ")}])|
+      message = "The value from \"#{field.name}\" on \"#{parent_type}\" could not be resolved to \"#{field.type}\". " \
+        "(Received: `#{resolved_type.inspect}`, Expected: [#{possible_types.map(&:inspect).join(", ")}]) " \
+        "Make sure you have defined a `type_from_object` proc on your schema and that value `#{value.inspect}` " \
+        "gets resolved to a valid type."
       super(message)
     end
   end

data/lib/graphql/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module GraphQL
-  VERSION = "1.6.7"
+  VERSION = "1.6.8"
 end

data/spec/graphql/enum_type_spec.rb

@@ -37,6 +37,21 @@ describe GraphQL::EnumType do
     end
   end
 
+  describe "invalid names" do
+    it "rejects names with a space" do
+      assert_raises(GraphQL::EnumType::InvalidEnumNameError) {
+        InvalidEnumTest = GraphQL::EnumType.define do
+          name "InvalidEnumTest"
+
+          value("SPACE IN VALUE", "Invalid enum because it contains spaces", value: 1)
+        end
+
+        # Force evaluation
+        InvalidEnumTest.name
+      }
+    end
+  end
+
   describe "values that are Arrays" do
     let(:schema) {
       enum = GraphQL::EnumType.define do

data/spec/graphql/object_type_spec.rb

@@ -4,6 +4,19 @@ require "spec_helper"
 describe GraphQL::ObjectType do
   let(:type) { Dummy::CheeseType }
 
+  it "doesn't allow double non-null constraints" do
+    assert_raises(GraphQL::DoubleNonNullTypeError) {
+      DoubleNullObject = GraphQL::ObjectType.define do
+        name "DoubleNull"
+
+        field :id, !!types.Int, "Fails because double !"
+      end
+
+      # Force evaluation
+      DoubleNullObject.name
+    }
+  end
+
   it "has a name" do
     assert_equal("Cheese", type.name)
     type.name = "Fromage"

data/spec/graphql/query/serial_execution/value_resolution_spec.rb

@@ -35,7 +35,7 @@ describe GraphQL::Query::SerialExecution::ValueResolution do
         resolve ->(obj, args, ctx) { (args["today"] + 1) % 7 }
       end
       field :resolvesToNilInterface, interface do
-        resolve ->(obj, args, ctx) { Object.new }
+        resolve ->(obj, args, ctx) { 1337 }
       end
       field :resolvesToWrongTypeInterface, interface do
         resolve ->(obj, args, ctx) { :something }
@@ -86,7 +86,10 @@ describe GraphQL::Query::SerialExecution::ValueResolution do
 
       it "raises an error" do
         err = assert_raises(GraphQL::UnresolvedTypeError) { result }
-        expected_message = %|The value from "resolvesToNilInterface" on "Query" could not be resolved to "SomeInterface". (Received: nil, Expected: [SomeObject])|
+        expected_message = "The value from \"resolvesToNilInterface\" on \"Query\" could not be resolved to \"SomeInterface\". " \
+          "(Received: `nil`, Expected: [SomeObject]) " \
+          "Make sure you have defined a `type_from_object` proc on your schema and that value `1337` " \
+          "gets resolved to a valid type."
         assert_equal expected_message, err.message
       end
     end
@@ -100,7 +103,10 @@ describe GraphQL::Query::SerialExecution::ValueResolution do
 
       it "raises an error" do
         err = assert_raises(GraphQL::UnresolvedTypeError) { result }
-        expected_message = %|The value from "resolvesToWrongTypeInterface" on "Query" could not be resolved to "SomeInterface". (Received: OtherObject, Expected: [SomeObject])|
+        expected_message = "The value from \"resolvesToWrongTypeInterface\" on \"Query\" could not be resolved to \"SomeInterface\". " \
+          "(Received: `OtherObject`, Expected: [SomeObject]) " \
+          "Make sure you have defined a `type_from_object` proc on your schema and that value `:something` " \
+          "gets resolved to a valid type."
         assert_equal expected_message, err.message
       end
     end

data/spec/graphql/query_spec.rb

@@ -68,7 +68,7 @@ describe GraphQL::Query do
     end
   end
 
-  describe "operation_name" do
+  describe "#operation_name" do
     describe "when provided" do
       let(:query_string) { <<-GRAPHQL
         query q1 { cheese(id: 1) { flavor } }
@@ -79,7 +79,6 @@ describe GraphQL::Query do
 
       it "returns the provided name" do
         assert_equal "q2", query.operation_name
-        assert_equal "q2", query.selected_operation_name
       end
     end
 
@@ -91,7 +90,44 @@ describe GraphQL::Query do
 
       it "returns nil" do
         assert_equal nil, query.operation_name
-        assert_equal "q3", query.selected_operation_name
+      end
+    end
+
+    describe "#selected_operation_name" do
+      describe "when an operation isprovided" do
+        let(:query_string) { <<-GRAPHQL
+          query q1 { cheese(id: 1) { flavor } }
+          query q2 { cheese(id: 2) { flavor } }
+        GRAPHQL
+        }
+        let(:operation_name) { "q2" }
+
+        it "returns the provided name" do
+          assert_equal "q2", query.selected_operation_name
+        end
+      end
+
+      describe "when operation is inferred" do
+        let(:query_string) { <<-GRAPHQL
+          query q3 { cheese(id: 3) { flavor } }
+        GRAPHQL
+        }
+
+        it "returns the inferred operation name" do
+          assert_equal "q3", query.selected_operation_name
+        end
+      end
+
+      describe "when there are no operations" do
+        let(:query_string) { <<-GRAPHQL
+          # Only Comments
+          # In this Query
+        GRAPHQL
+        }
+
+        it "returns the inferred operation name" do
+          assert_equal nil, query.selected_operation_name
+        end
       end
     end
 
@@ -633,6 +669,18 @@ describe GraphQL::Query do
     end
   end
 
+  describe '#irep_selection' do
+    it "returns the irep for the selected operation" do
+      assert_kind_of GraphQL::InternalRepresentation::Node, query.irep_selection
+      assert_equal 'getFlavor', query.irep_selection.name
+    end
+
+    it "returns nil when there is no selected operation" do
+      query = GraphQL::Query.new(schema, '# Only a comment')
+      assert_equal nil, query.irep_selection
+    end
+  end
+
   describe "query_execution_strategy" do
     let(:custom_execution_schema) {
       schema.redefine do

data/spec/graphql/relay/relation_connection_spec.rb

@@ -123,12 +123,19 @@ describe GraphQL::Relay::RelationConnection do
       assert_equal([], get_names(result))
     end
 
-    it 'handles cursors beyond the bounds of the array' do
+    it 'handles cursors above the bounds of the array' do
       overreaching_cursor = Base64.strict_encode64("100")
       result = star_wars_query(query_string, "after" => overreaching_cursor, "first" => 2)
       assert_equal([], get_names(result))
     end
 
+    it 'handles cursors below the bounds of the array' do
+      underreaching_cursor = Base64.strict_encode64("1")
+      result = star_wars_query(query_string, "before" => underreaching_cursor, "first" => 2)
+      assert_equal([], get_names(result))
+    end
+
+
     it 'handles grouped connections with only last argument' do
       grouped_conn_query = <<-GRAPHQL
       query {
@@ -286,6 +293,68 @@ describe GraphQL::Relay::RelationConnection do
     end
   end
 
+  describe "applying a max_page_size bigger than the results" do
+    let(:query_string) {%|
+      query getBases($first: Int, $after: String, $last: Int, $before: String){
+        empire {
+          bases: basesWithLargeMaxLimitRelation(first: $first, after: $after, last: $last, before: $before) {
+            ... basesConnection
+          }
+        }
+      }
+
+      fragment basesConnection on BaseConnection {
+        edges {
+          cursor
+          node {
+            name
+          }
+        },
+        pageInfo {
+          hasNextPage
+          hasPreviousPage
+          startCursor
+          endCursor
+        }
+      }
+      |}
+
+    it "applies to queries by `first`" do
+      result = star_wars_query(query_string, "first" => 100)
+      assert_equal(6, result["data"]["empire"]["bases"]["edges"].size)
+      assert_equal(false, result["data"]["empire"]["bases"]["pageInfo"]["hasNextPage"])
+
+      # Max page size is applied _without_ `first`, also
+      result = star_wars_query(query_string)
+      assert_equal(6, result["data"]["empire"]["bases"]["edges"].size)
+      assert_equal(false, result["data"]["empire"]["bases"]["pageInfo"]["hasNextPage"], "hasNextPage is false when first is not specified")
+    end
+
+    it "applies to queries by `last`" do
+      all_names = ["Yavin", "Echo Base", "Secret Hideout", "Death Star", "Shield Generator", "Headquarters"]
+
+      last_cursor = "Ng=="
+      result = star_wars_query(query_string, "last" => 100, "before" => last_cursor)
+      assert_equal(all_names[0..4], get_names(result))
+      assert_equal(false, result["data"]["empire"]["bases"]["pageInfo"]["hasPreviousPage"])
+
+      result = star_wars_query(query_string, "last" => 100)
+      assert_equal(all_names, get_names(result))
+      assert_equal(false, result["data"]["empire"]["bases"]["pageInfo"]["hasPreviousPage"])
+
+      result = star_wars_query(query_string, "before" => last_cursor)
+      assert_equal(all_names[0..4], get_names(result))
+      assert_equal(false, result["data"]["empire"]["bases"]["pageInfo"]["hasPreviousPage"], "hasPreviousPage is false when last is not specified")
+
+      fourth_cursor = "NA=="
+      result = star_wars_query(query_string, "last" => 100, "before" => fourth_cursor)
+      assert_equal(all_names[0..2], get_names(result))
+
+      result = star_wars_query(query_string, "before" => fourth_cursor)
+      assert_equal(all_names[0..2], get_names(result))
+    end
+  end
+
   describe "without a block" do
     let(:query_string) {%|
       {
@@ -441,6 +510,18 @@ describe GraphQL::Relay::RelationConnection do
 
       end
 
+      it 'handles cursors above the bounds of the array' do
+        overreaching_cursor = Base64.strict_encode64("100")
+        result = star_wars_query(query_string, "after" => overreaching_cursor, "first" => 2)
+        assert_equal([], get_names(result))
+      end
+
+      it 'handles cursors below the bounds of the array' do
+        underreaching_cursor = Base64.strict_encode64("1")
+        result = star_wars_query(query_string, "before" => underreaching_cursor, "first" => 2)
+        assert_equal([], get_names(result))
+      end
+
       it "applies custom arguments" do
         result = star_wars_query(query_string, "first" => 1, "nameIncludes" => "ea")
         assert_equal(["Death Star"], get_names(result))

data/spec/graphql/schema/build_from_definition_spec.rb

@@ -206,6 +206,85 @@ type Hello {
       build_schema_and_compare_output(schema.chop)
     end
 
+    it 'properly understands connections' do
+      schema = <<-SCHEMA
+schema {
+  query: Type
+}
+
+type Organization {
+  email: String
+}
+
+# The connection type for Organization.
+type OrganizationConnection {
+  # A list of edges.
+  edges: [OrganizationEdge]
+
+  # A list of nodes.
+  nodes: [Organization]
+
+  # Information to aid in pagination.
+  pageInfo: PageInfo!
+
+  # Identifies the total count of items in the connection.
+  totalCount: Int!
+}
+
+# An edge in a connection.
+type OrganizationEdge {
+  # A cursor for use in pagination.
+  cursor: String!
+
+  # The item at the end of the edge.
+  node: Organization
+}
+
+# Information about pagination in a connection.
+type PageInfo {
+  # When paginating forwards, the cursor to continue.
+  endCursor: String
+
+  # When paginating forwards, are there more items?
+  hasNextPage: Boolean!
+
+  # When paginating backwards, are there more items?
+  hasPreviousPage: Boolean!
+
+  # When paginating backwards, the cursor to continue.
+  startCursor: String
+}
+
+type Type {
+  name: String
+  organization(
+    # The login of the organization to find.
+    login: String!
+  ): Organization
+
+  # A list of organizations the user belongs to.
+  organizations(
+    # Returns the elements in the list that come after the specified global ID.
+    after: String
+
+    # Returns the elements in the list that come before the specified global ID.
+    before: String
+
+    # Returns the first _n_ elements from the list.
+    first: Int
+
+    # Returns the last _n_ elements from the list.
+    last: Int
+  ): OrganizationConnection!
+}
+      SCHEMA
+
+      built_schema = build_schema_and_compare_output(schema.chop)
+      obj = built_schema.types["Type"]
+      refute obj.fields["organization"].connection?
+      assert obj.fields["organizations"].connection?
+    end
+
     it 'supports simple type with multiple arguments' do
       schema = <<-SCHEMA
 schema {

data/spec/graphql/schema/traversal_spec.rb

@@ -8,8 +8,19 @@ describe GraphQL::Schema::Traversal do
     traversal.type_map
   end
 
+  it "finds types from directives" do
+    expected = {
+      "Boolean" => GraphQL::BOOLEAN_TYPE, # `skip` argument
+      "String" => GraphQL::STRING_TYPE # `deprecated` argument
+    }
+    result = reduce_types([])
+    assert_equal(expected.keys.sort, result.keys.sort)
+    assert_equal(expected, result.to_h)
+  end
+
   it "finds types from a single type and its fields" do
     expected = {
+      "Boolean" => GraphQL::BOOLEAN_TYPE,
       "Cheese" => Dummy::CheeseType,
       "Float" => GraphQL::FLOAT_TYPE,
       "String" => GraphQL::STRING_TYPE,
@@ -57,9 +68,10 @@ describe GraphQL::Schema::Traversal do
 
     result = reduce_types([type_parent])
     expected = {
+      "Boolean" => GraphQL::BOOLEAN_TYPE,
+      "String" => GraphQL::STRING_TYPE,
       "InputTypeParent" => type_parent,
       "InputTypeChild" => type_child,
-      "String" => GraphQL::STRING_TYPE
     }
     assert_equal(expected, result.to_h)
   end

data/spec/graphql/static_validation/rules/arguments_are_defined_spec.rb

@@ -24,28 +24,28 @@ describe GraphQL::StaticValidation::ArgumentsAreDefined do
 
     query_root_error = {
       "message"=>"Field 'cheese' doesn't accept argument 'silly'",
-      "locations"=>[{"line"=>4, "column"=>7}],
+      "locations"=>[{"line"=>4, "column"=>14}],
       "fields"=>["query getCheese", "cheese", "silly"],
     }
     assert_includes(errors, query_root_error)
 
     input_obj_record = {
       "message"=>"InputObject 'DairyProductInput' doesn't accept argument 'wacky'",
-      "locations"=>[{"line"=>5, "column"=>29}],
+      "locations"=>[{"line"=>5, "column"=>30}],
       "fields"=>["query getCheese", "searchDairy", "product", "wacky"],
     }
     assert_includes(errors, input_obj_record)
 
     fragment_error = {
       "message"=>"Field 'similarCheese' doesn't accept argument 'nonsense'",
-      "locations"=>[{"line"=>9, "column"=>7}],
+      "locations"=>[{"line"=>9, "column"=>36}],
       "fields"=>["fragment cheeseFields", "similarCheese", "nonsense"],
     }
     assert_includes(errors, fragment_error)
 
     directive_error = {
       "message"=>"Directive 'skip' doesn't accept argument 'something'",
-      "locations"=>[{"line"=>10, "column"=>10}],
+      "locations"=>[{"line"=>10, "column"=>16}],
       "fields"=>["fragment cheeseFields", "id", "something"],
     }
     assert_includes(errors, directive_error)
@@ -61,7 +61,7 @@ describe GraphQL::StaticValidation::ArgumentsAreDefined do
     it "finds undefined arguments" do
       assert_includes(errors, {
         "message"=>"Field '__type' doesn't accept argument 'somethingInvalid'",
-        "locations"=>[{"line"=>3, "column"=>9}],
+        "locations"=>[{"line"=>3, "column"=>16}],
         "fields"=>["query", "__type", "somethingInvalid"],
       })
     end

data/spec/rails_dependency_sanity_spec.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+describe 'Rails dependency sanity check' do
+  if rails_should_be_installed?
+    it "should have rails installed" do
+      assert defined?(Rails)
+    end
+  else
+    it "should not have rails installed" do
+      refute defined?(Rails)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,13 +1,22 @@
 # frozen_string_literal: true
+
+def rails_should_be_installed?
+  ENV['WITHOUT_RAILS'] != 'yes'
+end
 require "codeclimate-test-reporter"
 CodeClimate::TestReporter.start
-require "rake"
-require "rails/all"
-require "rails/generators"
-require "jdbc/sqlite3" if RUBY_ENGINE == 'jruby'
-require "sqlite3" if RUBY_ENGINE == 'ruby'
-require "pg" if RUBY_ENGINE == 'ruby'
-require "sequel"
+
+if rails_should_be_installed?
+  require "rake"
+  require "rails/all"
+  require "rails/generators"
+
+  require "jdbc/sqlite3" if RUBY_ENGINE == 'jruby'
+  require "sqlite3" if RUBY_ENGINE == 'ruby'
+  require "pg" if RUBY_ENGINE == 'ruby'
+  require "sequel"
+end
+
 require "graphql"
 require "graphql/rake_task"
 require "benchmark"
@@ -45,8 +54,15 @@ end
 NO_OP_RESOLVE_TYPE = ->(type, obj, ctx) {
   raise "this should never be called"
 }
+
 # Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each do |f|
+  unless rails_should_be_installed?
+    next if f.end_with?('star_wars/data.rb')
+    next if f.end_with?('base_generator_test.rb')
+  end
+  require f
+end
 
 def star_wars_query(string, variables={}, context: {})
   GraphQL::Query.new(StarWars::Schema, string, variables: variables, context: context).result

data/spec/support/star_wars/data.rb

@@ -39,7 +39,7 @@ module StarWars
 
   ActiveRecord::Schema.define do
     self.verbose = false
-    create_table :bases do |t|
+    create_table :bases, force: true do |t|
       t.column :name, :string
       t.column :planet, :string
       t.column :faction_id, :integer

data/spec/support/star_wars/schema.rb

@@ -167,6 +167,10 @@ module StarWars
       resolve ->(object, args, context) { Base.all.to_a }
     end
 
+    connection :basesWithLargeMaxLimitRelation, BaseType.connection_type, max_page_size: 1000 do
+      resolve ->(object, args, context) { Base.all }
+    end
+
     connection :basesAsSequelDataset, BaseConnectionWithTotalCountType, max_page_size: 1000 do
       argument :nameIncludes, types.String
       resolve ->(obj, args, ctx) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 1.6.7
+  version: 1.6.8
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-11 00:00:00.000000000 Z
+date: 2017-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -192,20 +192,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: rails
-  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'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -639,6 +625,7 @@ files:
 - spec/graphql/static_validation/validator_spec.rb
 - spec/graphql/string_type_spec.rb
 - spec/graphql/union_type_spec.rb
+- spec/rails_dependency_sanity_spec.rb
 - spec/spec_helper.rb
 - spec/support/base_generator_test.rb
 - spec/support/dummy/data.rb
@@ -793,6 +780,7 @@ test_files:
 - spec/graphql/static_validation/validator_spec.rb
 - spec/graphql/string_type_spec.rb
 - spec/graphql/union_type_spec.rb
+- spec/rails_dependency_sanity_spec.rb
 - spec/spec_helper.rb
 - spec/support/base_generator_test.rb
 - spec/support/dummy/data.rb