multi_video_streaming 1.0.1.beta → 1.0.1.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f823ff71e880e3e7efce69dcbdb48456176327e2f0731b9d40d2870d23f0b71
-  data.tar.gz: 9807632350465257894274a8818f498d5593b19757ab59db1f063c8fa26ccc6a
+  metadata.gz: 765bcaf5804a6f5cba3e24afa63bc7a5bbcfe753b1e6bd784af486c2a6a9ae7f
+  data.tar.gz: 816678de1d83ef07d15e27367ba1bee62f4586ad4074704e843f9f7fd059e63d
 SHA512:
-  metadata.gz: 8e4cd7670fd8b64ccc9f7b1ccb49ae6180cfb966f625b9942075b58dc9e2999b8c7dfbb9d48dc21b32ba1e2256af194e793feeaf29616b6875f48fcad4465412
-  data.tar.gz: 104882165a54cd6bc82b918b67b566cc5965cd492fc7f851a1de471283443cf00836d71c99d2f39f379c792020513681694af2f343407270e3d3aea8119fb70b
+  metadata.gz: ed105c282801bb02ab5bd5a3d27ea7c0f915ed15fa017e5314bc6f40df551de2e742b3fc51a703c0f89882f7e36ebdf45979394f18e9827977e5241ee4d7d953
+  data.tar.gz: 0bddcb8383e6594b97373394aad0e8d56d3f89bd5a095aaa15cb50ffd901eb957517798d8b582fa3d07928bdeb000a00e5c18f541868b6a6ba40d8f976308008

data/lib/multi_video_streaming/drivers/bunny.rb

@@ -99,10 +99,10 @@ module MultiVideoStreaming
           end
 
           response["directPlay"] = "https://video.bunnycdn.com/play/#{library_id}/#{video_id}"
-          response["availableResolutions"] = response["availableResolutions"].split(",")
+          response["availableResolutions"] = response["availableResolutions"]&.split(",")
 
           files = []
-          response["availableResolutions"].map do |available_resolution|
+          response["availableResolutions"]&.map do |available_resolution|
             files << 
             {
               file: "https://#{pull_zone}.b-cdn.net/#{response["guid"]}/play_#{available_resolution}.mp4",
@@ -116,6 +116,10 @@ module MultiVideoStreaming
 
           response["status"] = STATUS_EQUIVALENT[response["status"].to_s]
 
+          if response["status"] != "available"
+            raise MultiVideoStreaming::Helpers::GetDefaultErrorMessage.not_available
+          end
+
           return self.response_instance.add_response(
             platform_name: "bunny",
             status: "success",

data/lib/multi_video_streaming/drivers/s3.rb

@@ -29,7 +29,7 @@ module MultiVideoStreaming
           response = Aws::S3::Resource.new().bucket(bucket).object(video_id)
           video_url = response.public_url
 
-          url_signed = generate_presign_url(bucket: bucket, key: video_id)
+          url_signed = MultiVideoStreaming::Utils::S3.generate_presign_url(method: :get, bucket: bucket, key: video_id, download: false)
           data = {
             "key": response.key,
             "title": response.key,
@@ -140,11 +140,6 @@ module MultiVideoStreaming
           Aws.config.update(credentials: credentials, region: region, force_path_style: true)
         end
       end
-
-      def generate_presign_url(bucket:, key:)
-        signer = Aws::S3::Presigner.new
-        signer.presigned_url(:get_object, bucket: bucket, key: key, expires_in: 900)
-      end
     end
   end
 end

data/lib/multi_video_streaming/drivers/vimeo.rb

@@ -105,7 +105,7 @@ module MultiVideoStreaming
 
           available_resolutions = []
           files = []
-          response["files"].each do |file|
+          response["files"]&.each do |file|
             if file["rendition"] != "adaptive"
               available_resolutions << file["rendition"]
               files << { file: file["link"], label: file["rendition"] }
@@ -116,6 +116,11 @@ module MultiVideoStreaming
           response["files"] = files
           response["available_resolutions"] = available_resolutions
           response["status"] = STATUS_EQUIVALENT[response["status"]]
+
+          if response["status"] != "available"
+            raise MultiVideoStreaming::Helpers::GetDefaultErrorMessage.not_available
+          end
+
           return self.response_instance.add_response(
             platform_name: "vimeo",
             status: "success",

data/lib/multi_video_streaming/errors/invalid_s3_method_name.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module MultiVideoStreaming
+  module Errors
+    class InvalidS3MethodName < StandardError
+      def initialize(method)
+        super("Method name #{method} is invalid")
+      end
+    end
+  end
+end

data/lib/multi_video_streaming/errors.rb

@@ -3,5 +3,6 @@
 require "multi_video_streaming/errors/duplicated_platform_name"
 require "multi_video_streaming/errors/invalid_platform_name"
 require "multi_video_streaming/errors/invalid_platforms_param"
+require "multi_video_streaming/errors/invalid_s3_method_name"
 require "multi_video_streaming/errors/missing_param"
 require "multi_video_streaming/errors/s3_is_not_valid_to_upload"

data/lib/multi_video_streaming/helpers/get_default_error_message.rb

@@ -21,6 +21,10 @@ module MultiVideoStreaming
       def self.not_found(video_id:)
         "The video with id: #{video_id} does not exist."
       end
+
+      def self.not_available
+        "The video was successfully found, but it is currently not available."
+      end
     end
   end
 end

data/lib/multi_video_streaming/helpers/title_from_url.rb

@@ -4,7 +4,7 @@ module MultiVideoStreaming
   module Helpers
     class TitleFromUrl
       def self.get(url:)
-        URI(url.to_s).path.split('/').last
+        URI(url.to_s).path.split('/').last.gsub!(/[^._0-9A-Za-z]/, '')
       end
     end
   end

data/lib/multi_video_streaming/helpers.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-require "multi_video_streaming/helpers/title_from_url.rb"
-require "multi_video_streaming/helpers/sort_files_array_by_label.rb"
-require "multi_video_streaming/helpers/get_default_error_message.rb"
+require "multi_video_streaming/helpers/title_from_url"
+require "multi_video_streaming/helpers/sort_files_array_by_label"
+require "multi_video_streaming/helpers/get_default_error_message"

data/lib/multi_video_streaming/utils/s3/generate_presign_url.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module MultiVideoStreaming
+  module Utils
+    module S3
+      def self.generate_presign_url(method:, bucket:, key:, download:)
+        methods = { :get => :get_object, :put => :put_object, :delete => :delete_object }
+        method_to_generate_presign_url = methods[method]
+        raise MultiVideoStreaming::Errors::InvalidS3MethodName.new(method) if method_to_generate_presign_url.nil?
+        signer = Aws::S3::Presigner.new
+        if download
+          signer.presigned_url(method_to_generate_presign_url, bucket: bucket, key: key, expires_in: 900, whitelist_headers: ['response-content-disposition'], response_content_disposition: 'attachment')
+        else
+          signer.presigned_url(method_to_generate_presign_url, bucket: bucket, key: key, expires_in: 900)
+        end
+      end
+    end
+  end
+end

data/lib/multi_video_streaming/utils.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require "multi_video_streaming/utils/s3/generate_presign_url"

data/lib/multi_video_streaming/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MultiVideoStreaming
-  VERSION = "1.0.1.beta"
+  VERSION = "1.0.1.beta3"
 end

data/lib/multi_video_streaming.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'thread'
-require 'thwait'
 require "uri"
 require "net/http"
 require "openssl"
@@ -16,13 +14,12 @@ require "multi_video_streaming/factories"
 require "multi_video_streaming/errors"
 require "multi_video_streaming/response"
 require "multi_video_streaming/helpers"
+require "multi_video_streaming/utils"
 require "multi_video_streaming/version"
 require "multi_video_streaming/validators"
 
 module MultiVideoStreaming
   def self.upload(url, *platforms)
-    threads = []
-
     MultiVideoStreaming::Validators::PlatformsArrayValidator.validate(platforms_array: platforms)
     MultiVideoStreaming::Validators::PlatformsHashValidator.validate(platforms_hash: platforms, method: :create, number_of_platforms: platforms.length)
 
@@ -31,19 +28,16 @@ module MultiVideoStreaming
     https_service_instance = MultiVideoStreaming::Services::Https.new
 
     platforms.each do |platform|
-      threads << Thread.new {
-        platform_instance = MultiVideoStreaming::Factories::Drive.get_platform_instance(
-          platform_name: platform[:platform_name],
-          dependency_params: platform[:dependency_params],
-          response_instance: response_instance,
-          required_fields_validator_instance: required_fields_validator_instance,
-          https_service_instance: https_service_instance
-        )
-        platform_instance.upload_video(url: url)
-      }
+      platform_instance = MultiVideoStreaming::Factories::Drive.get_platform_instance(
+        platform_name: platform[:platform_name],
+        dependency_params: platform[:dependency_params],
+        response_instance: response_instance,
+        required_fields_validator_instance: required_fields_validator_instance,
+        https_service_instance: https_service_instance
+      )
+      platform_instance.upload_video(url: url)
     end
 
-    ThreadsWait.all_waits(*threads)
     response_instance.get_all_response
   end
 
@@ -76,8 +70,6 @@ module MultiVideoStreaming
   end
 
   def self.delete(*platforms)
-    threads = []
-
     MultiVideoStreaming::Validators::PlatformsArrayValidator.validate(platforms_array: platforms)
     MultiVideoStreaming::Validators::PlatformsHashValidator.validate(platforms_hash: platforms, method: :get, number_of_platforms: platforms.length)
 
@@ -86,19 +78,15 @@ module MultiVideoStreaming
     https_service_instance = MultiVideoStreaming::Services::Https.new
 
     platforms.each do |platform|
-      threads << Thread.new {
-        platform_instance = MultiVideoStreaming::Factories::Drive.get_platform_instance(
-          platform_name: platform[:platform_name],
-          dependency_params: platform[:dependency_params],
-          response_instance: response_instance,
-          required_fields_validator_instance: required_fields_validator_instance,
-          https_service_instance: https_service_instance
-        )
-        platform_instance.delete_video    
-      }
+      platform_instance = MultiVideoStreaming::Factories::Drive.get_platform_instance(
+        platform_name: platform[:platform_name],
+        dependency_params: platform[:dependency_params],
+        response_instance: response_instance,
+        required_fields_validator_instance: required_fields_validator_instance,
+        https_service_instance: https_service_instance
+      )
+      platform_instance.delete_video    
     end
-
-    ThreadsWait.all_waits(*threads)
     response_instance.get_all_response
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_video_streaming
 version: !ruby/object:Gem::Version
-  version: 1.0.1.beta
+  version: 1.0.1.beta3
 platform: ruby
 authors:
 - Henrique Schmeller
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-29 00:00:00.000000000 Z
+date: 2022-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -83,6 +83,7 @@ files:
 - lib/multi_video_streaming/errors/duplicated_platform_name.rb
 - lib/multi_video_streaming/errors/invalid_platform_name.rb
 - lib/multi_video_streaming/errors/invalid_platforms_param.rb
+- lib/multi_video_streaming/errors/invalid_s3_method_name.rb
 - lib/multi_video_streaming/errors/missing_param.rb
 - lib/multi_video_streaming/errors/s3_is_not_valid_to_upload.rb
 - lib/multi_video_streaming/factories.rb
@@ -99,6 +100,8 @@ files:
 - lib/multi_video_streaming/response.rb
 - lib/multi_video_streaming/services.rb
 - lib/multi_video_streaming/services/https.rb
+- lib/multi_video_streaming/utils.rb
+- lib/multi_video_streaming/utils/s3/generate_presign_url.rb
 - lib/multi_video_streaming/validators.rb
 - lib/multi_video_streaming/validators/platform_name_validator.rb
 - lib/multi_video_streaming/validators/platforms_array_validator.rb