opentok 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dffed69e7386516ebc1f8d614cb08d0446796b8b
-  data.tar.gz: 273669ac8cfd0b3f6115e555ef4e94628d208261
+  metadata.gz: 5cee4e37d52a813e5b61449188d03d0a679ab00a
+  data.tar.gz: bcfd00abc717c38236c0358375616c1947d35698
 SHA512:
-  metadata.gz: 8bac951b35a12efa2458bb9e0678fb1bf5dd2a71be575796a94b9c65d60cc9b57d460c38bedf1295152db81d1c3789fd5557b0da05ba9c0d9daf53dc0af6d5f5
-  data.tar.gz: d03cae5de75bb2aa2934c7cc735fbba4a8ed23acf59222d2689efd921a3707c876e95376b744b974ea22384e91cd0584a7fc1f478e4379a193264f06efd27da2
+  metadata.gz: 85739d5bb678e7af843692b30ace91d862552a8b749031bd35991415a9b0cf806d0daf79a381e03558baec66ff10071e012400294595df31fa88692a04c7e2f7
+  data.tar.gz: a85cdc9408a6df9babe9507ba71c001eae8c7a37de6a41211a0e96473b3ee0da1df25cce92e4aa292f914e6a3a37aed90f22bfdaab16847f5606df29b148b6b7

data/.travis.yml

@@ -3,6 +3,7 @@ rvm:
 - 1.9.3
 - 2.0.0
 - 2.1.0
+- 2.2.0
 - rbx-2
 notifications:
   slack:

data/DEVELOPING.md

@@ -50,6 +50,8 @@ In order to create a release, the following should be completed in order.
 1. Change the version number for future development by adding ".alpha.1", then make another commit with the message
    "Beginning development on next version".
 1. Push the changes to the main repository (`git push origin master`).
+1. Add a description to the [GitHub Releases](https://github.com/opentok/opentok-ruby-sdk/releases) page
+   with any notable changes. Upload the built gem as an attachment.
 
 ## Workflow
 

data/Rakefile

@@ -9,4 +9,9 @@ YARD::Rake::YardocTask.new do |t|
   # t.options = ['--any', '--extra', '--opts'] # optional
 end
 
+desc "Open an irb session preloaded with this library"
+task :console do
+  sh "irb -rubygems -I lib -r opentok.rb"
+end
+
 task :default => :spec

data/lib/opentok/client.rb

@@ -31,7 +31,7 @@ module OpenTok
     end
 
     def start_archive(session_id, opts)
-      body = { "sessionId" => session_id, "action" => "start" }
+      body = { "sessionId" => session_id }
       body["name"] = opts[:name] unless opts[:name].nil?
       response = self.class.post("/v2/partner/#{@api_key}/archive", {
         :body => body.to_json,
@@ -85,8 +85,7 @@ module OpenTok
     end
 
     def stop_archive(archive_id)
-      response = self.class.post("/v2/partner/#{@api_key}/archive/#{archive_id}", {
-        :body => { "action" => "stop" }.to_json,
+      response = self.class.post("/v2/partner/#{@api_key}/archive/#{archive_id}/stop", {
         :headers => { "Content-Type" => "application/json" }
       })
       case response.code
@@ -101,7 +100,7 @@ module OpenTok
       when 409
         raise OpenTokArchiveError, "The archive could not be stopped. The archive is not currently recording."
       else
-        raise OpenTokArchiveError, "The archive could not be started."
+        raise OpenTokArchiveError, "The archive could not be stopped."
       end
     end
 

data/lib/opentok/token_generator.rb

@@ -3,7 +3,7 @@ require "opentok/session"
 
 require "base64"
 require "addressable/uri"
-require "digest/hmac"
+require "openssl"
 require "active_support/time"
 
 module OpenTok
@@ -81,11 +81,11 @@ module OpenTok
         end
         data_params[:connection_data] = data
       end
-
+      digest = OpenSSL::Digest.new('sha1')
       data_string = Addressable::URI.form_encode data_params
       meta_string = Addressable::URI.form_encode({
         :partner_id => api_key,
-        :sig => Digest::HMAC.hexdigest(data_string, api_secret, Digest::SHA1)
+        :sig => OpenSSL::HMAC.hexdigest(digest, api_secret, data_string)
       })
 
       TOKEN_SENTINEL + Base64.strict_encode64(meta_string + ":" + data_string)

data/lib/opentok/version.rb

@@ -1,4 +1,4 @@
 module OpenTok
   # @private
-  VERSION = '2.2.3'
+  VERSION = '2.2.4'
 end

data/spec/cassettes/OpenTok_Archives/should_create_archives.yml

@@ -5,7 +5,7 @@ http_interactions:
     uri: https://api.opentok.com/v2/partner/123456/archive
     body:
       encoding: UTF-8
-      string: '{"sessionId":"SESSIONID","action":"start","name":""}'
+      string: '{"sessionId":"SESSIONID","name":""}'
     headers:
       X-Tb-Partner-Auth:
       - 123456:1234567890abcdef1234567890abcdef1234567890

data/spec/cassettes/OpenTok_Archives/should_create_named_archives.yml

@@ -5,8 +5,7 @@ http_interactions:
     uri: https://api.opentok.com/v2/partner/123456/archive
     body:
       encoding: UTF-8
-      string: '{"sessionId":"SESSIONID","action":"start","name":"ARCHIVE
-        NAME"}'
+      string: '{"sessionId":"SESSIONID","name":"ARCHIVE NAME"}'
     headers:
       X-Tb-Partner-Auth:
       - 123456:1234567890abcdef1234567890abcdef1234567890

data/spec/cassettes/OpenTok_Archives/should_stop_archives.yml

@@ -2,10 +2,7 @@
 http_interactions:
 - request:
     method: post
-    uri: https://api.opentok.com/v2/partner/123456/archive/30b3ebf1-ba36-4f5b-8def-6f70d9986fe9
-    body:
-      encoding: UTF-8
-      string: '{"action":"stop"}'
+    uri: https://api.opentok.com/v2/partner/123456/archive/30b3ebf1-ba36-4f5b-8def-6f70d9986fe9/stop
     headers:
       X-Tb-Partner-Auth:
       - 123456:1234567890abcdef1234567890abcdef1234567890

data/spec/matchers/token.rb

@@ -1,7 +1,7 @@
 require "rspec/matchers"
 
 require "base64"
-require "digest/hmac"
+require "openssl"
 require "addressable/uri"
 
 RSpec::Matchers.define :carry_token_data do |input_data|
@@ -40,9 +40,10 @@ RSpec::Matchers.define :carry_valid_token_signature do |api_secret|
   match do |token|
     decoded_token = Base64.decode64(token[4..token.length])
     metadata, data_string = decoded_token.split(':')
+    digest = OpenSSL::Digest.new('sha1')
     # form_unencode returns an array of arrays, annoying so hardcoded lookup
     # expected format: [["partner_id", "..."], ["sig", "..."]]
     signature = Addressable::URI.form_unencode(metadata)[1][1]
-    signature == Digest::HMAC.hexdigest(data_string, api_secret, Digest::SHA1)
+    signature == OpenSSL::HMAC.hexdigest(digest, api_secret, data_string)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opentok
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Stijn Mathysen
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler