opentok 0.0.72 → 0.0.73

data/Rakefile

@@ -1,2 +1,7 @@
 require 'bundler'
+require 'rspec/core/rake_task'
+
 Bundler::GemHelper.install_tasks
+
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec

data/lib/open_tok/archive.rb

@@ -9,53 +9,28 @@ module OpenTok
   class Archive
     attr_accessor :archive_id, :archive_title, :resources, :timeline
 
-    def initialize(archive_id, archive_title, resources, timeline, apiUrl, token)
+    def initialize(archive_id, archive_title, resources, timeline, api_url, token)
       @archive_id = archive_id
       @archive_title = archive_title
       @resources = resources
       @timeline = timeline
-      @apiUrl = apiUrl
+      @api_url = api_url
       @token = token
     end
 
-    def do_request(api_url, token)
-      url = URI.parse(api_url)
-      req = Net::HTTP::Get.new(url.path)
-
-      req.add_field 'X-TB-TOKEN-AUTH', token
-
-      http = Net::HTTP.new(url.host, url.port)
-      http.use_ssl = true if @apiUrl.start_with?("https")
-      res = http.start {|http| http.request(req)}
-      case res
-      when Net::HTTPSuccess, Net::HTTPRedirection
-        return res.read_body
-      else
-        res.error!
-      end
-    rescue Net::HTTPExceptions
-      raise
-      raise OpenTokException.new 'Unable to create fufill request: ' + $!
-    rescue NoMethodError
-      raise
-      raise OpenTokException.new 'Unable to create a fufill request at this time: ' + $1
-    end
-
-    def download_archive_url(video_id)
-      doc = do_request "#{@apiUrl}/archive/url/#{@archive_id}/#{video_id}" 
-      if not doc.get_elements('Errors').empty?
-        raise OpenTokException.new doc.get_elements('Errors')[0].get_elements('error')[0].children.to_s
-      end
-      doc
+    def do_request(path, token)
+      OpenTok::Request.new(@api_url, token).fetch(path)
     end
 
-    def downloadArchiveURL(video_id, token="")
+    def download_archive_url(video_id, token="")
       if token==""
-        return "#{@apiUrl}/archive/url/#{@archive_id}/#{video_id}" 
+        # this token check supports previous implementation of download_archive_url
+        return "#{@api_url}/archive/url/#{@archive_id}/#{video_id}"
       else
-        return do_request "#{@apiUrl}/archive/url/#{@archive_id}/#{video_id}", token
+        return do_request "/archive/url/#{@archive_id}/#{video_id}", token
       end
     end
+    alias_method :downloadArchiveURL, :download_archive_url
 
     def self.parse_manifest(manifest, apiUrl, token)
       archive_id = manifest.attributes['archiveid']

data/lib/open_tok/open_tok_sdk.rb

@@ -6,11 +6,8 @@
 
 =end
 
-require 'cgi'
 require 'openssl'
 require 'base64'
-require 'uri'
-require 'net/https'
 require 'rexml/document'
 
 DIGEST  = OpenSSL::Digest::Digest.new('sha1')
@@ -24,7 +21,7 @@ module OpenTok
   # * +MULTIPLEXER_SWITCHTYPE+ integer
   # * +MULTIPLEXER_SWITCHTIMEOUT+ integer
   # * +P2P_PREFERENCE+ string
-  class SessionPropertyConstants
+  module SessionPropertyConstants
     ECHOSUPPRESSION_ENABLED = "echoSuppression.enabled" #Boolean
     MULTIPLEXER_NUMOUTPUTSTREAMS = "multiplexer.numOutputStreams" #Integer
     MULTIPLEXER_SWITCHTYPE = "multiplexer.switchType" #Integer
@@ -37,7 +34,7 @@ module OpenTok
   # * +SUBSCRIBER+ Can only subscribe
   # * +PUBLISHER+ Can publish, subscribe, and signal
   # * +MODERATOR+ Can do the above along with forceDisconnect and forceUnpublish
-  class RoleConstants
+  module RoleConstants
     SUBSCRIBER = "subscriber" #Can only subscribe
     PUBLISHER = "publisher" #Can publish, subscribe, and signal
     MODERATOR = "moderator" #Can do the above along with  forceDisconnect and forceUnpublish
@@ -52,7 +49,7 @@ module OpenTok
     #
     # The first two attributes are required; +parnter_id+ and +partner_secret+ are the api-key and secret
     # that are provided to you.
-    # 
+    #
     # You can also pass in optional options;
     # * +:api_url+ sets the location of the api (staging or production)
     def initialize(partner_id, partner_secret, options = nil)
@@ -74,15 +71,12 @@ module OpenTok
 
     # Generate token for the given session_id. The options you can provide are;
     # * +:session_id+ (required) generate a token for the provided session
-    # * +:create_time+ 
+    # * +:create_time+
     # * +:expire_time+ (optional) The time when the token will expire, defined as an integer value for a Unix timestamp (in seconds). If you do not specify this value, tokens expire in 24 hours after being created.
     # * +:role+ (optional) Added in OpenTok v0.91.5. This defines the role the user will have. There are three roles: subscriber, publisher, and moderator.
     # * +:connection_data+ (optional) Added in OpenTok v0.91.20. A string containing metadata describing the connection.
     #
     # See http://www.tokbox.com/opentok/tools/documentation/overview/token_creation.html for more information on all options.
-    def generateToken(opts={})
-      generate_token(opts)
-    end
     def generate_token(opts = {})
       { :session_id => nil, :create_time => nil, :expire_time => nil, :role => nil, :connection_data => nil }.merge!(opts)
 
@@ -113,23 +107,18 @@ module OpenTok
         data_params[:connection_data] = opts[:connection_data]
       end
 
-      data_string = data_params.urlencode
+      data_string = OpenTok::Utils.urlencode_hash(data_params)
 
       sig = sign_string(data_string, @partner_secret)
-      meta_string = {
-        :partner_id => @partner_id,
-        :sig => sig
-      }.urlencode
+      meta_string = OpenTok::Utils.urlencode_hash(:partner_id => @partner_id, :sig => sig)
 
       @@TOKEN_SENTINEL + Base64.encode64(meta_string + ":" + data_string).gsub("\n", '')
     end
+    alias_method :generateToken, :generate_token
 
     # Generates a new OpenTok::Session and set it's session_id, situating it in TokBox's global network near the IP of the specified @location@.
     #
     # See http://www.tokbox.com/opentok/tools/documentation/overview/session_creation.html for more information
-    def createSession(location='', opts={})
-      create_session(location, opts)
-    end
     def create_session(location='', opts={})
       opts.merge!({:partner_id => @partner_id, :location=>location})
       doc = do_request("/session/create", opts)
@@ -138,12 +127,10 @@ module OpenTok
       end
       OpenTok::Session.new(doc.root.get_elements('Session')[0].get_elements('session_id')[0].children[0].to_s)
     end
+    alias_method :createSession, :create_session
 
     # This method takes two parameters. The first parameter is the +archive_id+ of the archive that contains the video (a String). The second parameter is the +token+ (a String)
     # The method returns an +OpenTok::Archive+ object. The resources property of this object is an array of OpenTok::ArchiveVideoResource objects. Each OpenTok::ArchiveVideoResource object represents a video in the archive.
-    def getArchiveManifest(archive_id, token)
-      get_archive_manifest(archive_id, token)
-    end
     def get_archive_manifest(archive_id, token)
       # TODO: verify that token is MODERATOR token, Staging and production
 
@@ -153,44 +140,37 @@ module OpenTok
       end
       OpenTok::Archive.parse_manifest(doc.get_elements('manifest')[0], @api_url, token)
     end
+    alias_method :getArchiveManifest, :get_archive_manifest
+
+    def stitchArchive(aid)
+      stitchURL = "/archive/#{aid}/stitch"
+      request = OpenTok::Request.new(@api_url, nil, @partner_id, @partner_secret)
+      response = request.sendRequest(stitchURL, {test:'none'})
+      case response.code
+      when '201'
+        return {:code=>201, :message=>"Successfully Created", :location=>response["location"]}
+      when '202'
+        return {:code=>202, :message=>"Processing"}
+      when '403'
+        return {:code=>403, :message=>"Invalid Credentials"}
+      when '404'
+        return {:code=>404, :message=>"Archive Does Not Exist"}
+      else
+        return {:code=>500, :message=>"Server Error"}
+      end
+      return {}
+    end
+    alias_method :stitch, :get_archive_manifest
 
     protected
     def sign_string(data, secret)
       OpenSSL::HMAC.hexdigest(DIGEST, secret, data)
     end
 
-    def do_request(api_url, params, token=nil)
-      url = URI.parse(@api_url + api_url)
-      if not params.empty?
-        req = Net::HTTP::Post.new(url.path)
-        req.set_form_data(params)
-      else
-        req = Net::HTTP::Get.new(url.path)
-      end
-
-      if not token.nil?
-        req.add_field 'X-TB-TOKEN-AUTH', token
-      else
-        req.add_field 'X-TB-PARTNER-AUTH', "#{@partner_id}:#{@partner_secret}"
-      end
-      http = Net::HTTP.new(url.host, url.port)
-      http.use_ssl = true if @api_url.start_with?("https")
-      res = http.start {|http| http.request(req)}
-      case res
-      when Net::HTTPSuccess, Net::HTTPRedirection
-        # OK
-        doc = REXML::Document.new(res.read_body)
-        return doc
-      else
-        res.error!
-      end
-    rescue Net::HTTPExceptions
-      raise
-      raise OpenTokException.new 'Unable to create fufill request: ' + $!
-    rescue NoMethodError
-      raise
-      raise OpenTokException.new 'Unable to create a fufill request at this time: ' + $1
+    def do_request(path, params, token=nil)
+      request = OpenTok::Request.new(@api_url, token, @partner_id, @partner_secret)
+      body = request.fetch(path, params)
+      REXML::Document.new(body)
     end
   end
 end
-

data/lib/open_tok/request.rb

@@ -0,0 +1,57 @@
+require 'uri'
+require 'net/http'
+require 'net/https'
+
+Net::HTTP.version_1_2 # to make sure version 1.2 is used
+
+module OpenTok
+  class Request
+
+    def initialize(api_host, token, partner_id=nil, partner_secret=nil)
+      @api_host       = api_host
+      @token          = token
+      @partner_id     = partner_id
+      @partner_secret = partner_secret
+    end
+
+    def sendRequest(path, params)
+      url = URI.parse(@api_host + path)
+
+      if params.empty?
+        req = Net::HTTP::Get.new(url.path)
+      else
+        req = Net::HTTP::Post.new(url.path)
+        req.set_form_data(params)
+      end
+
+      if @token
+        req.add_field 'X-TB-TOKEN-AUTH', @token
+      elsif @partner_id && @partner_secret
+        req.add_field 'X-TB-PARTNER-AUTH', "#{@partner_id}:#{@partner_secret}"
+      end
+
+      http = Net::HTTP.new(url.host, url.port)
+      http.use_ssl = @api_host.start_with?("https")
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+      res = http.start {|h| h.request(req) }
+      return res
+    end
+
+    def fetch(path, params={})
+      res = sendRequest(path, params)
+
+      case res
+      when Net::HTTPSuccess, Net::HTTPRedirection
+        return res.read_body
+      else
+        res.error!
+      end
+
+    rescue Net::HTTPExceptions => e
+      raise OpenTokException.new "Unable to create fufill request: #{e}"
+    rescue NoMethodError => e
+      raise OpenTokException.new "Unable to create a fufill request at this time: #{e}"
+    end
+  end
+end

data/lib/open_tok/utils.rb

@@ -0,0 +1,19 @@
+require 'cgi'
+
+module OpenTok
+  module Utils
+    # would recommend using `addressable` gem instead
+    def self.urlencode_hash(hash)
+      hash.to_a.map do |name_value|
+        if name_value[1].is_a? Array
+          name_value[0] = CGI.escape name_value[0].to_s
+          name_value[1].map { |e| CGI.escape e.to_s }
+          name_value[1] = name_value[1].join "&" + name_value[0] + "="
+          name_value.join '='
+        else
+          name_value.map { |e| CGI.escape e.to_s }.join '='
+        end
+      end.join '&'
+    end
+  end
+end

data/lib/open_tok/version.rb

@@ -1,3 +1,3 @@
 module Opentok
-  VERSION = "0.0.72"
+  VERSION = "0.0.73"
 end

data/lib/opentok.rb

@@ -9,20 +9,14 @@
 
 module OpenTok
   require 'rubygems'
-  require 'net/http'
-  require 'uri'
-  require 'digest/md5'
-  require 'cgi'
-  #require 'pp' # just for debugging purposes
-
-  Net::HTTP.version_1_2 # to make sure version 1.2 is used
 
   VERSION = "tbrb-v0.91.2011-02-17"
   API_URL = "https://staging.tokbox.com/hl"
   API_URL_PROD = 'https://api.opentok.com/hl'
-  
-  require 'monkey_patches'
+
   require 'open_tok/exception'
+  require 'open_tok/utils'
+  require 'open_tok/request'
   require 'open_tok/open_tok_sdk'
   require 'open_tok/session'
   require 'open_tok/archive'

data/opentok.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = Opentok::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Stijn Mathysen", "Karmen Blake", "Song Zheng"]
-  s.email       = ["stijn@skylight.be", "karmenblake@gmail.com", "Song Zheng"]
+  s.email       = ["stijn@skylight.be", "karmenblake@gmail.com", "song@tokbox.com"]
   s.homepage    = "https://github.com/opentok/Opentok-Ruby-SDK"
   s.summary     = %q{OpenTok gem}
   s.description = %q{OpenTok is an API from TokBox that enables websites to weave live group video communication into their online experience. With OpenTok you have the freedom and flexibility to create the most engaging web experience for your users. OpenTok is currently available as a JavaScript and ActionScript 3.0 library. This gem allows you to connect to the API from within Ruby (and Rails)}
@@ -18,4 +18,9 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "webmock"
+  s.add_development_dependency "vcr"
 end

data/spec/cassettes/archiving_downloads.yml

@@ -0,0 +1,81 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.opentok.com/hl/archive/getmanifest/5f74aee5-ab3f-421b-b124-ed2a698ee939
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+      X-Tb-Token-Auth:
+      - T1==cGFydG5lcl9pZD0xMTQyMTg3MiZzaWc9YTVlNWY3YjA1ZTZjMzE1NDdmZmIxNzE5NWQ0MGQxYzdiYTRlZjQ3NTpyb2xlPW1vZGVyYXRvciZzZXNzaW9uX2lkPTFfTVg0eE5EazNNVEk1TW41LU1qQXhNaTB3TlMweU1DQXdNVG93TXpvek1TNDFNREV6TURBck1EQTZNREItTUM0ME5qSTBNakk0TWpVMU1ERi0mY3JlYXRlX3RpbWU9MTM0NTEzNTg1MyZub25jZT0wLjUwODk3Nzg4NjYxNTIyODg=
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Thu, 16 Aug 2012 16:50:54 GMT
+      Content-Type:
+      - text/xml; charset=utf-8
+      Connection:
+      - keep-alive
+      Pragma:
+      - no-cache
+      Cache-Control:
+      - no-cache
+      Content-Length:
+      - '345'
+    body:
+      encoding: US-ASCII
+      string: ! "<manifest version=\"0.1\" archiveid=\"5f74aee5-ab3f-421b-b124-ed2a698ee939\"
+        title=\"Song Test Archive\">\n    <resources>\n    <video id=\"4b7227de-3b3f-45a7-a2dd-bffe6bf62085\"
+        length=\"5118\" name=\"\"/>\n    </resources>\n    <timeline>\n    <event
+        type=\"PLAY\" id=\"4b7227de-3b3f-45a7-a2dd-bffe6bf62085\" offset=\"1625\"
+        data=\"\" />\n    </timeline>\n</manifest>\n\n\n"
+    http_version: 
+  recorded_at: Thu, 16 Aug 2012 16:50:54 GMT
+- request:
+    method: get
+    uri: https://api.opentok.com/hl/archive/url/5f74aee5-ab3f-421b-b124-ed2a698ee939/4b7227de-3b3f-45a7-a2dd-bffe6bf62085
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+      X-Tb-Token-Auth:
+      - T1==cGFydG5lcl9pZD0xMTQyMTg3MiZzaWc9Mjk0ZjM4NzkwMjY3OTIxOTI1MjdiYjAzM2M1ZmNkNDhkNGFmMGRlZTpyb2xlPW1vZGVyYXRvciZzZXNzaW9uX2lkPTFfTVg0eE5EazNNVEk1TW41LU1qQXhNaTB3TlMweU1DQXdNVG93TXpvek1TNDFNREV6TURBck1EQTZNREItTUM0ME5qSTBNakk0TWpVMU1ERi0mY3JlYXRlX3RpbWU9MTM0NTEzNTg1NCZub25jZT0wLjc0MDc2NjMyNTg0NTYzNTE=
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Thu, 16 Aug 2012 16:50:55 GMT
+      Content-Type:
+      - text/html; charset=utf-8
+      Connection:
+      - keep-alive
+      Pragma:
+      - no-cache
+      Cache-Control:
+      - no-cache
+      Content-Length:
+      - '229'
+    body:
+      encoding: US-ASCII
+      string: https://s3.amazonaws.com/tokbox.com.production/11421872/5f74aee5-ab3f-421b-b124-ed2a698ee939/4b7227de-3b3f-45a7-a2dd-bffe6bf62085.flv?Signature=OTlzzfyKuNiukuyVcEaKP0pf8lU%3D&Expires=1345139455&AWSAccessKeyId=AKIAI6LQCPIXYVWCQV6Q
+    http_version: 
+  recorded_at: Thu, 16 Aug 2012 16:50:55 GMT
+recorded_with: VCR 2.2.4

data/spec/cassettes/generate_sessions.yml

@@ -0,0 +1,43 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://staging.tokbox.com/hl/session/create
+    body:
+      encoding: US-ASCII
+      string: partner_id=459782&location=127.0.0.1
+    headers:
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+      Content-Type:
+      - application/x-www-form-urlencoded
+      X-Tb-Partner-Auth:
+      - 459782:b44c3baa32b6476d9d88e8194d0eb1c6b777f76b
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Thu, 16 Aug 2012 16:49:56 GMT
+      Content-Type:
+      - text/xml
+      Connection:
+      - keep-alive
+      Access-Control-Allow-Origin:
+      - ! '*'
+      X-Tb-Host:
+      - stage301-sat.tokbox.com
+      Content-Length:
+      - '282'
+    body:
+      encoding: US-ASCII
+      string: <?xml version="1.0" encoding="UTF-8" standalone="yes"?><sessions><Session><session_id>2_MX40NTk3ODJ-MTI3LjAuMC4xflRodSBBdWcgMTYgMDk6NDk6NTYgUERUIDIwMTJ-MC41MDk2NDYyfg</session_id><partner_id>459782</partner_id><create_dt>Thu
+        Aug 16 09:49:56 PDT 2012</create_dt></Session></sessions>
+    http_version: 
+  recorded_at: Thu, 16 Aug 2012 16:49:56 GMT
+recorded_with: VCR 2.2.4

data/spec/cassettes/generate_tokens.yml

@@ -0,0 +1,43 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://staging.tokbox.com/hl/session/create
+    body:
+      encoding: US-ASCII
+      string: partner_id=459782&location=127.0.0.1
+    headers:
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+      Content-Type:
+      - application/x-www-form-urlencoded
+      X-Tb-Partner-Auth:
+      - 459782:b44c3baa32b6476d9d88e8194d0eb1c6b777f76b
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Thu, 16 Aug 2012 16:50:16 GMT
+      Content-Type:
+      - text/xml
+      Connection:
+      - keep-alive
+      Access-Control-Allow-Origin:
+      - ! '*'
+      X-Tb-Host:
+      - stage301-sat.tokbox.com
+      Content-Length:
+      - '282'
+    body:
+      encoding: US-ASCII
+      string: <?xml version="1.0" encoding="UTF-8" standalone="yes"?><sessions><Session><session_id>2_MX40NTk3ODJ-MTI3LjAuMC4xflRodSBBdWcgMTYgMDk6NTA6MTYgUERUIDIwMTJ-MC42MjI3MTA4fg</session_id><partner_id>459782</partner_id><create_dt>Thu
+        Aug 16 09:50:16 PDT 2012</create_dt></Session></sessions>
+    http_version: 
+  recorded_at: Thu, 16 Aug 2012 16:50:16 GMT
+recorded_with: VCR 2.2.4

data/spec/cassettes/session_creation.yml

@@ -0,0 +1,38 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://staging.tokbox.com/hl/session/create
+    body:
+      encoding: US-ASCII
+      string: partner_id=0&location=localhost
+    headers:
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+      Content-Type:
+      - application/x-www-form-urlencoded
+      X-Tb-Partner-Auth:
+      - ! '0:'
+  response:
+    status:
+      code: 403
+      message: Forbidden
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Thu, 16 Aug 2012 16:51:18 GMT
+      Content-Type:
+      - text/plain; charset=iso-8859-1
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '0'
+    body:
+      encoding: US-ASCII
+      string: ''
+    http_version: 
+  recorded_at: Thu, 16 Aug 2012 16:51:18 GMT
+recorded_with: VCR 2.2.4

data/spec/cassettes/token_creation.yml

@@ -0,0 +1,43 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://staging.tokbox.com/hl/session/create
+    body:
+      encoding: US-ASCII
+      string: partner_id=459782&location=localhost
+    headers:
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+      Content-Type:
+      - application/x-www-form-urlencoded
+      X-Tb-Partner-Auth:
+      - 459782:b44c3baa32b6476d9d88e8194d0eb1c6b777f76b
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Thu, 16 Aug 2012 16:51:48 GMT
+      Content-Type:
+      - text/xml
+      Connection:
+      - keep-alive
+      Access-Control-Allow-Origin:
+      - ! '*'
+      X-Tb-Host:
+      - stage301-sat.tokbox.com
+      Content-Length:
+      - '268'
+    body:
+      encoding: US-ASCII
+      string: <?xml version="1.0" encoding="UTF-8" standalone="yes"?><sessions><Session><session_id>1_MX40NTk3ODJ-flRodSBBdWcgMTYgMDk6NTE6NDggUERUIDIwMTJ-MC43NjEzNDN-</session_id><partner_id>459782</partner_id><create_dt>Thu
+        Aug 16 09:51:48 PDT 2012</create_dt></Session></sessions>
+    http_version: 
+  recorded_at: Thu, 16 Aug 2012 16:51:48 GMT
+recorded_with: VCR 2.2.4

data/spec/opentok_spec.rb

@@ -1,161 +1,157 @@
 require 'spec_helper'
 
-class TestOpentokSDK < OpenTok::OpenTokSDK
-  def do_request(api_url, params, token=nil)
-    super
-  end
-end
-
 describe "Functionality Test" do
-  before :all do
-    @api_key = '459782'
-    @api_secret = 'b44c3baa32b6476d9d88e8194d0eb1c6b777f76b'
-    @host = '127.0.0.1'
-    @api_staging_url = 'https://staging.tokbox.com/hl'
-    @api_production_url = 'https://api.opentok.com/hl'
-  end
+
+  let(:api_key) { '459782' }
+  let(:api_secret) { 'b44c3baa32b6476d9d88e8194d0eb1c6b777f76b' }
+  let(:host) { '127.0.0.1' }
+  let(:api_staging_url) { 'https://staging.tokbox.com/hl' }
+  let(:api_production_url) { 'https://api.opentok.com/hl' }
 
   describe "test Initializers" do
     it "should set staging URL with no options" do
-      @opentok = OpenTok::OpenTokSDK.new @api_key, @api_secret
-      @opentok.api_url.should eq @api_staging_url
+      opentok = OpenTok::OpenTokSDK.new api_key, api_secret
+      opentok.api_url.should eq api_staging_url
     end
+
     it "should be possible to set the api url as an option" do
-      opentok = OpenTok::OpenTokSDK.new @api_key, @api_secret, :api_url => @api_production_url
-      opentok.api_url.should eq @api_production_url
-      opentok = OpenTok::OpenTokSDK.new @api_key, @api_secret, :api_url => @api_staging_url
-      opentok.api_url.should eq @api_staging_url
+      opentok = OpenTok::OpenTokSDK.new api_key, api_secret, :api_url => api_production_url
+      opentok.api_url.should eq api_production_url
+      opentok = OpenTok::OpenTokSDK.new api_key, api_secret, :api_url => api_staging_url
+      opentok.api_url.should eq api_staging_url
     end
+
     it "should set staging URL with option false" do
-      @opentok = OpenTok::OpenTokSDK.new @api_key, @api_secret, false
-      @opentok.api_url.should eq @api_staging_url
+      opentok = OpenTok::OpenTokSDK.new api_key, api_secret, false
+      opentok.api_url.should eq api_staging_url
     end
+
     it "should set production URL with option true" do
-      @opentok = OpenTok::OpenTokSDK.new @api_key, @api_secret, true
-      @opentok.api_url.should eq @api_production_url
+      opentok = OpenTok::OpenTokSDK.new api_key, api_secret, true
+      opentok.api_url.should eq api_production_url
     end
   end
 
   describe "Generate Sessions" do
-    before :all do
-      @opentok = OpenTok::OpenTokSDK.new @api_key, @api_secret
-    end
+    use_vcr_cassette "generate_sessions"
+
+    let(:opentok) { OpenTok::OpenTokSDK.new api_key, api_secret }
 
     it "should generate valid session" do
-      session = @opentok.create_session @host
+      session = opentok.create_session host
       session.to_s.should match(/\A[0-9A-z_-]{40,}\Z/)
     end
+
     it "should generate valid session camelCase" do
-      session = @opentok.createSession @host
+      session = opentok.createSession host
       session.to_s.should match(/\A[0-9A-z_-]{40,}\Z/)
     end
   end
 
   describe "Generate Tokens" do
-    before :all do
-      @opentok = OpenTok::OpenTokSDK.new @api_key, @api_secret
-      @session = @opentok.createSession @host
-    end
+    use_vcr_cassette "generate_tokens"
+
+    let(:opentok) { OpenTok::OpenTokSDK.new api_key, api_secret }
+    let(:session) { opentok.createSession host }
 
     it "should generate valid token" do
-      @token = @opentok.generate_token({:session_id => @session, :role=>OpenTok::RoleConstants::MODERATOR})
-      @token.should match(/(T1==)+[0-9A-z_]+/)
+      token = opentok.generate_token({:session_id => session, :role=>OpenTok::RoleConstants::MODERATOR})
+      token.should match(/(T1==)+[0-9A-z_]+/)
     end
+
     it "should generate valid token camelCase" do
-      @token = @opentok.generateToken({:session_id => @session, :role=>OpenTok::RoleConstants::MODERATOR})
-      @token.should match(/(T1==)+[0-9A-z_]+/)
+      token = opentok.generateToken({:session_id => session, :role=>OpenTok::RoleConstants::MODERATOR})
+      token.should match(/(T1==)+[0-9A-z_]+/)
     end
   end
 
 end
 
 describe OpenTok do
-  
-  before :all do
-    @api_key = '459782'
-    @api_secret = 'b44c3baa32b6476d9d88e8194d0eb1c6b777f76b'
-    @api_staging_url = 'https://staging.tokbox.com/hl'
-    @api_production_url = 'https://api.opentok.com/hl'
-    @host = 'localhost'
-    
-    @opentok = OpenTok::OpenTokSDK.new @api_key, @api_secret
-  end
+
+  let(:api_key) { '459782' }
+  let(:api_secret) { 'b44c3baa32b6476d9d88e8194d0eb1c6b777f76b' }
+  let(:api_staging_url) { 'https://staging.tokbox.com/hl' }
+  let(:api_production_url) { 'https://api.opentok.com/hl' }
+  let(:host) { 'localhost' }
+
+  let(:opentok) { OpenTok::OpenTokSDK.new api_key, api_secret }
 
   describe "Production Environment" do
-    before :all do
-      @api_key = '11421872'
-      @api_secret = '296cebc2fc4104cd348016667ffa2a3909ec636f'
-      @opentok = TestOpentokSDK.new @api_key, @api_secret, {:api_url=>@api_production_url}
-      @opts = {:partner_id => @api_key, :location=>@host}
-    end
+
+    let(:api_key) { '11421872' }
+    let(:api_secret) { '296cebc2fc4104cd348016667ffa2a3909ec636f' }
+    let(:opentok) { OpenTok::OpenTokSDK.new api_key, api_secret, {:api_url=>api_production_url} }
+    let(:opts) { {:partner_id => api_key, :location=>host} }
 
     it "should be possible to valid a OpenTokSDK object with a valid key and secret" do
-      @opentok.should be_instance_of TestOpentokSDK
+      opentok.should be_instance_of OpenTok::OpenTokSDK
     end
-    
+
     it "a new OpenTokSDK object should point to the staging environment by default" do
-      @opentok.api_url.should eq @api_production_url
+      opentok.api_url.should eq api_production_url
     end
 
     describe "Archiving downloads" do
-      before :all do
-        @session = '1_MX4xNDk3MTI5Mn5-MjAxMi0wNS0yMCAwMTowMzozMS41MDEzMDArMDA6MDB-MC40NjI0MjI4MjU1MDF-'
-        @opentok = OpenTok::OpenTokSDK.new @api_key, @api_secret, {:api_url=>@api_production_url}
-        @token = @opentok.generateToken({:session_id => @session, :role=>OpenTok::RoleConstants::MODERATOR})
-        @archiveId = '5f74aee5-ab3f-421b-b124-ed2a698ee939'
-      end
+      use_vcr_cassette "archiving_downloads"
+
+      let(:session) { '1_MX4xNDk3MTI5Mn5-MjAxMi0wNS0yMCAwMTowMzozMS41MDEzMDArMDA6MDB-MC40NjI0MjI4MjU1MDF-' }
+      let(:opentok) { OpenTok::OpenTokSDK.new api_key, api_secret, {:api_url=>api_production_url} }
+      let(:token) { opentok.generateToken({:session_id => session, :role=>OpenTok::RoleConstants::MODERATOR}) }
+      let(:archiveId) { '5f74aee5-ab3f-421b-b124-ed2a698ee939' }
 
       it "should have archive resources" do
-        otArchive = @opentok.getArchiveManifest(@archiveId, @token)
+        otArchive = opentok.getArchiveManifest(archiveId, token)
         otArchiveResource = otArchive.resources[0]
         vid = otArchiveResource.getId()
         vid.should match(/[0-9A-z=]+/)
       end
 
       it "should return download url" do
-        otArchive = @opentok.get_archive_manifest(@archiveId, @token)
+        otArchive = opentok.get_archive_manifest(archiveId, token)
         otArchiveResource = otArchive.resources[0]
         vid = otArchiveResource.getId()
-        url = otArchive.downloadArchiveURL(vid)
+        url = otArchive.downloadArchiveURL(vid, token)
         url.start_with?('http').should eq true
       end
 
       it "should return file url" do
-        otArchive = @opentok.get_archive_manifest(@archiveId, @token)
+        otArchive = opentok.get_archive_manifest(archiveId, token)
         otArchiveResource = otArchive.resources[0]
         vid = otArchiveResource.getId()
-        url = otArchive.downloadArchiveURL(vid, @token)
+        url = otArchive.downloadArchiveURL(vid, token)
         url.start_with?('http').should eq true
       end
     end
   end
-  
-  
+
+
   describe "Session creation" do
+    use_vcr_cassette "session_creation"
+
     it "should raise an exception with an invalid key and secret" do
       opentok = OpenTok::OpenTokSDK.new 0, ''
-    
+
       expect{
-        session = opentok.create_session @host
+        session = opentok.create_session host
       }.to raise_error OpenTok::OpenTokException
     end
-  
+
   end
 
   describe "Token creation" do
-    before :all do
-      @opentok = OpenTok::OpenTokSDK.new @api_key, @api_secret
-      @valid_session = @opentok.create_session(@host).to_s
-    end
-    
+    use_vcr_cassette "token_creation"
+
+    let(:valid_session) { opentok.create_session(host).to_s }
+
     it "should be possible to create a token" do
-      token = @opentok.generate_token :session_id => @valid_session.to_s
-      
+      token = opentok.generate_token :session_id => valid_session
+
       token.should match(/\A[0-9A-z=]+\Z/)
     end
 
     it "should be able to set parameters in token" do
-      token = @opentok.generate_token :session_id => @valid_session.to_s, :role=> OpenTok::RoleConstants::PUBLISHER, :connection_data => "username=Bob,level=4"
+      token = opentok.generate_token :session_id => valid_session, :role=> OpenTok::RoleConstants::PUBLISHER, :connection_data => "username=Bob,level=4"
 
       str = token[4..token.length]
       decoded = Base64.decode64(str)
@@ -165,16 +161,26 @@ describe OpenTok do
   end
 
   describe "Archive Download" do
-    before :all do
-      @opentok = OpenTok::OpenTokSDK.new @api_key, @api_secret
-      @valid_session = @opentok.create_session(@host).to_s
-    end
+    use_vcr_cassette "archive_download"
+
+    let(:valid_session) { opentok.create_session(host).to_s }
 
 #    it "If token does not have moderator role, raise error" do
-#      token = @opentok.generate_token(:session_id=>@valid_session)
+#      token = opentok.generate_token(:session_id=>valid_session)
 #      expect{
-#        @opentok.get_archive_manifest("", token)
+#        opentok.get_archive_manifest("", token)
 #      }.to raise_error OpenTok::OpenTokException
 #    end
   end
+
+  describe "stitch api" do
+    use_vcr_cassette "archive_stitch"
+    it "should return stich url" do
+      OTKey = ENV['TB_KEY'] # Enter you OpenTok Key Here
+      OTSecret = ENV['TB_SECRET'] # Enter your OpenTok Secret Here
+      OTSDK = OpenTok::OpenTokSDK.new OTKey, OTSecret, true
+      a = OTSDK.stitchArchive("9cf9b35d-3c2f-432c-96b9-dbdf848ecf33")
+      a[:code].should == 202
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,2 +1,15 @@
-require 'I18n'
 require File.dirname(__FILE__) + '/../lib/opentok.rb'
+
+require 'vcr'
+require 'webmock'
+
+VCR.configure do |c|
+  c.cassette_library_dir     = 'spec/cassettes'
+  c.hook_into                :webmock
+  c.default_cassette_options = { :record => :new_episodes }
+  c.allow_http_connections_when_no_cassette=true
+end
+
+RSpec.configure do |c|
+  c.extend VCR::RSpec::Macros
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opentok
 version: !ruby/object:Gem::Version
-  version: 0.0.72
+  version: 0.0.73
   prerelease: 
 platform: ruby
 authors:
@@ -11,8 +11,72 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-14 00:00:00.000000000 Z
-dependencies: []
+date: 2012-08-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: OpenTok is an API from TokBox that enables websites to weave live group
   video communication into their online experience. With OpenTok you have the freedom
   and flexibility to create the most engaging web experience for your users. OpenTok
@@ -21,7 +85,7 @@ description: OpenTok is an API from TokBox that enables websites to weave live g
 email:
 - stijn@skylight.be
 - karmenblake@gmail.com
-- Song Zheng
+- song@tokbox.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -80,16 +144,22 @@ files:
 - doc/rdoc.css
 - doc/spec/opentok_spec_rb.html
 - doc/spec/spec_helper_rb.html
-- lib/monkey_patches.rb
 - lib/open_tok/archive.rb
 - lib/open_tok/archive_timeline_event.rb
 - lib/open_tok/archive_video_resource.rb
 - lib/open_tok/exception.rb
 - lib/open_tok/open_tok_sdk.rb
+- lib/open_tok/request.rb
 - lib/open_tok/session.rb
+- lib/open_tok/utils.rb
 - lib/open_tok/version.rb
 - lib/opentok.rb
 - opentok.gemspec
+- spec/cassettes/archiving_downloads.yml
+- spec/cassettes/generate_sessions.yml
+- spec/cassettes/generate_tokens.yml
+- spec/cassettes/session_creation.yml
+- spec/cassettes/token_creation.yml
 - spec/opentok_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/opentok/Opentok-Ruby-SDK
@@ -117,5 +187,10 @@ signing_key:
 specification_version: 3
 summary: OpenTok gem
 test_files:
+- spec/cassettes/archiving_downloads.yml
+- spec/cassettes/generate_sessions.yml
+- spec/cassettes/generate_tokens.yml
+- spec/cassettes/session_creation.yml
+- spec/cassettes/token_creation.yml
 - spec/opentok_spec.rb
 - spec/spec_helper.rb

data/lib/monkey_patches.rb

@@ -1,34 +0,0 @@
-=begin
- OpenTok Ruby Library
- http://www.tokbox.com/
-
- Copyright 2010 - 2011, TokBox, Inc.
-
- Last modified: 2011-02-17
-=end
-
-class Hash
-
-  # Adding a urlencode method to the hash class for easy querstring generation
-  def urlencode
-    to_a.map do |name_value|
-      if name_value[1].is_a? Array
-        name_value[0] = CGI.escape name_value[0].to_s
-        name_value[1].map { |e| CGI.escape e.to_s }
-        name_value[1] = name_value[1].join "&" + name_value[0] + "="
-        name_value.join '='
-      else
-        name_value.map { |e| CGI.escape e.to_s }.join '='
-      end
-    end.join '&'
-  end
-end
-
-class Net::HTTP
-  alias_method :old_initialize, :initialize
-  def initialize(*args)
-    old_initialize(*args)
-    @ssl_context = OpenSSL::SSL::SSLContext.new
-    @ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
-  end
-end