refactor

Author: bishosilwal

lib/active_storage/service/ik_file.rb

@@ -14,7 +14,7 @@ def url
 
       def delete
         begin
-          @imagekit.delete_file(file_id)
+          @imagekit.delete_file(file_id: file_id)
         rescue
           file_id
         end
@@ -53,7 +53,7 @@ def file_id
       end
 
       def exist?
-        details = @imagekit.get_file_details(file_id)
+        details = @imagekit.get_file_details(file_id: file_id)
         return false if details[:error].present?
 
         true

lib/active_storage/service/image_kit_io_service.rb

@@ -71,7 +71,7 @@ def initialize(**options)
       def upload(key, io, checksum: nil, **options)
         instrument :upload, key: key, checksum: checksum do
           blob = storage_blob(key)
-          response = client.upload_file(io, blob.filename.to_s)
+          response = client.upload_file(file: io, file_name: blob.filename.to_s)
           if response[:error].nil?
             blob.update_columns(metadata: response[:response].transform_keys(&:to_sym))
           end
@@ -178,7 +178,7 @@ def stream_file(key, &download_block)
             download_block.call(chunk) if download_block.present?
           end
         }
-        client.stream_file(file_obj.url, &block)
+        client.stream_file(file_url: file_obj.url, &block)
       end
     end
   end

lib/carrierwave/carrierwave.rb

@@ -36,8 +36,7 @@ def filename
         end
 
         if self.file != nil
-          base64 = Base64.encode64(::File.open(self.file.file, "rb").read)
-          resp = @imagekit.upload_file(open(self.file.file, 'rb'), self.file.filename, @options)
+          resp = @imagekit.upload_file(file: open(self.file.file, 'rb'), file_name: self.file.filename, options: @options)
           # ::File.delete(self.file.file)
           res = resp[:response].to_json
           if res != "null"

lib/carrierwave/storage/ik_file.rb

@@ -33,7 +33,7 @@ def size
         def delete
           # file_id=@identifier['fileId']
           begin
-            @imagekit.delete_file(fileId)
+            @imagekit.delete_file(file_id: fileId)
           rescue
             fileId
           end

lib/imagekitio/api_service/bulk.rb

@@ -9,16 +9,16 @@ def initialize(req_obj)
         @req_obj = req_obj
       end
 
-      def job_status(id)
-        if id == '' || id.nil?
-          raise ArgumentError, 'Job id is required'
+      def job_status(job_id: nil)
+        if job_id == '' || job_id.nil?
+          raise ArgumentError, 'job_id is required'
         end
-        url = "#{constants.BULK_BASE_URL}/#{id}"
-        payload = { 'jobId': id }
+        url = "#{constants.BULK_BASE_URL}/#{job_id}"
+        payload = { 'jobId': job_id }
         @req_obj.request('get', url, @req_obj.create_headers, payload)
       end
 
-      def add_tags(file_ids = [], tags = [])
+      def add_tags(file_ids: [], tags: [])
         if file_ids.empty? || tags.empty?
           raise ArgumentError, 'Parameters are required'
         end
@@ -27,7 +27,7 @@ def add_tags(file_ids = [], tags = [])
         @req_obj.request('post', url, @req_obj.create_headers, payload)
       end
 
-      def remove_tags(file_ids = [], tags = [])
+      def remove_tags(file_ids: [], tags: [])
         if file_ids.empty? || tags.empty?
           raise ArgumentError, 'Parameters are required'
         end
@@ -36,7 +36,7 @@ def remove_tags(file_ids = [], tags = [])
         @req_obj.request('post', url, @req_obj.create_headers, payload)
       end
 
-      def remove_ai_tags(file_ids = [], ai_tags = [])
+      def remove_ai_tags(file_ids: [], ai_tags: [])
         if file_ids.empty? || ai_tags.empty?
           raise ArgumentError, 'Parameters are required'
         end
@@ -45,7 +45,7 @@ def remove_ai_tags(file_ids = [], ai_tags = [])
         @req_obj.request('post', url, @req_obj.create_headers, payload)
       end
 
-      def remove_files(file_ids = [])
+      def remove_files(file_ids: [])
         if file_ids.empty?
           raise ArgumentError, 'File ids are required'
         end

lib/imagekitio/api_service/custom_metadata_field.rb

@@ -11,7 +11,7 @@ def initialize(req_obj)
         @req_obj = req_obj
       end
 
-      def create(name, label, schema)
+      def create(name: nil, label: nil, schema: nil)
         if name == '' || name.nil? || label == '' || label.nil? || schema == '' || schema.nil?
           raise ArgumentError, 'Parameters required'
         end
@@ -23,13 +23,13 @@ def create(name, label, schema)
         @req_obj.request('post', url, @req_obj.create_headers, payload)
       end
 
-      def list(options = {})
+      def list(**options)
         url = "#{constants.API_BASE_URL}/customMetadataFields"
-        payload = request_formatter(options)
+        payload = request_formatter(options || {})
         @req_obj.request('get', url, @req_obj.create_headers, payload)
       end
 
-      def update(id, label = nil, schema = nil)
+      def update(id: nil, label: nil, schema: nil)
         if id == '' || id.nil?
           raise ArgumentError, 'id is required'
         end
@@ -40,7 +40,7 @@ def update(id, label = nil, schema = nil)
         @req_obj.request('patch', url, @req_obj.create_headers, payload.to_json)
       end
 
-      def delete(id)
+      def delete(id: nil)
         if id == '' || id.nil?
           raise ArgumentError, 'id is required'
         end

lib/imagekitio/api_service/file.rb

@@ -28,7 +28,7 @@ def initialize(req_obj)
       #            "brand": "H&M",
       #            "discount": 30
       #         }
-      def upload(file, file_name, options)
+      def upload(file: nil, file_name: nil, **options)
         raise ArgumentError, constants.MISSING_UPLOAD_FILE_PARAMETER unless file
         raise ArgumentError, constants.MISSING_UPLOAD_FILE_PARAMETER unless file_name
 
@@ -46,7 +46,7 @@ def upload(file, file_name, options)
         end
       end
 
-      def update_details(file_id, options)
+      def update_details(file_id: nil, **options)
         unless options.fetch(:tags, []).is_a?(Array)
           raise ArgumentError, constants.UPDATE_DATA_TAGS_INVALID
         end
@@ -55,71 +55,84 @@ def update_details(file_id, options)
         end
         url = "#{constants.BASE_URL}/#{file_id}/details/"
         headers = @req_obj.create_headers
-        payload = request_formatter(options)
+        payload = request_formatter(options || {})
         @req_obj.request("patch", url, headers, payload.to_json)
       end
 
-      def list(options)
+      def list(**options)
         #  returns list of files on ImageKitIo Server
         #  :options dictionary of options
-        formatted_options = request_formatter(options)
+        formatted_options = request_formatter(options || {})
         raise KeyError(constants.LIST_FILES_INPUT_MISSING) unless formatted_options.is_a?(Hash)
         url = constants.BASE_URL
         headers = @req_obj.create_headers.update({params: formatted_options})
         @req_obj.request("get", url, headers, formatted_options)
       end
 
-      def details(file_identifier)
+      def details(file_identifier: nil)
         # Get detail of file by file_identifier
+        if file_identifier == "" || file_identifier.nil?
+          raise ArgumentError, "file_identifier is required"
+        end
         url = "#{constants.BASE_URL}/#{file_identifier}/details/"
         headers = @req_obj.create_headers
         @req_obj.request("get", url, headers)
       end
 
-      def get_metadata(file_id)
+      def get_metadata(file_id: nil)
         # Get metadata of a file by file_id
+        if file_id == "" || file_id.nil?
+          raise ArgumentError, "file_id is required"
+        end
         url = "#{constants.BASE_URL}/#{file_id}/metadata"
         @req_obj.request("get", url, @req_obj.create_headers)
       end
 
-      def delete(file_id)
+      def delete(file_id: nil)
         # Delete a file_id by file_id
+        if file_id == "" || file_id.nil?
+          raise ArgumentError, "file_id is required"
+        end
         url = "#{constants.BASE_URL}/#{file_id}"
         headers = @req_obj.create_headers
         @req_obj.request("delete", url, headers)
       end
 
-      def purge_cache(file_url)
-
+      def purge_cache(file_url: nil)
         # purges cache from server by file_url
-
+        if file_url == "" || file_url.nil?
+          raise ArgumentError, "file_url is required"
+        end
         url = "#{constants.BASE_URL}/purge"
         payload = {'url': file_url}
         @req_obj.request("post", url, @req_obj.create_headers, payload)
       end
 
-      def purge_cache_status(request_id)
+      def purge_cache_status(request_id: nil)
         # This function is to get cache_status
+        if request_id == "" || request_id.nil?
+          raise ArgumentError, "remote_file_url is required"
+        end
         url = "#{constants.BASE_URL}/purge/#{request_id}"
         @req_obj.request("get", url, @req_obj.create_headers)
       end
 
-      def get_metadata_from_remote_url(remote_file_url)
-        if remote_file_url == ""
+      def get_metadata_from_remote_url(remote_file_url: nil)
+        if remote_file_url == "" || remote_file_url.nil?
           raise ArgumentError, "remote_file_url is required"
         end
         url = "#{constants.REMOTE_METADATA_FULL_URL}?url=#{remote_file_url}"
         @req_obj.request("get", url, @req_obj.create_headers)
       end
 
-      def stream_file(remote_file_url, &block)
+      def stream_file(remote_file_url: nil, &block)
         if remote_file_url == '' || remote_file_url.nil?
           raise ArgumentError, 'remote_file_url is required'
         end
         @req_obj.request_stream('get', remote_file_url, headers: @req_obj.create_headers, &block)
       end
 
-      def copy(source_file_path, destination_path)
+      def copy(source_file_path: nil, destination_path: nil)
         if source_file_path == '' || source_file_path.nil? || destination_path == '' || destination_path.nil?
           raise ArgumentError, 'parameters required'
         end
@@ -128,7 +141,7 @@ def copy(source_file_path, destination_path)
         @req_obj.request('post', url, @req_obj.create_headers, payload)
       end
 
-      def move(source_file_path, destination_path)
+      def move(source_file_path: nil, destination_path: nil)
         if source_file_path == '' || source_file_path.nil? || destination_path == '' || destination_path.nil?
           raise ArgumentError, 'parameters required'
         end
@@ -137,7 +150,7 @@ def move(source_file_path, destination_path)
         @req_obj.request('post', url, @req_obj.create_headers, payload)
       end
 
-      def rename(file_path, new_file_name, **options)
+      def rename(file_path: nil, new_file_name: nil, **options)
         if file_path == '' || file_path.nil? || new_file_name == '' || new_file_name.nil?
           raise ArgumentError, 'parameters required'
         end

lib/imagekitio/api_service/folder.rb

@@ -9,7 +9,7 @@ def initialize(req_obj)
         @req_obj = req_obj
       end
 
-      def create(folder_name, parent_folder_path)
+      def create(folder_name: nil, parent_folder_path: nil)
         if folder_name == '' || folder_name.nil?
           raise ArgumentError, 'folder_name is required'
         end
@@ -18,7 +18,7 @@ def create(folder_name, parent_folder_path)
         @req_obj.request('post', url, @req_obj.create_headers, payload)
       end
 
-      def delete(folder_path)
+      def delete(folder_path: nil)
         if folder_path == '' || folder_path.nil?
           raise ArgumentError, 'folder_path is required'
         end
@@ -27,7 +27,7 @@ def delete(folder_path)
         @req_obj.request('delete', url, @req_obj.create_headers, payload)
       end
 
-      def copy(source_folder_path, destination_path)
+      def copy(source_folder_path: nil, destination_path: nil)
         if source_folder_path == '' || source_folder_path.nil? || destination_path == '' || destination_path.nil?
           raise ArgumentError, 'Parameters required'
         end
@@ -36,7 +36,7 @@ def copy(source_folder_path, destination_path)
         @req_obj.request('post', url, @req_obj.create_headers, payload)
       end
 
-      def move(source_folder_path, destination_path)
+      def move(source_folder_path: nil, destination_path: nil)
         if source_folder_path == '' || source_folder_path.nil? || destination_path == '' || destination_path.nil?
           raise ArgumentError, 'Parameters required'
         end