graphql_connector 1.3.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b8c2af2590f1daf462e0f348e64078c530a4c7f6833a7d8692e6bada0f11291
-  data.tar.gz: 52edb3725223b2538f91b1904fa57a071ab0b43b853f37f23242e1dbb8d7eb50
+  metadata.gz: 81e604778c1aab26ebebc224ef71b2843f91bc3b51f7098066cb515f9437d300
+  data.tar.gz: 9d0f5e40ed50fbcd52974dba215ffda51678a2d334f8fa8321b720d554e683fb
 SHA512:
-  metadata.gz: c82b787552cf4590bae68e4eb15103252a47660ba4a8b2d7645deb9e218034cadbca24feaf9ef610818106e322fc7916a91fdd3726d251e49c0051224666d3c2
-  data.tar.gz: 491988a32bc66f1d597d32dbf0164b5f5a23a87923ac6d4da3c0fbc8272de1b6721ba8657b35e99ad221a9bcb2860431964e22281fcba341da36f3f5dd49ba1e
+  metadata.gz: bc5edb75f96dbf575d2bef6e70d7d0980a02c5c7071df2960e40a83f113ad7c85060da3bbd50885c46ac4dbc86306f8db5394a476839a66132c994de0b50925d
+  data.tar.gz: d4737485bc2f8c94db473f605f19e33d570aa5688a90230ee81284980c59b76991290ebef57a446ae8a93ceaf8c26983e96b49e86f48d6e4f9b4878d1d971615

data/.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

data/.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

data/.github/workflows/ci.yaml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['2.4.10', '2.5.9', '2.6.7', '2.7.3', '3.0.1']
+        ruby: ['2.5', '2.6', '2.7', '3.0', '3.1']
     name: "ruby ${{ matrix.ruby }}"
     steps:
       - uses: actions/checkout@v1
@@ -24,14 +24,35 @@ jobs:
     name: Rubocop
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 2.7.3
-    - name: Install dependencies
-      run: |
-        gem install bundler
-        bundle install
-    - name: Build and test
-      run: |
-        bundle exec rubocop
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7
+      - name: Install dependencies
+        run: |
+          gem install bundler
+          bundle install
+      - name: Build and test
+        run: |
+          bundle exec rubocop
+  coverage:
+    name: coverage
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7
+      - name: Setup Code Climate test-reporter
+        run: |
+          curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+          chmod +x ./cc-test-reporter
+          ./cc-test-reporter before-build
+      - name: Build and test with RSpec
+        run: |
+          gem install bundler
+          bundle install
+          bundle exec rspec
+      - name: Publish code coverage
+        run: |
+          ./cc-test-reporter after-build -r ${{ secrets.CC_TEST_REPORTER_ID }}

data/.gitignore

@@ -0,0 +1 @@
+coverage/**

data/.rubocop.yml

@@ -1,2 +1,7 @@
 inherit_from: .rubocop_todo.yml
 
+AllCops:
+  TargetRubyVersion: 2.4
+
+Layout/LineLength:
+  Max: 100

data/.rubocop_todo.yml

@@ -3,4 +3,5 @@ Lint/DuplicateMethods:
     - lib/graphql_connector.rb
 Metrics/BlockLength:
   Exclude:
+    - "*.gemspec"
     - spec/graphql_connector/**/*.rb

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 2.0.0 (TBD)
+
+### Features
+
+Write here
+
+### Breaking changes
+
+* query results are now transformed to OpenStructs recursively, so nested attributes are no longer a hash but another OpenStruct
+* Set minimum Ruby version to `2.4` or higher
+
+## 1.4.0 (2022-03-17)
+
+* Add config for `httparty_adapter_options` allowing forwarding options to `httparty`
+
 ## 1.3.1 (2021-06-04)
 
 * add more specs to test headers and connectors

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    graphql_connector (1.3.0)
+    graphql_connector (1.4.0)
       httparty (~> 0.16)
 
 GEM
@@ -9,7 +9,8 @@ GEM
   specs:
     ast (2.4.0)
     coderay (1.1.2)
-    diff-lcs (1.3)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
     httparty (0.18.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
@@ -27,19 +28,19 @@ GEM
       method_source (~> 1.0)
     rainbow (3.0.0)
     rexml (3.2.5)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
     rubocop (0.82.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -49,6 +50,12 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
     ruby-progressbar (1.10.1)
+    simplecov (0.21.2)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
     unicode-display_width (1.7.0)
 
 PLATFORMS
@@ -60,6 +67,7 @@ DEPENDENCIES
   pry (~> 0.10)
   rspec (~> 3.8)
   rubocop (~> 0.75)
+  simplecov (~> 0.21.2)
 
 BUNDLED WITH
-   2.1.4
+   2.3.9

data/README.md

@@ -5,6 +5,7 @@
 Version](https://badge.fury.io/rb/graphql_connector.svg)](https://badge.fury.io/rb/graphql_connector)
 [![CI](https://github.com/Garllon/graphql_connector/workflows/CI/badge.svg)](https://github.com/Garllon/graphql_connector/actions?query=workflow%3ACI)
 [![Maintainability](https://api.codeclimate.com/v1/badges/548db3cf0d078b379c84/maintainability)](https://codeclimate.com/github/Garllon/graphql_connector/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/548db3cf0d078b379c84/test_coverage)](https://codeclimate.com/github/Garllon/graphql_connector/test_coverage)
 
 An easy connector to call your `graphql` server. Currently there is no schema
 check in the code, but i will add it.
@@ -30,20 +31,21 @@ Or install it yourself as:
 You need to configure the `graphql_connector` first:
 ``` ruby
 GraphqlConnector.configure do |config|
-  config.add_server(name: 'Foo', uri: 'http://foo.com/api/graphql', headers: {}, connector: {})
+  config.add_server(name: 'Foo', uri: 'http://foo.com/api/graphql', headers: {}, connector: {}, httparty_adapter_options: {})
 end
 ```
 
-The connector is expecting that it contains a `base` connector instance and a
-`method` parameter as string, where it gets the token. WE expect that the
-method is a public method in your connector class. Currently like this:
+* `name` (**mandatory**): Add a namespace under which the API is reachable. In the above example `'Foo'` means that `GraphqlConnector::Foo` provides API functionality for the configured `add_server`
+
+* `uri` (**mandatory**): Add uri of grapqhl API server that accepts **POST** requests.
+
+* `connector` (**optionally**): Add a  **Authentication Token class** in the following format:
 ```ruby
-{ base: TokenAgent.new, method: 'get_authorization_header' }
+connector: { base: AuthTokenAgent.instance, method: 'get_authorization_header' }
 ```
-
-Your method should return a hash like this:
+`base` is an instance of Authentication Token class and `method` represents the function where it gets the token.
 ```ruby
-class TokenAgent
+class AuthTokenAgent
    [...]
    def get_authorization_header
       [...]
@@ -51,9 +53,12 @@ class TokenAgent
    end
 end
 ```
+:warning: The function under `method` must be a public one in your connector class.<br />
+:warning: When you set a connector, it will override the setting in the headers for Authorization.
+
+
+* `httparty_adapter_options` (**optionally**): Add any [`connection_adapter`](https://github.com/jnunemaker/httparty/blob/master/lib/httparty/connection_adapter.rb) options that `httparty` supports in a hash format e.g. `{ timeout: 4 }`
 
-When you set a connector, it will override the setting in the headers for
-Authorization.
 
 For each graphql server you wish to query use `add_server`.
 
@@ -71,9 +76,23 @@ See the following sub sections for details
 
 You can call your graphql_endpoint via:
 ```ruby
-GraphqlConnector::<name>.raw_query(query_string)
+GraphqlConnector::<name>.raw_query('query { products { id name } }')
+
+GraphqlConnector::<name>.raw_query('query { products($id: [ID!]) { products(id: $id) { id name } } }', variables: { id: 1 })
+
+GraphqlConnector::<name>.raw_query('mutation { createProduct(name: "Coca-Cola") { id name } }')
+```
+
+Or if you want to **override**/**set** any `httparty_adapter_options` it is also possible to pass them in:
+```ruby
+GraphqlConnector::<name>.raw_query('query { products { id name } }', httparty_adapter_options: { timeout: 3, verify: true })
+
+GraphqlConnector::<name>.raw_query('query { products($id: [ID!]) { products(id: $id) { id name } } }', variables: { id: 1 }, httparty_adapter_options: { timeout: 3, verify: true })
+
+GraphqlConnector::<name>.raw_query('mutation { createProduct(name: "Coca-Cola") { id name } }', httparty_adapter_options: { timeout: 3, verify: true })
 ```
 
+
 Note that `<name>` has to be replaced by any of the ones added via `add_server`
 
 See also [here](examples/raw_query_examples.rb) for example usage
@@ -83,19 +102,22 @@ See also [here](examples/raw_query_examples.rb) for example usage
 
 You can also use the more comfortable `query`:
 ```ruby
-GraphqlConnector::<name>.query(model, condition, selected_fields)
+GraphqlConnector::<name>.query('products', { id:  [1,2] } , ['id','name'])
 ```
 
-| Variable        | DataType                | Example                                 |
-|----------------|-------------------------|------------------------------------------|
-| model           | String                  | 'product'                               |
-| condition       | Hash(key, value)        | { id: 1 }                               |
-| selected_fields | Array of Strings/Hashes | ['id', 'name', productCategory: ['id']] |
+Or if you want to **override**/**set** any `httparty` adapter_options, it is also possible
+to pass them in:
+
+```ruby
+GraphqlConnector::<name>.query('products', { id:  [1,2] } , ['id','name'], httparty_adapter_options: { timeout: 3 })
+```
 
-> Caution:
-> You get an OpenStruct back. Currently only the first level attributes are
-> supported with OpenStruct, associated objects are still a normal array of
-> hashes.
+| Variable                 | Required                      | DataType                | Example                                 |
+|--------------------------|-------------------------------|-------------------------|-----------------------------------------|
+| model                    | Yes                           | String                  | 'product'                               |
+| condition                | Yes (but can be empty)        | Hash(key, value)        | { id: 1 }                               |
+| selected_fields          | Yes                           | Array of Strings/Hashes | ['id', 'name', productCategory: ['id']] |
+| httparty_adapter_options | No                            | Hash                    | { timeout: 3 }                          |
 
 See also [here](examples/query_examples.rb) for example usage
 
@@ -129,14 +151,25 @@ so that it has re-usable graphql `query` and `mutation` **class methods**.
 * Then you can aliases as many graphql server types via `add_query` and/or `add_raw_query` and/or `add_mutation`:
 
 ```ruby
-add_query <alias>: :<graphql_server_type>, params: [...], returns: [...]
+add_query products_by: :products, params: [:id], returns: [:id, :name]
 
-add_raw_query <alias>: 'query { ... }', params: [...]
+add_raw_query products_raw_by: 'query { products(($id: [ID!]) products { id name } }', params: [:id]
 
-add_mutation <alias>: :<graphql_server_type>, params: [...], returns: [...]
+add_mutation create: :createProduct, params: [:name], returns: [:id, :name]
 ```
 * :grey_exclamation: If not needed omit `params`
 
+Or if you want to **override**/**set** any `httparty` adapter_options, it is also possible
+to pass them in:
+
+```ruby
+add_query products_by: :products, params: [:id], returns: [:id, :name], httparty_adapter_options: { timeout: 3 }
+
+add_raw_query products_raw_by: 'query { products(($id: [ID!]) products { id name } }', params: [:id], httparty_adapter_options: { verify: true }
+
+add_mutation create: :createProduct, params: [:name], returns: [:id, :name], httparty_adapter_options: { timeout: 5, verify: false }
+```
+
 See also [here](examples/departments_service_class_examples.rb) and also here for complete example usage:
 
 ```ruby
@@ -153,7 +186,8 @@ class Product
 
   add_query by_id: :products,
             params: :id,
-            returns: [:name, product_category: [:id, :name]]
+            returns: [:name, product_category: [:id, :name]],
+            httparty_adapter_options: { timeout: 3 }
 
   add_query by_names: :products,
             params: :names,
@@ -169,7 +203,8 @@ class Product
 
   add_mutation create: :createProduct,
                params: [:name, :catgetoryId],
-               returns: [:id, :name]
+               returns: [:id, :name],
+               httparty_adapter_options: { verify: false }
 end
 
 Product.all

data/graphql_connector.gemspec

@@ -31,10 +31,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '>= 2.4.0'
+
   spec.add_dependency 'httparty', '~> 0.16'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'pry', '~> 0.10'
   spec.add_development_dependency 'rspec', '~> 3.8'
   spec.add_development_dependency 'rubocop', '~> 0.75'
+  spec.add_development_dependency 'simplecov', '~> 0.21.2'
 end

data/lib/graphql_connector/base_server_type.rb

@@ -5,9 +5,9 @@ module GraphqlConnector
   # Class to wrap http_client calls under a specific namespaced class
   class BaseServerType
     class << self
-      def build(name, uri, headers = {}, connector = {})
+      def build(name, uri, headers = {}, connector = {}, httparty_adapter_options = {})
         verify_new_client_type_for!(name)
-        base_class = class_with(uri, headers, connector)
+        base_class = class_with(uri, headers, connector, httparty_adapter_options)
         base_object = GraphqlConnector.const_set(name, base_class)
         inject_http_client_delegations(base_object)
         create_service_class_module(base_object)
@@ -39,12 +39,13 @@ module GraphqlConnector
         METHOD
       end
 
-      def class_with(uri, headers = {}, connector = {})
+      def class_with(uri, headers = {}, connector = {}, httparty_adapter_options = {})
         Class.new do
-          attr_accessor :uri, :headers, :connector
+          attr_accessor :uri, :headers, :connector, :httparty_adapter_options
           @uri       = uri
           @headers   = headers
           @connector = connector
+          @httparty_adapter_options = httparty_adapter_options
         end
       end
 
@@ -54,8 +55,10 @@ module GraphqlConnector
           def_delegators :http_client, :query, :raw_query, :mutation
 
           def http_client
-            @http_client ||=
-              GraphqlConnector::HttpClient.new(@uri, @headers, @connector)
+            @http_client ||= GraphqlConnector::HttpClient.new(@uri,
+                                                              @headers,
+                                                              @connector,
+                                                              @httparty_adapter_options)
           end
         end
       end

data/lib/graphql_connector/configuration.rb

@@ -9,9 +9,9 @@ module GraphqlConnector
       @base_server_types = {}
     end
 
-    def add_server(name:, uri:, headers: {}, connector: {})
+    def add_server(name:, uri:, headers: {}, connector: {}, httparty_adapter_options: {})
       @base_server_types[name] =
-        BaseServerType.build(name, uri, headers, connector)
+        BaseServerType.build(name, uri, headers, connector, httparty_adapter_options)
     end
 
     def reset!

data/lib/graphql_connector/http_client.rb

@@ -3,31 +3,29 @@
 module GraphqlConnector
   # Wrapper class for HTTParty post query
   class HttpClient
-    def initialize(uri, headers = {}, connector = {})
+    def initialize(uri, headers = {}, connector = {}, httparty_adapter_options = {})
       @uri = uri
       @headers = headers
       @connector = connector
+      @httparty_adapter_options = httparty_adapter_options
     end
 
-    def query(model, conditions, selected_fields)
-      query_string =
-        Formatters::QueryFormat.new(model, conditions, selected_fields).create
-      parsed_body = raw_query(query_string)
-      format_body(parsed_body['data'][model.to_s])
+    def query(model, conditions, selected_fields, httparty_adapter_options: {})
+      query_string = Formatters::QueryFormat.new(model, conditions, selected_fields).create
+      format_body(query_string, model, httparty_adapter_options)
     end
 
-    def mutation(model, inputs, selected_fields)
-      query_string =
-        Formatters::MutationFormat.new(model, inputs, selected_fields).create
-      parsed_body = raw_query(query_string)
-      format_body(parsed_body['data'][model.to_s])
+    def mutation(model, inputs, selected_fields, httparty_adapter_options: {})
+      query_string = Formatters::MutationFormat.new(model, inputs, selected_fields).create
+      format_body(query_string, model, httparty_adapter_options)
     end
 
-    def raw_query(query_string, variables: {})
+    def raw_query(query_string, variables: {}, httparty_adapter_options: {})
+      adapter_options = combined_adapter_options(httparty_adapter_options)
       response = HTTParty.post(@uri,
                                headers: handle_headers,
-                               body: { query: query_string,
-                                       variables: variables })
+                               body: { query: query_string, variables: variables },
+                               **adapter_options)
       parsed_body = JSON.parse(response.body)
       verify_response!(parsed_body)
       parsed_body
@@ -35,6 +33,10 @@ module GraphqlConnector
 
     private
 
+    def combined_adapter_options(options)
+      @httparty_adapter_options.merge(options)
+    end
+
     def handle_headers
       return @headers if @connector.empty?
 
@@ -42,10 +44,22 @@ module GraphqlConnector
         .merge(@connector[:base].public_send(@connector[:method]))
     end
 
-    def format_body(response_body)
-      return OpenStruct.new(response_body) unless response_body.is_a? Array
+    def format_body(query_string, model, httparty_adapter_options)
+      parsed_body   = raw_query(query_string, httparty_adapter_options: httparty_adapter_options)
+      response_body = parsed_body['data'][model.to_s]
+      transform_data(response_body)
+    end
 
-      response_body.map { |entry| OpenStruct.new(entry) }
+    def transform_data(data)
+      case data
+      when Array
+        data.map { |element| transform_data(element) }
+      when Hash
+        data = data.transform_values { |value| transform_data(value) }
+        OpenStruct.new(data)
+      else
+        data
+      end
     end
 
     def verify_response!(parsed_body)

data/lib/graphql_connector/service_classable/queryable.rb

@@ -5,101 +5,83 @@ module GraphqlConnector
     # Module that allows to build query methods within the context of
     # service class
     module Queryable
-      CONDITIONS = 'binding.local_variables.map do |var|
-                      [var, binding.local_variable_get(var)]
-                    end.to_h'
+      BINDINGS = 'binding.local_variables.map do |var|
+                    [var, binding.local_variable_get(var)]
+                  end.to_h'
 
-      def add_query(params: [], returns:, **method_to_query)
-        class_method_name = method_to_query.first[0]
-        query_type = method_to_query.first[1]
-        ReturnFieldsValidator.validate(returns)
-        ClassMethodValidator.validate_class_method(class_method_name, self)
-        ClassMethodValidator.validate_element_class_type(query_type, Symbol)
+      def add_query(params: [], httparty_adapter_options: {}, returns:, **method_to_query)
+        class_method_name, query_type = parse_variables(method_to_query)
 
-        if params.empty?
-          return query_method(class_method_name, query_type, returns)
-        end
+        ensure_params_format!(returns, class_method_name, query_type)
+        ParamsValidator.validate(params) unless params.empty?
 
-        ParamsValidator.validate(params)
-        query_keyword_method(class_method_name, query_type, params, returns)
+        signature = method_signature(class_method_name, params)
+        signature[:graphql_method_type] = :query
+        create_method(signature, query_type, returns, httparty_adapter_options)
       end
 
-      def add_raw_query(params: [], **method_to_raw_query)
-        class_method_name = method_to_raw_query.first[0]
-        query_string = method_to_raw_query.first[1]
+      def add_raw_query(params: [], httparty_adapter_options: {}, **method_to_raw_query)
+        class_method_name, query_string = parse_variables(method_to_raw_query)
+
         ClassMethodValidator.validate_class_method(class_method_name, self)
         ClassMethodValidator.validate_element_class_type(query_string, String)
+        ParamsValidator.validate(params) unless params.empty?
 
-        if params.empty?
-          return raw_query_method(class_method_name, query_string)
-        end
-
-        ParamsValidator.validate(params)
-        raw_query_keyword_method(class_method_name, query_string, params)
+        signature = method_signature(class_method_name, params)
+        raw_query_method(signature, query_string, httparty_adapter_options)
       end
 
-      def add_mutation(params: [], returns:, **method_to_query)
-        class_method_name = method_to_query.first[0]
-        query_type = method_to_query.first[1]
-        ReturnFieldsValidator.validate(returns)
-        ClassMethodValidator.validate_class_method(class_method_name, self)
-        ClassMethodValidator.validate_element_class_type(query_type, Symbol)
+      def add_mutation(params: [], httparty_adapter_options: {}, returns:, **method_to_query)
+        class_method_name, query_type = parse_variables(method_to_query)
 
-        if params.empty?
-          return mutation_method(class_method_name, query_type, returns)
-        end
+        ensure_params_format!(returns, class_method_name, query_type)
+        ParamsValidator.validate(params) unless params.empty?
 
-        ParamsValidator.validate(params)
-        mutation_keyword_method(class_method_name, query_type, params, returns)
+        signature = method_signature(class_method_name, params)
+        signature[:graphql_method_type] = :mutation
+        create_method(signature, query_type, returns, httparty_adapter_options)
       end
 
       private
 
-      def query_method(class_method_name, query_type, return_fields)
-        define_singleton_method class_method_name do
-          http_client.query(query_type, {}, return_fields.to_a)
-        end
+      def parse_variables(method_to_query)
+        class_method_name = method_to_query.first[0]
+        query_type        = method_to_query.first[1]
+        [class_method_name, query_type]
       end
 
-      def raw_query_method(class_method_name, query_string)
-        define_singleton_method class_method_name do
-          http_client.raw_query(query_string)
-        end
-      end
+      def method_signature(name, keywords)
+        return { head: name, bindings: {} } if keywords.empty?
 
-      def query_keyword_method(name, query_type, keywords, return_fields)
         keywords = [keywords].flatten
-        instance_eval <<-METHOD, __FILE__, __LINE__ + 1
-          def #{name}(#{keywords.map { |keyword| "#{keyword}:" }.join(', ')})
-            http_client.query("#{query_type}",
-                              #{CONDITIONS},
-                              #{return_fields.to_a})
-          end
-        METHOD
+        { head: "#{name}(#{keywords.map { |keyword| "#{keyword}:" }.join(', ')})",
+          bindings: BINDINGS }
       end
 
-      def raw_query_keyword_method(name, query_string, keywords)
-        keywords = [keywords].flatten
+      def ensure_params_format!(returns, class_method_name, query_type)
+        ReturnFieldsValidator.validate(returns)
+        ClassMethodValidator.validate_class_method(class_method_name, self)
+        ClassMethodValidator.validate_element_class_type(query_type, Symbol)
+      end
+
+      def raw_query_method(signature, query_string, httparty_adapter_options)
         instance_eval <<-METHOD, __FILE__, __LINE__ + 1
-          def #{name}(#{keywords.map { |keyword| "#{keyword}:" }.join(', ')})
-            http_client.raw_query("#{query_string}", variables: #{CONDITIONS})
+          def #{signature[:head]}
+            http_client.raw_query("#{query_string}",
+                                  variables: #{signature[:bindings]},
+                                  httparty_adapter_options: #{httparty_adapter_options})
           end
         METHOD
       end
 
-      def mutation_method(class_method_name, query_type, return_fields)
-        define_singleton_method class_method_name do
-          http_client.mutation(query_type, {}, return_fields.to_a)
-        end
-      end
-
-      def mutation_keyword_method(name, query_type, keywords, return_fields)
-        keywords = [keywords].flatten
+      def create_method(signature, query_type, return_fields, httparty_adapter_options)
         instance_eval <<-METHOD, __FILE__, __LINE__ + 1
-          def #{name}(#{keywords.map { |keyword| "#{keyword}:" }.join(', ')})
-            http_client.mutation("#{query_type}",
-                                  #{CONDITIONS},
-                                  #{return_fields.to_a})
+          def #{signature[:head]}
+            http_client.#{signature[:graphql_method_type]}(
+              "#{query_type}",
+              #{signature[:bindings]},
+              #{return_fields.to_a},
+              httparty_adapter_options: #{httparty_adapter_options})
           end
         METHOD
       end

data/lib/graphql_connector/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GraphqlConnector
-  VERSION = '1.3.1'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphql_connector
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Garllon
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-04 00:00:00.000000000 Z
+date: 2023-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -81,6 +81,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.75'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.21.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.21.2
 description: Grahql client to query with your own raw string, with the small helper
   method query or with service class inclusion.
 email:
@@ -90,6 +104,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/feature_request.md"
 - ".github/workflows/ci.yaml"
 - ".gitignore"
 - ".rspec"
@@ -135,14 +151,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.7
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: GraphQL client