Ziggeo 1.15 → 1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c24a8a8b298521892c34a16986009d04fe70715
-  data.tar.gz: 06ccd77a9d10738e9d1df23429acd2caba35a211
+  metadata.gz: 32e29236f72378b9a8832c2f04cb79f409db8006
+  data.tar.gz: b794253cb141cefddf1cdbe4a3ee1c83055db231
 SHA512:
-  metadata.gz: 7001e5455e4c0c9681cdbb13779c1e0e0f12e0e583410543f08bdef5c4242b54e43e8e665b1d00e64e5aab08a177b6932296082945685f97436609ddca9cc54a
-  data.tar.gz: 3359a648fc52b7ddb22db9066c41986a83ffc95507004432cf2c8ec43f971e2173e06986cbdbd5589631e9eda3facb463566668478067fab47e8a3dd3e07d89f
+  metadata.gz: 5875a8d9040ba0a92b70416032f4081ad167a4c87f39a768d2727832b0c9994bc79121b84ae09cd0049eb3529dd3f8965e45b4b2cd2529d561b66a76fac2fa23
+  data.tar.gz: 84ea85ac18802c81fad122f196dab73e67656a03c15dc1d3b8f8c106921a6c54b691f9988cb46788a4b4a9c8bbec409e3f04d0d6039ad44e6f6dcead700244eb

data/README.md

@@ -1,4 +1,4 @@
-# Ziggeo Ruby Server SDK 1.15
+# Ziggeo Ruby Server SDK 1.17
 
 Ziggeo API (https://ziggeo.com) allows you to integrate video recording and playback with only
 two lines of code in your site, service or app. This is the Ruby Server SDK repository.
@@ -29,7 +29,7 @@ Then, you need to specify your api token:
 </script>
 ```
 
-You can specify other global options, [see here](http://ziggeo.com/docs).
+You can specify other global options, [see here](https://ziggeo.com/docs).
 
 To fire up a recorder on your page, add:
 ```html 
@@ -41,7 +41,7 @@ To embed a player for an existing video, add:
 <ziggeo ziggeo-video='video-token'></ziggeo> 
 ``` 
 
-For the full documentation, please visit [ziggeo.com](http://ziggeo.com/docs).
+For the full documentation, please visit [ziggeo.com](https://ziggeo.com/docs).
 
 
 ## Server-Side Integration
@@ -341,6 +341,6 @@ Arguments
 
 ## License
 
-Copyright (c) 2013-2016 Ziggeo
+Copyright (c) 2013-2017 Ziggeo
  
 Apache 2.0 License

data/lib/classes/ZiggeoConfig.rb

@@ -1,7 +1,10 @@
 class ZiggeoConfig
-  attr_accessor :server_api_url
+  attr_accessor :server_api_url, :request_timeout, :request_timeout_per_mb, :regions
 
   def initialize()
+    @request_timeout = 30 # seconds
+    @request_timeout_per_mb = 20 # seconds per MB of uploaded file
     @server_api_url = "https://srvapi.ziggeo.com"
+    @regions = {"r1" => "https://srvapi-eu-west-1.ziggeo.com", }
   end
 end

data/lib/classes/ZiggeoConnect.rb

@@ -9,22 +9,46 @@ class ZiggeoConnect
   end
 
   def request(method, path, data = nil, file = nil)
-    url = URI.parse(@application.config.server_api_url + '/v1' + path)
+    server_api_url = @application.config.server_api_url
+    regions = @application.config.regions
+    regions.each do |key, value|
+      if (@application.token.start_with?(key))
+        server_api_url = value
+      end
+    end
+
+    url = URI.parse(server_api_url + '/v1' + path)
     auth = { username: @application.token, password: @application.private_key }
+    timeout_in_seconds = @application.config.request_timeout.to_i
+
     method.downcase!
     allowed_methods = %w(get post delete)
     return unless allowed_methods.include?(method)
     if (file.nil?)
       if (method == "get")
-      	HTTParty.send(method, url.to_s, query: data, basic_auth: auth).body
+        begin
+          HTTParty.send(method, url.to_s, query: data, basic_auth: auth, timeout: timeout_in_seconds).body
+        rescue Net::ReadTimeout => error
+          self.timeout_error_message timeout_in_seconds, error
+        end
       else
-        HTTParty.send(method, url.to_s, body: data, basic_auth: auth).body
+        begin
+          HTTParty.send(method, url.to_s, body: data, basic_auth: auth, timeout: timeout_in_seconds).body
+        rescue Net::ReadTimeout => error
+          self.timeout_error_message timeout_in_seconds, error
+        end
       end
     else
       data = data.nil? ? {} : data;
       data["file"] = File.new(file)
-      HTTMultiParty.send(method, url.to_s, body: data, basic_auth: auth).body
-    end    
+      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).body
+      rescue Net::ReadTimeout => error
+        self.timeout_error_message timeout_in_seconds, error
+      end
+    end
   end
 
   def requestJSON(method, path, data = nil, file = nil)
@@ -55,4 +79,12 @@ class ZiggeoConnect
     return self.requestJSON("DELETE", path, data, file)
   end
 
+  protected
+
+  def timeout_error_message( timeout_in_seconds, error )
+    puts "Error source: " + error.message
+    puts "Server not responding. Host: #{@application.config.server_api_url} not responded in #{timeout_in_seconds} seconds."
+    exit(1)
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Ziggeo
 version: !ruby/object:Gem::Version
-  version: '1.15'
+  version: '1.17'
 platform: ruby
 authors:
 - Ziggeo, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-04 00:00:00.000000000 Z
+date: 2017-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -53,7 +53,7 @@ files:
 - lib/classes/ZiggeoVideos.rb
 - lib/Ziggeo.rb
 - README.md
-homepage: http://ziggeo.com
+homepage: https://ziggeo.com
 licenses:
 - Apache 2.0
 metadata: {}