opentok 0.0.73 → 0.0.91

data/CHANGES

@@ -1,5 +1,15 @@
 = Change Log
 
+== Version 0.0.8
+
+* Removed references to the staging environment as it no longer exists
+
+== Version 0.0.73
+
+* Added stitchArchive functionality
+* Updated Test Cases ( thanks to https://github.com/rlivsey )
+* Download Archive duplication and error catching ( thanks to https://github.com/muescha )
+
 == Version 0.0.5
 
 * Added connection_data to generate token method (thanks to https://github.com/jonmumm)
@@ -20,4 +30,4 @@
 
 == Version 0.0.1
 
-Initial version
+Initial version

data/LICENSE

@@ -0,0 +1,7 @@
+Copyright (c) 2012 TokBox, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+The software complies with Terms of Service for the OpenTok platform described in http://www.tokbox.com/termsofservice
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -12,29 +12,22 @@ gem 'opentok'
 
 To install as a regular gem just type `gem install opentok`
 
-# Requirements
+## Requirements
 
-You need an api-key and secret. Request them at <http://www.tokbox.com/opentok/tools/js/apikey>.  
+You need an api-key and secret. Request them at <http://www.tokbox.com/opentok/tools/js/apikey>.
 
 # OpenTokSDK
 
 In order to use any of the server side functions, you must first create an `OpenTokSDK` object with your developer credentials.  
-
 `OpenTokSDK` takes 2-3 parameters:
 > key (string) - Given to you when you register  
 > secret (string) - Given to you when you register  
-> Production (Boolean) - OPTIONAL. Puts your app in staging or production environment. Default value is `false`  
-For more information about production apps, check out <http://www.tokbox.com/opentok/api/tools/js/launch>
-
 
 <pre>
-# Creating an OpenTok Object in Staging Environment
+# Creating an OpenTok Object
 API_KEY = ''                # should be a string
 API_SECRET = ''            # should be a string
 OTSDK = OpenTok::OpenTokSDK.new API_KEY, API_SECRET
-
-# Creating an OpenTok Object in Production Environment
-OTSDK = OpenTok::OpenTokSDK.new API_KEY, API_SECRET, true
 </pre>
 
 
@@ -66,41 +59,71 @@ With the generated sessionId, you can start generating tokens for each user.
 token = OTSDK.generateToken :session_id => session, :role => OpenTok::RoleConstants::PUBLISHER, :connection_data => "username=Bob,level=4"
 </pre>
 
-### Downloading Archive Videos
-To Download archived video, you must have an Archive ID which you get from the javascript library
+# Manipulating Archive Videos
+To Download or delete archived video, you must have an Archive ID which you get from the javascript library. If you are unfamiliar with archiving concepts, please visit our [archiving tutorial](http://www.tokbox.com/opentok/api/documentation/gettingstartedarchiving)  
 
-#### Quick Overview of the javascript library: <http://www.tokbox.com/opentok/api/tools/js/documentation/api/Session.html#createArchive>
-1. Create an event listener on `archiveCreated` event: `session.addEventListener('archiveCreated', archiveCreatedHandler);`  
-2. Create an archive: `archive = session.createArchive(...);`  
-3. When archive is successfully created `archiveCreatedHandler` would be triggered. An Archive object containing `archiveId` property is passed into your function. Save this in your database, this archiveId is what you use to reference the archive for playbacks and download videos  
-4. After your archive has been created, you can start recording videos into it by calling `session.startRecording(archive)`  
- Optionally, you can also use the standalone archiving, which means that each archive would have only 1 video: <http://www.tokbox.com/opentok/api/tools/js/documentation/api/RecorderManager.html>
+# Delete Archives
+OpenTok SDK has a function `deleteArchive` that lets you delete videos in a recorded archive. 
+Use your `OpenTokSDK` object to call `deleteArchive`
+`deleteArchive` takes in 2 parameters and returns a true or false boolean representing the success of the delete request
+> archive_id (string) - REQUIRED  
+> token (string) - REQUIRED. This token MUST have a moderator role, and it should be generated with the same session_id used to create the archive  
+> **returns**  
+  true: Success, the archive is deleted  
+  false: Archive does not exist (perhaps it was already deleted or never created), invalid token (perhaps it does not have the moderator role or it's generated with the wrong session_id)
 
-### Get Archive Manifest
+Example:
+<pre>
+successful = OTSDK.deleteArchive( archive_id, token )
+</pre>
+
+# Stitching Archives
+OpenTok SDK allows you to stich up to 4 videos together in an archive.  
+Use your `OpenTokSDK` object to call stitchArchive  
+stitchArchive takes in 1 parameter and returns a hash object with code, message, and location if stitch is successful.  
+> archive_id (string) - REQUIRED  
+> **returns**:  
+  {:code=>201, :message=>"Successfully Created", :location=>response["location"]}  
+  {:code=>202, :message=>"Processing"}  
+  {:code=>403, :message=>"Invalid Credentials"}  
+  {:code=>404, :message=>"Archive Does Not Exist"}  
+  {:code=>500, :message=>"Server Error"}  
+
+Example:  
+<pre>
+result = OTSDK.stitchArchive archive_id
+if result[:code] == 201
+  return result[:location]
+end
+</pre>
+
+# Get Archive Manifest
 With your **moderator token** and OpentokSDK Object, you can generate OpenTokArchive Object, which contains information for all videos in the Archive  
-`get_archive_manifest()` takes in 2 parameters: **archiveId** and **moderator token**  
+`getArchiveManifest()` takes in 2 parameters: **archiveId** and **moderator token**  
 > archive_id (string) - REQUIRED. 
-> **returns** an `OpenTokArchive` object. The *resources* property of this object is array of `OpenTokArchiveVideoResource` objects, and each `OpenTokArchiveVideoResource` object represents a video in the archive.
+> token (string) - REQUIRED. 
+> **returns** an `OpenTokArchive` object.  
+  The *resources* property of this object is array of `OpenTokArchiveVideoResource` objects, and each `OpenTokArchiveVideoResource` object represents a video in the archive.
 
 Example:(Make sure you have the OpentokSDK Object)
 <pre>
-@token = 'moderator_token'
+@token = '...'  # token generated with corresponding session
 @archiveId = '5f74aee5-ab3f-421b-b124-ed2a698ee939' #Obtained from Javascript Library
-otArchive = OTSDK.get_archive_manifest(@archiveId, @token)
+otArchive = OTSDK.getArchiveManifest(@archiveId, @token)
 </pre>
 
-### Get video ID
-`OpenTokArchive.resources` is an array of `OpenTokArchiveVideoResource` objects. OpenTokArchiveVideoResource has `getId()` method that returns the videoId
+# Get video ID
+`OpenTokArchive.resources` is an array of `OpenTokArchiveVideoResource` objects. OpenTokArchiveVideoResource has `getId()` method that returns the video_id  
 `getId()` will return the video ID (a String)
 
 Example:
 <pre>
-otArchive = OTSDK.get_archive_manifest(@archiveId, @token)
+otArchive = OTSDK.getArchiveManifest(@archiveId, @token)
 otVideoResource = otArchive.resources[0]
 videoId = otVideoResource.getId()
 </pre>
 
-### Get Download Url
+# Get Download Url
 `OpenTokArchive` has `downloadArchiveURL` that will return an url string for downloading the video in the archive. You must call this function every time you want the file, because this url expires after 24 hours
 > video_id (string) - REQUIRED  
 > token (string) - REQUIRED  
@@ -110,3 +133,4 @@ Example:
 <pre>
 url = otArchive.downloadArchiveURL(video_id, token)
 </pre>
+

data/lib/open_tok/archive.rb

@@ -27,7 +27,11 @@ module OpenTok
         # this token check supports previous implementation of download_archive_url
         return "#{@api_url}/archive/url/#{@archive_id}/#{video_id}"
       else
-        return do_request "/archive/url/#{@archive_id}/#{video_id}", token
+        doc = do_request "/archive/url/#{@archive_id}/#{video_id}", token
+        if doc.split("http").length < 2
+          raise OpenTokException.new doc.get_elements('Errors')[0].get_elements('error')[0].children.to_s
+        end
+        return doc
       end
     end
     alias_method :downloadArchiveURL, :download_archive_url

data/lib/open_tok/open_tok_sdk.rb

@@ -49,24 +49,10 @@ 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)
+    def initialize(partner_id, partner_secret, backSupport="")
       @partner_id = partner_id
       @partner_secret = partner_secret.strip
-
-      if options.is_a?(::Hash)
-        # user input hash parameter
-        @api_url = options[:api_url] || API_URL
-      else
-        # use input true/false for parameter
-        @api_url = (options ? API_URL_PROD : API_URL)
-      end
-
-      unless @api_url
-        @api_url = API_URL
-      end
+      @api_url = API_URL
     end
 
     # Generate token for the given session_id. The options you can provide are;
@@ -98,7 +84,7 @@ module OpenTok
       if not opts[:expire_time].nil?
         raise OpenTokException.new 'Expire time must be a number' if not opts[:expire_time].is_a?(Numeric)
         raise OpenTokException.new 'Expire time must be in the future' if opts[:expire_time] < Time.now.to_i
-        raise OpenTokException.new 'Expire time must be in the next 7 days' if opts[:expire_time] > (Time.now.to_i + 604800)
+        raise OpenTokException.new 'Expire time must be in the next 30 days' if opts[:expire_time] > (Time.now.to_i + 2592000)
         data_params[:expire_time] = opts[:expire_time].to_i
       end
 
@@ -132,7 +118,7 @@ module OpenTok
     # 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 get_archive_manifest(archive_id, token)
-      # TODO: verify that token is MODERATOR token, Staging and production
+      # TODO: verify that token is MODERATOR token
 
       doc = do_request("/archive/getmanifest/#{archive_id}", {}, token)
       if not doc.get_elements('Errors').empty?
@@ -142,8 +128,22 @@ module OpenTok
     end
     alias_method :getArchiveManifest, :get_archive_manifest
 
+    def delete_archive( aid, token )
+      deleteURL = "/hl/archive/delete/#{aid}"
+      doc = do_request( deleteURL, {test:'none'}, token )
+      errors = doc.get_elements('Errors')
+      if doc.get_elements('Errors').empty?
+        #error = errors[0].get_elements('error')[0]
+        #errorCode = attributes['code']
+        return true
+      else
+        return false
+      end
+    end
+    alias_method :deleteArchive, :delete_archive
+
     def stitchArchive(aid)
-      stitchURL = "/archive/#{aid}/stitch"
+      stitchURL = "/hl/archive/#{aid}/stitch"
       request = OpenTok::Request.new(@api_url, nil, @partner_id, @partner_secret)
       response = request.sendRequest(stitchURL, {test:'none'})
       case response.code
@@ -160,7 +160,7 @@ module OpenTok
       end
       return {}
     end
-    alias_method :stitch, :get_archive_manifest
+    alias_method :stitch, :stitchArchive
 
     protected
     def sign_string(data, secret)

data/lib/open_tok/version.rb

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

data/lib/opentok.rb

@@ -2,17 +2,16 @@
  OpenTok Ruby Library
  http://www.tokbox.com/
 
- Copyright 2010 - 2011, TokBox, Inc.
+ Copyright 2010 - 2012, TokBox, Inc.
 
- Last modified: 2011-02-17
+ Last modified: 2012-08-28
 =end
 
 module OpenTok
   require 'rubygems'
 
-  VERSION = "tbrb-v0.91.2011-02-17"
-  API_URL = "https://staging.tokbox.com/hl"
-  API_URL_PROD = 'https://api.opentok.com/hl'
+  VERSION = "tbrb-v0.91.2012-08-28"
+  API_URL = "https://api.opentok.com"
 
   require 'open_tok/exception'
   require 'open_tok/utils'

data/spec/cassettes/archives.yml

@@ -0,0 +1,83 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.opentok.com/archive/getmanifest/200567af-0726-4e93-883b-fe0426d6310a
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+      X-Tb-Token-Auth:
+      - T1==cGFydG5lcl9pZD00NTk3ODImc2lnPWVjNjA1YTZhNzI5MDk5MzU5NTI1YWM2ZTczNDY1ZTQ3MzEwMWFkY2Q6cm9sZT1tb2RlcmF0b3Imc2Vzc2lvbl9pZD0xX01YNDBOVGszT0RKLU1USTNMakF1TUM0eGZsUjFaU0JUWlhBZ01EUWdNVFE2TlRNNk1ESWdVRVJVSURJd01USi1NQzQxTWpFeE9ERXpmZyZjcmVhdGVfdGltZT0xMzQ2ODAxMjQ1Jm5vbmNlPTAuMjUwMTIwMTEyNzkzODkwMjQ=
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Tue, 04 Sep 2012 23:27:13 GMT
+      Content-Type:
+      - text/xml; charset=utf-8
+      Connection:
+      - keep-alive
+      Pragma:
+      - no-cache
+      Cache-Control:
+      - no-cache
+      Content-Length:
+      - '510'
+    body:
+      encoding: US-ASCII
+      string: ! "<manifest version=\"0.1\" archiveid=\"200567af-0726-4e93-883b-fe0426d6310a\"
+        title=\"1346797109799\">\n    <resources>\n    <video id=\"bbf108c9-7237-49ae-9057-2ccdb71cf675\"
+        length=\"18734\" name=\"\"/>\n    <video id=\"3f0d3ec6-4a41-4cc5-9e38-f9e6375ba5fd\"
+        length=\"18743\" name=\"\"/>\n    </resources>\n    <timeline>\n    <event
+        type=\"PLAY\" id=\"3f0d3ec6-4a41-4cc5-9e38-f9e6375ba5fd\" offset=\"1255\"
+        data=\"\" />\n    <event type=\"PLAY\" id=\"bbf108c9-7237-49ae-9057-2ccdb71cf675\"
+        offset=\"1263\" data=\"\" />\n    </timeline>\n</manifest>\n\n\n"
+    http_version: 
+  recorded_at: Tue, 04 Sep 2012 23:27:25 GMT
+- request:
+    method: get
+    uri: https://api.opentok.com/archive/url/200567af-0726-4e93-883b-fe0426d6310a/bbf108c9-7237-49ae-9057-2ccdb71cf675
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+      X-Tb-Token-Auth:
+      - T1==cGFydG5lcl9pZD00NTk3ODImc2lnPTU2MDY5Y2VmMTAzY2M4YTUzY2RlNTZlZTAzNzdjODIyNTk0MTU5MzM6cm9sZT1tb2RlcmF0b3Imc2Vzc2lvbl9pZD0xX01YNDBOVGszT0RKLU1USTNMakF1TUM0eGZsUjFaU0JUWlhBZ01EUWdNVFE2TlRNNk1ESWdVRVJVSURJd01USi1NQzQxTWpFeE9ERXpmZyZjcmVhdGVfdGltZT0xMzQ2ODAxMjQ1Jm5vbmNlPTAuNDY2MDM2NDg4Nzc5NDgy
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Tue, 04 Sep 2012 23:27:13 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/459782/200567af-0726-4e93-883b-fe0426d6310a/bbf108c9-7237-49ae-9057-2ccdb71cf675.flv?Signature=Hn7ti7U2yG8tehW1ypD1R%2FGUvrg%3D&Expires=1346804833&AWSAccessKeyId=AKIAI6LQCPIXYVWCQV6Q
+    http_version: 
+  recorded_at: Tue, 04 Sep 2012 23:27:25 GMT
+recorded_with: VCR 2.2.4

data/spec/cassettes/deleteArchive.yml

@@ -0,0 +1,45 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://api.opentok.com/hl/archive/delete/200567af-0726-4e93-883b-fe0426d6310a
+    body:
+      encoding: US-ASCII
+      string: test=none
+    headers:
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+      Content-Type:
+      - application/x-www-form-urlencoded
+      X-Tb-Token-Auth:
+      - T1==cGFydG5lcl9pZD00NTk3ODImc2lnPTEyMTU4N2FiMGU3YmQzZTVmNjVjOGQxNjQ1NGQ4Y2UxM2RjZTI5YzI6cm9sZT1wdWJsaXNoZXImc2Vzc2lvbl9pZD0xX01YNDBOVGszT0RKLU1USTNMakF1TUM0eGZsUjFaU0JUWlhBZ01EUWdNVFE2TlRNNk1ESWdVRVJVSURJd01USi1NQzQxTWpFeE9ERXpmZyZjcmVhdGVfdGltZT0xMzQ3MDU0OTc3Jm5vbmNlPTAuNTAzNjU0NzIyODY0NzU1Mg==
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Fri, 07 Sep 2012 21:56:12 GMT
+      Content-Type:
+      - text/xml; charset=utf-8
+      Connection:
+      - keep-alive
+      Pragma:
+      - no-cache
+      Cache-Control:
+      - no-cache
+      Content-Length:
+      - '124'
+    body:
+      encoding: US-ASCII
+      string: ! '<Errors><error code="404"><itemNotFound message="Archive 200567af-0726-4e93-883b-fe0426d6310a
+        not found"/></error></Errors>
+
+'
+    http_version: 
+  recorded_at: Fri, 07 Sep 2012 21:56:17 GMT
+recorded_with: VCR 2.2.4

data/spec/cassettes/{session_creation.yml → invalidSession.yml}

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: post
-    uri: https://staging.tokbox.com/hl/session/create
+    uri: https://api.opentok.com/session/create
     body:
       encoding: US-ASCII
       string: partner_id=0&location=localhost
@@ -17,22 +17,25 @@ http_interactions:
       - ! '0:'
   response:
     status:
-      code: 403
-      message: Forbidden
+      code: 200
+      message: OK
     headers:
       Server:
       - nginx
       Date:
-      - Thu, 16 Aug 2012 16:51:18 GMT
+      - Tue, 04 Sep 2012 23:27:12 GMT
       Content-Type:
-      - text/plain; charset=iso-8859-1
+      - text/plain; charset=UTF-8
+      Transfer-Encoding:
+      - chunked
       Connection:
       - keep-alive
-      Content-Length:
-      - '0'
     body:
       encoding: US-ASCII
-      string: ''
+      string: ! '<Errors><error code="403"><notAuthorized message="The API secret
+        did not match, Invalid credentials passed"/></error></Errors>
+
+'
     http_version: 
-  recorded_at: Thu, 16 Aug 2012 16:51:18 GMT
+  recorded_at: Tue, 04 Sep 2012 23:27:24 GMT
 recorded_with: VCR 2.2.4

data/spec/cassettes/{token_creation.yml → session.yml}

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: post
-    uri: https://staging.tokbox.com/hl/session/create
+    uri: https://api.opentok.com/session/create
     body:
       encoding: US-ASCII
       string: partner_id=459782&location=localhost
@@ -23,21 +23,24 @@ http_interactions:
       Server:
       - nginx
       Date:
-      - Thu, 16 Aug 2012 16:51:48 GMT
+      - Tue, 04 Sep 2012 23:27:12 GMT
       Content-Type:
-      - text/xml
+      - text/xml; charset=utf-8
       Connection:
       - keep-alive
+      Pragma:
+      - no-cache
+      Cache-Control:
+      - no-cache
       Access-Control-Allow-Origin:
       - ! '*'
-      X-Tb-Host:
-      - stage301-sat.tokbox.com
       Content-Length:
-      - '268'
+      - '294'
     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>
+      string: ! "<Sessions>\n  <Session>\n    <session_id>2_MX40NTk3ODJ-fjIwMTItMDktMDQgMjM6Mjc6MTIuNzY3ODY5KzAwOjAwfjAuNTQzNTEwNTE4NjQxfg</session_id>\n
+        \   <partner_id>459782</partner_id>\n    <create_dt>2012-09-04 23:27:12.767869+00:00</create_dt>\n
+        \   <session_status></session_status>\n    </Session>\n</Sessions>\n"
     http_version: 
-  recorded_at: Thu, 16 Aug 2012 16:51:48 GMT
+  recorded_at: Tue, 04 Sep 2012 23:27:24 GMT
 recorded_with: VCR 2.2.4

data/spec/cassettes/stitchArchive.yml

@@ -0,0 +1,42 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://api.opentok.com/hl/archive/200567af-0726-4e93-883b-fe0426d6310a/stitch
+    body:
+      encoding: US-ASCII
+      string: test=none
+    headers:
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+      Content-Type:
+      - application/x-www-form-urlencoded
+      X-Tb-Partner-Auth:
+      - 459782:b44c3baa32b6476d9d88e8194d0eb1c6b777f76b
+  response:
+    status:
+      code: 201
+      message: Created
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Tue, 04 Sep 2012 23:27:14 GMT
+      Content-Type:
+      - text/plain
+      Connection:
+      - keep-alive
+      Location:
+      - https://tokbox.com.production.s3.amazonaws.com/459782%2F200567af-0726-4e93-883b-fe0426d6310a%2Fstitch.mp4?Expires=1346887634&AWSAccessKeyId=AKIAI6LQCPIXYVWCQV6Q&Signature=6%2BihfyAJiQGjmf%2FHV1BGCe14rr8%3D
+      X-Tb-Host:
+      - oms407-oak.tokbox.com
+      Content-Length:
+      - '0'
+    body:
+      encoding: US-ASCII
+      string: ''
+    http_version: 
+  recorded_at: Tue, 04 Sep 2012 23:27:26 GMT
+recorded_with: VCR 2.2.4

data/spec/opentok_spec.rb

@@ -1,39 +1,33 @@
 require 'spec_helper'
 
-describe "Functionality Test" do
+describe OpenTok do
 
   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' }
+  let(:api_url) { 'https://api.opentok.com' }
+  let(:host) { 'localhost' }
 
-  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
-    end
+  let(:opentok) { OpenTok::OpenTokSDK.new api_key, api_secret }
 
-    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
+  describe "test Initializers" do
+    it "should be backwards compatible if user set api URL with no effect" do
+      opentok = OpenTok::OpenTokSDK.new api_key, api_secret, {:api_url=>"bla bla"}
+      opentok.api_url.should eq api_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
+    it "should set api URL with no options" do
+      opentok = OpenTok::OpenTokSDK.new api_key, api_secret
+      opentok.api_url.should eq api_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
+    it "should be OpenTok SDK Object" do
+      opentok = OpenTok::OpenTokSDK.new api_key, api_secret
+      opentok.should be_instance_of OpenTok::OpenTokSDK
     end
   end
 
   describe "Generate Sessions" do
-    use_vcr_cassette "generate_sessions"
+    use_vcr_cassette "session"
 
     let(:opentok) { OpenTok::OpenTokSDK.new api_key, api_secret }
 
@@ -46,141 +40,102 @@ describe "Functionality Test" do
       session = opentok.createSession host
       session.to_s.should match(/\A[0-9A-z_-]{40,}\Z/)
     end
+
+    it "should generate valid p2p session" do
+      # Creating Session object with p2p enabled
+      sessionProperties = {OpenTok::SessionPropertyConstants::P2P_PREFERENCE => "enabled"}    # or disabled
+      session = opentok.createSession( @location, sessionProperties )
+      session.to_s.should match(/\A[0-9A-z_-]{40,}\Z/)
+    end
   end
 
-  describe "Generate Tokens" do
-    use_vcr_cassette "generate_tokens"
+  describe "invalid Sessions" do
+    use_vcr_cassette "invalidSession"
+    it "should raise an exception with an invalid key and secret" do
+      invalidOT = OpenTok::OpenTokSDK.new 0, ''
+
+      expect{
+        session = invalidOT.create_session host
+      }.to raise_error OpenTok::OpenTokException
+    end
+  end
 
+  describe "Generate Tokens" do
     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_]+/)
     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_]+/)
     end
+    it "should be able to set parameters in token" do
+      token = opentok.generate_token :session_id => session, :role=> OpenTok::RoleConstants::PUBLISHER, :connection_data => "username=Bob,level=4"
+      str = token[4..token.length]
+      decoded = Base64.decode64(str)
+      decoded.should match(/publisher.*username.*Bob.*level.*4/)
+    end
   end
 
-end
-
-describe OpenTok do
 
-  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
-
-    let(:api_key) { '11421872' }
-    let(:api_secret) { '296cebc2fc4104cd348016667ffa2a3909ec636f' }
-    let(:opentok) { OpenTok::OpenTokSDK.new api_key, api_secret, {:api_url=>api_production_url} }
+  describe "Archiving downloads" do
+    use_vcr_cassette "archives"
+    let(:api_key) { '459782' }
+    let(:api_secret) { 'b44c3baa32b6476d9d88e8194d0eb1c6b777f76b' }
+    let(:opentok) { OpenTok::OpenTokSDK.new api_key, api_secret, {:api_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 OpenTok::OpenTokSDK
-    end
+    let(:session) { '1_MX40NTk3ODJ-MTI3LjAuMC4xflR1ZSBTZXAgMDQgMTQ6NTM6MDIgUERUIDIwMTJ-MC41MjExODEzfg' }
+    let(:token) { opentok.generateToken({:session_id => session, :role=>OpenTok::RoleConstants::MODERATOR}) }
+    let(:archiveId) { "200567af-0726-4e93-883b-fe0426d6310a" }
 
-    it "a new OpenTokSDK object should point to the staging environment by default" do
-      opentok.api_url.should eq api_production_url
+    it "should have archive resources" do
+      otArchive = opentok.getArchiveManifest(archiveId, token)
+      otArchiveResource = otArchive.resources[0]
+      vid = otArchiveResource.getId()
+      vid.should match(/[0-9A-z=]+/)
     end
 
-    describe "Archiving downloads" do
-      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)
-        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)
-        otArchiveResource = otArchive.resources[0]
-        vid = otArchiveResource.getId()
-        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)
-        otArchiveResource = otArchive.resources[0]
-        vid = otArchiveResource.getId()
-        url = otArchive.downloadArchiveURL(vid, token)
-        url.start_with?('http').should eq true
-      end
+    it "should return download url" do
+      otArchive = opentok.get_archive_manifest(archiveId, token)
+      otArchiveResource = otArchive.resources[0]
+      vid = otArchiveResource.getId()
+      url = otArchive.downloadArchiveURL(vid, token)
+      url.start_with?('http').should eq true
     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
-      }.to raise_error OpenTok::OpenTokException
+  describe "Delete Archives" do
+    use_vcr_cassette "deleteArchive"
+    let(:api_key) { '459782' }
+    let(:api_secret) { 'b44c3baa32b6476d9d88e8194d0eb1c6b777f76b' }
+    let(:opentok) { OpenTok::OpenTokSDK.new api_key, api_secret, {:api_url=>""} }
+    let(:session) { '1_MX40NTk3ODJ-MTI3LjAuMC4xflR1ZSBTZXAgMDQgMTQ6NTM6MDIgUERUIDIwMTJ-MC41MjExODEzfg' }
+    let(:token) { opentok.generateToken({:session_id => session, :role=>OpenTok::RoleConstants::PUBLISHER}) }
+    let(:archiveId) { "200567af-0726-4e93-883b-fe0426d6310a" }
+
+    it "should return false on wrong moderator" do
+      a = opentok.deleteArchive( archiveId, token )
+      a.should eq false
     end
-
-  end
-
-  describe "Token creation" do
-    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
-
-      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, :role=> OpenTok::RoleConstants::PUBLISHER, :connection_data => "username=Bob,level=4"
-
-      str = token[4..token.length]
-      decoded = Base64.decode64(str)
-
-      decoded.should match(/publisher.*username.*Bob.*level.*4/)
-    end
-  end
-
-  describe "Archive Download" do
-    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)
-#      expect{
-#        opentok.get_archive_manifest("", token)
-#      }.to raise_error OpenTok::OpenTokException
-#    end
   end
 
   describe "stitch api" do
-    use_vcr_cassette "archive_stitch"
+    use_vcr_cassette "stitchArchive"
+    let(:api_key) { '459782' }
+    let(:api_secret) { 'b44c3baa32b6476d9d88e8194d0eb1c6b777f76b' }
+    let(:opentok) { OpenTok::OpenTokSDK.new api_key, api_secret, {:api_url=>""} }
+    let(:session) { '1_MX40NTk3ODJ-MTI3LjAuMC4xflR1ZSBTZXAgMDQgMTQ6NTM6MDIgUERUIDIwMTJ-MC41MjExODEzfg' }
+    let(:token) { opentok.generateToken({:session_id => session, :role=>OpenTok::RoleConstants::MODERATOR}) }
+    let(:archiveId) { "200567af-0726-4e93-883b-fe0426d6310a" }
+
     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
+      a = opentok.stitchArchive( archiveId )
+      a[:code].should == 201
+      a[:location].start_with?('http').should eq true
     end
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opentok
 version: !ruby/object:Gem::Version
-  version: 0.0.73
+  version: 0.0.91
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-21 00:00:00.000000000 Z
+date: 2012-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -93,7 +93,7 @@ files:
 - .gitignore
 - CHANGES
 - Gemfile
-- LICENCE
+- LICENSE
 - README.md
 - Rakefile
 - doc/CHANGES.html
@@ -155,11 +155,11 @@ files:
 - 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/cassettes/archives.yml
+- spec/cassettes/deleteArchive.yml
+- spec/cassettes/invalidSession.yml
+- spec/cassettes/session.yml
+- spec/cassettes/stitchArchive.yml
 - spec/opentok_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/opentok/Opentok-Ruby-SDK
@@ -187,10 +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/cassettes/archives.yml
+- spec/cassettes/deleteArchive.yml
+- spec/cassettes/invalidSession.yml
+- spec/cassettes/session.yml
+- spec/cassettes/stitchArchive.yml
 - spec/opentok_spec.rb
 - spec/spec_helper.rb

data/LICENCE

@@ -1,19 +0,0 @@
-Copyright (c) 2011 TokBox, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

data/spec/cassettes/archiving_downloads.yml

@@ -1,81 +0,0 @@
----
-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

@@ -1,43 +0,0 @@
----
-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

@@ -1,43 +0,0 @@
----
-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