graphql-client 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92517699fcc7f893fbcb3509710c652ce988c348
-  data.tar.gz: f8c7a89ad56791a82bd2190045ecb73e7c13cda0
+  metadata.gz: 261b7d370edcba549d839ac1faa87f1e33ba4966
+  data.tar.gz: 4c64adc1352929f43f3d2f44f6a698d61c9a0e0b
 SHA512:
-  metadata.gz: 66d40ba79f8cd348f11c2f20c2d4318bfbf84f8132cb61af589f67e7d19ab3192e9db162053b2afdd34a6b013aabeb5ed5a264e5d55eda2b1518a60588e39995
-  data.tar.gz: 3d7dea0a68e49397b5fa3eb8f77108e25d572231ed93cc2ae27d9b498945bcbe83c3e0418d8e697e101bce0532f92db9cae4304f21566c366e15e5cfcc114abc
+  metadata.gz: 6b3c3460544febc35e64b5c4f1da101d8651cee640bdc8ff3a224f4ff6d9edebae2c306d00ad5841990fbed84d92a9a50282aabcf1fce7a532490bc7e9d55e23
+  data.tar.gz: 2a7df513bf269e8cde27157ff3c0a917dd665c73efce31230750d9ef897e36681ada81b7a0d55b1fb47b80e57a4e1e2898b3ed085be89cbc14013ba5d15840e4

data/lib/graphql/client.rb

@@ -1,3 +1,4 @@
+require "active_support/core_ext/hash/keys"
 require "active_support/inflector"
 require "active_support/notifications"
 require "graphql"
@@ -193,8 +194,13 @@ module GraphQL
 
         errors = validator.validate(query)
         errors.fetch(:errors).each do |error|
-          validation_line = error["locations"][0]["line"]
-          error = ValidationError.new(error["message"])
+          if error.respond_to?(:message)
+            validation_line = error.line
+            error = ValidationError.new(error.message)
+          else # TODO: Remove when only supporting graphql-ruby 1.x
+            validation_line = error["locations"][0]["line"]
+            error = ValidationError.new(error["message"])
+          end
           error.set_backtrace(["#{filename}:#{lineno + validation_line}"] + caller) if filename && lineno
           raise error
         end
@@ -245,6 +251,8 @@ module GraphQL
         raise TypeError, "expected definition to be a #{OperationDefinition.name} but was #{document.class.name}"
       end
 
+      variables = variables.deep_stringify_keys
+
       document = definition.document
       operation = definition.definition_node
 

data/lib/graphql/client/erubis.rb

@@ -25,9 +25,8 @@ module GraphQL
       # defined.
       def self.extract_graphql_section(src)
         query_string = src.scan(/<%graphql([^%]+)%>/).flatten.first
-        if query_string
-          return query_string, Regexp.last_match.pre_match.count("\n") + 1
-        end
+        return nil unless query_string
+        [query_string, Regexp.last_match.pre_match.count("\n") + 1]
       end
 
       # Internal: Extend Rails' Erubis handler to simply ignore <%graphql

data/lib/graphql/client/query_result.rb

@@ -22,6 +22,7 @@ module GraphQL
         node.selections.each do |selection|
           case selection
           when Language::Nodes::FragmentSpread
+            nil
           when Language::Nodes::Field
             field_name = selection.alias || selection.name
             field_klass = selection.selections.any? ? wrap(selection, name: "#{name}[:#{field_name}]") : nil
@@ -115,15 +116,12 @@ module GraphQL
         when Hash
           new(obj, errors)
         when self
-          return obj
+          obj
         when QueryResult
           spreads = Set.new(self.spreads(obj.class.source_node).map(&:name))
 
           unless spreads.include?(source_node.name)
-            message = "couldn't cast #{obj.inspect} to #{inspect}\n\n"
-            suggestion = "\n  ...#{name || 'YourFragment'} # SUGGESTION"
-            message << GraphQL::Language::Generation.generate(obj.class.source_node).sub(/\n}$/, "#{suggestion}\n}")
-            raise TypeError, message
+            raise TypeError, "couldn't cast #{obj.inspect} to #{inspect}"
           end
           cast(obj.to_h, obj.errors)
         when Array

data/lib/rubocop/cop/graphql/heredoc.rb

@@ -0,0 +1,17 @@
+require "rubocop"
+
+module RuboCop
+  module Cop
+    module GraphQL
+      # Public: Cop for enforcing non-interpolated GRAPHQL heredocs.
+      class Heredoc < Cop
+        def on_str(node)
+          return unless node.location.is_a?(Parser::Source::Map::Heredoc)
+          return unless node.location.expression.source == "<<-GRAPHQL"
+
+          add_offense(node, :expression, "GraphQL heredocs should be quoted. <<-'GRAPHQL'")
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/graphql/overfetch.rb

@@ -0,0 +1,63 @@
+require "active_support/inflector"
+require "graphql"
+require "graphql/client/erubis"
+require "rubocop"
+
+module RuboCop
+  module Cop
+    module GraphQL
+      # Public: Rubocop for catching overfetched fields in ERB templates.
+      class Overfetch < Cop
+        def_node_search :send_methods, "(send ...)"
+
+        def investigate(processed_source)
+          erb = File.read(processed_source.buffer.name)
+          query, = ::GraphQL::Client::Erubis.extract_graphql_section(erb)
+          return unless query
+
+          aliases = {}
+          fields = {}
+          ranges = {}
+
+          # TODO: Use GraphQL client parser
+          document = ::GraphQL.parse(query.gsub(/::/, "__"))
+
+          visitor = ::GraphQL::Language::Visitor.new(document)
+          visitor[::GraphQL::Language::Nodes::Field] << ->(node, _parent) do
+            name = node.alias || node.name
+            fields[name] ||= 0
+            field_aliases(name).each { |n| (aliases[n] ||= []) << name }
+            ranges[name] ||= source_range(processed_source.buffer, node.line, 0)
+          end
+          visitor.visit
+
+          send_methods(processed_source.ast).each do |node|
+            _receiver, method_name, *_args = *node
+            aliases.fetch(method_name.to_s, []).each do |field_name|
+              fields[field_name] += 1
+            end
+          end
+
+          fields.each do |field, count|
+            next if count > 0
+            add_offense(nil, ranges[field], "GraphQL field '#{field}' query but was not used in template.")
+          end
+        end
+
+        def field_aliases(name)
+          names = Set.new
+
+          names << name
+          names << "#{name}?"
+
+          names << underscore_name = ActiveSupport::Inflector.underscore(name)
+          names << "#{underscore_name}?"
+
+          names << "each_node" if name == "edges" || name == "node"
+
+          names
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-client
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - GitHub
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2016-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -34,9 +34,6 @@ dependencies:
   name: graphql
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.19'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.2
@@ -44,9 +41,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.19'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.2
@@ -133,6 +127,8 @@ files:
 - lib/graphql/client/response.rb
 - lib/graphql/client/view_module.rb
 - lib/graphql/language/nodes/deep_freeze_ext.rb
+- lib/rubocop/cop/graphql/heredoc.rb
+- lib/rubocop/cop/graphql/overfetch.rb
 homepage: https://github.com/github/graphql-client
 licenses:
 - MIT