cielo24 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9107d0e793b84ed3a486338337eeb04714376905
-  data.tar.gz: 9794c0732b072a63811fddd86a3581b095991081
+  metadata.gz: ac1299303ddcc2014db9089215d733ef4e3308f1
+  data.tar.gz: 8495707247b1e88c08c99fc09b9ec2cc486d929b
 SHA512:
-  metadata.gz: 27669efdf2a205b83418245bebfa953f1d8f894c8b0ffa500e715316c5984da976df91f7e4914fa555981cadead49efb3f5acd57de0f105a59aa99088a00fcc5
-  data.tar.gz: ed250abdfb41c16841a2dde46885a6269d4c1fffbe33d924d5799958fb1a21aea0cace56992749c66b1a6ea1a355e2b6fb8aab4cdb1a932fb8a68e09f87b935f
+  metadata.gz: 0cc9c9090e2b3ca4f07ff151e406f081574ee687c09756b5e94d270e394e702e5b1a1530e00ebaa4096e789a0f1af8f44e1ae55c20dd9373c9e99e81fac2b494
+  data.tar.gz: 7f309f52761b1cc90931073d1d88f14586d6cf91a00eda9656957555fd7ee4a77c5c56ed267088b03345278859a29987cf91f5324e624deca9fb5185e08ea03b

data/lib/cielo24/actions.rb

@@ -63,7 +63,6 @@ module Cielo24
 
     def logout(api_token)
       query_hash = init_access_req_dict(api_token)
-
       # Nothing returned
       WebUtils.http_request(@base_url + LOGOUT_PATH, 'GET', WebUtils::BASIC_TIMEOUT, query_hash)
     end
@@ -110,7 +109,6 @@ module Cielo24
 
     def authorize_job(api_token, job_id)
       query_hash = init_job_req_dict(api_token, job_id)
-
       # Nothing returned
       WebUtils.http_request(@base_url + AUTHORIZE_JOB_PATH, 'GET', WebUtils::BASIC_TIMEOUT, query_hash)
     end
@@ -126,7 +124,6 @@ module Cielo24
       query_hash = init_job_req_dict(api_token, job_id)
 
       json = WebUtils.get_json(@base_url + GET_JOB_INFO_PATH, 'GET', WebUtils::BASIC_TIMEOUT, query_hash)
-      # TODO: JobInfo
       return Mash.new(json)
     end
 
@@ -134,7 +131,6 @@ module Cielo24
       query_hash = init_access_req_dict(api_token)
 
       json = WebUtils.get_json(@base_url + GET_JOB_LIST_PATH, 'GET', WebUtils::BASIC_TIMEOUT, query_hash)
-      # TODO: JobList
       return Mash.new(json)
     end
 
@@ -219,7 +215,6 @@ module Cielo24
       query_hash = init_job_req_dict(api_token, job_id)
 
       json = WebUtils.get_json(@base_url + GET_ELEMENT_LIST_PATH, 'GET', WebUtils::BASIC_TIMEOUT, query_hash)
-      # TODO: ElementList
       return Mash.new(json)
     end
 
@@ -228,7 +223,6 @@ module Cielo24
 
       response = WebUtils.http_request(@base_url + GET_LIST_OF_ELEMENT_LISTS_PATH, 'GET', WebUtils::BASIC_TIMEOUT, query_hash)
       array = JSON.parse(response)
-      # TODO: List<ElementListVersion>
       return array
     end
 

data/lib/cielo24/enums.rb

@@ -6,9 +6,10 @@ module Cielo24
     def self.JOB_ADD_TRANSCRIPT; "JOB_ADD_TRANSCRIPT"; end
     def self.JOB_PERFORM_TRANSCRIPTION; "JOB_PERFORM_TRANSCRIPTION"; end
     def self.JOB_PERFORM_PREMIUM_SYNC; "JOB_PERFORM_PREMIUM_SYNC"; end
-    def self.JOB_REQUEST_TRANSCRIPT; "JOB_REQUEST_TRANSCRIPT"; end
-    def self.JOB_REQUEST_CAPTION; "JOB_REQUEST_CAPTION"; end
-    def self.JOB_REQUEST_ELEMENTLIST; "JOB_REQUEST_ELEMENTLIST"; end
+    def self.JOB_UPDATE_ELEMENTLIST; "JOB_UPDATE_ELEMENTLIST"; end
+    def self.JOB_GET_TRANSCRIPT; "JOB_GET_TRANSCRIPT"; end
+    def self.JOB_GET_CAPTION; "JOB_GET_CAPTION"; end
+    def self.JOB_GET_ELEMENTLIST; "JOB_GET_ELEMENTLIST"; end
   end
 
   class ErrorType < BasicObject
@@ -42,24 +43,30 @@ module Cielo24
     def self.STANDARD; "STANDARD"; end
     def self.PRIORITY; "PRIORITY"; end
     def self.CRITICAL; "CRITICAL"; end
-    def self.all; "[ ECONOMY, STANDARD, PRIORITY, CRITICAL ]"; end
+    def self.HIGH; "HIGH"; end
+    def self.all; "[ ECONOMY, STANDARD, PRIORITY, CRITICAL, HIGH ]"; end
   end
 
   class Fidelity < BasicObject
     def self.MECHANICAL; "MECHANICAL"; end
+    def self.STANDARD; "STANDARD"; end
+    def self.HIGH; "HIGH"; end
     def self.PREMIUM; "PREMIUM"; end
     def self.PROFESSIONAL; "PROFESSIONAL"; end
-    def self.INTERIM_PROFESSIONAL; "INTERIM_PROFESSIONAL"; end
-    def self.FINAL; "FINAL"; end
-    def self.all; "[ MECHANICAL, PREMIUM, PROFESSIONAL, INTERIM_PROFESSIONAL, FINAL ]"; end
+    def self.EXTERNAL; "EXTERNAL"; end
+    def self.all; "[ MECHANICAL, STANDARD, HIGH, PREMIUM, PROFESSIONAL, EXTERNAL ]"; end
   end
 
   class CaptionFormat < BasicObject
     def self.SRT; "SRT"; end
     def self.SBV; "SBV"; end
     def self.DFXP; "DFXP"; end
-    def self.QT; "QT"; end
-    def self.all; "[ SRT, SBV, DFXP, QT ]"; end
+    def self.TRANSCRIPT; "TRANSCRIPT"; end
+    def self.TWX; "TWX"; end
+    def self.TPM; "TPM"; end
+    def self.WEB_VTT; "WEB_VTT"; end
+    def self.ECHO; "ECHO"; end
+    def self.all; "[ SRT, SBV, DFXP, QT, TRANSCRIPT, TWX, TPM, WEB_VTT, ECHO ]"; end
   end
 
   class TokenType < BasicObject

data/lib/cielo24/options.rb

@@ -1,5 +1,6 @@
 module Cielo24
   class Options
+
     def get_hash
       hash = {}
       self.instance_variables.each{ |var|

data/lib/cielo24/version.rb

@@ -1,3 +1,3 @@
 module Cielo24
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/cielo24/web_utils.rb

@@ -3,11 +3,12 @@ module Cielo24
 
     require 'json'
     require 'httpclient'
+    require 'timeout'
     include JSON
 
     VERIFY_MODE = nil
-    BASIC_TIMEOUT = 60
-    DOWNLOAD_TIMEOUT = 300
+    BASIC_TIMEOUT = 60     # seconds
+    DOWNLOAD_TIMEOUT = 300 # seconds
     @@LAST_URL = "none" # For logging purposes
 
     def self.LAST_URL
@@ -22,18 +23,27 @@ module Cielo24
     def self.http_request(uri, method, timeout, query=nil, headers = nil, body = nil)
       http_client = HTTPClient.new
       http_client.cookie_manager = nil
-      # TODO: timeout
 
-      response = http_client.request(method, uri, query, body, headers, nil)
-      @@LAST_URL = uri + "?" + URI.encode_www_form(query)
+      # Timeout block:
+      begin
+        # Error is raised if the following block fails to execute in 'timeout' sec:
+        Timeout.timeout(timeout) {
 
-      # Handle web errors
-      if response.status_code == 200 or response.status_code == 204
-        return response.body
-      else
-        json = JSON.parse(response.body)
-        raise WebError.new(json["ErrorType"], json["ErrorComment"])
+          response = http_client.request(method, uri, query, body, headers, nil)
+          # Handle web errors
+          if response.status_code == 200 or response.status_code == 204
+            return response.body
+          else
+            json = JSON.parse(response.body)
+            raise WebError.new(json["ErrorType"], json["ErrorComment"])
+          end
+
+        }
+      rescue Timeout::Error
+        raise TimeoutError.new("The HTTP session has timed out.")
       end
+
+      @@LAST_URL = uri + (query.nil? ? "" : "?" + URI.encode_www_form(query))
     end
   end
 
@@ -48,4 +58,10 @@ module Cielo24
       return @type + " - " + super.to_s
     end
   end
+
+  class TimeoutError < StandardError
+    def initialize(message)
+      super message
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cielo24
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Evgeny Chistyakov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler