graphql 1.8.3 → 1.8.4

data/spec/graphql/query/variables_spec.rb

@@ -110,6 +110,26 @@ describe GraphQL::Query::Variables do
           assert_equal expected, variables.errors.first.message
         end
       end
+
+      describe "when provided input cannot be coerced" do
+        let(:query_string) {%|
+        query searchMyDairy (
+          $time: Time
+        ) {
+          searchDairy(expiresAfter: $time) {
+            ... on Cheese {
+              flavor
+            }
+          }
+        }
+        |}
+        let(:provided_variables) { { "time" => "a" } }
+
+        it "validates invalid input objects" do
+          expected = "Variable time of type Time was provided invalid value"
+          assert_equal expected, variables.errors.first.message
+        end
+      end
     end
 
     describe "nullable variables" do

data/spec/graphql/relay/connection_instrumentation_spec.rb

@@ -77,7 +77,7 @@ describe GraphQL::Relay::ConnectionInstrumentation do
       # Before the object is wrapped in a connection, the instrumentation sees `Array`
       assert_equal ["StarWars::FactionRecord", "Array", "GraphQL::Relay::ArrayConnection"], ctx[:before_built_ins]
       # After the object is wrapped in a connection, it sees the connection object
-      assert_equal ["StarWars::Faction", "GraphQL::Relay::ArrayConnection", "GraphQL::Relay::ArrayConnection"], ctx[:after_built_ins]
+      assert_equal ["StarWars::Faction", "GraphQL::Relay::ArrayConnection", "GraphQL::Types::Relay::PageInfo"], ctx[:after_built_ins]
     end
   end
 end

data/spec/graphql/schema/resolver_spec.rb

@@ -49,6 +49,21 @@ describe GraphQL::Schema::Resolver do
     class Resolver5 < Resolver4
     end
 
+    class Resolver6 < Resolver1
+      type Integer, null: false
+
+      def resolve
+        self.class.complexity
+      end
+    end
+
+    class Resolver7 < Resolver6
+      complexity 2
+    end
+
+    class Resolver8 < Resolver7
+    end
+
     class Query < GraphQL::Schema::Object
       class CustomField < GraphQL::Schema::Field
         def resolve_field(*args)
@@ -68,6 +83,9 @@ describe GraphQL::Schema::Resolver do
       field :resolver_3_again, resolver: Resolver3, description: "field desc"
       field :resolver_4, "Positional description", resolver: Resolver4
       field :resolver_5, resolver: Resolver5
+      field :resolver_6, resolver: Resolver6
+      field :resolver_7, resolver: Resolver7
+      field :resolver_8, resolver: Resolver8
     end
 
     class Schema < GraphQL::Schema
@@ -114,6 +132,19 @@ describe GraphQL::Schema::Resolver do
     end
   end
 
+  describe "complexity" do
+    it "has default values" do
+      res = ResolverTest::Schema.execute " { resolver6 } ", root_value: OpenStruct.new(value: 0)
+      assert_equal 1, res["data"]["resolver6"]
+    end
+
+    it "is inherited" do
+      res = ResolverTest::Schema.execute " { resolver7 resolver8 } ", root_value: OpenStruct.new(value: 0)
+      assert_equal 2, res["data"]["resolver7"]
+      assert_equal 2, res["data"]["resolver8"]
+    end
+  end
+
   describe "when applied to a field" do
     it "gets the field's description" do
       assert_nil ResolverTest::Schema.find("Query.resolver3").description

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

@@ -134,4 +134,56 @@ describe GraphQL::StaticValidation::VariableDefaultValuesAreCorrectlyTyped do
       end
     end
   end
+
+  describe "custom error messages" do
+    let(:schema) {
+      TimeType = GraphQL::ScalarType.define do
+        name "Time"
+        description "Time since epoch in seconds"
+
+        coerce_input ->(value, ctx) do
+          begin
+            Time.at(Float(value))
+          rescue ArgumentError
+            raise GraphQL::CoercionError, 'cannot coerce to Float'
+          end
+        end
+
+        coerce_result ->(value, ctx) { value.to_f }
+      end
+
+      QueryType = GraphQL::ObjectType.define do
+        name "Query"
+        description "The query root of this schema"
+
+        field :time do
+          type TimeType
+          argument :value, !TimeType
+          resolve ->(obj, args, ctx) { args[:value] }
+        end
+      end
+
+      GraphQL::Schema.define do
+        query QueryType
+      end
+    }
+
+    let(:query_string) {%|
+      query(
+        $value: Time = "a"
+      ) {
+        time(value: $value)
+      }
+    |}
+
+    it "sets error message from a CoercionError if raised" do
+      assert_equal 1, errors.length
+
+      assert_includes errors, {
+        "message"=> "cannot coerce to Float",
+        "locations"=>[{"line"=>3, "column"=>9}],
+        "fields"=>["query"]
+      }
+    end
+  end
 end

data/spec/support/dummy/schema.rb

@@ -248,6 +248,21 @@ module Dummy
     end
   end
 
+  TimeType = GraphQL::ScalarType.define do
+    name "Time"
+    description "Time since epoch in seconds"
+
+    coerce_input ->(value, ctx) do
+      begin
+        Time.at(Float(value))
+      rescue ArgumentError
+        raise GraphQL::CoercionError, 'cannot coerce to Float'
+      end
+    end
+
+    coerce_result ->(value, ctx) { value.to_f }
+  end
+
   class FetchItem < GraphQL::Function
     attr_reader :type, :description, :arguments
 
@@ -312,6 +327,7 @@ module Dummy
       type !DairyProductUnion
       # This is a list just for testing 😬
       argument :product, types[DairyProductInputType], default_value: [{"source" => "SHEEP"}]
+      argument :expiresAfter, TimeType
       resolve ->(t, args, c) {
         source = args["product"][0][:source] # String or Sym is ok
         products = CHEESES.values + MILKS.values

data/spec/support/star_wars/schema.rb

@@ -27,12 +27,23 @@ module StarWars
     field :planet, String, null: true
   end
 
-  # Use an optional block to add fields to the connection type:
-  BaseConnectionWithTotalCountType = BaseType.define_connection(nodes_field: true) do
-    name "BasesConnectionWithTotalCount"
-    field :totalCount do
-      type types.Int
-      resolve ->(obj, args, ctx) { obj.nodes.count }
+
+  class BaseEdge < GraphQL::Types::Relay::BaseEdge
+    node_type(BaseType)
+  end
+
+  class BaseConnection < GraphQL::Types::Relay::BaseConnection
+    edge_type(BaseEdge)
+  end
+
+  class BasesConnectionWithTotalCountType < GraphQL::Types::Relay::BaseConnection
+    edge_type(BaseEdge)
+    nodes_field
+
+    field :total_count, Integer, null: true
+
+    def total_count
+      object.nodes.count
     end
   end
 
@@ -121,7 +132,7 @@ module StarWars
 
     field :shipsWithMaxPageSize, "Ships with max page size", max_page_size: 2, function: ShipsWithMaxPageSize.new
 
-    field :bases, BaseConnectionWithTotalCountType, null: true, connection: true, resolve: ->(obj, args, ctx) {
+    field :bases, BasesConnectionWithTotalCountType, null: true, connection: true, resolve: ->(obj, args, ctx) {
       all_bases = Base.where(id: obj.bases)
       if args[:nameIncludes]
         all_bases = all_bases.where("name LIKE ?", "%#{args[:nameIncludes]}%")
@@ -131,8 +142,8 @@ module StarWars
       argument :nameIncludes, String, required: false
     end
 
-    field :basesClone, BaseType.connection_type, null: true
-    field :basesByName, BaseType.connection_type, null: true do
+    field :basesClone, BaseConnection, null: true
+    field :basesByName, BaseConnection, null: true do
       argument :order, String, default_value: "name", required: false
     end
     def bases_by_name(order: nil)
@@ -143,13 +154,13 @@ module StarWars
       end
     end
 
-    field :basesWithMaxLimitRelation, BaseType.connection_type, null: true, max_page_size: 2, resolve: Proc.new { Base.all}
-    field :basesWithMaxLimitArray, BaseType.connection_type, null: true, max_page_size: 2, resolve: Proc.new { Base.all.to_a }
-    field :basesWithDefaultMaxLimitRelation, BaseType.connection_type, null: true, resolve: Proc.new { Base.all }
-    field :basesWithDefaultMaxLimitArray, BaseType.connection_type, null: true, resolve: Proc.new { Base.all.to_a }
-    field :basesWithLargeMaxLimitRelation, BaseType.connection_type, null: true, max_page_size: 1000, resolve: Proc.new { Base.all }
+    field :basesWithMaxLimitRelation, BaseConnection, null: true, max_page_size: 2, resolve: Proc.new { Base.all}
+    field :basesWithMaxLimitArray, BaseConnection, null: true, max_page_size: 2, resolve: Proc.new { Base.all.to_a }
+    field :basesWithDefaultMaxLimitRelation, BaseConnection, null: true, resolve: Proc.new { Base.all }
+    field :basesWithDefaultMaxLimitArray, BaseConnection, null: true, resolve: Proc.new { Base.all.to_a }
+    field :basesWithLargeMaxLimitRelation, BaseConnection, null: true, max_page_size: 1000, resolve: Proc.new { Base.all }
 
-    field :basesAsSequelDataset, BaseConnectionWithTotalCountType, null: true, connection: true, max_page_size: 1000 do
+    field :basesAsSequelDataset, BasesConnectionWithTotalCountType, null: true, connection: true, max_page_size: 1000 do
       argument :nameIncludes, String, required: false
     end
 
@@ -297,14 +308,14 @@ module StarWars
 
     field :largestBase, BaseType, null: true, resolve: ->(obj, args, ctx) { Base.find(3) }
 
-    field :newestBasesGroupedByFaction, BaseType.connection_type, null: true, resolve: ->(obj, args, ctx) {
+    field :newestBasesGroupedByFaction, BaseConnection, null: true, resolve: ->(obj, args, ctx) {
       Base
         .having('id in (select max(id) from bases group by faction_id)')
         .group(:id)
         .order('faction_id desc')
     }
 
-    field :basesWithNullName, BaseType.connection_type, null: false, resolve: ->(obj, args, ctx) {
+    field :basesWithNullName, BaseConnection, null: false, resolve: ->(obj, args, ctx) {
       [OpenStruct.new(id: nil)]
     }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.4
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-14 00:00:00.000000000 Z
+date: 2018-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -348,6 +348,7 @@ files:
 - lib/graphql/analysis/reducer_state.rb
 - lib/graphql/analysis_error.rb
 - lib/graphql/argument.rb
+- lib/graphql/authorization.rb
 - lib/graphql/backtrace.rb
 - lib/graphql/backtrace/inspect_result.rb
 - lib/graphql/backtrace/table.rb
@@ -588,12 +589,22 @@ files:
 - lib/graphql/tracing/scout_tracing.rb
 - lib/graphql/tracing/skylight_tracing.rb
 - lib/graphql/type_kinds.rb
+- lib/graphql/types.rb
 - lib/graphql/types/boolean.rb
 - lib/graphql/types/float.rb
 - lib/graphql/types/id.rb
 - lib/graphql/types/int.rb
 - lib/graphql/types/iso_8601_date_time.rb
+- lib/graphql/types/relay.rb
+- lib/graphql/types/relay/base_connection.rb
+- lib/graphql/types/relay/base_edge.rb
+- lib/graphql/types/relay/base_field.rb
+- lib/graphql/types/relay/base_interface.rb
+- lib/graphql/types/relay/base_object.rb
+- lib/graphql/types/relay/node.rb
+- lib/graphql/types/relay/page_info.rb
 - lib/graphql/types/string.rb
+- lib/graphql/unauthorized_error.rb
 - lib/graphql/union_type.rb
 - lib/graphql/unresolved_type_error.rb
 - lib/graphql/upgrader/member.rb
@@ -966,6 +977,7 @@ files:
 - spec/graphql/analysis/query_complexity_spec.rb
 - spec/graphql/analysis/query_depth_spec.rb
 - spec/graphql/argument_spec.rb
+- spec/graphql/authorization_spec.rb
 - spec/graphql/backtrace_spec.rb
 - spec/graphql/base_type_spec.rb
 - spec/graphql/boolean_type_spec.rb
@@ -1514,6 +1526,7 @@ test_files:
 - spec/graphql/analysis/query_complexity_spec.rb
 - spec/graphql/analysis/query_depth_spec.rb
 - spec/graphql/argument_spec.rb
+- spec/graphql/authorization_spec.rb
 - spec/graphql/backtrace_spec.rb
 - spec/graphql/base_type_spec.rb
 - spec/graphql/boolean_type_spec.rb