cielo24 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b09cd26328c50d779c3a5ad4bcdab2a0c0d7d93
-  data.tar.gz: 2527d71d3ba675dc9e42e4a2e4e8d96dfd944d8b
+  metadata.gz: 9107d0e793b84ed3a486338337eeb04714376905
+  data.tar.gz: 9794c0732b072a63811fddd86a3581b095991081
 SHA512:
-  metadata.gz: 7491fc76d01f2e77bd739a2db280630f3f8c1b66aa07f6c7b6338dbd25b0b677829d22433fe6db99030aa83c88898e6fa49f1ad75a701f9528b883ad0357ae5e
-  data.tar.gz: 71b71029d04d55cb73491240ce81e1bcb69d9d4c0f4f092cf3055206bab5403277c2efc4f6e8380efab42f14e57b2e53f8209eafaec7c83ee3fcc650d287e256
+  metadata.gz: 27669efdf2a205b83418245bebfa953f1d8f894c8b0ffa500e715316c5984da976df91f7e4914fa555981cadead49efb3f5acd57de0f105a59aa99088a00fcc5
+  data.tar.gz: ed250abdfb41c16841a2dde46885a6269d4c1fffbe33d924d5799958fb1a21aea0cace56992749c66b1a6ea1a355e2b6fb8aab4cdb1a932fb8a68e09f87b935f

data/lib/cielo24.rb

@@ -1,11 +1,11 @@
-require 'cielo24/version'
-require 'cielo24/actions'
-require 'cielo24/enums'
-require 'cielo24/options'
-require 'cielo24/web_utils'
-
-require 'hashie'
-require 'httpclient'
-
-module Cielo24
-end
+require 'cielo24/version'
+require 'cielo24/actions'
+require 'cielo24/enums'
+require 'cielo24/options'
+require 'cielo24/web_utils'
+
+require 'hashie'
+require 'httpclient'
+
+module Cielo24
+end

data/lib/cielo24/actions.rb

@@ -32,7 +32,7 @@ module Cielo24
     GET_ELEMENT_LIST_PATH = "/api/job/get_elementlist"
     GET_LIST_OF_ELEMENT_LISTS_PATH = "/api/job/list_elementlists"
 
-    def initialize(base_url="https://sandbox-dev.cielo24.com")
+    def initialize(base_url="https://api.cielo24.com")
       @base_url = base_url
     end
 
@@ -42,7 +42,7 @@ module Cielo24
       assert_argument(username, "Username")
       # Password or API Secure Key must be supplied but not both
       raise ArgumentError.new("Only password or API secure must be supplied for login.") if (!password.nil? and !api_securekey.nil?)
-      raise ArgumentError.new("Password or API secure must be supplied for login.") if (password.nil? and api_securekey.nil?)
+      raise ArgumentError.new("Password or API Secure Key must be supplied for login.") if (password.nil? and api_securekey.nil?)
 
       query_hash = init_version_dict
       headers = Hash.new
@@ -188,7 +188,7 @@ module Cielo24
       query_hash[:callback_uri] = URI.escape(callback_uri) if !(callback_uri.nil?)
       query_hash[:turnaround_hours] = turnaround_hours if !(turnaround_hours.nil?)
       query_hash[:target_language] = target_language if !(target_language.nil?)
-      query_hash.merge(options.get_hash) if !(options.nil?)
+      query_hash.merge!(options.get_hash) if !(options.nil?)
 
       json = WebUtils.get_json(@base_url + PERFORM_TRANSCRIPTION, 'GET', WebUtils::BASIC_TIMEOUT, query_hash)
       return json["TaskId"]
@@ -196,7 +196,7 @@ module Cielo24
 
     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?)
+      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)
@@ -205,7 +205,7 @@ module Cielo24
     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?)
+      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

data/lib/cielo24/options.rb

@@ -22,8 +22,20 @@ module Cielo24
       return array.join("&")
     end
 
-    def populate_from_key_value_pair
+    def populate_from_key_value_pair(key, value)
+      # Iterate over instance variables
+      self.instance_variables.each{ |var|
+        if var.to_s.delete("@") == key
+          self.instance_variable_set(var, value)
+          break
+        end
+      }
+    end
 
+    def populate_from_hash(hash)
+      hash.each do |key, value|
+        populate_from_key_value_pair(key, value)
+      end
     end
   end
 

data/lib/cielo24/version.rb

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

data/lib/cielo24/web_utils.rb

@@ -8,6 +8,11 @@ module Cielo24
     VERIFY_MODE = nil
     BASIC_TIMEOUT = 60
     DOWNLOAD_TIMEOUT = 300
+    @@LAST_URL = "none" # For logging purposes
+
+    def self.LAST_URL
+      return @@LAST_URL
+    end
 
     def self.get_json(uri, method, timeout, query=nil, headers=nil, body=nil)
       response = http_request(uri, method, timeout, query, headers, body)
@@ -20,6 +25,7 @@ module Cielo24
       # TODO: timeout
 
       response = http_client.request(method, uri, query, body, headers, nil)
+      @@LAST_URL = uri + "?" + URI.encode_www_form(query)
 
       # Handle web errors
       if response.status_code == 200 or response.status_code == 204

metadata

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