eivid 1.0.5 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b16e547e53edc9be84a3a08ed34040e9eb00995f0e28d5a7b724d038d905204
-  data.tar.gz: d6925d650bee18147b71f2f919f416a03807292cf0b528d2a22905bad33c144b
+  metadata.gz: 5d4c04b8322a6feab4b5a6329e564f1687cf6e71d7db09538101a38233aa9263
+  data.tar.gz: df5e24bb82fdb4f5e45e9eefc57fdababf0ff623efd29d0f9a32d0c4ab0cf5e1
 SHA512:
-  metadata.gz: b49a8b85807843736d3a2617ed1134b414fbfe1dd68aeed7172f59d2105c0b8c213b0ee6d3736ee29ce2787d7e1d11bcef0b037445d7f84062d724d5926852ae
-  data.tar.gz: c8830d684823a77d6023168a51a6ea43101f81e4489be674f7195867b0f17c6ba06c81b9f3903f06e7db38c5ee3e9754eef5f213106fb1e5e3afba98f81247d8
+  metadata.gz: 970e33e8efb6f0a3d15c2af957fee892edd48b67fac09fa72d295a82ffeef0da6bfbb9497554688a04344d71720873274ea7c11d6a207951556b79f67ec43fb1
+  data.tar.gz: e955eea3a14e70a13135d3a231307259a82bf0f7b22415551adddec3c7994cf3428b3be422dad2adff2806d90e443ddb247020a62397dd57634e667222f92787

data/app/errors/eivid/video_unavailable_all_attempts_failed_error.rb

@@ -0,0 +1,4 @@
+module Eivid
+  class VideoUnavailableAllAttemptsFailedError < StandardError
+  end
+end

data/app/errors/eivid/video_urls_all_attempts_failed_error.rb

@@ -0,0 +1,4 @@
+module Eivid
+  class VideoUrlsAllAttemptsFailedError < StandardError
+  end
+end

data/app/jobs/eivid/check_vimeo_status_job.rb

@@ -1,7 +1,12 @@
 module Eivid
   class CheckVimeoStatusJob < ApplicationJob
 
-    retry_on VideoUnavailableError, wait: 10.seconds, attempts: 50
+    retry_on(VideoUnavailableError, wait: 10.seconds, attempts: 50) do |job, error|
+      raise Eivid::VideoUnavailableAllAttemptsFailedError, "failed after the set max attempts (#{job.executions} times)"
+    end
+
+    discard_on ActiveJob::DeserializationError
+
     after_perform :poll_vimeo_urls
 
     def perform(video_record:)

data/app/jobs/eivid/get_vimeo_hd_url_job.rb

@@ -0,0 +1,24 @@
+module Eivid
+  class GetVimeoHdUrlJob < ApplicationJob
+
+    include Eivid::GetVimeoUrlsMixin
+
+    def perform(video_record:, vimeo_id:)
+      @video_record = video_record
+      @vimeo_id     = vimeo_id
+
+      set_response
+      set_url_hd
+
+      return unless @url_hd
+      update_record
+    end
+
+    private
+
+    def update_record
+      @video_record.update(url_hd: @url_hd)
+    end
+
+  end
+end

data/app/jobs/eivid/get_vimeo_urls_job.rb

@@ -1,7 +1,13 @@
 module Eivid
   class GetVimeoUrlsJob < ApplicationJob
 
-    retry_on VideoUrlsUnavailableError, wait: 10.seconds, attempts: 50
+    include Eivid::GetVimeoUrlsMixin
+
+    retry_on(VideoUrlsUnavailableError, wait: 10.seconds, attempts: 50) do |job, error| 
+      raise Eivid::VideoUrlsAllAttemptsFailedError, "failed after the set max attempts (#{job.executions} times)"
+    end
+
+    discard_on ActiveJob::DeserializationError
 
     def perform(video_record:, vimeo_id:)
       @video_record = video_record
@@ -16,55 +22,33 @@ module Eivid
       validate_url_thumbnail
 
       update_record
+      schedule_hd_url_job
       notify_front
     end
 
     private
 
-    def set_response
-      @response = Eivid::RequestService.get_video @vimeo_id
-    end
-
-    def set_url_sd
-      @url_sd = dig_video_url :sd
-    end
-
-    def set_url_hd
-      @url_hd = dig_video_url :hd
-    end
-
-    def dig_video_url(definition)
-      @response[:files]&.find { |video| video[:quality] == definition.to_s }&.dig(:link)
+    def notify_front
+      data = { video: @video_record.slice(:id, :user_id), progress: { percentage: 100, step: "All video versions are available on Vimeo." } }
+      NotifyFrontService.progress('notify_method_on_versions_available', data)
     end
 
-    def set_url_thumbnail
-      @url_thumbnail = find_high_res_thumbnail || find_low_res_thumbnail
+    def update_record
+      @video_record.update(uploaded: true, url_sd: @url_sd, url_hd: @url_hd, url_thumbnail: @url_thumbnail)
     end
 
-    def find_high_res_thumbnail
-      @response&.dig(:pictures, :sizes)&.find { |url| url[:width] == 960 && url[:height] == 540 }&.dig(:link_with_play_button)
+    def schedule_hd_url_job
+      Eivid::GetVimeoHdUrlJob.set(wait: 5.minutes).perform_later(video_record: @video_record, vimeo_id: @vimeo_id)
     end
 
-    def find_low_res_thumbnail
-      @response&.dig(:pictures, :sizes)&.find { |url| url[:width] == 640 && url[:height] == 360 }&.dig(:link_with_play_button)
-    end
 
     def validate_url_presence
-      raise Eivid::VideoUrlsUnavailableError unless @url_thumbnail
+      raise Eivid::VideoUrlsUnavailableError unless @url_thumbnail && @url_sd
     end
 
     def validate_url_thumbnail
       raise Eivid::VideoUrlsUnavailableError if @url_thumbnail.include? 'video%2Fdefault'
     end
 
-    def update_record
-      @video_record.update(uploaded: true, url_sd: @url_sd, url_hd: @url_hd, url_thumbnail: @url_thumbnail)
-    end
-
-    def notify_front
-      data = { video: @video_record.slice(:id, :user_id), progress: { percentage: 100, step: "All video versions are available on Vimeo." } }
-      NotifyFrontService.progress('notify_method_on_versions_available', data)
-    end
-
   end
 end

data/app/jobs/eivid/get_vimeo_urls_mixin.rb

@@ -0,0 +1,36 @@
+module Eivid::GetVimeoUrlsMixin
+  extend ActiveSupport::Concern
+  included do
+
+    private
+
+    def set_response
+      @response = Eivid::RequestService.get_video @vimeo_id
+    end
+
+    def set_url_sd
+      @url_sd = dig_video_url :sd
+    end
+
+    def set_url_hd
+      @url_hd = dig_video_url :hd
+    end
+
+    def dig_video_url(definition)
+      @response[:files]&.find { |video| video[:quality] == definition.to_s }&.dig(:link)
+    end
+
+    def set_url_thumbnail
+      @url_thumbnail = find_high_res_thumbnail || find_low_res_thumbnail
+    end
+
+    def find_high_res_thumbnail
+      @response&.dig(:pictures, :sizes)&.find { |url| url[:width] == 960 && url[:height] == 540 }&.dig(:link_with_play_button)
+    end
+
+    def find_low_res_thumbnail
+      @response&.dig(:pictures, :sizes)&.find { |url| url[:width] == 640 && url[:height] == 360 }&.dig(:link_with_play_button)
+    end
+
+  end
+end

data/app/jobs/eivid/request_folder_id_job.rb

@@ -0,0 +1,16 @@
+module Eivid
+  class RequestFolderIdJob < ApplicationJob
+
+    def perform(eivid_owner_id)
+
+      owner     = Owner.find(eivid_owner_id) 
+      folder_id = RequestService.create_folder(namespace: Eivid.owner_model, id: owner.id)
+
+      # binding.pry
+
+      owner.update!(folder_id: folder_id)
+
+    end
+
+  end
+end

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

@@ -12,5 +12,7 @@ module Eivid::Concerns::MainApp::VideoConcerns
     scope :has_processed_video,   -> { joins(:videos).where('eivid_videos.uploaded': true).distinct }
     scope :has_unprocessed_video, -> { joins(:videos).where('eivid_videos.uploaded' => false).distinct }
 
+    scope :has_video_from_user,   -> (user_id) { joins(:videos).where('eivid_videos.user_id = ?', user_id) }
+    
   end
 end

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

@@ -6,7 +6,7 @@ module Eivid::Concerns::RequestService::ManageFolder
   end
 
   def create_folder(namespace:, id:)
-    body = { "name" => "#{Rails.env}_#{namespace}_#{id}" }
+    body = { "name" => "#{rails_environment}_#{namespace}_#{id}" }
     
     @response = HTTParty.post Eivid::RequestService::FOLDER_URL, body: body.to_json, headers: default_headers
     get_folder_id
@@ -20,6 +20,11 @@ module Eivid::Concerns::RequestService::ManageFolder
     HTTParty.put endpoint, headers: default_headers
   end
 
+  def rails_environment
+    return "test" if Figaro.env.IS_TEST_SERVER
+    Rails.env
+  end
+
   private
 
   def get_folder_id

data/app/models/eivid/owner.rb

@@ -5,16 +5,16 @@ module Eivid
 
     validates :external_id, presence: true, uniqueness: true
 
-    before_create :get_folder_id
+    after_create :get_folder_id
 
-    belongs_to :"#{Eivid.owner_model}", foreign_key: "external_id"
+    belongs_to :"#{Eivid.owner_model}", foreign_key: "external_id", optional: true
 
     def external_owner
       send Eivid.owner_model
     end
 
     def get_folder_id
-      self.folder_id = RequestService.create_folder(namespace: Eivid.owner_model, id: self.external_id)
+      RequestFolderIdJob.perform_later(self.id)
     end
 
   end

data/lib/eivid/version.rb

@@ -1,3 +1,3 @@
 module Eivid
-  VERSION = '1.0.5'
+  VERSION = '1.0.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eivid
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.10
 platform: ruby
 authors:
 - Jurriaan Schrofer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-19 00:00:00.000000000 Z
+date: 2021-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -71,11 +71,16 @@ files:
 - app/errors/eivid/maximum_vimeo_poll_reached_error.rb
 - app/errors/eivid/video_file_not_present_error.rb
 - app/errors/eivid/video_file_size_too_big_error.rb
+- app/errors/eivid/video_unavailable_all_attempts_failed_error.rb
 - app/errors/eivid/video_unavailable_error.rb
+- app/errors/eivid/video_urls_all_attempts_failed_error.rb
 - app/errors/eivid/video_urls_unavailable_error.rb
 - app/jobs/eivid/application_job.rb
 - app/jobs/eivid/check_vimeo_status_job.rb
+- app/jobs/eivid/get_vimeo_hd_url_job.rb
 - app/jobs/eivid/get_vimeo_urls_job.rb
+- app/jobs/eivid/get_vimeo_urls_mixin.rb
+- app/jobs/eivid/request_folder_id_job.rb
 - app/jobs/eivid/upload_vimeo_job.rb
 - app/mailers/eivid/application_mailer.rb
 - app/models/eivid/application_record.rb