Fix ruby input file

Author: abnegate

templates/ruby/lib/container/client.rb.twig

@@ -109,15 +109,15 @@ module {{ spec.title | caseUcfirst }}
             case input_file.source_type
             when 'path'
                 size = ::File.size(input_file.path)
-            when 'bytes'
+            when 'string'
                 size = input_file.data.bytesize
             end
 
             if size < @chunk_size
                 if input_file.source_type == 'path'
                     input_file.data = IO.read(input_file.path)
                 end
-                params[param_name] = input_file
+                params[param_name.to_sym] = input_file
                 return call(
                     method: 'POST',
                     path: path,
@@ -141,16 +141,20 @@ module {{ spec.title | caseUcfirst }}
                 offset = [size, (chunks_uploaded * @chunk_size)].min
             end
 
-            cached_input = input_file
-
             while offset < size
                 case input_file.source_type
                 when 'path'
-                    input_file.data = IO.read(input_file.path, @chunk_size, offset)
-                when 'bytes'
-                    input_file.data = cached_input.data.slice(offset, @chunk_size)
+                    string = IO.read(input_file.path, @chunk_size, offset)
+                when 'string'
+                    string = input_file.data.byteslice(offset, [@chunk_size, size - offset].min)
                 end
-                params[param_name] = input_file
+
+                params[param_name.to_sym] = InputFile::from_string(
+                    string,
+                    filename: input_file.filename,
+                    mime_type: input_file.mime_type
+                )
+
                 headers['content-range'] = "bytes #{offset}-#{[offset + @chunk_size - 1, size].min}/#{size}"
 
                 result = call(

templates/ruby/lib/container/input_file.rb.twig

@@ -6,25 +6,28 @@ module {{spec.title | caseUcfirst}}
         attr_accessor :filename
         attr_accessor :mime_type
         attr_accessor :source_type
-
         attr_accessor :data
 
-        def self.fromPath(path)
+        def self.from_path(path)
             instance = InputFile.new
             instance.path = path
             instance.filename = ::File.basename(path)
-            instance.mime_type = MIME::Types.type_for(path)
+            instance.mime_type = MIME::Types.type_for(path).first.content_type
             instance.source_type = 'path'
             instance
         end
 
-        def self.fromBytes(bytes, filename: nil, mime_type: nil)
+        def self.from_string(string, filename: nil, mime_type: nil)
             instance = InputFile.new
-            instance.data = bytes
+            instance.data = string
             instance.filename = filename
             instance.mime_type = mime_type
-            instance.source_type = 'bytes'
+            instance.source_type = 'string'
             instance
         end
+
+        def self.from_bytes(bytes, filename: nil, mime_type: nil)
+            self.from_string(bytes.pack('C*'), filename: filename, mime_type: mime_type)
+        end
     end
 end

tests/Ruby27Test.php

@@ -17,6 +17,8 @@ class Ruby27Test extends Base
         ...Base::BAR_RESPONSES,
         ...Base::GENERAL_RESPONSES,
         ...Base::LARGE_FILE_RESPONSES,
+        ...Base::LARGE_FILE_RESPONSES,
+        ...Base::LARGE_FILE_RESPONSES,
         ...Base::EXCEPTION_RESPONSES
     ];
 }

tests/Ruby30Test.php

@@ -19,7 +19,6 @@ class Ruby30Test extends Base
         ...Base::LARGE_FILE_RESPONSES,
         ...Base::LARGE_FILE_RESPONSES,
         ...Base::LARGE_FILE_RESPONSES,
-        ...Base::LARGE_FILE_RESPONSES,
         ...Base::EXCEPTION_RESPONSES
     ];
 }

tests/Ruby31Test.php

@@ -17,6 +17,8 @@ class Ruby31Test extends Base
         ...Base::BAR_RESPONSES,
         ...Base::GENERAL_RESPONSES,
         ...Base::LARGE_FILE_RESPONSES,
+        ...Base::LARGE_FILE_RESPONSES,
+        ...Base::LARGE_FILE_RESPONSES,
         ...Base::EXCEPTION_RESPONSES
     ];
 }

tests/languages/ruby/tests.rb

@@ -49,19 +49,35 @@
 response = general.redirect()
 puts response["result"]
 
-response = general.upload(x: 'string', y: 123, z:['string in array'], file: Appwrite::InputFile.fromPath('./tests/resources/file.png'))
-puts response.result
+begin
+    response = general.upload(x: 'string', y: 123, z:['string in array'], file: Appwrite::InputFile.from_path('./tests/resources/file.png'))
+    puts response.result
+rescue => e
+    puts e
+end
 
-response = general.upload(x: 'string', y: 123, z:['string in array'], file: Appwrite::InputFile.fromPath('./tests/resources/large_file.mp4'))
-puts response.result
+begin
+    response = general.upload(x: 'string', y: 123, z:['string in array'], file: Appwrite::InputFile.from_path('./tests/resources/large_file.mp4'))
+    puts response.result
+rescue => e
+    puts e
+end
 
-data = IO.read('./tests/resources/file.png')
-response = general.upload(x: 'string', y: 123, z:['string in array'], file: Appwrite::InputFile.fromBytes(data, filename:'file.png', mime_type: 'image/png'))
-puts response.result
+begin
+    string = IO.read('./tests/resources/file.png')
+    response = general.upload(x: 'string', y: 123, z:['string in array'], file: Appwrite::InputFile.from_string(string, filename:'file.png', mime_type: 'image/png'))
+    puts response.result
+rescue => e
+    puts e
+end
 
-data = IO.read('./tests/resources/large_file.mp4')
-response = general.upload(x: 'string', y: 123, z:['string in array'], file: Appwrite::InputFile.fromBytes(data, filename:'large_file.mp4', mime_type: 'video/mp4'))
-puts response.result
+begin
+    string = IO.read('./tests/resources/large_file.mp4')
+    response = general.upload(x: 'string', y: 123, z:['string in array'], file: Appwrite::InputFile.from_string(string, filename:'large_file.mp4', mime_type: 'video/mp4'))
+    puts response.result
+rescue => e
+    puts e
+end
 
 begin
     general.error400()