graphql 0.19.3 → 0.19.4

data/spec/graphql/schema_spec.rb

@@ -92,7 +92,7 @@ describe GraphQL::Schema do
         assert_raises(NotImplementedError) {
           GraphQL::Schema.define do
             query(query_type)
-            resolve_type -> (obj, ctx) { :whatever }
+            resolve_type ->(obj, ctx) { :whatever }
           end
         }
       end
@@ -118,7 +118,7 @@ describe GraphQL::Schema do
         assert_raises(NotImplementedError) {
           GraphQL::Schema.define do
             query(query_type)
-            resolve_type -> (obj, ctx) { :whatever }
+            resolve_type ->(obj, ctx) { :whatever }
           end
         }
       end

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

@@ -47,4 +47,17 @@ describe GraphQL::StaticValidation::FragmentsAreFinite do
     ]
     assert_equal(expected, errors)
   end
+
+  describe "undefined spreads inside fragments" do
+    let(:query_string) {%|
+      {
+        cheese(id: 1) { ... frag1 }
+      }
+      fragment frag1 on Cheese { id, ...frag2 }
+    |}
+
+    it "doesn't blow up" do
+      assert_equal("Fragment frag2 was used, but not defined", errors.first["message"])
+    end
+  end
 end

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

@@ -4,7 +4,7 @@ describe GraphQL::StaticValidation::FragmentsAreUsed do
   include StaticValidationHelpers
   let(:query_string) {"
     query getCheese {
-      name,
+      name
       ...cheeseFields
       ...undefinedFields
     }

data/spec/graphql/static_validation/type_stack_spec.rb

@@ -7,7 +7,7 @@ class TypeCheckValidator
 
   def validate(context)
     self.class.checks.clear
-    context.visitor[GraphQL::Language::Nodes::Field] << -> (node, parent) {
+    context.visitor[GraphQL::Language::Nodes::Field] << ->(node, parent) {
       self.class.checks << context.object_types.map(&:name)
     }
   end

data/spec/support/dairy_app.rb

@@ -58,7 +58,7 @@ CheeseType = GraphQL::ObjectType.define do
     # metadata test
     joins [:cheeses, :milks]
     argument :source, !types[!DairyAnimalEnum], default_value: [1]
-    resolve -> (t, a, c) {
+    resolve ->(t, a, c) {
       # get the strings out:
       sources = a["source"]
       if sources.include?("YAK")
@@ -71,12 +71,12 @@ CheeseType = GraphQL::ObjectType.define do
 
   field :nullableCheese, CheeseType, "Cheeses like this one" do
     argument :source, types[!DairyAnimalEnum]
-    resolve -> (t, a, c) { raise("NotImplemented") }
+    resolve ->(t, a, c) { raise("NotImplemented") }
   end
 
   field :deeplyNullableCheese, CheeseType, "Cheeses like this one" do
     argument :source, types[types[DairyAnimalEnum]]
-    resolve -> (t, a, c) { raise("NotImplemented") }
+    resolve ->(t, a, c) { raise("NotImplemented") }
   end
 
   # Keywords can be used for definition methods
@@ -96,17 +96,17 @@ MilkType = GraphQL::ObjectType.define do
   field :origin, !types.String, "Place the milk comes from"
   field :flavors, types[types.String], "Chocolate, Strawberry, etc" do
     argument :limit, types.Int
-    resolve -> (milk, args, ctx) {
+    resolve ->(milk, args, ctx) {
       args[:limit] ? milk.flavors.first(args[:limit]) : milk.flavors
     }
   end
   field :executionError do
     type GraphQL::STRING_TYPE
-    resolve -> (t, a, c) { raise(GraphQL::ExecutionError, "There was an execution error") }
+    resolve ->(t, a, c) { raise(GraphQL::ExecutionError, "There was an execution error") }
   end
 
   field :allDairy, -> { types[DairyProductUnion] } do
-    resolve -> (obj, args, ctx) { CHEESES.values + MILKS.values }
+    resolve ->(obj, args, ctx) { CHEESES.values + MILKS.values }
   end
 end
 
@@ -153,12 +153,12 @@ CowType = GraphQL::ObjectType.define do
 
   field :cantBeNullButIs do
     type !GraphQL::STRING_TYPE
-    resolve -> (t, a, c) { nil }
+    resolve ->(t, a, c) { nil }
   end
 
   field :cantBeNullButRaisesExecutionError do
     type !GraphQL::STRING_TYPE
-    resolve -> (t, a, c) { raise GraphQL::ExecutionError, "BOOM" }
+    resolve ->(t, a, c) { raise GraphQL::ExecutionError, "BOOM" }
   end
 end
 
@@ -188,11 +188,11 @@ DeepNonNullType = GraphQL::ObjectType.define do
   name "DeepNonNull"
   field :nonNullInt, !types.Int do
     argument :returning, types.Int
-    resolve -> (obj, args, ctx) { args[:returning] }
+    resolve ->(obj, args, ctx) { args[:returning] }
   end
 
   field :deepNonNull, DeepNonNullType.to_non_null_type do
-    resolve -> (obj, args, ctx) { :deepNonNull }
+    resolve ->(obj, args, ctx) { :deepNonNull }
   end
 end
 
@@ -205,7 +205,7 @@ class FetchField
       description(desc)
       argument :id, id_type
 
-      resolve -> (t, a, c) {
+      resolve ->(t, a, c) {
         id_string = a["id"].to_s # Cheese has Int type, Milk has ID type :(
         id, item = data.find { |id, item| id.to_s == id_string }
         item
@@ -222,7 +222,7 @@ class SingletonField
       type(return_type)
       description(desc)
 
-      resolve -> (t, a, c) {data}
+      resolve ->(t, a, c) {data}
     end
   end
 end
@@ -231,7 +231,7 @@ SourceFieldDefn = Proc.new {
   type GraphQL::ListType.new(of_type: CheeseType)
   description "Cheese from source"
   argument :source, DairyAnimalEnum, default_value: 1
-  resolve -> (target, arguments, context) {
+  resolve ->(target, arguments, context) {
     CHEESES.values.select{ |c| c.source == arguments["source"] }
   }
 }
@@ -240,7 +240,7 @@ FavoriteFieldDefn = GraphQL::Field.define do
   name "favoriteEdible"
   description "My favorite food"
   type EdibleInterface
-  resolve -> (t, a, c) { MILKS[1] }
+  resolve ->(t, a, c) { MILKS[1] }
 end
 
 DairyAppQueryType = GraphQL::ObjectType.define do
@@ -260,7 +260,7 @@ DairyAppQueryType = GraphQL::ObjectType.define do
     type !DairyProductUnion
     # This is a list just for testing 😬
     argument :product, types[DairyProductInputType], default_value: [{"source" => "SHEEP"}]
-    resolve -> (t, args, c) {
+    resolve ->(t, args, c) {
       source = args["product"][0][:source] # String or Sym is ok
       products = CHEESES.values + MILKS.values
       if !source.nil?
@@ -272,7 +272,7 @@ DairyAppQueryType = GraphQL::ObjectType.define do
 
   field :allDairy, types[DairyProductUnion] do
     argument :executionErrorAtIndex, types.Int
-    resolve -> (obj, args, ctx) {
+    resolve ->(obj, args, ctx) {
       result = CHEESES.values + MILKS.values
       result[args[:executionErrorAtIndex]] = GraphQL::ExecutionError.new("missing dairy") if args[:executionErrorAtIndex]
       result
@@ -280,27 +280,27 @@ DairyAppQueryType = GraphQL::ObjectType.define do
   end
 
   field :allEdible, types[EdibleInterface] do
-    resolve -> (obj, args, ctx) { CHEESES.values + MILKS.values }
+    resolve ->(obj, args, ctx) { CHEESES.values + MILKS.values }
   end
 
   field :error do
     description "Raise an error"
     type GraphQL::STRING_TYPE
-    resolve -> (t, a, c) { raise("This error was raised on purpose") }
+    resolve ->(t, a, c) { raise("This error was raised on purpose") }
   end
 
   field :executionError do
     type GraphQL::STRING_TYPE
-    resolve -> (t, a, c) { raise(GraphQL::ExecutionError, "There was an execution error") }
+    resolve ->(t, a, c) { raise(GraphQL::ExecutionError, "There was an execution error") }
   end
 
   # To test possibly-null fields
   field :maybeNull, MaybeNullType do
-    resolve -> (t, a, c) { OpenStruct.new(cheese: nil) }
+    resolve ->(t, a, c) { OpenStruct.new(cheese: nil) }
   end
 
   field :deepNonNull, !DeepNonNullType do
-    resolve -> (o, a, c) { :deepNonNull }
+    resolve ->(o, a, c) { :deepNonNull }
   end
 end
 
@@ -317,7 +317,7 @@ DairyAppMutationType = GraphQL::ObjectType.define do
   field :pushValue, !types[!types.Int] do
     description("Push a value onto a global array :D")
     argument :value, !types.Int
-    resolve -> (o, args, ctx) {
+    resolve ->(o, args, ctx) {
       GLOBAL_VALUES << args[:value]
       GLOBAL_VALUES
     }
@@ -326,7 +326,7 @@ DairyAppMutationType = GraphQL::ObjectType.define do
   field :replaceValues, !types[!types.Int] do
     description("Replace the global array with new values")
     argument :input, !ReplaceValuesInputType
-    resolve -> (o, args, ctx) {
+    resolve ->(o, args, ctx) {
       GLOBAL_VALUES.clear
       GLOBAL_VALUES.push(*args[:input][:values])
       GLOBAL_VALUES
@@ -337,7 +337,7 @@ end
 SubscriptionType = GraphQL::ObjectType.define do
   name "Subscription"
   field :test, types.String do
-    resolve -> (o, a, c) { "Test" }
+    resolve ->(o, a, c) { "Test" }
   end
 end
 
@@ -350,7 +350,7 @@ DummySchema = GraphQL::Schema.define do
 
   rescue_from(NoSuchDairyError) { |err| err.message  }
 
-  resolve_type -> (obj, ctx) {
+  resolve_type ->(obj, ctx) {
     DummySchema.types[obj.class.name]
   }
 end

data/spec/support/dairy_data.rb

@@ -1,3 +1,5 @@
+require 'ostruct'
+
 Cheese = Struct.new(:id, :flavor, :origin, :fat_content, :source)
 CHEESES = {
   1 => Cheese.new(1, "Brie", "France", 0.19, 1),

data/spec/support/star_wars_data.rb

@@ -1,3 +1,4 @@
+require 'ostruct'
 
 names = [
   'X-Wing',
@@ -73,6 +74,6 @@ def STAR_WARS_DATA.create_ship(name, faction_id)
   new_id = (self["Ship"].keys.map(&:to_i).max + 1).to_s
   new_ship = OpenStruct.new(id: new_id, name: name)
   self["Ship"][new_id] = new_ship
-  self["Faction"][faction_id]["ships"] << new_id
+  self["Faction"][faction_id].ships << new_id
   new_ship
 end

data/spec/support/star_wars_schema.rb

@@ -21,7 +21,7 @@ BaseConnectionWithTotalCountType = BaseType.define_connection do
   name "BasesConnectionWithTotalCount"
   field :totalCount do
     type types.Int
-    resolve -> (obj, args, ctx) { obj.nodes.count }
+    resolve ->(obj, args, ctx) { obj.nodes.count }
   end
 end
 
@@ -40,7 +40,7 @@ CustomBaseEdgeType = BaseType.define_edge do
   field :upcasedName, types.String, property: :upcased_name
   field :upcasedParentName, types.String, property: :upcased_parent_name
   field :edgeClassName, types.String do
-    resolve -> (obj, args, ctx) { obj.class.name }
+    resolve ->(obj, args, ctx) { obj.class.name }
   end
 end
 
@@ -49,10 +49,10 @@ CustomEdgeBaseConnectionType = BaseType.define_connection(edge_class: CustomBase
 
   field :totalCountTimes100 do
     type types.Int
-    resolve -> (obj, args, ctx) { obj.nodes.count * 100 }
+    resolve ->(obj, args, ctx) { obj.nodes.count * 100 }
   end
 
-  field :fieldName, types.String, resolve: -> (obj, args, ctx) { obj.field.name }
+  field :fieldName, types.String, resolve: ->(obj, args, ctx) { obj.field.name }
 end
 
 Faction = GraphQL::ObjectType.define do
@@ -62,7 +62,7 @@ Faction = GraphQL::ObjectType.define do
   field :id, !types.ID, resolve: GraphQL::Relay::GlobalIdResolve.new(type: Faction)
   field :name, types.String
   connection :ships, Ship.connection_type do
-    resolve -> (obj, args, ctx) {
+    resolve ->(obj, args, ctx) {
       all_ships = obj.ships.map {|ship_id| STAR_WARS_DATA["Ship"][ship_id] }
       if args[:nameIncludes]
         all_ships = all_ships.select { |ship| ship.name.include?(args[:nameIncludes])}
@@ -73,7 +73,7 @@ Faction = GraphQL::ObjectType.define do
     argument :nameIncludes, types.String
   end
   connection :shipsWithMaxPageSize, Ship.connection_type, max_page_size: 2 do
-    resolve -> (obj, args, ctx) {
+    resolve ->(obj, args, ctx) {
       all_ships = obj.ships.map {|ship_id| STAR_WARS_DATA["Ship"][ship_id] }
       if args[:nameIncludes]
         all_ships = all_ships.select { |ship| ship.name.include?(args[:nameIncludes])}
@@ -87,7 +87,7 @@ Faction = GraphQL::ObjectType.define do
   connection :bases, BaseConnectionWithTotalCountType do
     # Resolve field should return an Array, the Connection
     # will do the rest!
-    resolve -> (obj, args, ctx) {
+    resolve ->(obj, args, ctx) {
       all_bases = Base.where(id: obj.bases)
       if args[:nameIncludes]
         all_bases = all_bases.where("name LIKE ?", "%#{args[:nameIncludes]}%")
@@ -100,7 +100,7 @@ Faction = GraphQL::ObjectType.define do
   connection :basesClone, BaseType.connection_type
   connection :basesByName, BaseType.connection_type, property: :bases do
     argument :order, types.String, default_value: "name"
-    resolve -> (obj, args, ctx) {
+    resolve ->(obj, args, ctx) {
       if args[:order].present?
         obj.bases.order(args[:order])
       else
@@ -110,16 +110,16 @@ Faction = GraphQL::ObjectType.define do
   end
 
   connection :basesWithMaxLimitRelation, BaseType.connection_type, max_page_size: 2 do
-    resolve -> (object, args, context) { Base.all }
+    resolve ->(object, args, context) { Base.all }
   end
 
   connection :basesWithMaxLimitArray, BaseType.connection_type, max_page_size: 2 do
-    resolve -> (object, args, context) { Base.all.to_a }
+    resolve ->(object, args, context) { Base.all.to_a }
   end
 
   connection :basesAsSequelDataset, BaseConnectionWithTotalCountType do
     argument :nameIncludes, types.String
-    resolve -> (obj, args, ctx) {
+    resolve ->(obj, args, ctx) {
       all_bases = SequelBase.where(faction_id: obj.id)
       if args[:nameIncludes]
         all_bases = all_bases.where("name LIKE ?", "%#{args[:nameIncludes]}%")
@@ -155,7 +155,7 @@ IntroduceShipMutation = GraphQL::Relay::Mutation.define do
   return_field :faction, Faction
 
   # Here's the mutation operation:
-  resolve -> (root_obj, inputs, ctx) {
+  resolve ->(root_obj, inputs, ctx) {
     faction_id = inputs["factionId"]
     ship = STAR_WARS_DATA.create_ship(inputs["shipName"], faction_id)
     faction = STAR_WARS_DATA["Faction"][faction_id]
@@ -169,15 +169,15 @@ end
 QueryType = GraphQL::ObjectType.define do
   name "Query"
   field :rebels, Faction do
-    resolve -> (obj, args, ctx) { STAR_WARS_DATA["Faction"]["1"]}
+    resolve ->(obj, args, ctx) { STAR_WARS_DATA["Faction"]["1"]}
   end
 
   field :empire, Faction do
-    resolve -> (obj, args, ctx) { STAR_WARS_DATA["Faction"]["2"]}
+    resolve ->(obj, args, ctx) { STAR_WARS_DATA["Faction"]["2"]}
   end
 
   field :largestBase, BaseType do
-    resolve -> (obj, args, ctx) { Base.find(3) }
+    resolve ->(obj, args, ctx) { Base.find(3) }
   end
 
   field :node, GraphQL::Relay::Node.field
@@ -193,7 +193,7 @@ StarWarsSchema = GraphQL::Schema.define do
   query(QueryType)
   mutation(MutationType)
 
-  resolve_type -> (object, ctx) {
+  resolve_type ->(object, ctx) {
     if object == :test_error
       :not_a_type
     elsif object.is_a?(Base)
@@ -207,12 +207,12 @@ StarWarsSchema = GraphQL::Schema.define do
     end
   }
 
-  object_from_id -> (node_id, ctx) do
+  object_from_id ->(node_id, ctx) do
     type_name, id = GraphQL::Schema::UniqueWithinType.decode(node_id)
     STAR_WARS_DATA[type_name][id]
   end
 
-  id_from_object -> (object, type, ctx) do
+  id_from_object ->(object, type, ctx) do
     GraphQL::Schema::UniqueWithinType.encode(type.name, object.id)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 0.19.3
+  version: 0.19.4
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-13 00:00:00.000000000 Z
+date: 2016-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
@@ -192,6 +192,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '11.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.44'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.44'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -349,6 +363,7 @@ files:
 - lib/graphql/introspection/typename_field.rb
 - lib/graphql/invalid_null_error.rb
 - lib/graphql/language.rb
+- lib/graphql/language/comments.rb
 - lib/graphql/language/definition_slice.rb
 - lib/graphql/language/generation.rb
 - lib/graphql/language/lexer.rb
@@ -467,6 +482,7 @@ files:
 - spec/graphql/language/definition_slice_spec.rb
 - spec/graphql/language/equality_spec.rb
 - spec/graphql/language/generation_spec.rb
+- spec/graphql/language/lexer_spec.rb
 - spec/graphql/language/nodes_spec.rb
 - spec/graphql/language/parser_spec.rb
 - spec/graphql/language/visitor_spec.rb
@@ -584,6 +600,7 @@ test_files:
 - spec/graphql/language/definition_slice_spec.rb
 - spec/graphql/language/equality_spec.rb
 - spec/graphql/language/generation_spec.rb
+- spec/graphql/language/lexer_spec.rb
 - spec/graphql/language/nodes_spec.rb
 - spec/graphql/language/parser_spec.rb
 - spec/graphql/language/visitor_spec.rb