Ziggeo 2.18 → 2.26

data/lib/Ziggeo.rb

@@ -19,7 +19,7 @@ require_relative "classes/ZiggeoAnalytics"
 
 class Ziggeo
 
-    attr_accessor :token, :private_key, :encryption_key, :config, :connect, :api_connect
+    attr_accessor :token, :private_key, :encryption_key, :config, :connect, :api_connect, :cdn_connect
 
     def initialize(token = nil, private_key = nil, encryption_key = nil)
         @token = token
@@ -42,6 +42,14 @@ class Ziggeo
             end
         end
         @api_connect = ZiggeoConnect.new(self, api_url)
+        cdn_url = @config.cdn_url
+        cdn_regions = @config.cdn_regions
+        cdn_regions.each do |key, value|
+            if (@token.start_with?(key))
+                cdn_url = value
+            end
+        end
+        @cdn_connect = ZiggeoConnect.new(self, cdn_url)
         @auth = nil
         @videos = nil
         @streams = nil
@@ -64,70 +72,58 @@ class Ziggeo
     end
 
     def auth()
-        if (@auth == nil)
-            @auth = ZiggeoAuth.new(self)
-        end
-        return @auth    end
+        @auth = @auth || ZiggeoAuth.new(self)
+        return @auth
+    end
 
     def videos()
-        if (@videos == nil)
-            @videos = ZiggeoVideos.new(self)
-        end
-        return @videos    end
+        @videos = @videos || ZiggeoVideos.new(self)
+        return @videos
+    end
 
     def streams()
-        if (@streams == nil)
-            @streams = ZiggeoStreams.new(self)
-        end
-        return @streams    end
+        @streams = @streams || ZiggeoStreams.new(self)
+        return @streams
+    end
 
     def authtokens()
-        if (@authtokens == nil)
-            @authtokens = ZiggeoAuthtokens.new(self)
-        end
-        return @authtokens    end
+        @authtokens = @authtokens || ZiggeoAuthtokens.new(self)
+        return @authtokens
+    end
 
     def application()
-        if (@application == nil)
-            @application = ZiggeoApplication.new(self)
-        end
-        return @application    end
+        @application = @application || ZiggeoApplication.new(self)
+        return @application
+    end
 
     def effectProfiles()
-        if (@effectProfiles == nil)
-            @effectProfiles = ZiggeoEffectProfiles.new(self)
-        end
-        return @effectProfiles    end
+        @effectProfiles = @effectProfiles || ZiggeoEffectProfiles.new(self)
+        return @effectProfiles
+    end
 
     def effectProfileProcess()
-        if (@effectProfileProcess == nil)
-            @effectProfileProcess = ZiggeoEffectProfileProcess.new(self)
-        end
-        return @effectProfileProcess    end
+        @effectProfileProcess = @effectProfileProcess || ZiggeoEffectProfileProcess.new(self)
+        return @effectProfileProcess
+    end
 
     def metaProfiles()
-        if (@metaProfiles == nil)
-            @metaProfiles = ZiggeoMetaProfiles.new(self)
-        end
-        return @metaProfiles    end
+        @metaProfiles = @metaProfiles || ZiggeoMetaProfiles.new(self)
+        return @metaProfiles
+    end
 
     def metaProfileProcess()
-        if (@metaProfileProcess == nil)
-            @metaProfileProcess = ZiggeoMetaProfileProcess.new(self)
-        end
-        return @metaProfileProcess    end
+        @metaProfileProcess = @metaProfileProcess || ZiggeoMetaProfileProcess.new(self)
+        return @metaProfileProcess
+    end
 
     def webhooks()
-        if (@webhooks == nil)
-            @webhooks = ZiggeoWebhooks.new(self)
-        end
-        return @webhooks    end
+        @webhooks = @webhooks || ZiggeoWebhooks.new(self)
+        return @webhooks
+    end
 
     def analytics()
-        if (@analytics == nil)
-            @analytics = ZiggeoAnalytics.new(self)
-        end
-        return @analytics    end
-
+        @analytics = @analytics || ZiggeoAnalytics.new(self)
+        return @analytics
+    end
 
 end

data/lib/classes/ZiggeoConfig.rb

@@ -1,13 +1,17 @@
 
 class ZiggeoConfig
-  attr_accessor :server_api_url, :api_url, :request_timeout, :request_timeout_per_mb, :regions, :api_regions
+  attr_accessor :request_timeout, :request_timeout_per_mb, :server_api_url, :api_url, :cdn_url, :regions, :api_regions, :cdn_regions, :resilience_factor, :resilience_on_fail
 
   def initialize()
     @request_timeout = 30 # seconds
     @request_timeout_per_mb = 20 # seconds per MB of uploaded file
-    @server_api_url = "https://srvapi.ziggeo.com"
+    @server_api_url = "https://srv-api.ziggeo.com"
     @api_url = "https://api-us-east-1.ziggeo.com"
-    @regions = {"r1" => "https://srvapi-eu-west-1.ziggeo.com", }
+    @cdn_url = "https://video-cdn.ziggeo.com"
+    @regions = {"r1" => "https://srv-api-eu-west-1.ziggeo.com", }
     @api_regions = {"r1" => "https://api-eu-west-1.ziggeo.com", }
+    @cdn_regions = {"r1" => "https://video-cdn-eu-west-1.ziggeo.com", }
+    @resilience_factor = 5
+    @resilience_on_fail = {"error" => "Too many failed attempts"}
   end
 end

data/lib/classes/ZiggeoConnect.rb

@@ -1,7 +1,6 @@
 require 'net/http'
 require 'json'
 require 'httparty'
-require 'httmultiparty'
 
 class ZiggeoConnect
   def initialize(application, baseuri)
@@ -17,27 +16,20 @@ class ZiggeoConnect
     method.downcase!
     allowed_methods = %w(get post delete)
     return unless allowed_methods.include?(method)
-    if (file.nil?)
-      if (method == "get")
-        begin
-          HTTParty.send(method, url.to_s, query: data, basic_auth: auth, timeout: timeout_in_seconds)
-        rescue Net::ReadTimeout => error
-          self.timeout_error_message timeout_in_seconds, error
-        end
-      else
-        begin
-          HTTParty.send(method, url.to_s, body: data, basic_auth: auth, timeout: timeout_in_seconds)
-        rescue Net::ReadTimeout => error
-          self.timeout_error_message timeout_in_seconds, error
-        end
+    unless (file.nil?)
+      data = data || {}
+      data["file"] = File.new(file)
+      timeout_in_seconds = ( ( File.size(file).to_f / 2**20 ).ceil * @application.config.request_timeout_per_mb.to_i ).to_i;
+    end
+    if (method == "get")
+      begin
+        HTTParty.send(method, url.to_s, query: data, basic_auth: auth, timeout: timeout_in_seconds)
+      rescue Net::ReadTimeout => error
+        self.timeout_error_message timeout_in_seconds, error
       end
     else
-      data = data.nil? ? {} : data;
-      data["file"] = File.new(file)
-      timeout_in_seconds = ( ( File.size(file).to_f / 2**20 ).round(0) * @application.config.request_timeout_per_mb.to_i ).to_i;
-
       begin
-        HTTMultiParty.send(method, url.to_s, body: data, basic_auth: auth, timeout: timeout_in_seconds)
+        HTTParty.send(method, url.to_s, body: data, basic_auth: auth, timeout: timeout_in_seconds)
       rescue Net::ReadTimeout => error
         self.timeout_error_message timeout_in_seconds, error
       end
@@ -46,12 +38,13 @@ class ZiggeoConnect
 
   def request(method, path, data = nil, file = nil)
     res = nil
-    5.times do
+    @application.config.resilience_factor.times do
       res = self.singleRequest(method, path, data, file)
-      break if res.response.code.to_i < 500
+      if res.response.code.to_i >= 200 && res.response.code.to_i < 500
+        return res.body
+      end
     end
-
-    return res.body
+    return @application.config.resilience_on_fail.to_json
   end
 
   def requestJSON(method, path, data = nil, file = nil)
@@ -82,6 +75,33 @@ class ZiggeoConnect
     return self.requestJSON("DELETE", path, data, file)
   end
 
+  def uploadFile(url, file, data)
+    res = nil
+    data["file"] = File.new(file)
+    timeout_in_seconds = ( ( File.size(file).to_f / 2**20 ).ceil * @application.config.request_timeout_per_mb.to_i ).to_i;
+    begin
+      @application.config.resilience_factor.times do
+        res = HTTParty.send("post", url.to_s, body: data, timeout: timeout_in_seconds)
+        if res.response.code.to_i >= 200 && res.response.code.to_i < 300
+          return
+        end
+      end
+      raise Exception.new res.response
+    rescue Net::ReadTimeout => error
+      self.timeout_error_message timeout_in_seconds, error
+    end
+  end
+
+  def postUploadJSON(path, scope, data = nil, file = nil, type_key = nil)
+    data = data || {}
+    if type_key && (file.is_a? String)
+      data[type_key] = File.extname(file)
+    end
+    result = self.postJSON(path, data)
+    self.uploadFile(result["url_data"]["url"], file, result["url_data"]["fields"])
+    return result[scope]
+  end
+
   protected
 
   def timeout_error_message( timeout_in_seconds, error )

data/lib/classes/ZiggeoEffectProfileProcess.rb

@@ -21,11 +21,23 @@ class ZiggeoEffectProfileProcess
   end
 
   def create_watermark_process(effect_token_or_key, data = nil, file = nil)
-    return @application.connect.postJSON('/v1/effects/' + effect_token_or_key + '/process/watermark', data, file)
+    unless file.nil?
+      result = @application.connect.postUploadJSON('/v1/effects/' + effect_token_or_key + '/process/watermark-upload-url', 'effect_process', data, file)
+      result = @application.connect.postJSON('/v1/effects/' + effect_token_or_key + '/process/' + result["token"] + '/confirm-watermark');
+      return result
+    else
+      return @application.connect.postJSON('/v1/effects/' + effect_token_or_key + '/process/watermark', data, file)
+    end
   end
 
   def edit_watermark_process(effect_token_or_key, token_or_key, data = nil, file = nil)
-    return @application.connect.postJSON('/v1/effects/' + effect_token_or_key + '/process/watermark/' + token_or_key + '', data, file)
+    unless file.nil?
+      result = @application.connect.postUploadJSON('/v1/effects/' + effect_token_or_key + '/process/' + token_or_key + '/watermark-upload-url', 'effect_process', data, file)
+      result = @application.connect.postJSON('/v1/effects/' + effect_token_or_key + '/process/' + token_or_key + '/confirm-watermark');
+      return result
+    else
+      return @application.connect.postJSON('/v1/effects/' + effect_token_or_key + '/process/watermark/' + token_or_key + '', data, file)
+    end
   end
 
 end

data/lib/classes/ZiggeoMetaProfileProcess.rb

@@ -28,4 +28,8 @@ class ZiggeoMetaProfileProcess
     return @application.connect.postJSON('/v1/metaprofiles/' + meta_token_or_key + '/process/nsfw', data)
   end
 
+  def create_profanity_process(meta_token_or_key, data = nil)
+    return @application.connect.postJSON('/v1/metaprofiles/' + meta_token_or_key + '/process/profanity', data)
+  end
+
 end

data/lib/classes/ZiggeoStreams.rb

@@ -13,11 +13,11 @@ class ZiggeoStreams
   end
 
   def download_video(video_token_or_key, token_or_key)
-    return @application.connect.get('/v1/videos/' + video_token_or_key + '/streams/' + token_or_key + '/video')
+    return @application.cdn_connect.get('/v1/videos/' + video_token_or_key + '/streams/' + token_or_key + '/video')
   end
 
   def download_image(video_token_or_key, token_or_key)
-    return @application.connect.get('/v1/videos/' + video_token_or_key + '/streams/' + token_or_key + '/image')
+    return @application.cdn_connect.get('/v1/videos/' + video_token_or_key + '/streams/' + token_or_key + '/image')
   end
 
   def push_to_service(video_token_or_key, token_or_key, data = nil)
@@ -29,15 +29,33 @@ class ZiggeoStreams
   end
 
   def create(video_token_or_key, data = nil, file = nil)
-    return @application.connect.postJSON('/v1/videos/' + video_token_or_key + '/streams', data, file)
+    unless file.nil?
+      result = @application.connect.postUploadJSON('/v1/videos/' + video_token_or_key + '/streams-upload-url', 'stream', data, file, 'video_type')
+      result = @application.connect.postJSON('/v1/videos/' + video_token_or_key + '/streams/' + result["token"] + '/confirm-video');
+      return result
+    else
+      return @application.connect.postJSON('/v1/videos/' + video_token_or_key + '/streams', data, file)
+    end
   end
 
   def attach_image(video_token_or_key, token_or_key, data = nil, file = nil)
-    return @application.connect.postJSON('/v1/videos/' + video_token_or_key + '/streams/' + token_or_key + '/image', data, file)
+    unless file.nil?
+      result = @application.connect.postUploadJSON('/v1/videos/' + video_token_or_key + '/streams/' + token_or_key + '/image-upload-url', 'stream', data, file)
+      result = @application.connect.postJSON('/v1/videos/' + video_token_or_key + '/streams/' + token_or_key + '/confirm-image');
+      return result
+    else
+      return @application.connect.postJSON('/v1/videos/' + video_token_or_key + '/streams/' + token_or_key + '/image', data, file)
+    end
   end
 
   def attach_video(video_token_or_key, token_or_key, data = nil, file = nil)
-    return @application.connect.postJSON('/v1/videos/' + video_token_or_key + '/streams/' + token_or_key + '/video', data, file)
+    unless file.nil?
+      result = @application.connect.postUploadJSON('/v1/videos/' + video_token_or_key + '/streams/' + token_or_key + '/video-upload-url', 'stream', data, file, 'video_type')
+      result = @application.connect.postJSON('/v1/videos/' + video_token_or_key + '/streams/' + token_or_key + '/confirm-video');
+      return result
+    else
+      return @application.connect.postJSON('/v1/videos/' + video_token_or_key + '/streams/' + token_or_key + '/video', data, file)
+    end
   end
 
   def attach_subtitle(video_token_or_key, token_or_key, data = nil)

data/lib/classes/ZiggeoVideos.rb

@@ -25,11 +25,11 @@ class ZiggeoVideos
   end
 
   def download_video(token_or_key)
-    return @application.connect.get('/v1/videos/' + token_or_key + '/video')
+    return @application.cdn_connect.get('/v1/videos/' + token_or_key + '/video')
   end
 
   def download_image(token_or_key)
-    return @application.connect.get('/v1/videos/' + token_or_key + '/image')
+    return @application.cdn_connect.get('/v1/videos/' + token_or_key + '/image')
   end
 
   def get_stats(token_or_key)
@@ -61,7 +61,13 @@ class ZiggeoVideos
   end
 
   def create(data = nil, file = nil)
-    return @application.connect.postJSON('/v1/videos/', data, file)
+    unless file.nil?
+      result = @application.connect.postUploadJSON('/v1/videos-upload-url', 'video', data, file, 'video_type')
+      result["default_stream"] = @application.connect.postJSON('/v1/videos/' + result["token"] + '/streams/' + result["default_stream"]["token"] + '/confirm-video');
+      return result
+    else
+      return @application.connect.postJSON('/v1/videos/', data, file)
+    end
   end
 
   def analytics(token_or_key, data = nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Ziggeo
 version: !ruby/object:Gem::Version
-  version: '2.18'
+  version: '2.26'
 platform: ruby
 authors:
 - Ziggeo, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-13 00:00:00.000000000 Z
+date: 2021-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -16,28 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
-- !ruby/object:Gem::Dependency
-  name: httmultiparty
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.16'
 description: The Ziggeo Ruby and Rails Server SDK.
 email:
 - support@ziggeo.com