graphql-client 0.12.3 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 532760d69d3380633bfa7e7555697aa843b72fa7
-  data.tar.gz: 947e81aeea7eb9058c01b844425e4035a955a003
+SHA256:
+  metadata.gz: eb27216cecd8b82430beda5f04f9eb8883be29ba245c0b7db606f835ede4a044
+  data.tar.gz: 782d1321f053407d369e1a119feebf9799612b4103395c2ff72a17bb7680a6c2
 SHA512:
-  metadata.gz: 34f989f928690406e82004b449264785395ffc00c809e70784b53284889b8c4409f1bbc3226b1ae7ac62df69b1ca8d753871f44b2545746e2b775c0a0bc263e8
-  data.tar.gz: 7f354451883ab22eefea03dea49cfe1bc848b8a6419ad9f626881a7dece1ec6922b3154a89561d5aa8ada72e9d919ecb24c529b4d13669c28ec63a7ab47d166e
+  metadata.gz: 251c12981e0af0c0b4c10261880b9c6f01aea92c2ccdd35a35cc484796354fbd8aeb365d077b93a41618269341e64bceb5a85985df3af623f12abeab6591db23
+  data.tar.gz: 023c4081d943267049fc6f7b0be964445fc5f7bb65460015ac3d849177b75a76a1158eae4a67810c9d9ca3a3c5ca61f6f8c689fbafdc3a1010c6d912d9675433

data/README.md

@@ -8,14 +8,14 @@ GraphQL Client is a Ruby library for declaring, composing and executing GraphQL
 
 Sample configuration for a GraphQL Client to query from the [SWAPI GraphQL Wrapper](https://github.com/graphql/swapi-graphql).
 
-``` ruby
+```ruby
 require "graphql/client"
 require "graphql/client/http"
 
 # Star Wars API example wrapper
 module SWAPI
   # Configure GraphQL endpoint using the basic HTTP network adapter.
-  HTTP = GraphQL::Client::HTTP.new("http://graphql-swapi.parseapp.com/") do
+  HTTP = GraphQL::Client::HTTP.new("https://example.com/graphql") do
     def headers(context)
       # Optionally set any HTTP headers
       { "User-Agent": "My Client" }
@@ -42,7 +42,7 @@ If you haven't already, [familiarize yourself with the GraphQL query syntax](htt
 
 This client library encourages all GraphQL queries to be declared statically and assigned to a Ruby constant.
 
-``` ruby
+```ruby
 HeroNameQuery = SWAPI::Client.parse <<-'GRAPHQL'
   query {
     hero {
@@ -51,6 +51,7 @@ HeroNameQuery = SWAPI::Client.parse <<-'GRAPHQL'
   }
 GRAPHQL
 ```
+
 Queries can reference variables that are passed in at query execution time.
 
 ```ruby
@@ -65,7 +66,7 @@ GRAPHQL
 
 Fragments are declared similarly.
 
-``` ruby
+```ruby
 HumanFragment = SWAPI::Client.parse <<-'GRAPHQL'
   fragment on Human {
     name
@@ -76,7 +77,7 @@ GRAPHQL
 
 To include a fragment in a query, reference the fragment by constant.
 
-``` ruby
+```ruby
 HeroNameQuery = SWAPI::Client.parse <<-'GRAPHQL'
   {
     luke: human(id: "1000") {
@@ -91,7 +92,7 @@ GRAPHQL
 
 This works for namespaced constants.
 
-``` ruby
+```ruby
 module Hero
   Query = SWAPI::Client.parse <<-'GRAPHQL'
     {
@@ -112,7 +113,7 @@ end
 
 Pass the reference of a parsed query definition to `GraphQL::Client#query`. Data is returned back in a wrapped `GraphQL::Client::Schema::ObjectType` struct that provides Ruby-ish accessors.
 
-``` ruby
+```ruby
 result = SWAPI::Client.query(Hero::Query)
 
 # The raw data is Hash of JSON values
@@ -121,18 +122,20 @@ result = SWAPI::Client.query(Hero::Query)
 # The wrapped result allows to you access data with Ruby methods
 result.data.luke.home_planet
 ```
-`GraphQL::Client#query` also accepts variables and context parameters that can be leveraged by the underlying network executor. 
 
-``` ruby
+`GraphQL::Client#query` also accepts variables and context parameters that can be leveraged by the underlying network executor.
+
+```ruby
 result = SWAPI::Client.query(Hero::HeroFromEpisodeQuery, variables: {episode: "JEDI"}, context: {user_id: current_user_id})
 ```
+
 ### Rails ERB integration
 
 If you're using Ruby on Rails ERB templates, theres a ERB extension that allows static queries to be defined in the template itself.
 
 In standard Ruby you can simply assign queries and fragments to constants and they'll be available throughout the app. However, the contents of an ERB template is compiled into a Ruby method, and methods can't assign constants. So a new ERB tag was extended to declare static sections that include a GraphQL query.
 
-``` erb
+```erb
 <%# app/views/humans/human.html.erb %>
 <%graphql
   fragment HumanFragment on Human {
@@ -161,7 +164,7 @@ These `<%graphql` sections are simply ignored at runtime but make their definiti
 
 Add `graphql-client` to your app's Gemfile:
 
-``` ruby
+```ruby
 gem 'graphql-client'
 ```
 

data/lib/graphql/client.rb

@@ -198,6 +198,7 @@ module GraphQL
           client: self,
           irep_node: irep_node,
           document: sliced_document,
+          source_document: doc,
           source_location: source_location
         )
         definitions[node.name] = definition

data/lib/graphql/client/definition.rb

@@ -25,9 +25,10 @@ module GraphQL
         end
       end
 
-      def initialize(client:, document:, irep_node:, source_location:)
+      def initialize(client:, document:, source_document:, irep_node:, source_location:)
         @client = client
         @document = document
+        @source_document = source_document
         @definition_node = irep_node.ast_node
         @source_location = source_location
         @schema_class = client.types.define_class(self, irep_node, irep_node.return_type)
@@ -36,17 +37,23 @@ module GraphQL
       # Internal: Get associated owner GraphQL::Client instance.
       attr_reader :client
 
-      # Internal root schema class for defintion. Returns
+      # Internal root schema class for definition. Returns
       # GraphQL::Client::Schema::ObjectType or
       # GraphQL::Client::Schema::PossibleTypes.
       attr_reader :schema_class
 
-      # Internal: Get underlying operation or fragment defintion AST node for
+      # Internal: Get underlying operation or fragment definition AST node for
       # definition.
       #
       # Returns OperationDefinition or FragmentDefinition object.
       attr_reader :definition_node
 
+      # Internal: Get original document that created this definition, without
+      # any additional dependencies.
+      #
+      # Returns GraphQL::Language::Nodes::Document.
+      attr_reader :source_document
+
       # Public: Global name of definition in client document.
       #
       # Returns a GraphQL safe name of the Ruby constant String.

data/lib/graphql/client/erb.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+require "action_view"
+
+module GraphQL
+  class Client
+    begin
+      require "action_view/template/handlers/erb/erubi"
+    rescue LoadError
+      require "graphql/client/erubis_enhancer"
+
+      # Public: Extended Erubis implementation that supports GraphQL static
+      # query sections.
+      #
+      #   <%graphql
+      #     query GetVersion {
+      #       version
+      #     }
+      #   %>
+      #   <%= data.version %>
+      #
+      # Configure ActionView's default ERB implementation to use this class.
+      #
+      #   ActionView::Template::Handlers::ERB.erb_implementation = GraphQL::Client::Erubis
+      #
+      class ERB < ActionView::Template::Handlers::Erubis
+        include ErubisEnhancer
+      end
+    else
+      require "graphql/client/erubi_enhancer"
+
+      # Public: Extended Erubis implementation that supports GraphQL static
+      # query sections.
+      #
+      #   <%graphql
+      #     query GetVerison {
+      #       version
+      #     }
+      #   %>
+      #   <%= data.version %>
+      #
+      # Configure ActionView's default ERB implementation to use this class.
+      #
+      #   ActionView::Template::Handlers::ERB.erb_implementation = GraphQL::Client::Erubi
+      #
+      class ERB < ActionView::Template::Handlers::ERB::Erubi
+        include ErubiEnhancer
+      end
+    end
+  end
+end

data/lib/graphql/client/erubis.rb

@@ -1,30 +1,8 @@
 # frozen_string_literal: true
-require "action_view"
-require "graphql/client/erubis_enhancer"
+require "graphql/client/erb"
 
 module GraphQL
   class Client
-    # Ignore deprecation errors loading AV Erubis
-    ActiveSupport::Deprecation.silence do
-      ActionView::Template::Handlers::Erubis
-    end
-
-    # Public: Extended Erubis implementation that supports GraphQL static
-    # query sections.
-    #
-    #   <%graphql
-    #     query GetVersion {
-    #       version
-    #     }
-    #   %>
-    #   <%= data.version %>
-    #
-    # Configure ActionView's default ERB implementation to use this class.
-    #
-    #   ActionView::Template::Handlers::ERB.erb_implementation = GraphQL::Client::Erubis
-    #
-    class Erubis < ActionView::Template::Handlers::Erubis
-      include ErubisEnhancer
-    end
+    Erubis = GraphQL::Client::ERB
   end
 end

data/lib/graphql/client/railtie.rb

@@ -22,8 +22,8 @@ module GraphQL
       end
 
       initializer "graphql.configure_erb_implementation" do |_app|
-        require "graphql/client/erubis"
-        ActionView::Template::Handlers::ERB.erb_implementation = GraphQL::Client::Erubis
+        require "graphql/client/erb"
+        ActionView::Template::Handlers::ERB.erb_implementation = GraphQL::Client::ERB
       end
 
       initializer "graphql.configure_views_namespace" do |app|

data/lib/graphql/client/schema/object_type.rb

@@ -22,7 +22,10 @@ module GraphQL
 
         def define_class(definition, irep_node)
           fields = irep_node.typed_children[type].inject({}) { |h, (field_name, field_irep_node)|
-            if definition.indexes[:definitions][field_irep_node.ast_node] == definition.definition_node
+            definition_for_field = definition.indexes[:definitions][field_irep_node.ast_node]
+
+            # Ignore fields defined in other documents.
+            if definition.source_document.definitions.include?(definition_for_field)
               h[field_name.to_sym] = schema_module.define_class(definition, field_irep_node, field_irep_node.definition.type)
             end
             h

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphql-client
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.13.0
 platform: ruby
 authors:
 - GitHub
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-05 00:00:00.000000000 Z
+date: 2018-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -126,28 +126,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '0.55'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '0.55'
 description: A Ruby library for declaring, composing and executing GraphQL queries
 email: engineering@github.com
 executables: []
@@ -161,6 +161,7 @@ files:
 - lib/graphql/client/definition.rb
 - lib/graphql/client/definition_variables.rb
 - lib/graphql/client/document_types.rb
+- lib/graphql/client/erb.rb
 - lib/graphql/client/error.rb
 - lib/graphql/client/errors.rb
 - lib/graphql/client/erubi_enhancer.rb
@@ -211,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: GraphQL Client