active_graphql 0.2.4 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 398cdea1d95da44a0fce577bf1fc7764ba5461f4b32ee84116fe5a96d06b47af
-  data.tar.gz: 0ba5f89799c23e30a5f602e2f33895a8fb4c0758a6b684e0e2af6d7d119eb118
+  metadata.gz: bba3575ea3683cf6d8df16cb0b42b1c48b60edd67f8d5119098ec05b9a291171
+  data.tar.gz: d315c4e5ac40e378c5c16bc940302de0f177e5ab18f4dbae3091b7527cb46233
 SHA512:
-  metadata.gz: c57a57dbdf0e732153e1759966d4adc4c5270be4819908824aed3cbaccbd1510904c207e23ecf63b565c3f498dd074a221184b1c5a9a8457c94a788ea27c3eba
-  data.tar.gz: a123889abdd1bbb88a520b2e033cafb4fec3f7d5e8e3e7c7fdcdc791ef4bfd42a78e30ec7827d4c2f7c43cb407d300564ce9327a11fc210cb3ddc90814c02f22
+  metadata.gz: af76a227b8eaafaac0ce607ae095a6ba847c0e192edb4c2e580dd43acba00753450c5100db504f6fe37c8fbbc5a2616cdf7c204914ae6db5e899acb71e311458
+  data.tar.gz: 264571fe765368fd250a5f4685b33a3c3fc6071c84be79c9bd486d87934ee43c72a658ecfdaceab4304b9f495400ec49053c321871fb64cf0ba76ae0e91306ba

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    active_graphql (0.2.4)
+    active_graphql (0.3)
       activemodel (>= 3.0.0)
       activesupport (>= 4.0.0)
       graphlient (>= 0.3)
       graphql (>= 1.9.0)
+      mime-types (>= 3.0)
 
 GEM
   remote: https://rubygems.org/
@@ -55,6 +56,9 @@ GEM
     jaro_winkler (1.5.4)
     json (2.3.1)
     method_source (1.0.0)
+    mime-types (3.3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2020.1104)
     minitest (5.14.2)
     multipart-post (2.1.1)
     parallel (1.20.1)
@@ -129,4 +133,4 @@ DEPENDENCIES
   webmock (~> 3)
 
 BUNDLED WITH
-   2.0.1
+   2.2.6

data/active_graphql.gemspec

@@ -37,6 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'graphlient', '>= 0.3'
   spec.add_dependency 'activesupport', '>= 4.0.0'
   spec.add_dependency 'activemodel', '>= 3.0.0'
+  spec.add_dependency 'mime-types', '>= 3.0'
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "webmock", "~> 3"

data/lib/active_graphql/client/actions/action.rb

@@ -1,14 +1,18 @@
 # frozen_string_literal: true
 
+require 'active_graphql/client/actions/variable_detectable'
+require 'active_graphql/client/actions/action/format_outputs'
+require 'active_graphql/client/actions/action/format_inputs'
+require 'active_graphql/client/actions/action/format_variable_inputs'
+
 module ActiveGraphql
   class Client
     module Actions
       # Base class for query/mutation action objects
       class Action
-        class InvalidActionError < StandardError; end
+        include VariableDetectable
 
-        require 'active_graphql/client/actions/action/format_outputs'
-        require 'active_graphql/client/actions/action/format_inputs'
+        class InvalidActionError < StandardError; end
 
         attr_reader :name, :type, :output_values, :client, :input_attributes, :meta_attributes
 
@@ -63,7 +67,7 @@ module ActiveGraphql
           assert_format
 
           <<~TXT
-            #{type} {
+            #{type}#{wrapped_header formatted_variable_headers} {
               #{name}#{wrapped_header formatted_inputs} {
                 #{formatted_outputs}
               }
@@ -71,6 +75,10 @@ module ActiveGraphql
           TXT
         end
 
+        def graphql_variables
+          variable_attributes(input_attributes)
+        end
+
         private
 
         def join_array_and_hash(*array, **hash)
@@ -85,6 +93,10 @@ module ActiveGraphql
           FormatOutputs.new(output_values).call
         end
 
+        def formatted_variable_headers
+          FormatVariableInputs.new(graphql_variables).call
+        end
+
         def assert_format
           return unless output_values.empty?
 

data/lib/active_graphql/client/actions/action/format_inputs.rb

@@ -6,6 +6,8 @@ module ActiveGraphql
       class Action
         # converts ruby object in to grapqhl input string
         class FormatInputs
+          include VariableDetectable
+
           def initialize(inputs)
             @inputs = inputs
           end
@@ -20,9 +22,9 @@ module ActiveGraphql
 
           attr_reader :inputs
 
-          def formatted(attributes)
+          def formatted(attributes, parent_keys: [])
             if attributes.is_a?(Hash)
-              formatted_attributes(attributes)
+              formatted_attributes(attributes, parent_keys: parent_keys)
             else
               raise(
                 ActiveGraphql::Client::Actions::WrongTypeError,
@@ -31,39 +33,45 @@ module ActiveGraphql
             end
           end
 
-          def formatted_attributes(attributes)
+          def formatted_attributes(attributes, parent_keys: [])
             attributes = attributes.dup
             keyword_fields = (attributes.delete(:__keyword_attributes) || []).map(&:to_s)
 
             formatted_attributes = attributes.map do |key, val|
               if keyword_fields.include?(key.to_s)
-                formatted_key_and_keyword(key, val)
+                formatted_key_and_keyword(key, val, parent_keys: parent_keys)
               else
-                formatted_key_and_value(key, val)
+                formatted_key_and_value(key, val, parent_keys: parent_keys)
               end
             end
 
             formatted_attributes.join(', ')
           end
 
-          def formatted_key_and_value(key, value)
-            "#{key}: #{formatted_value(value)}"
+          def formatted_key_and_value(key, value, parent_keys:)
+            if variable_value?(value)
+              "#{key}: $#{[*parent_keys, key].compact.join('_')}"
+            else
+              "#{key}: #{formatted_value(value, parent_keys: [*parent_keys, key])}"
+            end
           end
 
-          def formatted_key_and_keyword(key, value)
+          def formatted_key_and_keyword(key, value, parent_keys:)
             if value.is_a?(String) || value.is_a?(Symbol)
               "#{key}: #{value}"
             else
-              "#{key}: #{formatted_value(value)}"
+              "#{key}: #{formatted_value(value, parent_keys: [*parent_keys, key])}"
             end
           end
 
-          def formatted_value(value) # rubocop:disable Metrics/MethodLength
+          def formatted_value(value, parent_keys:) # rubocop:disable Metrics/MethodLength
             case value
             when Hash
-              "{ #{formatted(value)} }"
+              "{ #{formatted(value, parent_keys: parent_keys)} }"
             when Array
-              formatted_values = value.map { |it| formatted_value(it) }
+              formatted_values = value.map.with_index do |it, idx|
+                formatted_value(it, parent_keys: [*parent_keys, idx])
+              end
               "[#{formatted_values.join(', ')}]"
             when nil
               'null'

data/lib/active_graphql/client/actions/action/format_variable_inputs.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module ActiveGraphql
+  class Client
+    module Actions
+      class Action
+        # converts ruby object in to varbiable stype grapqhl input
+        class FormatVariableInputs
+          include VariableDetectable
+
+          def initialize(inputs)
+            @initial_inputs = inputs
+          end
+
+          def call
+            return '' if inputs.empty?
+
+            formatted_attributes(inputs)
+          end
+
+          private
+
+          attr_reader :initial_inputs
+
+          def formatted_attributes(attributes)
+            attributes = attributes.dup
+            formatted_attributes = attributes.map do |key, val|
+              formatted_key_and_type(key, val)
+            end
+
+            formatted_attributes.join(', ')
+          end
+
+          def inputs
+            @inputs ||= variable_attributes(initial_inputs)
+          end
+
+          def formatted_key_and_type(key, value)
+            "$#{key}: #{formatted_type(value)}"
+          end
+
+          def formatted_type(value)
+            if value.is_a?(Array)
+              '[File!]!'
+            else
+              'File!'
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_graphql/client/actions/variable_detectable.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module ActiveGraphql
+  class Client
+    module Actions
+      # handles all action details which are specific for query type request
+      module VariableDetectable
+        def variable_attributes(attributes)
+          variables_or_nil = attributes.transform_values do |value|
+            if value.is_a?(Hash)
+              variable_attributes(value)
+            elsif variable_value?(value)
+              value
+            elsif value.is_a?(Array)
+              variable_attributes(value.map.with_index { |val, i| [i, val] }.to_h)
+            end
+          end
+
+          flatten_keys(variables_or_nil).select { |_, val| val.present? }
+        end
+
+        def variable_value?(value)
+          kind_of_file?(value) || (value.is_a?(Array) && kind_of_file?(value.first))
+        end
+
+        private
+
+        def flatten_keys(attributes, parent_key: nil)
+          flattened = {}
+          attributes.each do |key, value|
+            full_key = [parent_key, key].compact.join('_').to_sym
+            if value.is_a?(Hash)
+              flattened.merge!(flatten_keys(value, parent_key: full_key))
+            else
+              flattened[full_key] = value
+            end
+          end
+          flattened
+        end
+
+        def kind_of_file?(value)
+          value.is_a?(File)
+        end
+      end
+    end
+  end
+end

data/lib/active_graphql/client/adapters/format_multipart_variables.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require 'faraday'
+require 'mime/types'
+require 'active_graphql/errors'
+
+module ActiveGraphql
+  class Client
+    module Adapters
+      class NoMimeTypeException < ActiveGraphql::Errors::Error; end
+
+      # Converts deeply nested File instances to Faraday::UploadIO
+      class FormatMultipartVariables
+        def initialize(variables)
+          @variables = variables
+        end
+
+        def call
+          deep_transform_values(variables) do |variable|
+            variable_value(variable)
+          end
+        end
+
+        private
+
+        attr_reader :variables
+
+        def deep_transform_values(hash, &block)
+          return hash unless hash.is_a?(Hash)
+
+          hash.transform_values do |val|
+            if val.is_a?(Hash)
+              deep_transform_values(val, &block)
+            else
+              yield(val)
+            end
+          end
+        end
+
+        def variable_value(variable)
+          if variable.is_a?(Array)
+            variable.map { |it| variable_value(it) }
+          elsif variable.is_a?(Hash)
+            variable.transform_values { |it| variable_value(it) }
+          elsif variable.is_a?(File)
+            file_variable_value(variable)
+          else
+            variable
+          end
+        end
+
+        def file_variable_value(file)
+          content_type = MIME::Types.type_for(file.path).first
+          return Faraday::UploadIO.new(file.path, content_type) if content_type
+
+          raise NoMimeTypeException, "Unable to determine mime type for #{file.path}"
+        end
+      end
+    end
+  end
+end

data/lib/active_graphql/client/adapters/graphlient_adapter.rb

@@ -6,26 +6,37 @@ module ActiveGraphql
       # Client which makes raw API requests to GraphQL server
       class GraphlientAdapter
         require 'graphlient'
+        require_relative './graphlient_multipart_adapter'
 
         def initialize(config)
           @url = config[:url]
-          @adapter_config = config.except(:url)
+          @config = config
         end
 
         def post(action)
-          raw_response = graphql_client.query(action.to_graphql)
+          raw_response = graphql_client.query(action.to_graphql, action.graphql_variables)
           Response.new(raw_response.data)
         rescue Graphlient::Errors::GraphQLError => e
           Response.new(nil, e)
         end
 
+        def adapter_config
+          @adapter_config ||= config.except(:url, :multipart).tap do |new_config|
+            new_config[:http] = GraphlientMultipartAdapter if multipart?
+          end
+        end
+
         private
 
-        attr_reader :url, :adapter_config
+        attr_reader :url, :config
 
         def graphql_client
           @graphql_client ||= Graphlient::Client.new(url, **adapter_config)
         end
+
+        def multipart?
+          config[:multipart].present?
+        end
       end
     end
   end

data/lib/active_graphql/client/adapters/graphlient_multipart_adapter.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'graphlient'
+require 'faraday'
+require 'faraday/request/multipart'
+require 'faraday_middleware'
+require 'active_graphql/client/adapters/format_multipart_variables'
+
+module ActiveGraphql
+  class Client
+    module Adapters
+      # Adapter enabling multipart data transfer
+      class GraphlientMultipartAdapter < Graphlient::Adapters::HTTP::Adapter
+        def execute(document:, operation_name:, variables:, context:)
+          response = execute_request(
+            document: document, operation_name: operation_name,
+            variables: variables, context: context
+          )
+          response.body
+        rescue Faraday::ClientError => e
+          raise Graphlient::Errors::FaradayServerError, e
+        end
+
+        private
+
+        def execute_request(document:, operation_name:, variables:, context:)
+          connection.post do |req|
+            req.headers.merge!(context[:headers] || {})
+            req.body = {
+              query: document.to_query_string,
+              operationName: operation_name,
+              variables: FormatMultipartVariables.new(variables).call
+            }
+          end
+        end
+
+        def connection
+          @connection ||= Faraday.new(url: url, headers: headers) do |c|
+            c.adapter Faraday::Response::RaiseError
+            c.request :multipart
+            c.request :url_encoded
+            c.response :json
+
+            block_given? ? yield(c) : c.adapter(Faraday::Adapter::NetHttp)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_graphql/model.rb

@@ -155,7 +155,10 @@ module ActiveGraphql
 
       def create(params)
         action_name = "create_#{active_graphql.resource_name}"
-        response = exec_graphql { |api| api.mutation(action_name).input(params) }
+        response = exec_graphql do |api|
+          api.mutation(action_name).input(params)
+        end
+
         new(response.result.to_h).tap do |record|
           record.graphql_errors = response.detailed_errors if !response.success? || !record.valid?
         end

data/lib/active_graphql/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveGraphql
-  VERSION = '0.2.4'
+  VERSION = '0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_graphql
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: '0.3'
 platform: ruby
 authors:
 - Povilas Jurcys
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-25 00:00:00.000000000 Z
+date: 2021-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +192,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - po.jurcys@gmail.com
 executables: []
@@ -212,10 +226,14 @@ files:
 - lib/active_graphql/client/actions/action.rb
 - lib/active_graphql/client/actions/action/format_inputs.rb
 - lib/active_graphql/client/actions/action/format_outputs.rb
+- lib/active_graphql/client/actions/action/format_variable_inputs.rb
 - lib/active_graphql/client/actions/mutation_action.rb
 - lib/active_graphql/client/actions/query_action.rb
+- lib/active_graphql/client/actions/variable_detectable.rb
 - lib/active_graphql/client/adapters.rb
+- lib/active_graphql/client/adapters/format_multipart_variables.rb
 - lib/active_graphql/client/adapters/graphlient_adapter.rb
+- lib/active_graphql/client/adapters/graphlient_multipart_adapter.rb
 - lib/active_graphql/client/response.rb
 - lib/active_graphql/errors.rb
 - lib/active_graphql/model.rb
@@ -231,8 +249,8 @@ licenses:
 metadata:
   homepage_uri: https://github.com/samesystem/active_graphql
   source_code_uri: https://github.com/samesystem/active_graphql
-  changelog_uri: https://github.com/samesystem/active_graphql/blob/v0.2.4/CHANGELOG.md
-post_install_message: 
+  changelog_uri: https://github.com/samesystem/active_graphql/blob/v0.3/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -247,8 +265,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Graphql client
 test_files: []