graphql 0.18.3 → 0.18.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e542df508ad2037e784439e944e47df3711dc7b7
-  data.tar.gz: 4623d2ac01705a25245a114aec72a71117172c77
+  metadata.gz: 45a2831bb2cf4c54f83f856f5e614a64b4e2a06e
+  data.tar.gz: ca550cdf4e4e9772f0facd364295754bf2bc1440
 SHA512:
-  metadata.gz: d2b6f96474c81050d2f626e62ab96c784459662f3676c6b4a28ea8d36def062e5de6b1cefa097705f6c93be2b026dfb6cea1184b9e736d9fd0618024442b8d83
-  data.tar.gz: de4ea313f70e012ad7152a71dbfe459d62fa4988b43f6947791d00c1fa45eb377962331e8db7f504a96ca331d27d962933874af4afae405a4794be2c82c2d714
+  metadata.gz: 3b52b0fd7948401ad258096f00611d63d7576d83981bd7efbda85a5d34fb7e3938ec661f357d92ab7d8bcf158a3e56ccc2be60a8402249746a9f14cda3edc601
+  data.tar.gz: 06cab8b10aa6f6d1fd03049e24cdca3f97c014801d16fbc127d6adb6f81b55bad57797c35cfeacf4e0958834cd5e74e9e8925ca304b9e70439028ae31e1f9ba7

data/lib/graphql/invalid_null_error.rb

@@ -5,13 +5,12 @@ module GraphQL
     def initialize(field_name, value)
       @field_name = field_name
       @value = value
+      super("Cannot return null for non-nullable field #{@field_name}")
     end
 
     # @return [Hash] An entry for the response's "errors" key
     def to_h
-      {
-        "message" => "Cannot return null for non-nullable field #{@field_name}"
-      }
+      { "message" => message }
     end
 
     # @return [Boolean] Whether the null in question was caused by another error

data/lib/graphql/query.rb

@@ -63,30 +63,33 @@ module GraphQL
       end
 
       @arguments_cache = Hash.new { |h, k| h[k] = {} }
+      @validation_errors = []
+      @analysis_errors = []
+      @internal_representation = nil
+      @was_validated = false
     end
 
     # Get the result for this query, executing it once
     def result
       @result ||= begin
-        if @validate && (validation_errors.any? || analysis_errors.any?)
-          { "errors" => validation_errors + analysis_errors}
+        if !valid?
+          all_errors = validation_errors + analysis_errors
+          if all_errors.any?
+            { "errors" => all_errors }
+          else
+            nil
+          end
         else
           Executor.new(self).result
         end
       end
-
     end
 
 
     # This is the operation to run for this query.
     # If more than one operation is present, it must be named at runtime.
     # @return [GraphQL::Language::Nodes::OperationDefinition, nil]
-    def selected_operation
-      @selected_operation ||= begin
-        perform_validation
-        @selected_operation
-      end
-    end
+    attr_reader :selected_operation
 
     # Determine the values for variables of this query, using default values
     # if a value isn't provided at runtime.
@@ -101,18 +104,25 @@ module GraphQL
       )
     end
 
+    # @return [Hash<String, nil => GraphQL::InternalRepresentation::Node] Operation name -> Irep node pairs
     def internal_representation
-      @internal_representation ||= begin
-        perform_validation
-        @internal_representation
-      end
+      valid?
+      @internal_representation
     end
 
+    # TODO this should probably contain error instances, not hashes
+    # @return [Array<Hash>] Static validation errors for the query string
     def validation_errors
-      @validation_errors ||= begin
-        perform_validation
-        @validation_errors
-      end
+      valid?
+      @validation_errors
+    end
+
+
+    # TODO this should probably contain error instances, not hashes
+    # @return [Array<Hash>] Errors for this particular query run (eg, exceeds max complexity)
+    def analysis_errors
+      valid?
+      @analysis_errors
     end
 
     # Node-level cache for calculating arguments. Used during execution and query analysis.
@@ -127,24 +137,59 @@ module GraphQL
       end
     end
 
+    # @return [GraphQL::Language::Nodes::Document, nil]
+    def selected_operation
+      @selected_operation ||= find_operation(@operations, @operation_name)
+    end
+
+    def valid?
+      if !@was_validated
+        @was_validated = true
+        @valid = if @validate
+          document_valid? && query_possible? && query_valid?
+        else
+          true
+        end
+      end
+
+      @valid
+    end
+
     private
 
-    def perform_validation
-      @selected_operation = find_operation(@operations, @operation_name)
+    # Assert that the passed-in query string is internally consistent
+    def document_valid?
       validation_result = schema.static_validator.validate(self)
       @validation_errors = validation_result[:errors]
       @internal_representation = validation_result[:irep]
-      if @validation_errors.none?
-        # Accessing variables will raise errors if there are any :S
-        variables
-      end
-      nil
+      @validation_errors.none?
+    end
+
+    # Given that the document is valid, do we have what we need to
+    # execute the document this time?
+    # - Is there an operation to run?
+    # - Are all variables accounted for?
+    def query_possible?
+      !selected_operation.nil? && variables
+      true
     rescue GraphQL::Query::OperationNameMissingError, GraphQL::Query::VariableValidationError => err
-      @validation_errors = [err.to_h]
-      @internal_representation = nil
-      nil
+      @validation_errors << err.to_h
+      false
     end
 
+    # Given that we _could_ execute this query, _should_ we?
+    # - Does it violate any query analyzers?
+    def query_valid?
+      @analysis_errors = begin
+        if @query_analyzers.any?
+          reduce_results = GraphQL::Analysis.analyze_query(self, @query_analyzers)
+          reduce_results.select { |r| r.is_a?(GraphQL::AnalysisError) }.map(&:to_h)
+        else
+          []
+        end
+      end
+      @analysis_errors.none?
+    end
 
     def find_operation(operations, operation_name)
       if operations.length == 1
@@ -157,19 +202,5 @@ module GraphQL
         operations[operation_name]
       end
     end
-
-    def analysis_errors
-      @analysis_errors ||= begin
-        if validation_errors.any?
-          # Can't reduce an invalid query
-          []
-        elsif @query_analyzers.any?
-          reduce_results = GraphQL::Analysis.analyze_query(self, @query_analyzers)
-          reduce_results.select { |r| r.is_a?(GraphQL::AnalysisError) }.map(&:to_h)
-        else
-          []
-        end
-      end
-    end
   end
 end

data/lib/graphql/version.rb

@@ -1,3 +1,3 @@
 module GraphQL
-  VERSION = "0.18.3"
+  VERSION = "0.18.4"
 end

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

@@ -30,4 +30,14 @@ describe GraphQL::StaticValidation::FragmentsAreUsed do
       "path"=>["query getCheese", "... undefinedFields"]
     })
   end
+
+  describe "queries that are comments" do
+    let(:query_string) {%|
+      # I am a comment.
+    |}
+    let(:result) { DummySchema.execute(query_string) }
+    it "handles them gracefully" do
+      assert_equal({}, result)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql
 version: !ruby/object:Gem::Version
-  version: 0.18.3
+  version: 0.18.4
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2016-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter