graphlient 0.7.0 → 0.9.0

data/RELEASING.md

@@ -1,63 +1,63 @@
-# Releasing Graphlient
-
-There're no hard rules about when to release graphlient. Release bug fixes frequently, features not so frequently and breaking API changes rarely.
-
-### Release
-
-Run tests, check that all tests succeed locally.
-
-```
-bundle install
-rake
-```
-
-Check that the last build succeeded in [Travis CI](https://travis-ci.org/dblock/graphlient) for all supported platforms.
-
-Change next release in [CHANGELOG.md](CHANGELOG.md) to the new version.
-
-```
-### 0.2.2 (7/10/2015)
-```
-
-Remove the line with "Your contribution here.", since there will be no more contributions to this release.
-
-Update the version in `lib/graphlient/version.rb`.
-
-Commit your changes.
-
-```
-git add CHANGELOG.md
-git commit -m "Preparing for release, 0.2.2."
-git push origin master
-```
-
-Release.
-
-```
-$ rake release
-
-graphlient 0.2.2 built to pkg/graphlient-0.2.2.gem.
-Tagged v0.2.2.
-Pushed git commits and tags.
-Pushed graphlient 0.2.2 to rubygems.org.
-```
-
-### Prepare for the Next Version
-
-Add the next release to [CHANGELOG.md](CHANGELOG.md).
-
-```
-### 0.2.3 (Next)
-
-* Your contribution here.
-```
-
-Increment the third version number in [lib/graphlient/version.rb](lib/graphlient/version.rb). Usually the major version is incremented during the development cycle when the release contains major features or breaking API changes (eg. change `0.2.1` to `0.3.0`).
-
-Commit your changes.
-
-```
-git add CHANGELOG.md lib/graphlient/version.rb
-git commit -m "Preparing for next development iteration, 0.2.3."
-git push origin master
-```
+# Releasing Graphlient
+
+There're no hard rules about when to release graphlient. Release bug fixes frequently, features not so frequently and breaking API changes rarely.
+
+### Release
+
+Run tests, check that all tests succeed locally.
+
+```
+bundle install
+rake
+```
+
+Check that the last build succeeded in [Travis CI](https://travis-ci.org/dblock/graphlient) for all supported platforms.
+
+Change next release in [CHANGELOG.md](CHANGELOG.md) to the new version.
+
+```
+### 0.2.2 (7/10/2015)
+```
+
+Remove the line with "Your contribution here.", since there will be no more contributions to this release.
+
+Update the version in `lib/graphlient/version.rb`.
+
+Commit your changes.
+
+```
+git add CHANGELOG.md
+git commit -m "Preparing for release, 0.2.2."
+git push origin master
+```
+
+Release.
+
+```
+$ rake release
+
+graphlient 0.2.2 built to pkg/graphlient-0.2.2.gem.
+Tagged v0.2.2.
+Pushed git commits and tags.
+Pushed graphlient 0.2.2 to rubygems.org.
+```
+
+### Prepare for the Next Version
+
+Add the next release to [CHANGELOG.md](CHANGELOG.md).
+
+```
+### 0.2.3 (Next)
+
+* Your contribution here.
+```
+
+Increment the third version number in [lib/graphlient/version.rb](lib/graphlient/version.rb). Usually the major version is incremented during the development cycle when the release contains major features or breaking API changes (eg. change `0.2.1` to `0.3.0`).
+
+Commit your changes.
+
+```
+git add CHANGELOG.md lib/graphlient/version.rb
+git commit -m "Preparing for next development iteration, 0.2.3."
+git push origin master
+```

data/Rakefile

@@ -1,15 +1,15 @@
-require 'rubygems'
-require 'bundler/gem_tasks'
-Bundler.setup(:default, :development)
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-end
-
-require 'rubocop/rake_task'
-RuboCop::RakeTask.new(:rubocop)
-
-task default: %i[rubocop spec]
+require 'rubygems'
+require 'bundler/gem_tasks'
+Bundler.setup(:default, :development)
+
+require 'rspec/core'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
+end
+
+require 'rubocop/rake_task'
+RuboCop::RakeTask.new(:rubocop)
+
+task default: %i[rubocop spec]

data/UPGRADING.md

@@ -1,23 +1,23 @@
-Upgrading Graphlient
-===========================
-
-### Upgrading to >= 0.4.0
-
-#### Requires Faraday >= 1.0
-
-See [#75](https://github.com/ashkan18/graphlient/pull/75).
-
-#### Changes in error handling of connection refused error
-
-When the GraphQL request was failing, we were receiving a `Faraday::ServerError`. After 0.4.0, Graphlient
-will return `Graphlient::Errors::FaradayServerError` instead.
-
-### Upgrading to >= 0.3.7
-
-#### Changes in error handling of connection refused error
-
-Prior to 0.3.7, Graphlient would return `NoMethodError: undefined method []' for nil:NilClass` error if connection is
-refused/failed when connecting to a remote host. After 0.3.7, Graphlient will return a new 
-`Graphlient::Errors::ConnectionFailedError` instead.
-
-See [#68](https://github.com/ashkan18/graphlient/pull/68) for more information.
+Upgrading Graphlient
+===========================
+
+### Upgrading to >= 0.4.0
+
+#### Requires Faraday >= 1.0
+
+See [#75](https://github.com/ashkan18/graphlient/pull/75).
+
+#### Changes in error handling of connection refused error
+
+When the GraphQL request was failing, we were receiving a `Faraday::ServerError`. After 0.4.0, Graphlient
+will return `Graphlient::Errors::FaradayServerError` instead.
+
+### Upgrading to >= 0.3.7
+
+#### Changes in error handling of connection refused error
+
+Prior to 0.3.7, Graphlient would return `NoMethodError: undefined method []' for nil:NilClass` error if connection is
+refused/failed when connecting to a remote host. After 0.3.7, Graphlient will return a new 
+`Graphlient::Errors::ConnectionFailedError` instead.
+
+See [#68](https://github.com/ashkan18/graphlient/pull/68) for more information.

data/graphlient.gemspec

@@ -1,19 +1,19 @@
-$LOAD_PATH.push File.expand_path('lib', __dir__)
-
-require 'graphlient/version'
-
-Gem::Specification.new do |s|
-  s.name = 'graphlient'
-  s.version = Graphlient::VERSION
-  s.authors = ['Ashkan Nasseri']
-  s.email = 'ashkan.nasseri@gmail.com'
-  s.platform = Gem::Platform::RUBY
-  s.required_rubygems_version = '>= 1.3.6'
-  s.files = `git ls-files`.split("\n")
-  s.require_paths = ['lib']
-  s.homepage = 'http://github.com/ashkan18/graphlient'
-  s.licenses = ['MIT']
-  s.summary = 'A friendlier Ruby client for consuming GraphQL-based APIs.'
-  s.add_dependency 'faraday', '~> 2.0'
-  s.add_dependency 'graphql-client'
-end
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+
+require 'graphlient/version'
+
+Gem::Specification.new do |s|
+  s.name = 'graphlient'
+  s.version = Graphlient::VERSION
+  s.authors = ['Ashkan Nasseri']
+  s.email = 'ashkan.nasseri@gmail.com'
+  s.platform = Gem::Platform::RUBY
+  s.required_rubygems_version = '>= 1.3.6'
+  s.files = `git ls-files`.split("\n")
+  s.require_paths = ['lib']
+  s.homepage = 'http://github.com/ashkan18/graphlient'
+  s.licenses = ['MIT']
+  s.summary = 'A friendlier Ruby client for consuming GraphQL-based APIs.'
+  s.add_dependency 'faraday', '~> 2.0'
+  s.add_dependency 'graphql-client'
+end

data/lib/graphlient/adapters/http/adapter.rb

@@ -1,41 +1,41 @@
-module Graphlient
-  module Adapters
-    module HTTP
-      class Adapter
-        attr_accessor :url, :options
-
-        def initialize(url, options = {}, &_block)
-          @url = url
-          @options = options.dup if options
-          yield self if block_given?
-        end
-
-        def headers
-          options[:headers] if options
-        end
-
-        def http_options
-          return {} unless options
-
-          options[:http_options] || {}
-        end
-
-        def execute(*)
-          raise NotImplementedError
-        end
-
-        private
-
-        def configure_http_options(client_options)
-          http_options.each do |k, v|
-            begin
-              client_options.send("#{k}=", v)
-            rescue NoMethodError => e
-              raise Graphlient::Errors::HttpOptionsError, e.message
-            end
-          end
-        end
-      end
-    end
-  end
-end
+module Graphlient
+  module Adapters
+    module HTTP
+      class Adapter
+        attr_accessor :url, :options
+
+        def initialize(url, options = {}, &_block)
+          @url = url
+          @options = options.dup if options
+          yield self if block_given?
+        end
+
+        def headers
+          options[:headers] if options
+        end
+
+        def http_options
+          return {} unless options
+
+          options[:http_options] || {}
+        end
+
+        def execute(*)
+          raise NotImplementedError
+        end
+
+        private
+
+        def configure_http_options(client_options)
+          http_options.each do |k, v|
+            begin
+              client_options.send("#{k}=", v)
+            rescue NoMethodError => e
+              raise Graphlient::Errors::HttpOptionsError, e.message
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/graphlient/adapters/http/faraday_adapter.rb

@@ -1,45 +1,79 @@
-require 'faraday'
-
-module Graphlient
-  module Adapters
-    module HTTP
-      class FaradayAdapter < Adapter
-        def execute(document:, operation_name:, variables:, context:)
-          response = connection.post do |req|
-            req.headers.merge!(context[:headers] || {})
-            req.body = {
-              query: document.to_query_string,
-              operationName: operation_name,
-              variables: variables
-            }.to_json
-          end
-          response.body
-        rescue Faraday::ConnectionFailed => e
-          raise Graphlient::Errors::ConnectionFailedError, e
-        rescue Faraday::TimeoutError => e
-          raise Graphlient::Errors::TimeoutError, e
-        rescue Faraday::ClientError => e
-          raise Graphlient::Errors::FaradayServerError, e
-        rescue Faraday::ServerError => e
-          raise Graphlient::Errors::FaradayServerError, e
-        end
-
-        def connection
-          @connection ||= Faraday.new(url: url, headers: headers) do |c|
-            c.use Faraday::Response::RaiseError
-            c.request :json
-            c.response :json
-
-            configure_http_options(c.options)
-
-            if block_given?
-              yield c
-            else
-              c.adapter Faraday::Adapter::NetHttp
-            end
-          end
-        end
-      end
-    end
-  end
-end
+require 'faraday'
+require 'json'
+
+module Graphlient
+  module Adapters
+    module HTTP
+      class FaradayAdapter < Adapter
+        def execute(document:, operation_name:, variables:, context:)
+          response = connection.post do |req|
+            req.headers.merge!(context[:headers] || {})
+            req.body = {
+              query: document.to_query_string,
+              operationName: operation_name,
+              variables: variables
+            }.to_json
+          end
+
+          parse_body(response.body)
+        rescue Faraday::ConnectionFailed => e
+          raise Graphlient::Errors::ConnectionFailedError, e
+        rescue Faraday::TimeoutError => e
+          raise Graphlient::Errors::TimeoutError, e
+        rescue Faraday::ClientError => e
+          raise Graphlient::Errors::FaradayServerError, e
+        rescue Faraday::ServerError => e
+          raise Graphlient::Errors::FaradayServerError, e
+        end
+
+        def connection
+          @connection ||= Faraday.new(url: url, headers: headers) do |c|
+            c.use Faraday::Response::RaiseError
+            c.request :json
+            c.response :json
+
+            configure_http_options(c.options)
+
+            if block_given?
+              yield c
+            else
+              c.adapter Faraday::Adapter::NetHttp
+            end
+          end
+        end
+
+        private
+
+        # Faraday 2.x's JSON response middleware will only parse a JSON
+        # response body into a Hash (or Array) object if the response headers
+        # match a specific content type regex. See Faraday's response JSON
+        # middleware definition for specifics on what the datatype of the
+        # response body will be. This method will handle the situation where
+        # the response header is not set appropriately, but contains JSON
+        # anyways. If the body cannot be parsed as JSON, an exception will be
+        # raised.
+        def parse_body(body)
+          case body
+          when Hash, Array
+            body
+          when String
+            begin
+              JSON.parse(body)
+            rescue JSON::ParserError
+              raise Graphlient::Errors::ServerError, 'Failed to parse response body as JSON'
+            end
+          else
+            inner_exception = StandardError.new <<~ERR.strip.tr("\n", ' ')
+              Unexpected response body type '#{body.class}'. Graphlient doesn't
+              know how to handle a response body of this type, but Faraday is
+              returning it. Please open an issue, particularly if the response
+              body does actually contain valid JSON.
+            ERR
+
+            raise Graphlient::Errors::ClientError, inner_exception
+          end
+        end
+      end
+    end
+  end
+end

data/lib/graphlient/adapters/http/http_adapter.rb

@@ -1,39 +1,40 @@
-require 'graphql/client/http'
-
-module Graphlient
-  module Adapters
-    module HTTP
-      class HTTPAdapter < Adapter
-        def execute(document:, operation_name: nil, variables: {}, context: {})
-          request = Net::HTTP::Post.new(url)
-
-          request['Accept'] = 'application/json'
-          request['Content-Type'] = 'application/json'
-          headers && headers.each { |name, value| request[name] = value }
-
-          body = {}
-          body['query'] = document.to_query_string
-          body['variables'] = variables if variables.any?
-          body['operationName'] = operation_name if operation_name
-          request.body = JSON.generate(body)
-
-          response = connection.request(request)
-          raise Graphlient::Errors::HttpServerError, response unless response.is_a?(Net::HTTPOK)
-          JSON.parse(response.body)
-        end
-
-        def uri
-          @uri ||= URI(url)
-        end
-
-        def connection
-          Net::HTTP.new(uri.host, uri.port).tap do |client|
-            client.use_ssl = uri.scheme == 'https'
-
-            configure_http_options(client)
-          end
-        end
-      end
-    end
-  end
-end
+require 'graphql/client/http'
+
+module Graphlient
+  module Adapters
+    module HTTP
+      class HTTPAdapter < Adapter
+        def execute(document:, operation_name: nil, variables: {}, context: {})
+          request = Net::HTTP::Post.new(url)
+
+          request['Accept'] = 'application/json'
+          request['Content-Type'] = 'application/json'
+          headers && headers.each { |name, value| request[name] = value }
+
+          body = {}
+          body['query'] = document.to_query_string
+          body['variables'] = variables if variables.any?
+          body['operationName'] = operation_name if operation_name
+          request.body = JSON.generate(body)
+
+          response = connection.request(request)
+          raise Graphlient::Errors::HttpServerError, response unless response.is_a?(Net::HTTPOK)
+
+          JSON.parse(response.body)
+        end
+
+        def uri
+          @uri ||= URI(url)
+        end
+
+        def connection
+          Net::HTTP.new(uri.host, uri.port).tap do |client|
+            client.use_ssl = uri.scheme == 'https'
+
+            configure_http_options(client)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/graphlient/adapters/http.rb

@@ -1,3 +1,3 @@
-require_relative 'http/adapter'
-require_relative 'http/faraday_adapter'
-require_relative 'http/http_adapter'
+require_relative 'http/adapter'
+require_relative 'http/faraday_adapter'
+require_relative 'http/http_adapter'

data/lib/graphlient/adapters.rb

@@ -1 +1 @@
-require_relative 'adapters/http'
+require_relative 'adapters/http'