graphql-client 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a60948e4ebebe634045e72a530fccc7e7447b40
-  data.tar.gz: a1b16f7712be91dbe4bff628b4113b5d5d7ef39e
+  metadata.gz: e4e9abe01489f5224ba5c84893f5ea903b005f60
+  data.tar.gz: 713e06fac524292c381d2b83a9addb10cae3d3f7
 SHA512:
-  metadata.gz: c69238f56d5a2a659e5400b669c4c6cf358ed8b967f8cb88e90c87c708d1cc3361fe4c1c6dcf34bdb94caff6fc87c24d964f5fecab38fc69987458964be63cec
-  data.tar.gz: a2422fbb6cd197535d4c4ba51e26235b2906e6b00f78db4b08bf551f2c0c680a5d0231987c8bffcb2b5451ad29c284c851581511c1760fe8c9015387bc1acc8a
+  metadata.gz: 38e2dd21778105c39cc58efcbf5799bb9bfb72b8243e827057794aeeec39966cca2ff2ad1b9f7c2b8b7facd109cb71e23c511fa1c2e1eb7a63c8ff351bcb339d
+  data.tar.gz: b941fac81280d251fb0a8156917ff7cdb2e0179c95f935fe203c8336f671a396d398c29cae96b16dd6061846a190a3c6c3e21886cdc4cad9e191d05f9449c4df

data/lib/graphql/client.rb

@@ -1,10 +1,8 @@
 require "active_support/inflector"
 require "graphql"
 require "graphql/client/query_result"
-require "graphql/language/mutator"
 require "graphql/language/nodes/deep_freeze_ext"
 require "graphql/language/operation_slice"
-require "graphql/relay/parser"
 
 module GraphQL
   class Client
@@ -15,14 +13,24 @@ module GraphQL
 
     def initialize(schema:)
       @schema = schema
-      @definitions = []
-      @document = GraphQL::Language::Nodes::Document.new(definitions: @definitions)
-      @document_slices = {}
+      @document = GraphQL::Language::Nodes::Document.new(definitions: [])
     end
 
     class Definition < Module
-      def initialize(node:)
+      def self.for(node:, **kargs)
+        case node
+        when Language::Nodes::OperationDefinition
+          OperationDefinition.new(node: node, **kargs)
+        when Language::Nodes::FragmentDefinition
+          FragmentDefinition.new(node: node, **kargs)
+        else
+          raise TypeError, "expected node to be a definition type, but was #{node.class}"
+        end
+      end
+
+      def initialize(node:, document:)
         @definition_node = node
+        @document = document
       end
 
       # Internal: Get underlying operation or fragment defintion AST node for
@@ -49,6 +57,13 @@ module GraphQL
         @definition_name ||= name.gsub("::", "__").freeze
       end
 
+      # Public: Get document with only the definitions needed to perform this
+      # operation.
+      #
+      # Returns GraphQL::Language::Nodes::Document with one OperationDefinition
+      # and any FragmentDefinition dependencies.
+      attr_reader :document
+
       def new(*args)
         query_result_class.new(*args)
       end
@@ -60,38 +75,21 @@ module GraphQL
     end
 
     class OperationDefinition < Definition
-      def initialize(document:, **kargs)
-        @document = document
-        super(**kargs)
-      end
-
       # Public: Alias for definition name.
       alias_method :operation_name, :definition_name
-
-      # Public: Owner document of operation definition.
-      #
-      # Returns GraphQL::Language::Nodes::Document of all registered
-      # definitions.
-      attr_reader :document
-
-      # Public: Get document with only the definitions needed to perform this
-      # operation.
-      #
-      # Returns GraphQL::Language::Nodes::Document with one OperationDefinition
-      # and any FragmentDefinition dependencies.
-      def operation_document
-        @operation_document ||= Language::OperationSlice.slice(document, operation_name).deep_freeze
-      end
     end
 
     class FragmentDefinition < Definition
     end
 
     def parse(str)
+      definition_dependencies = Set.new
+
       str = str.gsub(/\.\.\.([a-zA-Z0-9_]+(::[a-zA-Z0-9_]+)+)/) { |m|
         const_name = $1
         case fragment = ActiveSupport::Inflector.safe_constantize(const_name)
         when FragmentDefinition
+          definition_dependencies.merge(fragment.document.definitions)
           "...#{fragment.definition_name}"
         when nil
           raise NameError, "uninitialized constant #{const_name}\n#{str}"
@@ -100,23 +98,29 @@ module GraphQL
         end
       }
 
-      doc = GraphQL::Relay::Parser.parse(str)
+      doc = GraphQL.parse(str)
 
-      mutator = GraphQL::Language::Mutator.new(doc)
+      definition_dependencies.merge(doc.definitions)
+      document_dependencies = Language::Nodes::Document.new(definitions: definition_dependencies.to_a)
 
-      definitions, renames = {}, {}
+      definitions = {}
       doc.definitions.each do |node|
-        local_name = node.name
-        definition = case node
-        when Language::Nodes::OperationDefinition
-          OperationDefinition.new(document: self.document, node: node)
-        when Language::Nodes::FragmentDefinition
-          FragmentDefinition.new(node: node)
-        end
-        definitions[local_name] = definition
-        renames[local_name] = -> { definition.definition_name }
+        sliced_document = Language::OperationSlice.slice(document_dependencies, node.name)
+        definition = Definition.for(node: node, document: sliced_document)
+        definitions[node.name] = definition
       end
-      mutator.rename_definitions(renames)
+
+      rename_node = -> (node, parent) {
+        if definition = definitions[node.name]
+          node.extend(LazyName)
+          node.name = -> { definition.definition_name }
+        end
+      }
+      visitor = Language::Visitor.new(doc)
+      visitor[Language::Nodes::FragmentDefinition].leave << rename_node
+      visitor[Language::Nodes::OperationDefinition].leave << rename_node
+      visitor[Language::Nodes::FragmentSpread].leave << rename_node
+      visitor.visit
 
       doc.deep_freeze
 
@@ -147,5 +151,12 @@ module GraphQL
 
       nil
     end
+
+    private
+      module LazyName
+        def name
+          @name.call
+        end
+      end
   end
 end

data/lib/graphql/language/operation_slice.rb

@@ -16,7 +16,8 @@ module GraphQL
         seen = Set.new([operation_name])
         stack = [operation_name]
 
-        while name = stack.pop
+        while stack.length > 0
+          name = stack.pop
           names = find_definition_fragment_spreads(document, name)
           seen.merge(names)
           stack.concat(names.to_a)
@@ -27,6 +28,7 @@ module GraphQL
 
       def self.find_definition_fragment_spreads(document, definition_name)
         definition = document.definitions.find { |node| node.name == definition_name }
+        raise "missing definition: #{definition_name}" if !definition
         spreads = Set.new
         visitor = Visitor.new(definition)
         visitor[Nodes::FragmentSpread].enter << -> (node, parent) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-client
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - GitHub
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2016-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: graphql
   requirement: !ruby/object:Gem::Requirement
@@ -66,8 +72,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '11.2'
-description: 
-email: 
+description: "???"
+email: engineering@github.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -75,11 +81,9 @@ files:
 - LICENSE
 - lib/graphql/client.rb
 - lib/graphql/client/query_result.rb
-- lib/graphql/language/mutator.rb
 - lib/graphql/language/nodes/deep_freeze_ext.rb
 - lib/graphql/language/operation_slice.rb
-- lib/graphql/relay/parser.rb
-homepage: 
+homepage: https://github.com/github/graphql-client
 licenses:
 - MIT
 metadata: {}
@@ -102,5 +106,5 @@ rubyforge_project:
 rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
-summary: "???"
+summary: GraphQL Client
 test_files: []

data/lib/graphql/language/mutator.rb

@@ -1,35 +0,0 @@
-require "graphql"
-require "set"
-
-module GraphQL
-  module Language
-    class Mutator
-      def initialize(document)
-        @document = document
-      end
-
-      module LazyName
-        def name
-          @name.call
-        end
-      end
-
-      def rename_definitions(definitions)
-        rename_node = -> (node, parent) {
-          if name = definitions[node.name]
-            node.extend(LazyName) if name.is_a?(Proc)
-            node.name = name
-          end
-        }
-
-        visitor = Visitor.new(@document)
-        visitor[Nodes::FragmentDefinition].leave << rename_node
-        visitor[Nodes::OperationDefinition].leave << rename_node
-        visitor[Nodes::FragmentSpread].leave << rename_node
-        visitor.visit
-
-        nil
-      end
-    end
-  end
-end

data/lib/graphql/relay/parser.rb

@@ -1,27 +0,0 @@
-require "graphql"
-
-module GraphQL
-  module Relay
-    module Parser
-      ANONYMOUS_SENTINEL = "__anonymous__".freeze
-
-      # Public: Extended GraphQL.parse that supports Relay style anonymous
-      # fragments.
-      #
-      # TODO: See about getting support for this upstreamed to the graphql-ruby
-      # gem.
-      #
-      # str - A GraphQL String
-      #
-      # Returns a GraphQL::Language::Nodes::Document.
-      def self.parse(str)
-        str = str.sub(/fragment on /, "fragment #{ANONYMOUS_SENTINEL} on ")
-        document = GraphQL.parse(str)
-        document.definitions.each do |node|
-          node.name = nil if node.name == ANONYMOUS_SENTINEL
-        end
-        document
-      end
-    end
-  end
-end