graphql 0.18.7 → 0.18.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d560175134555b76ef12afce0b9a3e71b84d71bc
-  data.tar.gz: 47f43437b229e9abfe655804cd05e02642c17f38
+  metadata.gz: e3550ea852aad13e43cd451dfa44ed0889f71f9a
+  data.tar.gz: ce68835d73683f572b8b53529dc5f7de426b7a02
 SHA512:
-  metadata.gz: 50032a491c2c078266193c85072d4cb3d3827bbd56c6d04318cced4b7366de5b037b0e91d2b98e98ff7617811e5118625375a4a818232a70ac4bc486a82935da
-  data.tar.gz: d77d29e850053e7a1aa5096933790011b97acc32e4eab0d9e2450b6aedb902e5055586b17a1dc6de948c4521b429960ae51b63990ddb28ee60c22d8a8a46315c
+  metadata.gz: af009ae9281638daab169b41c94b6def2967a16ba2e41f667cf51d5c45a83b6aeacf0169195c651e5f2136934346a086775d65be713d4da03db429e4d41ce421
+  data.tar.gz: b7c1225ffe636db87a332f8ec0af465ee38b29d8269cc18485f40f22296608b1cb0ee0d69a17be58e7f28067611ebf946b1b306d1c796bb4dcf439190bc15249

data/lib/graphql/define/assign_connection.rb

@@ -4,7 +4,7 @@ module GraphQL
       def self.call(type_defn, *field_args, max_page_size: nil, **field_kwargs, &field_block)
         underlying_field = GraphQL::Define::AssignObjectField.call(type_defn, *field_args, **field_kwargs, &field_block)
         connection_field = GraphQL::Relay::ConnectionField.create(underlying_field, max_page_size: max_page_size)
-        type_defn.fields[name.to_s] = connection_field
+        type_defn.fields[underlying_field.name] = connection_field
       end
     end
   end

data/lib/graphql/language/nodes.rb

@@ -25,6 +25,13 @@ module GraphQL
           raise NotImplementedError
         end
 
+        def eql?(other)
+          return true if equal?(other)
+          other.is_a?(self.class) &&
+            other.scalars.eql?(self.scalars) &&
+            other.children.eql?(self.children)
+        end
+
         # @return [GraphQL::Language::Nodes::AbstractNode] all nodes in the tree below this one
         def children
           self.class.child_attributes
@@ -32,7 +39,22 @@ module GraphQL
             .flatten
         end
 
+        def scalars
+          self.class.scalar_attributes
+            .map { |attr_name| public_send(attr_name) }
+        end
+
         class << self
+          def inherited(subclass)
+            subclass.scalar_attributes(*@scalar_attributes)
+            subclass.child_attributes(*@child_attributes)
+          end
+
+          def scalar_attributes(*attr_names)
+            @scalar_attributes ||= []
+            @scalar_attributes += attr_names
+          end
+
           def child_attributes(*attr_names)
             @child_attributes ||= []
             @child_attributes += attr_names
@@ -50,6 +72,8 @@ module GraphQL
 
       class WrapperType < AbstractNode
         attr_accessor :of_type
+        scalar_attributes :of_type
+
         def initialize_node(of_type: nil)
           @of_type = of_type
         end
@@ -61,6 +85,8 @@ module GraphQL
 
       class NameOnlyNode < AbstractNode
         attr_accessor :name
+        scalar_attributes :name
+
         def initialize_node(name: nil)
           @name = name
         end
@@ -73,6 +99,7 @@ module GraphQL
 
       class Argument < AbstractNode
         attr_accessor :name, :value
+        scalar_attributes :name, :value
 
         def initialize_node(name: nil, value: nil)
           @name = name
@@ -86,6 +113,7 @@ module GraphQL
 
       class Directive < AbstractNode
         attr_accessor :name, :arguments
+        scalar_attributes :name
         child_attributes :arguments
 
         def initialize_node(name: nil, arguments: [])
@@ -107,6 +135,7 @@ module GraphQL
 
       class Field < AbstractNode
         attr_accessor :name, :alias, :arguments, :directives, :selections
+        scalar_attributes :name, :alias
         child_attributes :arguments, :directives, :selections
 
         def initialize_node(name: nil, arguments: [], directives: [], selections: [], **kwargs)
@@ -121,6 +150,7 @@ module GraphQL
 
       class FragmentDefinition < AbstractNode
         attr_accessor :name, :type, :directives, :selections
+        scalar_attributes :name, :type
         child_attributes :directives, :selections
 
         def initialize_node(name: nil, type: nil, directives: [], selections: [])
@@ -133,6 +163,7 @@ module GraphQL
 
       class FragmentSpread < AbstractNode
         attr_accessor :name, :directives
+        scalar_attributes :name
         child_attributes :directives
 
         def initialize_node(name: nil, directives: [])
@@ -143,6 +174,7 @@ module GraphQL
 
       class InlineFragment < AbstractNode
         attr_accessor :type, :directives, :selections
+        scalar_attributes :type
         child_attributes :directives, :selections
 
         def initialize_node(type: nil, directives: [], selections: [])
@@ -176,6 +208,7 @@ module GraphQL
 
       class OperationDefinition < AbstractNode
         attr_accessor :operation_type, :name, :variables, :directives, :selections
+        scalar_attributes :operation_type, :name
         child_attributes :variables, :directives, :selections
 
         def initialize_node(operation_type: nil, name: nil, variables: [], directives: [], selections: [])
@@ -191,6 +224,8 @@ module GraphQL
 
       class VariableDefinition < AbstractNode
         attr_accessor :name, :type, :default_value
+        scalar_attributes :name, :type, :default_value
+
         def initialize_node(name: nil, type: nil, default_value: nil)
           @name = name
           @type = type
@@ -203,6 +238,8 @@ module GraphQL
 
       class SchemaDefinition < AbstractNode
         attr_accessor :query, :mutation, :subscription
+        scalar_attributes :query, :mutation, :subscription
+
         def initialize_node(query: nil, mutation: nil, subscription: nil)
           @query = query
           @mutation = mutation
@@ -214,7 +251,9 @@ module GraphQL
 
       class ObjectTypeDefinition < AbstractNode
         attr_accessor :name, :interfaces, :fields
-        child_attributes :fields
+        scalar_attributes :name
+        child_attributes :interfaces, :fields
+
         def initialize_node(name:, interfaces:, fields:)
           @name = name
           @interfaces = interfaces || []
@@ -224,6 +263,8 @@ module GraphQL
 
       class InputValueDefinition < AbstractNode
         attr_accessor :name, :type, :default_value
+        scalar_attributes :name, :type, :default_value
+
         def initialize_node(name:, type:, default_value: nil)
           @name = name
           @type = type
@@ -233,7 +274,9 @@ module GraphQL
 
       class FieldDefinition < AbstractNode
         attr_accessor :name, :arguments, :type
+        scalar_attributes :name, :type
         child_attributes :arguments
+
         def initialize_node(name:, arguments:, type:)
           @name = name
           @arguments = arguments
@@ -243,7 +286,9 @@ module GraphQL
 
       class InterfaceTypeDefinition < AbstractNode
         attr_accessor :name, :fields
+        scalar_attributes :name
         child_attributes :fields
+
         def initialize_node(name:, fields:)
           @name = name
           @fields = fields
@@ -252,6 +297,9 @@ module GraphQL
 
       class UnionTypeDefinition < AbstractNode
         attr_accessor :name, :types
+        scalar_attributes :name
+        child_attributes :types
+
         def initialize_node(name:, types:)
           @name = name
           @types = types
@@ -260,6 +308,9 @@ module GraphQL
 
       class EnumTypeDefinition < AbstractNode
         attr_accessor :name, :values
+        scalar_attributes :name
+        child_attributes :values
+
         def initialize_node(name:, values:)
           @name = name
           @values = values
@@ -268,7 +319,9 @@ module GraphQL
 
       class InputObjectTypeDefinition < AbstractNode
         attr_accessor :name, :fields
+        scalar_attributes :name
         child_attributes :fields
+
         def initialize_node(name:, fields:)
           @name = name
           @fields = fields

data/lib/graphql/version.rb

@@ -1,3 +1,3 @@
 module GraphQL
-  VERSION = "0.18.7"
+  VERSION = "0.18.8"
 end

data/spec/graphql/language/equality_spec.rb

@@ -0,0 +1,83 @@
+require "spec_helper"
+
+describe GraphQL::Language::Nodes::AbstractNode do
+  describe ".eql?" do
+    let(:document1) { GraphQL::Language::Parser.parse(query_string1) }
+    let(:document2) { GraphQL::Language::Parser.parse(query_string2) }
+
+    describe "large identical document" do
+      let(:query_string1) {%|
+        query getStuff($someVar: Int = 1, $anotherVar: [String!], $skipNested: Boolean! = false) @skip(if: false) {
+          myField: someField(someArg: $someVar, ok: 1.4) @skip(if: $anotherVar) @thing(or: "Whatever")
+          anotherField(someArg: [1, 2, 3]) {
+            nestedField
+            ...moreNestedFields @skip(if: $skipNested)
+          }
+          ... on OtherType @include(unless: false) {
+            field(arg: [{ key: "value", anotherKey: 0.9, anotherAnotherKey: WHATEVER }])
+            anotherField
+          }
+          ... {
+            id
+          }
+        }
+
+        fragment moreNestedFields on NestedType @or(something: "ok") {
+          anotherNestedField
+        }
+      |}
+      let(:query_string2) { query_string1 }
+
+      it "should be equal" do
+        assert document1.eql?(document2)
+        assert document2.eql?(document1)
+      end
+    end
+
+    describe "different operations" do
+      let(:query_string1) { "query { field }" }
+      let(:query_string2) { "mutation { setField }" }
+
+      it "should not be equal" do
+        refute document1.eql?(document2)
+        refute document2.eql?(document1)
+      end
+    end
+
+    describe "different query fields" do
+      let(:query_string1) { "query { foo }" }
+      let(:query_string2) { "query { bar }" }
+
+      it "should not be equal" do
+        refute document1.eql?(document2)
+        refute document2.eql?(document1)
+      end
+    end
+
+    describe "different schemas" do
+      let(:query_string1) {%|
+        schema {
+          query: Query
+        }
+
+        type Query {
+          field: String!
+        }
+      |}
+      let(:query_string2) {%|
+        schema {
+          query: Query
+        }
+
+        type Query {
+          field: Int!
+        }
+      |}
+
+      it "should not be equal" do
+        refute document1.eql?(document2)
+        refute document2.eql?(document1)
+      end
+    end
+  end
+end

data/spec/graphql/language/nodes_spec.rb

@@ -0,0 +1,15 @@
+require "spec_helper"
+
+describe GraphQL::Language::Nodes::AbstractNode do
+  describe "child and scalar attributes" do
+    it "are inherited by node subclasses" do
+      subclassed_directive = Class.new(GraphQL::Language::Nodes::Directive)
+
+      assert_equal GraphQL::Language::Nodes::Directive.scalar_attributes,
+        subclassed_directive.scalar_attributes
+
+      assert_equal GraphQL::Language::Nodes::Directive.child_attributes,
+        subclassed_directive.child_attributes
+    end
+  end
+end

data/spec/graphql/relay/connection_field_spec.rb

@@ -0,0 +1,12 @@
+require "spec_helper"
+
+describe GraphQL::Relay::ConnectionField do
+  it "replaces the previous field definition" do
+    test_type = GraphQL::ObjectType.define do
+      name "Test"
+      connection :tests, test_type.connection_type
+    end
+
+    assert_equal ["tests"], test_type.fields.keys
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 0.18.7
+  version: 0.18.8
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2016-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
@@ -413,7 +413,9 @@ files:
 - spec/graphql/introspection/introspection_query_spec.rb
 - spec/graphql/introspection/schema_type_spec.rb
 - spec/graphql/introspection/type_type_spec.rb
+- spec/graphql/language/equality_spec.rb
 - spec/graphql/language/generation_spec.rb
+- spec/graphql/language/nodes_spec.rb
 - spec/graphql/language/parser_spec.rb
 - spec/graphql/language/visitor_spec.rb
 - spec/graphql/list_type_spec.rb
@@ -427,6 +429,7 @@ files:
 - spec/graphql/query/variables_spec.rb
 - spec/graphql/query_spec.rb
 - spec/graphql/relay/array_connection_spec.rb
+- spec/graphql/relay/connection_field_spec.rb
 - spec/graphql/relay/connection_type_spec.rb
 - spec/graphql/relay/global_node_identification_spec.rb
 - spec/graphql/relay/mutation_spec.rb
@@ -521,7 +524,9 @@ test_files:
 - spec/graphql/introspection/introspection_query_spec.rb
 - spec/graphql/introspection/schema_type_spec.rb
 - spec/graphql/introspection/type_type_spec.rb
+- spec/graphql/language/equality_spec.rb
 - spec/graphql/language/generation_spec.rb
+- spec/graphql/language/nodes_spec.rb
 - spec/graphql/language/parser_spec.rb
 - spec/graphql/language/visitor_spec.rb
 - spec/graphql/list_type_spec.rb
@@ -535,6 +540,7 @@ test_files:
 - spec/graphql/query/variables_spec.rb
 - spec/graphql/query_spec.rb
 - spec/graphql/relay/array_connection_spec.rb
+- spec/graphql/relay/connection_field_spec.rb
 - spec/graphql/relay/connection_type_spec.rb
 - spec/graphql/relay/global_node_identification_spec.rb
 - spec/graphql/relay/mutation_spec.rb