apollo_upload_server 1.0.0 → 2.0.0.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 013e8d44965539f6c6497711dd03d89bfcade844
-  data.tar.gz: ff865ced6a90b5dbda49d9532146fe234147f3cf
+  metadata.gz: 56d9a1cede8b8618901f4b4ebf80557c2676fe18
+  data.tar.gz: 07b2468de665b6c48e42f50c682c98a01bb547e6
 SHA512:
-  metadata.gz: 38cb39ad98899d62e66ef5062da999ae9205dc10e3fcf9a7ea7affb3430c2bb0dc8ff0de7d0ebecf460394a74201236ccc7a711f96b1d576c30580e140a91cec
-  data.tar.gz: 7a25372d926e596e3658660edf053b3bd5e36e07083b57bf814e7942d798270fd26f6f3f4451932bd1b8fd7a039d1a3931e67791c3623dc257b44427ea06ba02
+  metadata.gz: fc9d2bdefd35a214560ffa68781eac2b7129c2658b32494fe89adbe869c5fbc6c19fa2a94c3ce5f2bfa86a5aae1e9a4af80d67d69061627a5c43623d7b803de8
+  data.tar.gz: 2b796b2080b4feb1dd0676f47f71b3fda31635e59e7add4b641ed1c6ec5f3f8a39d1deae2c422eb3bc39fcd7ef3f337f155cacf5e1fa59c05ee0504130469495

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    apollo_upload_server (0.1.0)
+    apollo_upload_server (2.0.0.alpha.1)
       graphql (~> 1.7)
       rails (~> 5.0)
 
@@ -53,7 +53,7 @@ GEM
     erubi (1.7.0)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
-    graphql (1.7.7)
+    graphql (1.7.8)
     i18n (0.9.1)
       concurrent-ruby (~> 1.0)
     loofah (2.1.1)
@@ -64,8 +64,8 @@ GEM
     method_source (0.9.0)
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
-    minitest (5.10.3)
-    nio4r (2.1.0)
+    minitest (5.11.1)
+    nio4r (2.2.0)
     nokogiri (1.8.1)
       mini_portile2 (~> 2.3.0)
     rack (2.0.3)
@@ -99,7 +99,7 @@ GEM
       rspec-core (~> 3.7.0)
       rspec-expectations (~> 3.7.0)
       rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.0)
+    rspec-core (3.7.1)
       rspec-support (~> 3.7.0)
     rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -133,4 +133,4 @@ DEPENDENCIES
   rspec (~> 3.5)
 
 BUNDLED WITH
-   1.16.0
+   1.16.1

data/README.md

@@ -2,8 +2,8 @@
 
 Middleware which allows you to upload files using [graphql-ruby](https://github.com/rmosolgo/graphql-ruby), [apollo-upload-client](https://github.com/jaydenseric/apollo-upload-client) and Ruby on Rails.
 
-Note: this implementation uses [v1 of the GraphQL multipart request spec](https://github.com/jaydenseric/graphql-multipart-request-spec/tree/v1.0.0), so you should use apollo-upload-client library v5.1.1.
-
+Note: this implementation uses [v2 of the GraphQL multipart request spec](https://github.com/jaydenseric/graphql-multipart-request-spec/tree/v2.0.0-alpha.2), so you should use apollo-upload-client library >= v7.0.0-alpha.3. If you need support for [v1 of the GraphQL multipart request spec](https://github.com/jaydenseric/graphql-multipart-request-spec/tree/v1.0.0), you must
+use [version 1.0.0](https://github.com/jetruby/apollo_upload_server-ruby/tree/1.0.0) of this gem.
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -25,7 +25,7 @@ Middleware will be used automatically.
 Gem adds custom `Upload` type to your GraphQL types.
 Use `ApolloUploadServer::Upload` type for your file as input field:
 ```ruby
-  input_field :file, !ApolloUploadServer::Upload
+  input_field :file, ApolloUploadServer::Upload
 ```
 
 That's all folks!

data/lib/apollo_upload_server/graphql_data_builder.rb

@@ -1,52 +1,35 @@
 require 'json'
-require 'active_support'
 
 module ApolloUploadServer
   class GraphQLDataBuilder
     def call(params)
-      operations = begin
-                     JSON.parse(params['operations'])
-                   rescue JSON::ParserError
-                     nil
-                   end
-      return unless operations.is_a?(Array)
+      operations = safe_json_parse(params['operations'])
+      file_mapper = safe_json_parse(params['map'])
 
-      files = transform(convert_to_hash(select_files(params)))
-      operations.zip(files).map do |data, file|
-        if file.nil?
-          data
-        else
-          data.deep_merge(file)
+      return nil if operations.nil? || file_mapper.nil?
+      single_operation = operations.is_a?(Hash)
+      file_mapper.to_a.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
+            # 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
     end
 
     private
 
-    def select_files(params)
-      params.select do |key, _value|
-        key.include?('.variables') # && value.is_a?(ActionDispatch::Http::UploadedFile)
-      end
-    end
-
-    def convert_to_hash(params)
-      params.reduce({}) do |memo, (key, value)|
-        memo.deep_merge(key.split('.').reverse.inject(value) { |hash, name| { name => hash } })
-      end
-    end
-
-    def transform(hash)
-      if hash.is_a?(Hash)
-        if hash.keys.all? { |key| key.to_i.to_s == key }
-          hash.keys.each_with_object([]) do |index, memo|
-            memo[index.to_i] = transform(hash[index])
-          end
-        else
-          hash.map { |k, v| [k, transform(v)] }.to_h
-        end
-      else
-        hash
-      end
+    def safe_json_parse(data)
+      JSON.parse(data)
+    rescue JSON::ParserError
+      nil
     end
   end
 end

data/lib/apollo_upload_server/middleware.rb

@@ -8,8 +8,7 @@ module ApolloUploadServer
 
     def call(env)
       request = ActionDispatch::Request.new(env)
-
-      if env['CONTENT_TYPE'].to_s.include?('multipart/form-data') && request.params['operations'].present?
+      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))
       end
 

data/lib/apollo_upload_server/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apollo_upload_server
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0.alpha.1
 platform: ruby
 authors:
 - JetRuby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-04 00:00:00.000000000 Z
+date: 2018-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -121,9 +121,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.11