twilio-ruby 3.1.1 → 3.2.0

data/lib/twilio-ruby.rb

@@ -7,10 +7,12 @@ require 'json'
 require 'cgi'
 require 'openssl'
 require 'base64'
+require 'jwt'
 
 
 require "#{TWILIO_RUBY_ROOT}/twilio-ruby/util"
 require "#{TWILIO_RUBY_ROOT}/twilio-ruby/util/request_validator"
+require "#{TWILIO_RUBY_ROOT}/twilio-ruby/util/capability"
 require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/errors"
 require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/utils"
 require "#{TWILIO_RUBY_ROOT}/twilio-ruby/rest/list_resource"

data/lib/twilio-ruby/rest/client.rb

@@ -7,7 +7,7 @@ module Twilio
 
       HTTP_HEADERS = {
         'Accept' => 'application/json',
-        'User-Agent' => 'twilio-ruby/3.1.1',
+        'User-Agent' => 'twilio-ruby/3.2.0',
       }
 
       attr_reader :account_sid, :account, :accounts

data/lib/twilio-ruby/util/capability.rb

@@ -0,0 +1,61 @@
+module Twilio
+  module Util
+    class Capability
+
+      include Twilio::Util
+
+      def initialize(account_sid, auth_token)
+        @account_sid = account_sid
+        @auth_token = auth_token
+        @capabilities = []
+      end
+
+      def allow_client_incoming(client_name)
+        @client_name = client_name # stash for use in outgoing
+        scope_params = {'clientName' => client_name}
+        @capabilities << scope_uri_for('client', 'incoming', scope_params)
+      end
+
+      def allow_client_outgoing(app_sid, params = {})
+        @allow_client_outgoing = true
+        @outgoing_scope_params = {'appSid' => app_sid}
+        unless params.empty?
+          @outgoing_scope_params['appParams'] = url_encode params
+        end
+      end
+
+      def allow_event_stream(filters = {})
+        scope_params = {'path' => '/2010-04-01/Events'}
+        scope_params['params'] = filters unless filters.empty?
+        @capabilities << scope_uri_for('stream', 'subscribe', scope_params)
+      end
+
+      def scope_uri_for(service, privilege, params = {})
+        scope_uri = "scope:#{service}:#{privilege}"
+        scope_uri << "?#{url_encode(params)}" unless params.empty?
+      end
+
+      def generate(ttl = 3600)
+
+        capabilities = @capabilities.clone # we need a local copy to work on
+
+        # build the outgoing scope lazily so that we can use @client_name
+        if @allow_client_outgoing
+          params = @outgoing_scope_params
+          params.merge!({'clientName' => @client_name}) if @client_name
+          capabilities << scope_uri_for('client', 'outgoing', params)
+        end
+
+        payload = {
+          'scope' => capabilities.join(' '),
+          'iss' => @account_sid,
+          'exp' => (Time.now.to_i + ttl),
+        }
+
+        JWT.encode payload, @auth_token
+
+      end
+
+    end
+  end
+end

data/lib/twilio-ruby/util/request_validator.rb

@@ -12,7 +12,7 @@ module Twilio
       end
 
       def build_signature_for(url, params)
-        data = url + params.sort.to_s
+        data = url + params.sort.join
         digest = OpenSSL::Digest::Digest.new('sha1')
         Base64.encode64(OpenSSL::HMAC.digest(digest, @auth_token, data)).strip
       end

data/twilio-ruby.gemspec

@@ -1,14 +1,15 @@
 Gem::Specification.new do |s|
   s.name = "twilio-ruby"
-  s.version = "3.1.1"
+  s.version = "3.2.0"
   s.author = "Andrew Benton"
   s.email = "andrew@twilio.com"
-  s.description = "A simple library for communicating with the Twilio REST API"
-  s.summary = "A simple library for communicating with the Twilio REST API"
+  s.description = "A simple library for communicating with the Twilio REST API, building TwiML, and generating Twilio Client Capability Tokens"
+  s.summary = "A simple library for communicating with the Twilio REST API, building TwiML, and generating Twilio Client Capability Tokens"
   s.homepage = "http://github.com/twilio/twilio-ruby"
   s.platform = Gem::Platform::RUBY
   s.files = Dir['lib/**/*.rb'] + Dir['test/**/*.rb'] + ['examples.rb', 'Rakefile', 'LICENSE', 'README.md', 'twilio-ruby.gemspec']
   s.test_files = Dir['test/**/*.rb']
   s.add_dependency("json", ">= 1.2.0")
   s.add_dependency("builder", ">= 2.1.2")
+  s.add_dependency("jwt", ">= 0.1.2")
 end

metadata

@@ -1,64 +1,57 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: twilio-ruby
-version: !ruby/object:Gem::Version 
-  hash: 1
+version: !ruby/object:Gem::Version
+  version: 3.2.0
   prerelease: 
-  segments: 
-  - 3
-  - 1
-  - 1
-  version: 3.1.1
 platform: ruby
-authors: 
+authors:
 - Andrew Benton
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-22 00:00:00 -07:00
+date: 2011-07-26 00:00:00.000000000 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &17469100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: builder
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *17469100
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: &17468340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 1
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.1.2
   type: :runtime
-  version_requirements: *id002
-description: A simple library for communicating with the Twilio REST API
+  prerelease: false
+  version_requirements: *17468340
+- !ruby/object:Gem::Dependency
+  name: jwt
+  requirement: &17467360 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *17467360
+description: A simple library for communicating with the Twilio REST API, building
+  TwiML, and generating Twilio Client Capability Tokens
 email: andrew@twilio.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/twilio-ruby.rb
 - lib/twilio-ruby/rest/client.rb
 - lib/twilio-ruby/rest/list_resource.rb
@@ -96,6 +89,7 @@ files:
 - lib/twilio-ruby/rest/available_phone_numbers/toll_free.rb
 - lib/twilio-ruby/rest/sandbox/sandbox.rb
 - lib/twilio-ruby/rest/instance_resource.rb
+- lib/twilio-ruby/util/capability.rb
 - lib/twilio-ruby/util/request_validator.rb
 - lib/twilio-ruby/util.rb
 - lib/twilio-ruby/twiml/response.rb
@@ -108,36 +102,28 @@ files:
 has_rdoc: true
 homepage: http://github.com/twilio/twilio-ruby
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: A simple library for communicating with the Twilio REST API
-test_files: 
+summary: A simple library for communicating with the Twilio REST API, building TwiML,
+  and generating Twilio Client Capability Tokens
+test_files:
 - test/twilio_spec.rb