multi_video_streaming 1.0.0.beta → 1.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c1ae1d10ba98cf2adfd9db15e18956c5ec601e0afdd47f4857c5313d5b5661c
-  data.tar.gz: e972c5a015cb6e813c9423d21a0993646aacc807b549797f6db638f3686823c4
+  metadata.gz: 576ef1a45eec87fcae6d0ff4f9a4242d9c59cc7472f8440126db5610aa77beaf
+  data.tar.gz: 9ed14f0f89b288cb6a43c1c9058491f0addbc2243eb9428a31826052439f676d
 SHA512:
-  metadata.gz: 1feb06fa08e5ec6775c208ea859371083956b99d95c71b419b040823cfa307156c1acaeb110ae012bf12c6d573636ef800752d3fb3ed3ed74415ecb6db1bac2f
-  data.tar.gz: a4cf1f7c854d9b3b4838e459c75417441078fccc2ac2b09ff02751855d29579126529a701efc7303da03ea5a96604da6ca8d746e2b5158b7da75a610b1c99982
+  metadata.gz: 5ffb28c7493a0503dcba1c6efd42b1660deef94ff22a80a73053d3b1b10c39b7c4b4c2b3d657f2b4ea34cd50fcb62bd4108603a8cb23ba677c429636d40792d9
+  data.tar.gz: 4edd27ce4ac7871057254aea303093c512f0aebe22a4dd457f687fadc90529ad93b17d0615c72dbdec052a9945895d10affba89e53dc4671136551f5a9f15c35

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",
@@ -110,11 +110,16 @@ module MultiVideoStreaming
             }
           end
 
+          MultiVideoStreaming::Helpers::SortFilesArrayByLabel.sort(array: files)
           response["files"] = files
           status = STATUS_EQUIVALENT[response["status"].to_s]
 
           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,17 +29,18 @@ module MultiVideoStreaming
           response = Aws::S3::Resource.new().bucket(bucket).object(video_id)
           video_url = response.public_url
 
+          url_signed = MultiVideoStreaming::Utils::S3.generate_presign_url(bucket: bucket, key: video_id)
           data = {
             "key": response.key,
             "title": response.key,
             "status":  STATUS_EQUIVALENT[:true],
             "files": [
               {
-                file: video_url
+                file: url_signed
               }
             ],
             "available_resolutions": [],
-            "direct_play": video_url,
+            "direct_play": url_signed,
             "date_uploaded": response.data.last_modified
           }
 

data/lib/multi_video_streaming/drivers/vimeo.rb

@@ -105,16 +105,22 @@ 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"] }
             end
           end
 
+          MultiVideoStreaming::Helpers::SortFilesArrayByLabel.sort(array: files)
           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/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/sort_files_array_by_label.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module MultiVideoStreaming
+  module Helpers
+    class SortFilesArrayByLabel
+      def self.sort(array:)
+        array.sort! { |lastFile, nextFile|  /[\d]+/.match(nextFile[:label])[0].to_i <=> /[\d]+/.match(lastFile[:label])[0].to_i }
+      end
+    end
+  end
+end

data/lib/multi_video_streaming/helpers.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 
-require "multi_video_streaming/helpers/title_from_url.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,12 @@
+# frozen_string_literal: true
+
+module MultiVideoStreaming
+  module Utils
+    module S3
+      def self.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/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.0.beta"
+  VERSION = "1.0.0.beta2"
 end

data/lib/multi_video_streaming.rb

@@ -16,6 +16,7 @@ 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"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_video_streaming
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta
+  version: 1.0.0.beta2
 platform: ruby
 authors:
 - Henrique Schmeller
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-10 00:00:00.000000000 Z
+date: 2022-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -89,6 +89,7 @@ files:
 - lib/multi_video_streaming/factories/drive.rb
 - lib/multi_video_streaming/helpers.rb
 - lib/multi_video_streaming/helpers/get_default_error_message.rb
+- lib/multi_video_streaming/helpers/sort_files_array_by_label.rb
 - lib/multi_video_streaming/helpers/title_from_url.rb
 - lib/multi_video_streaming/platforms_support.rb
 - lib/multi_video_streaming/protocols.rb
@@ -98,6 +99,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