graphql 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe097cf7f88ed8a62ed53cc4fb3df2943a7a26e7
-  data.tar.gz: 66c7f5ef3707ffdf91a8e15b5fd94319c6799f6c
+  metadata.gz: cda98acc4cef5d2d8e4c9c77cd9ac5f5139cc38a
+  data.tar.gz: 184b72d444de078b443453bca6f0a4d64d8cf0b9
 SHA512:
-  metadata.gz: 6f922011419b6a8dcaed84c2088c0323681b27b283881339a021aeee0ae21b3d5d68da6da75dffe317d5db3514a2e0f5b7f9143553d2b3fef4d27ebeb36f45ae
-  data.tar.gz: e109b93bd6d60ef1e57dd09e64260b1fc89aa728c01153ec703bc73e2232ba628df78e8188dba57b98a57b81a214aa750cd6f85c4f364a9db487dec85a8d9ead
+  metadata.gz: cf7c368fd8d9ef704580aa2956e2813db1e3efbd748f1d9836d58b17ae5afaca3df2d623750dd9546688e42ab1cb5c0be26f6bbe46ea3f7d837788c8fc00fe92
+  data.tar.gz: ce531eb4ad6cd87b947c9c5fbd68d5cd14fef266950a3448e02659d02e8bc7db10c7d9d206ea12751d059c01392ed952facf938c3cddfd53dfb21404b554d83f

data/lib/graphql/define/defined_object_proxy.rb

@@ -16,22 +16,13 @@ module GraphQL
         if definition
           definition.call(@target, *args, &block)
         else
-          p "Failed to find config #{name} in #{inspect}"
-          super
+          msg = "#{@target.class.name} can't define '#{name}'"
+          raise NoMethodError, msg, caller
         end
       end
 
       def respond_to_missing?(name, include_private = false)
-        return true if @dictionary[name]
-        super
-      end
-
-      def to_s
-        inspect
-      end
-
-      def inspect
-        "<DefinedObjectProxy #{@target} (#{@dictionary.keys})>"
+        @dictionary[name] || super
       end
     end
   end

data/lib/graphql/field.rb

@@ -126,18 +126,22 @@ module GraphQL
       :type, :arguments,
       :property, :hash_key, :complexity, :mutation,
       :relay_node_field,
+      :relay_nodes_field,
       argument: GraphQL::Define::AssignArgument
 
     ensure_defined(
       :name, :deprecation_reason, :description, :description=, :property, :hash_key, :mutation, :arguments, :complexity,
       :resolve, :resolve=, :lazy_resolve, :lazy_resolve=, :lazy_resolve_proc, :resolve_proc,
       :type, :type=, :name=, :property=, :hash_key=,
-      :relay_node_field,
+      :relay_node_field, :relay_nodes_field,
     )
 
     # @return [Boolean] True if this is the Relay find-by-id field
     attr_accessor :relay_node_field
 
+    # @return [Boolean] True if this is the Relay find-by-ids field
+    attr_accessor :relay_nodes_field
+
     # @return [<#call(obj, args, ctx)>] A proc-like object which can be called to return the field's value
     attr_reader :resolve_proc
 

data/lib/graphql/language/lexer.rb

@@ -990,7 +990,7 @@ end
       def self.record_comment(ts, te, meta)
         token = GraphQL::Language::Token.new(
           name: :COMMENT,
-          value: meta[:data][ts...te].pack("c*"),
+          value: meta[:data][ts...te].pack("c*").force_encoding("UTF-8"),
           line: meta[:line],
           col: meta[:col],
           prev_token: meta[:previous_token],
@@ -1004,7 +1004,7 @@ end
       def self.emit(token_name, ts, te, meta)
         meta[:tokens] << token = GraphQL::Language::Token.new(
           name: token_name,
-          value: meta[:data][ts...te].pack("c*"),
+          value: meta[:data][ts...te].pack("c*").force_encoding("UTF-8"),
           line: meta[:line],
           col: meta[:col],
           prev_token: meta[:previous_token],

data/lib/graphql/language/lexer.rl

@@ -145,7 +145,7 @@ module GraphQL
       def self.record_comment(ts, te, meta)
         token = GraphQL::Language::Token.new(
           name: :COMMENT,
-          value: meta[:data][ts...te].pack("c*"),
+          value: meta[:data][ts...te].pack("c*").force_encoding("UTF-8"),
           line: meta[:line],
           col: meta[:col],
           prev_token: meta[:previous_token],
@@ -159,7 +159,7 @@ module GraphQL
       def self.emit(token_name, ts, te, meta)
         meta[:tokens] << token = GraphQL::Language::Token.new(
           name: token_name,
-          value: meta[:data][ts...te].pack("c*"),
+          value: meta[:data][ts...te].pack("c*").force_encoding("UTF-8"),
           line: meta[:line],
           col: meta[:col],
           prev_token: meta[:previous_token],

data/lib/graphql/relay/mutation.rb

@@ -177,23 +177,23 @@ module GraphQL
         def call(obj, args, ctx)
           mutation_result = @resolve.call(obj, args[:input], ctx)
 
-          if mutation_result.is_a?(GraphQL::ExecutionError)
-            ctx.add_error(mutation_result)
-            mutation_result = nil
-          end
-
           if ctx.schema.lazy?(mutation_result)
             @mutation.field.prepare_lazy(mutation_result, args, ctx).then { |inner_obj|
-              build_result(inner_obj, args)
+              build_result(inner_obj, args, ctx)
             }
           else
-            build_result(mutation_result, args)
+            build_result(mutation_result, args, ctx)
           end
         end
 
         private
 
-        def build_result(mutation_result, args)
+        def build_result(mutation_result, args, ctx)
+          if mutation_result.is_a?(GraphQL::ExecutionError)
+            ctx.add_error(mutation_result)
+            mutation_result = nil
+          end
+
           if @wrap_result
             @mutation.result_class.new(client_mutation_id: args[:input][:clientMutationId], result: mutation_result)
           else

data/lib/graphql/relay/node.rb

@@ -17,13 +17,30 @@ module GraphQL
         end
       end
 
+      def self.plural_field
+        GraphQL::Field.define do
+          type(!types[GraphQL::Relay::Node.interface])
+          description("Fetches a list of objects given a list of IDs.")
+          argument(:ids, !types[!types.ID], "IDs of the objects.")
+          resolve(GraphQL::Relay::Node::FindNodes)
+          relay_nodes_field(true)
+        end
+      end
+
       # @return [GraphQL::InterfaceType] The interface which all Relay types must implement
       def self.interface
         @interface ||= GraphQL::InterfaceType.define do
-          name "Node"
-          description "An object with an ID."
-          field :id, !types.ID, "ID of the object."
-          default_relay true
+          name("Node")
+          description("An object with an ID.")
+          field(:id, !types.ID, "ID of the object.")
+          default_relay(true)
+        end
+      end
+
+      # A field resolve for finding objects by IDs
+      module FindNodes
+        def self.call(obj, args, ctx)
+          args[:ids].map { |id| ctx.query.schema.object_from_id(id, ctx) }
         end
       end
 

data/lib/graphql/schema/validation.rb

@@ -132,7 +132,7 @@ module GraphQL
 
         SCHEMA_CAN_RESOLVE_TYPES = ->(schema) {
           if schema.types.values.any? { |type| type.kind.resolves? } && schema.resolve_type_proc.nil?
-            "schema contains Interfaces or Unions, so you must define a `resolve_type (obj, ctx) -> { ... }` function"
+            "schema contains Interfaces or Unions, so you must define a `resolve_type -> (obj, ctx) { ... }` function"
           else
             # :+1:
           end
@@ -141,7 +141,7 @@ module GraphQL
         SCHEMA_CAN_FETCH_IDS = ->(schema) {
           has_node_field = schema.query && schema.query.all_fields.any?(&:relay_node_field)
           if has_node_field && schema.object_from_id_proc.nil?
-            "schema contains `node(id:...)` field, so you must define a `object_from_id (id, ctx) -> { ... }` function"
+            "schema contains `node(id:...)` field, so you must define a `object_from_id -> (id, ctx) { ... }` function"
           else
             # :rocket:
           end
@@ -150,7 +150,7 @@ module GraphQL
         SCHEMA_CAN_GENERATE_IDS = ->(schema) {
           has_id_field = schema.types.values.any? { |t| t.kind.fields? && t.all_fields.any? { |f| f.resolve_proc.is_a?(GraphQL::Relay::GlobalIdResolve) } }
           if has_id_field && schema.id_from_object_proc.nil?
-            "schema contains `global_id_field`, so you must define a `id_from_object (obj, type, ctx) -> { ... }` function"
+            "schema contains `global_id_field`, so you must define a `id_from_object -> (obj, type, ctx) { ... }` function"
           else
             # :ok_hand:
           end

data/lib/graphql/version.rb

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

data/spec/graphql/define/instance_definable_spec.rb

@@ -115,4 +115,22 @@ describe GraphQL::Define::InstanceDefinable do
       assert_equal :green, arugula.metadata[:color]
     end
   end
+
+  describe "typos" do
+    it "provides the right class name, method name and line number" do
+      err = assert_raises(NoMethodError) {
+        beet = Garden::Vegetable.define {
+          name "Beet"
+          nonsense :Blah
+        }
+        beet.name
+      }
+      assert_includes err.message, "Garden::Vegetable"
+      assert_includes err.message, "nonsense"
+      first_backtrace = err.backtrace.first
+      # This is the offset from the assertion to the `nonsense` call,
+      # it might change when this test changes:
+      assert_includes first_backtrace, "#{__LINE__ - 9}"
+    end
+  end
 end

data/spec/graphql/relay/mutation_spec.rb

@@ -190,5 +190,28 @@ describe GraphQL::Relay::Mutation do
 
       assert_equal(expected, result)
     end
+
+    it "supports raising an error in a lazy callback" do
+      result = star_wars_query(query_string, "clientMutationId" => "5678", "shipName" => "Ebon Hawk")
+
+      expected = {
+        "data" => {
+          "introduceShip" => {
+            "clientMutationId" => "5678",
+            "shipEdge" => nil,
+            "faction" => nil,
+          }
+        },
+        "errors" => [
+          {
+            "message" => "💥",
+            "locations" => [ { "line" => 3 , "column" => 7}],
+            "path" => ["introduceShip"]
+          }
+        ]
+      }
+
+      assert_equal(expected, result)
+    end
   end
 end

data/spec/graphql/relay/node_spec.rb

@@ -56,7 +56,6 @@ describe GraphQL::Relay::Node do
       end
     end
 
-
     it 'finds objects by id' do
       id = GraphQL::Schema::UniqueWithinType.encode("Faction", "1")
       result = star_wars_query(%|{
@@ -91,4 +90,58 @@ describe GraphQL::Relay::Node do
       assert_equal(expected, result)
     end
   end
+
+  describe ".plural_identifying_field" do
+    it 'finds objects by ids' do
+      id = GraphQL::Schema::UniqueWithinType.encode("Faction", "1")
+      id2 = GraphQL::Schema::UniqueWithinType.encode("Faction", "2")
+
+      result = star_wars_query(%|{
+        nodes(ids: ["#{id}", "#{id2}"]) {
+          id,
+          ... on Faction {
+            name
+            ships(first: 1) {
+              edges {
+               node {
+                 name
+                 }
+              }
+            }
+          }
+        }
+      }|)
+
+      expected = {
+        "data" => {
+          "nodes" => [{
+            "id"=>"RmFjdGlvbi0x",
+            "name"=>"Alliance to Restore the Republic",
+            "ships"=>{
+              "edges"=>[
+                {"node"=>{
+                    "name" => "X-Wing"
+                  }
+                }
+              ]
+            }
+          }, {
+            "id" => "RmFjdGlvbi0y",
+            "name" => "Galactic Empire",
+            "ships" => {
+              "edges" => [
+                { "node" => { "name" => "TIE Fighter" } }
+              ]
+            }
+          }]
+        }
+      }
+
+      assert_equal(expected, result)
+    end
+
+    it 'is marked as relay_nodes_field' do
+      assert GraphQL::Relay::Node.plural_field.relay_nodes_field
+    end
+  end
 end

data/spec/support/star_wars/schema.rb

@@ -161,7 +161,8 @@ module StarWars
       faction_id = inputs["factionId"]
       if inputs["shipName"] == 'Millennium Falcon'
         GraphQL::ExecutionError.new("Sorry, Millennium Falcon ship is reserved")
-
+      elsif inputs["shipName"] == "Ebon Hawk"
+        LazyWrapper.new { raise GraphQL::ExecutionError.new("💥")}
       else
         ship = DATA.create_ship(inputs["shipName"], faction_id)
         faction = DATA["Faction"][faction_id]
@@ -183,9 +184,16 @@ module StarWars
 
 
   class LazyWrapper
-    attr_reader :value
-    def initialize(value)
-      @value = value
+    def initialize(value = nil, &block)
+      if block_given?
+        @lazy_value = block
+      else
+        @value = value
+      end
+    end
+
+    def value
+      @resolved_value = @value || @lazy_value.call
     end
   end
 
@@ -210,6 +218,7 @@ module StarWars
     end
 
     field :node, GraphQL::Relay::Node.field
+    field :nodes, GraphQL::Relay::Node.plural_field
   end
 
   MutationType = GraphQL::ObjectType.define do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-23 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter