eivid 1.1.1 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9246a571186c117fe8a8cedba5908a275eaa74b0bea191fd69f557431a18201a
-  data.tar.gz: 860c7a305e0909d59b093cd33fb063542edf0a49632f7c1db83889681a6029a4
+  metadata.gz: 84e784e3dbec889dae0b8fd97deade4b7dfb158845015783c1f3bc4bf7ff1f5f
+  data.tar.gz: d804c9c9c80d164bcfcf07046d880f3359e7e1c6f030d038039c43e711689941
 SHA512:
-  metadata.gz: ff72ebf02f8a5f89bb2ffa3ac1e92f7001900588fbbf54fe3764dd2a680003c06776a2100f68952ae4f2515b2213a5b8bbdc423dc01b2f28e9f241cca3bf839c
-  data.tar.gz: a62b3655af2be692f16f71fb3bb029000cefff28575eb2f480f900037d11a41924a7dfab8d737a91714b1b345e5a29aa260c09a7a1aceabed1c9bcf6063493b3
+  metadata.gz: ade10d5df13c9d5bd79ce6c1c0e12a8ac470feca13d0cc7c0611a51d632dd01fb344afe54a4163a0a781238b8c9f63f3ceb6726a71aa17c93160eb4ef76bda75
+  data.tar.gz: e6df28555d25e1d259546285924e5fd237383bebfb9ce98b7856c3b2618428ca31245a07b67cc5f37396aa1aefb89cf6c863e232e820aba97bb3104774339586

data/app/controllers/eivid/concerns/video_validations.rb

@@ -14,27 +14,21 @@ module Eivid::Concerns::VideoValidations
 
     def validate_video_file_presence
       unless params["video_file"]
-        raise Eivid::VideoFileNotPresentError.new(
-          "you forgot to add a required 'video_file' to your request"
-        )
+        raise_controller_error "you forgot to add a required 'video_file' to your request"
       end
     end
 
     def validate_video_file_format
       mime = params["video_file"]&.original_filename&.split('.')&.last&.downcase     
       unless Eivid::VideoMimeDump::DATA.include?(mime)
-        raise Eivid::IncorrectVideoMimeTypeError.new(
-          "the 'video_file' you tried to upload, is of an invalid mime type"
-        )
+        raise_controller_error "the 'video_file' you tried to upload, is of an invalid mime type"
       end
     end
 
     def validate_video_file_size
       megabytes = params["video_file"].tempfile.size / 1.0.megabyte
       unless MAX_MB_VIDEO >= megabytes
-        raise VideoFileSizeTooBigError.new(
-          "the 'video_file' size (#{megabytes.round(2)} mb) you tried to upload exceeds the maximum file size (#{MAX_MB_VIDEO} mb)"
-        )
+        raise_controller_error "the 'video_file' size (#{megabytes.round(2)} mb) you tried to upload exceeds the maximum file size (#{MAX_MB_VIDEO} mb)"
       end
     end
   

data/app/models/eivid/concerns/main_app/owner.rb

@@ -3,7 +3,7 @@ module Eivid::Concerns::MainApp::Owner
   included do
   
     has_one  :video_owner, class_name: 'Eivid::Owner', foreign_key: 'external_id'
-    has_many :videos, class_name: 'Eivid::Video', source: :video_owner, foreign_key: 'owner_id'
+    has_many :videos, class_name: 'Eivid::Video', foreign_key: 'owner_id'
 
     include Eivid::Concerns::MainApp::VideoConcerns
 

data/app/models/eivid/concerns/request_service/upload_video.rb

@@ -2,19 +2,56 @@ module Eivid::Concerns::RequestService::UploadVideo
   extend ActiveSupport::Concern
 
   def upload_video(video_path:)
-    @file        = File.open(video_path) 
-    @request     = HTTParty.post Eivid::RequestService::VIDEOS_URL, **upload_params
-    @response    = JSON.parse(@request).deep_symbolize_keys
-    @upload_link = @response.dig(:upload, :upload_link)
-
+    @file = File.open(video_path)
+    retrieve_upload_link
     tus_upload_to_vimeo
     @response
   end
 
   private
 
+  def retrieve_upload_link
+    efforts     = 0
+    max_efforts = 180
+    sleep_time  = 1
+
+    while @upload_link.blank? && efforts < max_efforts do
+
+      puts "Trying to retrieve upload link from Vimeo... try #{efforts}/#{max_efforts} with #{sleep_time} seconds sleep in between..."
+
+      @request     = HTTParty.post Eivid::RequestService::VIDEOS_URL, **upload_params
+      @response    = JSON.parse(@request).deep_symbolize_keys
+      @upload_link = @response.dig(:upload, :upload_link)
+
+      if @upload_link.blank?
+        sleep sleep_time
+        efforts += 1
+
+      else
+        puts "successfully retrieved the Vimeo upload link!"
+      end
+    end
+  end
+
   def tus_upload_to_vimeo
-    HTTParty.patch @upload_link, body: @file.read, headers: tus_headers
+    efforts     = 0
+    max_efforts = 10
+    sleep_time  = 30
+    successful  = false
+
+    while !successful && efforts < max_efforts
+
+      puts "Trying to upload the video to Vimeo... try #{efforts}/#{max_efforts} with #{sleep_time} seconds sleep in between..."
+      response = HTTParty.patch @upload_link, body: @file.read, headers: tus_headers
+
+      if response.code >= 500
+        sleep sleep_time
+        efforts += 1
+      else
+        successful = true
+        puts "successfully uploaded the video to Vimeo!"
+      end
+    end
   end
 
   def upload_params
@@ -28,4 +65,4 @@ module Eivid::Concerns::RequestService::UploadVideo
     { body: body.to_json, headers: default_headers }
   end
 
-end
+end

data/lib/eivid/version.rb

@@ -1,3 +1,3 @@
 module Eivid
-  VERSION = '1.1.1'
+  VERSION = '1.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eivid
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.4
 platform: ruby
 authors:
 - Jurriaan Schrofer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-25 00:00:00.000000000 Z
+date: 2022-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Eivid because we can.