Fix multiple uploaded files examples

lib/rspec/openapi/schema_builder.rb

@@ -195,6 +195,11 @@ def adjust_params(value)
         value[key] = v.original_filename
       elsif v.is_a?(Hash)
         adjust_params(v)
+      elsif v.is_a?(Array)
+        result = v.map do |item|
+          item.is_a?(ActionDispatch::Http::UploadedFile) ? item.original_filename : item
+        end
+        value[key] = result
       end
     end
   end

spec/integration_tests/rails_test.rb

@@ -104,13 +104,7 @@ class TablesUpdateTest < ActionDispatch::IntegrationTest
   openapi!
 
   test 'returns a table' do
-    png = 'iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAAAAADhZOFXAAAADklEQVQIW2P4DwUMlDEA98A/wTjP
-    QBoAAAAASUVORK5CYII='.unpack1('m')
-    File.binwrite('test.png', png)
-    image = Rack::Test::UploadedFile.new('test.png', 'image/png')
-    patch '/tables/1', headers: { authorization: 'k0kubun' }, params: {
-      nested: { image: image, caption: 'Some caption' },
-    }
+    patch '/tables/1', headers: { authorization: 'k0kubun' }, params: { name: 'test' }
     assert_response 200
   end
 end
@@ -141,6 +135,33 @@ class ImageTest < ActionDispatch::IntegrationTest
     get '/images'
     assert_response 200
   end
+
+  test 'returns a image payload with upload' do
+    png = 'iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAAAAADhZOFXAAAADklEQVQIW2P4DwUMlDEA98A/wTjP
+    QBoAAAAASUVORK5CYII='.unpack1('m')
+    File.binwrite('test.png', png)
+    image = Rack::Test::UploadedFile.new('test.png', 'image/png')
+    post '/images/upload', params: { image: image }
+    assert_response 200
+  end
+
+  test 'returns a image payload with upload nested' do
+    png = 'iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAAAAADhZOFXAAAADklEQVQIW2P4DwUMlDEA98A/wTjP
+    QBoAAAAASUVORK5CYII='.unpack1('m')
+    File.binwrite('test.png', png)
+    image = Rack::Test::UploadedFile.new('test.png', 'image/png')
+    post '/images/upload_nested', params: { nested_image: { image: image, caption: 'Some caption' } }
+    assert_response 200
+  end
+
+  test 'returns a image payload with upload multiple' do
+    png = 'iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAAAAADhZOFXAAAADklEQVQIW2P4DwUMlDEA98A/wTjP
+    QBoAAAAASUVORK5CYII='.unpack1('m')
+    File.binwrite('test.png', png)
+    image = Rack::Test::UploadedFile.new('test.png', 'image/png')
+    post '/images/upload_multiple', params: { images: [image, image] }
+    assert_response 200
+  end
 end
 
 class ExtraRoutesTest < ActionDispatch::IntegrationTest

spec/rails/app/controllers/images_controller.rb

@@ -1,8 +1,6 @@
 class ImagesController < ApplicationController
   def show
-    png = 'iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAAAAADhZOFXAAAADklEQVQIW2P4DwUMlDEA98A/wTjP
-    QBoAAAAASUVORK5CYII='.unpack('m').first
-    send_data png, type: 'image/png', disposition: 'inline'
+    send_image
   end
 
   def index
@@ -14,4 +12,24 @@ def index
     ]
     render json: list
   end
+
+  def upload
+    send_image
+  end
+
+  def upload_nested
+    send_image
+  end
+
+  def upload_multiple
+    send_image
+  end
+
+  private
+
+  def send_image
+    png = 'iVBORw0KGgoAAAANSUhEUgAAAAgAAAAICAAAAADhZOFXAAAADklEQVQIW2P4DwUMlDEA98A/wTjP
+    QBoAAAAASUVORK5CYII='.unpack('m').first
+    send_data png, type: 'image/png', disposition: 'inline'
+  end
 end

spec/rails/config/routes.rb

@@ -3,7 +3,13 @@
 
   defaults format: 'json' do
     resources :tables, only: [:index, :show, :create, :update, :destroy]
-    resources :images, only: [:index, :show]
+    resources :images, only: [:index, :show] do
+      collection do
+        post 'upload'
+        post 'upload_nested'
+        post 'upload_multiple'
+      end
+    end
     resources :users,  only: [:show, :create]
 
     get '/test_block' => ->(_env) { [200, { 'Content-Type' => 'text/plain' }, ['A TEST']] }

spec/rails/doc/openapi.json

@@ -455,36 +455,20 @@
         ],
         "requestBody": {
           "content": {
-            "multipart/form-data": {
+            "application/x-www-form-urlencoded": {
               "schema": {
                 "type": "object",
                 "properties": {
-                  "nested": {
-                    "type": "object",
-                    "properties": {
-                      "image": {
-                        "type": "string",
-                        "format": "binary"
-                      },
-                      "caption": {
-                        "type": "string"
-                      }
-                    },
-                    "required": [
-                      "image",
-                      "caption"
-                    ]
+                  "name": {
+                    "type": "string"
                   }
                 },
                 "required": [
-                  "nested"
+                  "name"
                 ]
               },
               "example": {
-                "nested": {
-                  "image": "test.png",
-                  "caption": "Some caption"
-                }
+                "name": "test"
               }
             }
           }
@@ -797,6 +781,153 @@
           }
         }
       }
+    },
+    "/images/upload_multiple": {
+      "post": {
+        "summary": "upload_multiple",
+        "tags": [
+          "Image"
+        ],
+        "requestBody": {
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "images": {
+                    "type": "array",
+                    "items": {
+                      "type": "string",
+                      "format": "binary"
+                    }
+                  }
+                },
+                "required": [
+                  "images"
+                ]
+              },
+              "example": {
+                "images": [
+                  "test.png",
+                  "test.png"
+                ]
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "returns a image payload with upload multiple",
+            "content": {
+              "image/png": {
+                "schema": {
+                  "type": "string",
+                  "format": "binary"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/images/upload_nested": {
+      "post": {
+        "summary": "upload_nested",
+        "tags": [
+          "Image"
+        ],
+        "requestBody": {
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "nested_image": {
+                    "type": "object",
+                    "properties": {
+                      "image": {
+                        "type": "string",
+                        "format": "binary"
+                      },
+                      "caption": {
+                        "type": "string"
+                      }
+                    },
+                    "required": [
+                      "image",
+                      "caption"
+                    ]
+                  }
+                },
+                "required": [
+                  "nested_image"
+                ]
+              },
+              "example": {
+                "nested_image": {
+                  "image": "test.png",
+                  "caption": "Some caption"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "returns a image payload with upload nested",
+            "content": {
+              "image/png": {
+                "schema": {
+                  "type": "string",
+                  "format": "binary"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/images/upload": {
+      "post": {
+        "summary": "upload",
+        "tags": [
+          "Image"
+        ],
+        "requestBody": {
+          "content": {
+            "multipart/form-data": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "image": {
+                    "type": "string",
+                    "format": "binary"
+                  }
+                },
+                "required": [
+                  "image"
+                ]
+              },
+              "example": {
+                "image": "test.png"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "returns a image payload with upload",
+            "content": {
+              "image/png": {
+                "schema": {
+                  "type": "string",
+                  "format": "binary"
+                }
+              }
+            }
+          }
+        }
+      }
     }
   }
 }