apollo_upload_server 2.0.0.alpha.1 → 2.0.0.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56d9a1cede8b8618901f4b4ebf80557c2676fe18
-  data.tar.gz: 07b2468de665b6c48e42f50c682c98a01bb547e6
+  metadata.gz: 1f4d76e5ca733dd6fa8bd2ebc54dbfc355bd6588
+  data.tar.gz: 90cfc63714bac37890f794821f7abfec4cf099fa
 SHA512:
-  metadata.gz: fc9d2bdefd35a214560ffa68781eac2b7129c2658b32494fe89adbe869c5fbc6c19fa2a94c3ce5f2bfa86a5aae1e9a4af80d67d69061627a5c43623d7b803de8
-  data.tar.gz: 2b796b2080b4feb1dd0676f47f71b3fda31635e59e7add4b641ed1c6ec5f3f8a39d1deae2c422eb3bc39fcd7ef3f337f155cacf5e1fa59c05ee0504130469495
+  metadata.gz: 7671994289526ee7330d52ee47e1cf5a901394fa72d451059df80c3307d688a2c9f1452f5cf276b66f96f062f8a42c169fae7cf8d9b5d325640eb05af930b456
+  data.tar.gz: f4e457e5e4d6c89a2d741c7f5294d2525df2fbb0d4650bb675b0fa75a37a97dc95e3f01cff35d6fe65f4d351969ca33dfffe7cae2e5468bf7b87a296554da1ae

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    apollo_upload_server (2.0.0.alpha.1)
+    apollo_upload_server (2.0.0.alpha.2)
       graphql (~> 1.7)
       rails (~> 5.0)
 

data/README.md

@@ -9,7 +9,7 @@ use [version 1.0.0](https://github.com/jetruby/apollo_upload_server-ruby/tree/1.
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'apollo_upload_server'
+gem 'apollo_upload_server', '2.0.0.alpha.1'
 ```
 
 And then execute:

data/lib/apollo_upload_server/graphql_data_builder.rb

@@ -7,25 +7,40 @@ module ApolloUploadServer
       file_mapper = safe_json_parse(params['map'])
 
       return nil if operations.nil? || file_mapper.nil?
-      single_operation = operations.is_a?(Hash)
-      file_mapper.to_a.each do |file_index, paths|
+      if operations.is_a?(Hash)
+        single_transformation(file_mapper, operations, params)
+      else
+        { '_json' => multiple_transformation(file_mapper, operations, params) }
+      end
+    end
+
+    private
+
+    def single_transformation(file_mapper, operations, params)
+      operations = operations.dup
+      file_mapper.each do |file_index, paths|
         paths.each do |path|
           splited_path = path.split('.')
-          if single_operation
             # splited_path => 'variables.input.profile_photo'; splited_path[0..-2] => ['variables', 'input']
             # dig from first to penultimate key, and merge last key with value as file
             operations.dig(*splited_path[0..-2]).merge!(splited_path.last => params[file_index])
-          else
+        end
+      end
+      operations
+    end
+
+    def multiple_transformation(file_mapper, operations, params)
+      operations = operations.dup
+      file_mapper.each do |file_index, paths|
+        paths.each do |path|
+          splited_path = path.split('.')
             # dig from second to penultimate key, and merge last key with value as file to operation with first key index
             operations[splited_path.first.to_i].dig(*splited_path[1..-2]).merge!(splited_path.last => params[file_index])
-          end
         end
       end
-      single_operation ? [operations] : operations
+      operations
     end
 
-    private
-
     def safe_json_parse(data)
       JSON.parse(data)
     rescue JSON::ParserError

data/lib/apollo_upload_server/middleware.rb

@@ -8,8 +8,13 @@ module ApolloUploadServer
 
     def call(env)
       request = ActionDispatch::Request.new(env)
-      if env['CONTENT_TYPE'].to_s.include?('multipart/form-data') && request.params['operations'].present? && request.params['map'].present?
-        request.update_param('_json', GraphQLDataBuilder.new.call(request.params))
+      params = request.params
+
+      if env['CONTENT_TYPE'].to_s.include?('multipart/form-data') && params['operations'].present? && params['map'].present?
+        result = GraphQLDataBuilder.new.call(request.params)
+        result&.each do |key, value|
+          request.update_param(key, value)
+        end
       end
 
       @app.call(env)

data/lib/apollo_upload_server/version.rb

@@ -1,3 +1,3 @@
 module ApolloUploadServer
-  VERSION = '2.0.0.alpha.1'.freeze
+  VERSION = '2.0.0.alpha.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apollo_upload_server
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha.1
+  version: 2.0.0.alpha.2
 platform: ruby
 authors:
 - JetRuby