opentok 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31559c8863e6d4d9fc421175f04ac721510500f7
-  data.tar.gz: 7c587bd56bec73b00a1b36250f42c3aefd2bc9a8
+  metadata.gz: b2ce0a896ef93fac779a7a0772acb81daeca3b82
+  data.tar.gz: 76c29f78298726db9ccad7f4d9913ee39090c024
 SHA512:
-  metadata.gz: 18227e422d95dfa809324e6ebcd688768ac8fdfec9444039099ac853365492fdf4f362929508030ec7f6cb73d9e998fcd8cdc10836290edd7f5ce9e2ed74bed6
-  data.tar.gz: 3d1acb0a2cc1a03cfd8b1bf318c20c5dcca44e363df23cfe3882c2c52d2dfa662886b383c09b35b4fd1022ed99f37c4239751fe418d96e86e0a44751817ff866
+  metadata.gz: ab5aab9c444ba3e8d34bac8008f14311aca71b9946c4261a85c6b9a11f629620c0b4ef35308be2e2acb3a016638841f1758b0fae4c16ccadefeea06a80e5033f
+  data.tar.gz: 6764f9f49a31380a2f3ada27c8c5c4baded6502831673248c394857f46c90770f0f06418ba4e50a3b1fab13e8e7fe5c816591aa8af572ca62a0a2874c9b71e1f

data/README.md

@@ -1,6 +1,6 @@
 # OpenTok Ruby SDK
 
-[![Build Status](https://travis-ci.org/opentok/Opentok-Ruby-SDK.png?branch=modernization)](https://travis-ci.org/opentok/Opentok-Ruby-SDK)
+[![Build Status](https://travis-ci.org/opentok/Opentok-Ruby-SDK.png)](https://travis-ci.org/opentok/Opentok-Ruby-SDK)
 
 The OpenTok Ruby SDK lets you generate
 [sessions](http://www.tokbox.com/opentok/tutorials/create-session/) and
@@ -20,7 +20,7 @@ Bundler helps manage dependencies for Ruby projects. Find more info here: <http:
 Add this gem to your `Gemfile`:
 
 ```ruby
-gem "opentok", "~> 2.2.x"
+gem "opentok", "~> 2.2"
 ```
 
 Allow bundler to install the change.
@@ -32,7 +32,7 @@ $ bundle install
 ## RubyGems:
 
 ```
-$ gem install opentok -v 2.2.0
+$ gem install opentok -v 2.2.1
 ```
 
 # Usage

data/lib/opentok/token_generator.rb

@@ -21,7 +21,7 @@ module OpenTok
       # *  session_id (required - if no lambda assigned, part of method sig)
       # *  token_opts (optional - part of method sig)
       #
-      # arg_lambdas is a hash of keys which are the above args and values are lambdas that all have the 
+      # arg_lambdas is a hash of keys which are the above args and values are lambdas that all have the
       # signature ->(instance)
       def generates_tokens(arg_lambdas={})
         @arg_lambdas = arg_lambdas
@@ -68,9 +68,9 @@ module OpenTok
       }
 
       # normalize and add additional data params
-      unless (expire_time = opts[:expire_time]).nil?
-        unless expire_time.between?(Time.now, Time.now + 30.days)
-          raise "Expire time must be within the next 30 days" 
+      unless (expire_time = opts[:expire_time].to_i) == 0
+        unless expire_time.between?(Time.now.to_i, (Time.now + 30.days).to_i)
+          raise "Expire time must be within the next 30 days"
         end
         data_params[:expire_time] = expire_time.to_i
       end
@@ -95,7 +95,7 @@ module OpenTok
     # this works when using extend TokenGenerator
     # def generates_tokens(method_opts)
     #   puts "I'm being called on #{self} with argument #{method_opts.inspect}"
-    #   
+    #
     # end
   end
 end

data/lib/opentok/version.rb

@@ -1,4 +1,4 @@
 module OpenTok
   # @private
-  VERSION = '2.2.0'
+  VERSION = '2.2.1'
 end

data/opentok.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   # TODO: exclude this for compatibility with rbx
   # spec.add_development_dependency "debugger", "~> 1.6.6"
 
-  spec.add_dependency "addressable", "~> 2.3.5"
-  spec.add_dependency "httparty", "0.13.0"
-  spec.add_dependency "activesupport", ">= 3.2"
+  spec.add_dependency "addressable", "~> 2.3" #  2.3.0 <= version < 3.0.0
+  spec.add_dependency "httparty", "~> 0.8"
+  spec.add_dependency "activesupport", ">= 2.0"
 end

data/spec/shared/opentok_generates_tokens.rb

@@ -33,6 +33,18 @@ shared_examples "opentok generates tokens" do
       expect(expiring_token).to carry_valid_token_signature api_secret
     end
 
+    it "generates tokens with an integer expire time" do
+      expire_time = Time.now.to_i + (60*60*24)
+      expiring_token = opentok.generate_token session_id, :expire_time => expire_time
+      expect(expiring_token).to be_an_instance_of String
+      expect(expiring_token).to carry_token_data :session_id => session_id
+      expect(expiring_token).to carry_token_data :api_key => api_key
+      expect(expiring_token).to carry_token_data :role => default_role
+      expect(expiring_token).to carry_token_data :expire_time => expire_time
+      expect(expiring_token).to carry_token_data [:nonce, :create_time]
+      expect(expiring_token).to carry_valid_token_signature api_secret
+    end
+
     it "generates tokens with a role" do
       role = :moderator
       role_token = opentok.generate_token session_id, :role => role

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opentok
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Stijn Mathysen
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,42 +104,42 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.5
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.5
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '2.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. This