cielo24 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 827188b8e97e031a14d9c4923c44f73c80f2e1bb
-  data.tar.gz: 858f74b9cb08ef0e3ac3a6232e3e19091ae7a5a9
+  metadata.gz: 53e31a6d1a427f035275f3a67c69dd29b4f985cb
+  data.tar.gz: e51be163b5ac729a3ab6d41651968df9cd801705
 SHA512:
-  metadata.gz: f0ec27fdb903e3765e905e5ae7557b68739e11017c820cb94e3cb046a9670e7fb9c5f6a13ae04b5bca87f1ff843cd24134573e2f576df01567fe99845115edb0
-  data.tar.gz: 3ce8a723d3e9c8e3662b5e0c5d985d6f1cd92ebdf27c03e1b7f34489919c08872d784a257bed9f82ac69b55cdfffdcb80991a00c06fe379fd2165e0117e87d79
+  metadata.gz: b4ee8286682127ad776994309e08b2cc34ca2218a65e1f6a60ace77dd2f3dd0e7d0ebc8a2293a611550332b3c6ea183dd338ef1ef359afe9846c77e6f9bfb077
+  data.tar.gz: b3fbdfe72374bb683eb75cb5e742c7523a37b4952b7afb135cd9f4e26144296ff8bc0167f3095ced9a253af449312afc6e99a2e715dbe7b673bf5ea31b6b60c1

data/lib/cielo24/actions.rb

@@ -76,7 +76,7 @@ module Cielo24
       WebUtils.http_request(@base_url + UPDATE_PASSWORD_PATH, 'POST', WebUtils::BASIC_TIMEOUT, nil, nil, query_hash)
     end
 
-    def generate_api_key(api_token, username, force_new = false)
+    def generate_api_key(api_token, username, force_new=false)
       assert_argument(username, "Username")
       assert_argument(api_token, "API Token")
       query_hash = init_access_req_dict(api_token)
@@ -97,7 +97,7 @@ module Cielo24
 
     ### JOB CONTROL ###
 
-    def create_job(api_token, job_name = nil, source_language = "en")
+    def create_job(api_token, job_name=nil, source_language="en")
       query_hash = init_access_req_dict(api_token)
       query_hash[:job_name] = job_name if !(job_name.nil?)
       query_hash[:source_language] = source_language
@@ -144,11 +144,11 @@ module Cielo24
     end
 
     def add_media_to_job_url(api_token, job_id, media_url)
-      return send_media_url(api_token, job_id, media_url, ADD_MEDIA_TO_JOB_PATH);
+      return send_media_url(api_token, job_id, media_url, ADD_MEDIA_TO_JOB_PATH)
     end
 
     def add_media_to_job_embedded(api_token, job_id, media_url)
-      return send_media_url(api_token, job_id, media_url, ADD_EMBEDDED_MEDIA_TO_JOB_PATH);
+      return send_media_url(api_token, job_id, media_url, ADD_EMBEDDED_MEDIA_TO_JOB_PATH)
     end
 
     def send_media_url(api_token, job_id, media_url, path)
@@ -163,9 +163,7 @@ module Cielo24
 
     def get_media(api_token, job_id)
       query_hash = init_job_req_dict(api_token, job_id)
-
       json = WebUtils.get_json(@base_url + GET_MEDIA_PATH, 'GET', WebUtils::BASIC_TIMEOUT, query_hash)
-
       return json["MediaUrl"]
     end
 
@@ -173,9 +171,9 @@ module Cielo24
                               job_id,
                               fidelity,
                               priority,
-                              callback_uri = nil,
-                              turnaround_hours = nil,
-                              target_language = nil,
+                              callback_uri=nil,
+                              turnaround_hours=nil,
+                              target_language=nil,
                               options = nil)
       assert_argument(fidelity, "Fidelity")
       assert_argument(priority, "Priority")
@@ -191,21 +189,20 @@ module Cielo24
       return json["TaskId"]
     end
 
-    def get_transcript(api_token, job_id, transcript_options = nil)
+    def get_transcript(api_token, job_id, transcript_options=nil)
       query_hash = init_job_req_dict(api_token, job_id)
       query_hash.merge!(transcript_options.get_hash) if !(transcript_options.nil?)
-
       # Return raw transcript text
       return WebUtils.http_request(@base_url + GET_TRANSCRIPTION_PATH, 'GET', WebUtils::DOWNLOAD_TIMEOUT, query_hash)
     end
 
-    def get_caption(api_token, job_id, caption_format, caption_options = nil)
+    def get_caption(api_token, job_id, caption_format, caption_options=nil)
       query_hash = init_job_req_dict(api_token, job_id)
       query_hash[:caption_format] = caption_format
       query_hash.merge!(caption_options.get_hash) if !(caption_options.nil?)
 
       response = WebUtils.http_request(@base_url + GET_CAPTION_PATH, 'GET', WebUtils::DOWNLOAD_TIMEOUT, query_hash)
-      if(!caption_options.nil? and caption_options[:build_url]) # If build_url is true
+      if(!caption_options.nil? and caption_options.build_url) # If build_url is true
         return JSON.parse(response)["CaptionUrl"]
       else
         return response # Else return raw caption text
@@ -214,17 +211,14 @@ module Cielo24
 
     def get_element_list(api_token, job_id)
       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)
       return Mash.new(json)
     end
 
     def get_list_of_element_lists(api_token, job_id)
       query_hash = init_job_req_dict(api_token, job_id)
-
-      response = WebUtils.http_request(@base_url + GET_LIST_OF_ELEMENT_LISTS_PATH, 'GET', WebUtils::BASIC_TIMEOUT, query_hash)
-      array = JSON.parse(response)
-      return array
+      json = WebUtils.get_json(@base_url + GET_LIST_OF_ELEMENT_LISTS_PATH, 'GET', WebUtils::BASIC_TIMEOUT, query_hash)
+      return json
     end
 
     ### PRIVATE HELPER METHODS ###

data/lib/cielo24/options.rb

@@ -1,5 +1,5 @@
 module Cielo24
-  class Options
+  class BaseOptions
 
     def get_hash
       hash = {}
@@ -14,11 +14,9 @@ module Cielo24
 
     def to_query
       hash = get_hash
-      array = Array.new(hash.length)
-      counter = 0
+      array = Array.new()
       hash.each do |key, value|
-        array[counter] = key + '=' + value.to_s
-        counter += 1
+        array.push(key + '=' + value.to_s)
       end
       return array.join("&")
     end
@@ -40,7 +38,7 @@ module Cielo24
     end
   end
 
-  class CommonOptions < Options
+  class CommonOptions < BaseOptions
 
     attr_accessor :characters_per_caption_line
     attr_accessor :elementlist_version
@@ -153,7 +151,7 @@ module Cielo24
     end
   end
 
-  class PerformTranscriptionOptions < Options
+  class PerformTranscriptionOptions < BaseOptions
 
     attr_accessor :customer_approval_steps
     attr_accessor :customer_approval_tool

data/lib/cielo24/version.rb

@@ -1,3 +1,3 @@
 module Cielo24
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/cielo24/web_utils.rb

@@ -6,7 +6,6 @@ module Cielo24
     require 'timeout'
     include JSON
 
-    VERIFY_MODE = nil
     BASIC_TIMEOUT = 60     # seconds
     DOWNLOAD_TIMEOUT = 300 # seconds
     @@LAST_URL = "none" # For logging purposes
@@ -20,7 +19,7 @@ module Cielo24
       return JSON.parse(response)
     end
 
-    def self.http_request(uri, method, timeout, query=nil, headers = nil, body = nil)
+    def self.http_request(uri, method, timeout, query=nil, headers=nil, body=nil)
       http_client = HTTPClient.new
       http_client.cookie_manager = nil
       http_client.send_timeout = 60*60*24*7 # HTTPClient default timeout set to 7 days, our own timeout handler is down below

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cielo24
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - cielo24
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-28 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler