graphql 1.5.4 → 1.5.5

data/spec/graphql/schema/loader_spec.rb

@@ -104,6 +104,7 @@ describe GraphQL::Schema::Loader do
         argument :varied, variant_input_type, default_value: { id: "123", int: 234, float: 2.3, enum: :foo, sub: [{ string: "str" }] }
         argument :variedWithNull, variant_input_type_with_nulls, default_value: { id: nil, int: nil, float: nil, enum: nil, sub: nil, bigint: nil, bool: nil }
         argument :enum, choice_type, default_value: :foo
+        argument :array, types[!types.String], default_value: ["foo", "bar"]
       end
 
       field :content do
@@ -223,10 +224,13 @@ describe GraphQL::Schema::Loader do
     it "sets correct default values for complex field arguments" do
       type = loaded_schema.types['Query']
       field = type.fields['post']
-      arg = field.arguments['varied']
 
-      assert_equal arg.default_value, { 'id' => "123", 'int' => 234, 'float' => 2.3, 'enum' => "FOO", 'sub' => [{ 'string' => "str" }] }
-      assert !arg.default_value.key?('bool'), 'Omits default value for unspecified arguments'
+      varied = field.arguments['varied']
+      assert_equal varied.default_value, { 'id' => "123", 'int' => 234, 'float' => 2.3, 'enum' => "FOO", 'sub' => [{ 'string' => "str" }] }
+      assert !varied.default_value.key?('bool'), 'Omits default value for unspecified arguments'
+
+      array = field.arguments['array']
+      assert_equal array.default_value, ["foo", "bar"]
     end
 
     it "does not set default value when there are none on input fields" do

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

@@ -82,7 +82,6 @@ describe GraphQL::StaticValidation::ArgumentLiteralsAreCompatible do
     end
   end
 
-
   describe "null value" do
     describe "nullable arg" do
       let(:schema) {

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

@@ -156,7 +156,7 @@ describe GraphQL::StaticValidation::FieldsWillMerge do
     |}
 
     it "fails rule" do
-      assert_equal [%q(Field 'doesKnowCommand' has an argument conflict: {"dogCommand":"SIT"} or {"dogCommand":"$dogCommand"}?)], error_messages
+      assert_equal [%q(Field 'doesKnowCommand' has an argument conflict: {dogCommand:"SIT"} or {dogCommand:"$dogCommand"}?)], error_messages
     end
   end
 
@@ -171,7 +171,7 @@ describe GraphQL::StaticValidation::FieldsWillMerge do
     |}
 
     it "fails rule" do
-      assert_equal [%q(Field 'doesKnowCommand' has an argument conflict: {"dogCommand":"$varOne"} or {"dogCommand":"$varTwo"}?)], error_messages
+      assert_equal [%q(Field 'doesKnowCommand' has an argument conflict: {dogCommand:"$varOne"} or {dogCommand:"$varTwo"}?)], error_messages
     end
   end
 
@@ -246,7 +246,7 @@ describe GraphQL::StaticValidation::FieldsWillMerge do
     |}
 
     it "fails rule" do
-      assert_equal [%q(Field 'doesKnowCommand' has an argument conflict: {} or {"dogCommand":"HEEL"}?)], error_messages
+      assert_equal [%q(Field 'doesKnowCommand' has an argument conflict: {} or {dogCommand:"HEEL"}?)], error_messages
     end
   end
 
@@ -261,7 +261,7 @@ describe GraphQL::StaticValidation::FieldsWillMerge do
     |}
 
     it "fails rule" do
-      assert_equal [%q(Field 'doesKnowCommand' has an argument conflict: {"dogCommand":"SIT"} or {}?)], error_messages
+      assert_equal [%q(Field 'doesKnowCommand' has an argument conflict: {dogCommand:"SIT"} or {}?)], error_messages
     end
   end
 
@@ -276,7 +276,7 @@ describe GraphQL::StaticValidation::FieldsWillMerge do
     |}
 
     it "fails rule" do
-      assert_equal [%q(Field 'doesKnowCommand' has an argument conflict: {"dogCommand":"SIT"} or {"dogCommand":"HEEL"}?)], error_messages
+      assert_equal [%q(Field 'doesKnowCommand' has an argument conflict: {dogCommand:"SIT"} or {dogCommand:"HEEL"}?)], error_messages
     end
   end
 
@@ -291,7 +291,7 @@ describe GraphQL::StaticValidation::FieldsWillMerge do
     |}
 
     it "fails rule" do
-      assert_equal [%q(Field 'image' has an argument conflict: {"maxWidth":"10"} or {"maxWidth":"20"}?)], error_messages
+      assert_equal [%q(Field 'image' has an argument conflict: {maxWidth:"10"} or {maxWidth:"20"}?)], error_messages
     end
   end
 

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+require "spec_helper"
+
+describe GraphQL::StaticValidation::NoDefinitionsArePresent do
+  include StaticValidationHelpers
+  describe "when schema definitions are present in the query" do
+    let(:query_string) {
+      <<-GRAPHQL
+      {
+        cheese(id: 1) { flavor }
+      }
+
+      type Thing {
+        stuff: Int
+      }
+
+      scalar Date
+      GRAPHQL
+    }
+
+    it "adds an error" do
+      assert_equal 1, errors.length
+      err = errors[0]
+      assert_equal "Query cannot contain schema definitions", err["message"]
+      assert_equal [{"line"=>5, "column"=>7}, {"line"=>9, "column"=>7}], err["locations"]
+    end
+  end
+end

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

@@ -63,4 +63,21 @@ describe GraphQL::StaticValidation::VariableUsagesAreAllowed do
     ]
     assert_equal(expected, errors)
   end
+
+  describe "input objects that are out of place" do
+    let(:query_string) { <<-GRAPHQL
+      query getCheese($id: ID!) {
+        cheese(id: {blah: $id} ) {
+          __typename @nonsense(id: {blah: $id})
+          nonsense(id: {blah: {blah: $id}})
+        }
+      }
+    GRAPHQL
+    }
+
+    it "adds an error" do
+      assert_equal 3, errors.length
+      assert_equal "Argument 'id' on Field 'cheese' has an invalid value. Expected type 'Int!'.", errors[0]["message"]
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -3,7 +3,8 @@ require "codeclimate-test-reporter"
 CodeClimate::TestReporter.start
 require "rails/all"
 require "rails/generators"
-require "sqlite3"
+require "jdbc/sqlite3" if RUBY_ENGINE == 'jruby'
+require "sqlite3" if RUBY_ENGINE == 'ruby'
 require "sequel"
 require "graphql"
 require "benchmark"

data/spec/support/dummy/schema.rb

@@ -168,6 +168,15 @@ module Dummy
     end
   end
 
+  ResourceOrderType = GraphQL::InputObjectType.define {
+    name "ResourceOrderType"
+    description "Properties used to determine ordering"
+
+    argument :direction, !types.String do
+      description "ASC or DESC"
+    end
+  }
+
   DairyProductInputType = GraphQL::InputObjectType.define {
     name "DairyProductInput"
     description "Properties for finding a dairy product"
@@ -188,6 +197,8 @@ module Dummy
 
     # ensure default can be false
     input_field :organic, types.Boolean, default_value: false
+
+    input_field :order_by, -> { ResourceOrderType }, default_value: { direction: 'ASC' }
   }
 
   DeepNonNullType = GraphQL::ObjectType.define do

data/spec/support/star_wars/data.rb

@@ -1,5 +1,11 @@
 # frozen_string_literal: true
 require 'ostruct'
+
+# platform helper
+def jruby?
+  RUBY_ENGINE == 'jruby'
+end
+
 module StarWars
   names = [
     'X-Wing',
@@ -15,7 +21,11 @@ module StarWars
   # ActiveRecord::Base.logger = Logger.new(STDOUT)
   `rm -f ./_test_.db`
   # Set up "Bases" in ActiveRecord
-  ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: "./_test_.db")
+  if jruby?
+    ActiveRecord::Base.establish_connection(adapter: "jdbcsqlite3", database: "./_test_.db")
+  else
+    ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: "./_test_.db")
+  end
 
   ActiveRecord::Schema.define do
     self.verbose = false
@@ -37,7 +47,11 @@ module StarWars
   Base.create!(name: "Headquarters", planet: "Coruscant", faction_id: 2)
 
   # Also, set up Bases with Sequel
-  DB = Sequel.sqlite("./_test_.db")
+  DB = if jruby?
+    Sequel.connect('jdbc:sqlite:./_test_.db')
+  else
+    Sequel.sqlite("./_test_.db")
+  end
   class SequelBase < Sequel::Model(:bases)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-22 00:00:00.000000000 Z
+date: 2017-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -220,20 +234,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.45'
-- !ruby/object:Gem::Dependency
-  name: ruby-prof
-  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: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -262,20 +262,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  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: github-pages
   requirement: !ruby/object:Gem::Requirement
@@ -489,6 +475,7 @@ files:
 - lib/graphql/static_validation/rules/fragments_are_on_composite_types.rb
 - lib/graphql/static_validation/rules/fragments_are_used.rb
 - lib/graphql/static_validation/rules/mutation_root_exists.rb
+- lib/graphql/static_validation/rules/no_definitions_are_present.rb
 - lib/graphql/static_validation/rules/operation_names_are_valid.rb
 - lib/graphql/static_validation/rules/required_arguments_are_present.rb
 - lib/graphql/static_validation/rules/subscription_root_exists.rb
@@ -533,6 +520,7 @@ files:
 - spec/graphql/directive_spec.rb
 - spec/graphql/enum_type_spec.rb
 - spec/graphql/execution/execute_spec.rb
+- spec/graphql/execution/lazy/lazy_method_map_spec.rb
 - spec/graphql/execution/lazy_spec.rb
 - spec/graphql/execution/typecast_spec.rb
 - spec/graphql/execution_error_spec.rb
@@ -604,6 +592,7 @@ files:
 - spec/graphql/static_validation/rules/fragments_are_on_composite_types_spec.rb
 - spec/graphql/static_validation/rules/fragments_are_used_spec.rb
 - spec/graphql/static_validation/rules/mutation_root_exists_spec.rb
+- spec/graphql/static_validation/rules/no_definitions_are_present_spec.rb
 - spec/graphql/static_validation/rules/operation_names_are_valid_spec.rb
 - spec/graphql/static_validation/rules/required_arguments_are_present_spec.rb
 - spec/graphql/static_validation/rules/subscription_root_exists_spec.rb
@@ -676,6 +665,7 @@ test_files:
 - spec/graphql/directive_spec.rb
 - spec/graphql/enum_type_spec.rb
 - spec/graphql/execution/execute_spec.rb
+- spec/graphql/execution/lazy/lazy_method_map_spec.rb
 - spec/graphql/execution/lazy_spec.rb
 - spec/graphql/execution/typecast_spec.rb
 - spec/graphql/execution_error_spec.rb
@@ -747,6 +737,7 @@ test_files:
 - spec/graphql/static_validation/rules/fragments_are_on_composite_types_spec.rb
 - spec/graphql/static_validation/rules/fragments_are_used_spec.rb
 - spec/graphql/static_validation/rules/mutation_root_exists_spec.rb
+- spec/graphql/static_validation/rules/no_definitions_are_present_spec.rb
 - spec/graphql/static_validation/rules/operation_names_are_valid_spec.rb
 - spec/graphql/static_validation/rules/required_arguments_are_present_spec.rb
 - spec/graphql/static_validation/rules/subscription_root_exists_spec.rb