tropo-provisioning 0.0.22 → 0.0.23

data/Gemfile.lock

@@ -1,21 +1,24 @@
 PATH
   remote: .
   specs:
-    tropo-provisioning (0.0.21)
+    tropo-provisioning (0.0.22)
       activesupport
       hashie (>= 0.2.1)
       i18n
+      json
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.1.0)
+    activesupport (3.1.3)
       multi_json (~> 1.0)
     diff-lcs (1.1.2)
     fakeweb (1.3.0)
-    hashie (1.1.0)
+    hashie (1.2.0)
     i18n (0.6.0)
-    multi_json (1.0.3)
+    json (1.6.5)
+    json (1.6.5-java)
+    multi_json (1.0.4)
     rdoc (3.9.4)
     rspec (2.3.0)
       rspec-core (~> 2.3.0)
@@ -28,6 +31,7 @@ GEM
     yard (0.7.2)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2010 Voxeo, Corporation
+Copyright (c) 2012 Voxeo, Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.rdoc

@@ -18,7 +18,7 @@ The Tropo Provisioning gem provides a library for convenient access to the Tropo
 
 == Requirements
 
-* Unit tests passed on: Ruby MRI v1.8.6/1.8.7, Ruby 1.9.2, JRuby 1.5.0 and MacRuby 0.6
+* Unit tests passed on: Ruby MRI v1.8.6/1.8.7, Ruby 1.9.2 and JRuby 1.6.3
 
 * RubyGems: Check tropo-provisioning.gemspec
 

data/Rakefile

@@ -9,7 +9,6 @@ require 'tropo-provisioning/version'
 
 
 RSpec::Core::RakeTask.new(:test) do |spec|
-    spec.skip_bundler = true
     spec.pattern = ['spec/*_spec.rb']
     spec.rspec_opts = '--color --format doc'
 end

data/lib/tropo-provisioning/tropo_client.rb

@@ -27,14 +27,22 @@ class TropoClient
   # * [required, String] *password* valid password
   # * [optional, String] *base_uri* Tropo provisioning API endpoint
   # * [optional, String] *headers* required HTTP headers
+  # * [optional, Hash] * proxy => {"host" : <host>, "port" : <port>}
   #
   # ==== Return
   # * new TropoClient instance
-  def initialize(username, password, base_uri = "http://api.tropo.com/v1", headers)
+  def initialize(username, password, base_uri = "http://api.tropo.com/v1/", headers = nil, proxy = nil)
     @base_uri = base_uri
+    if RUBY_VERSION =~ /1.8/
+      @base_uri << "/" if !@base_uri[-1].eql?(47)
+    elsif RUBY_VERSION =~ /1.9/
+      @base_uri << "/" if !@base_uri[-1].eql?("/")
+    end
+    
     @username = username
     @password = password
     @headers = headers.nil? ? {} : headers
+    @proxy = proxy
   end
   
   ##
@@ -142,7 +150,22 @@ class TropoClient
   def http
     @http ||= (
       uri = URI.parse(base_uri)
-      http = Net::HTTP.new(uri.host, uri.port)
+      if @proxy.nil?
+        base = Net::HTTP
+      else
+        [:host, :port].each{|item|
+          if @proxy.has_key(item)
+            proxy[item.to_s] = proxy[item]
+          end
+        }
+        if @proxy.has_key?("host") && @proxy.has_key?("port")
+          base = Net::HTTP::Proxy(@proxy["host"], @proxy["port"])
+        else
+          base = Net::HTTP
+        end
+      end
+      
+      http = base.new(uri.host, uri.port)
       http.use_ssl = true if uri.scheme == 'https'
       http
     )
@@ -153,18 +176,13 @@ class TropoClient
   #
   # ==== Parameters
   # * [required, Symbol] http_request Net::HTTPRequest child
-  # * [required, Hash] params used to create the request
-  #   * [String] :resource the resource to call on the base URL
-  #   * [Hash] :body the details to use when posting, putting or deleting an object, converts into the appropriate JSON
+  # * [required, Hash] body details parameters to use when posting or putting an object, converts into the appropriate JSON
   #
   # ==== Return
   # * [Hash] the result of the request
   # * [TropoError]
   #   if it can not connect to the API server or if the response.code is not 200 
-  def request(http_request, params = {})
-    params[:body] and params[:body] = camelize_params(params[:body])
-    
-    uri = params[:resource].nil? ? "" : params[:resource]
+  def request(http_request, body = {})
 
     unless http_request.is_a?(Net::HTTPRequest)
       raise TropoError.new("Invalid request type #{http_request}")
@@ -172,8 +190,10 @@ class TropoClient
     
     http_request.initialize_http_header(headers)
     http_request.basic_auth username, password
-    http_request.body = ActiveSupport::JSON.encode params[:body] if params[:body]
-    
+
+    # Include body if received
+    body.empty? or http_request.body = ActiveSupport::JSON.encode(camelize_params(body)) 
+
     begin
       response = http.request(http_request)
     rescue => e

data/lib/tropo-provisioning/tropo_provisioning.rb

@@ -32,8 +32,9 @@ class TropoProvisioning
   #
   # TropoProvisioning object
   def initialize(username, password, params={})   
-    base_uri             = params[:base_uri] || "http://api.tropo.com/v1/"
-    @tropo_client        = TropoClient.new(username, password, base_uri, { 'Content-Type' => 'application/json' })
+    base_uri             = params[:base_uri] || "https://api.tropo.com/v1/"
+    proxy                = params[:proxy] || nil
+    @tropo_client        = TropoClient.new(username, password, base_uri, { 'Content-Type' => 'application/json' }, proxy)
     user(username)
   end
     
@@ -161,7 +162,7 @@ class TropoProvisioning
   # ==== Parameters
   # * [required] search_term
   #   * [String] a key/value of the search term you would like to use, such as 'username=foobar', or 'city=Orlando'
-  #   * [Hash] a Hash instance, such as {:username => "foobar"}, or {:city => "Orlando"}
+  #   * [Hash] a Hash instance, such as {"username" => "foobar"}, or {"city" => "Orlando"}
   #
   # ==== Return
   # * [Array]
@@ -300,9 +301,9 @@ class TropoProvisioning
   # Add/modify payment info for a user
   #
   # ==== Parameters
-  # * [required, String] user_id to add the payment details for
+  # * [user_id - required, String]  to add the payment details for
   # * [require, Hash] params the params to add the payment info
-  #   * [required, String] :account_number the credit card number
+  #   * [:account_number] [required, String] the credit card number
   #   * [required, String] :payment_type the type, such as visa, mastercard, etc
   #   * [required, String] :address 
   #   * [optional, String] :address2
@@ -411,7 +412,13 @@ class TropoProvisioning
   #   * [String] :partition defines whether the application is in staging/development or production
   def application(application_id)
     app = @tropo_client.get("applications/#{application_id.to_s}")
-    app.merge!({ :application_id => get_element(app.href) })
+    if app.instance_of? Array
+      href = app[0].href
+      app[0].merge!({ :application_id => get_element(href) })
+    else
+      href = app.href
+      app.merge!({ :application_id => get_element(href) })
+    end
   end
     
   ##

data/lib/tropo-provisioning/version.rb

@@ -1,5 +1,5 @@
 
 class TropoProvisioning
   # Current gem version
-  VERSION = "0.0.22"
+  VERSION = "0.0.23"
 end

data/lib/tropo-provisioning.rb

@@ -1,2 +1,2 @@
-
+require 'json' if RUBY_VERSION =~ /1.8/
 require 'tropo-provisioning/tropo_provisioning'

data/spec/live-tropo-provisioning_spec.rb

@@ -97,14 +97,14 @@ describe "TropoProvisioning" do
   it "should create an application" do
     # Get a specific user by username
     FakeWeb.register_uri(:get, 
-                         "http://#{USERNAME}:#{PASSWORD}@api.tropo.com/v1/users/jsgoecke",
+                         "https://#{USERNAME}:#{PASSWORD}@api.tropo.com/v1/users/jsgoecke",
                          :body => ActiveSupport::JSON.encode(existing_user), 
                          :content_type => "application/json",
                          :status => ["200", "OK"])
 
     # Create an application       
     FakeWeb.register_uri(:post, 
-                         %r|http://#{USERNAME}:#{PASSWORD}@api.tropo.com/v1/applications|, 
+                         %r|https://#{USERNAME}:#{PASSWORD}@api.tropo.com/v1/applications|, 
                          :body => ActiveSupport::JSON.encode({ "href" => "http://api.tropo.com/provisioning/applications/#{APPLICATION_ID}" }),
                          :status => ["200", "OK"])
     
@@ -118,7 +118,7 @@ describe "TropoProvisioning" do
   it "should get a list of exchanges" do
     # Exchanges
     FakeWeb.register_uri(:get, 
-                         "http://#{USERNAME}:#{PASSWORD}@api.tropo.com/v1/exchanges", 
+                         "https://#{USERNAME}:#{PASSWORD}@api.tropo.com/v1/exchanges", 
                          :body => exchanges, 
                          :status => ["200", "OK"],
                          :content_type => "application/json")
@@ -130,21 +130,21 @@ describe "TropoProvisioning" do
   it "should add a phone, IM and token address to the application" do  
     # Get a specific user by username
     FakeWeb.register_uri(:get, 
-                         "http://#{USERNAME}:#{PASSWORD}@api.tropo.com/v1/users/jsgoecke",
+                         "https://#{USERNAME}:#{PASSWORD}@api.tropo.com/v1/users/jsgoecke",
                          :body => ActiveSupport::JSON.encode(existing_user), 
                          :content_type => "application/json",
                          :status => ["200", "OK"])
 
     # Exchanges
     FakeWeb.register_uri(:get, 
-                        "http://#{USERNAME}:#{PASSWORD}@api.tropo.com/v1/exchanges", 
+                        "https://#{USERNAME}:#{PASSWORD}@api.tropo.com/v1/exchanges", 
                         :body => exchanges, 
                         :status => ["200", "OK"],
                         :content_type => "application/json")
 
     # Get a address that is a number
     FakeWeb.register_uri(:post, 
-                         "http://#{USERNAME}:#{PASSWORD}@api.tropo.com/v1/applications/108016/addresses", 
+                         "https://#{USERNAME}:#{PASSWORD}@api.tropo.com/v1/applications/108016/addresses", 
                          :body => ActiveSupport::JSON.encode({ "href" => "http://api.tropo.com/v1/applications/108000/addresses/number/7202551912" }), 
                          :content_type => "application/json")
     
@@ -156,21 +156,21 @@ describe "TropoProvisioning" do
   it "should add an IM token address to the application" do 
     # Get a specific user by username
     FakeWeb.register_uri(:get, 
-                         "http://#{USERNAME}:#{PASSWORD}@api.tropo.com/v1/users/jsgoecke",
+                         "https://#{USERNAME}:#{PASSWORD}@api.tropo.com/v1/users/jsgoecke",
                          :body => ActiveSupport::JSON.encode(existing_user), 
                          :content_type => "application/json",
                          :status => ["200", "OK"])
 
     # Exchanges
     FakeWeb.register_uri(:get, 
-                        "http://#{USERNAME}:#{PASSWORD}@api.tropo.com/v1/exchanges", 
+                        "https://#{USERNAME}:#{PASSWORD}@api.tropo.com/v1/exchanges", 
                         :body => exchanges, 
                         :status => ["200", "OK"],
                         :content_type => "application/json")
 
     # Get a address that is a number
     FakeWeb.register_uri(:post, 
-                         "http://#{USERNAME}:#{PASSWORD}@api.tropo.com/v1/applications/#{APPLICATION_ID}/addresses", 
+                         "https://#{USERNAME}:#{PASSWORD}@api.tropo.com/v1/applications/#{APPLICATION_ID}/addresses", 
                          :body => ActiveSupport::JSON.encode({ "href" => "http://api.tropo.com/v1/applications/#{APPLICATION_ID}/addresses/jabber/appsdsdsdasd@bot.im" }), 
                          :content_type => "application/json")
                          
@@ -182,21 +182,21 @@ describe "TropoProvisioning" do
   it "should add a token to the application" do 
     # Get a specific user by username
     FakeWeb.register_uri(:get, 
-                         "http://#{USERNAME}:#{PASSWORD}@api.tropo.com/v1/users/jsgoecke",
+                         "https://#{USERNAME}:#{PASSWORD}@api.tropo.com/v1/users/jsgoecke",
                          :body => ActiveSupport::JSON.encode(existing_user), 
                          :content_type => "application/json",
                          :status => ["200", "OK"])
 
     # Exchanges
     FakeWeb.register_uri(:get, 
-                        "http://#{USERNAME}:#{PASSWORD}@api.tropo.com/v1/exchanges", 
+                        "https://#{USERNAME}:#{PASSWORD}@api.tropo.com/v1/exchanges", 
                         :body => exchanges, 
                         :status => ["200", "OK"],
                         :content_type => "application/json")
 
     # Get a address that is a number
     FakeWeb.register_uri(:post, 
-                         "http://#{USERNAME}:#{PASSWORD}@api.tropo.com/v1/applications/#{APPLICATION_ID}/addresses", 
+                         "https://#{USERNAME}:#{PASSWORD}@api.tropo.com/v1/applications/#{APPLICATION_ID}/addresses", 
                          :body => ActiveSupport::JSON.encode({ "href" => "http://api.tropo.com/v1/applications/#{APPLICATION_ID}/addresses/token/"+("w"*88) }), 
                          :content_type => "application/json")
     result = tropo_provisioning.create_address(APPLICATION_ID, { :type => 'token', :channel => 'voice' } )
@@ -208,7 +208,7 @@ describe "TropoProvisioning" do
     
     # A specific application
     FakeWeb.register_uri(:get, 
-                         "http://#{USERNAME}:#{PASSWORD}@api.tropo.com/v1/applications/#{APPLICATION_ID}", 
+                         "https://#{USERNAME}:#{PASSWORD}@api.tropo.com/v1/applications/#{APPLICATION_ID}", 
                          :body => ActiveSupport::JSON.encode(application),
                          :content_type => "application/json")
     
@@ -217,7 +217,7 @@ describe "TropoProvisioning" do
     
     # Update a specific application
     FakeWeb.register_uri(:put, 
-                         %r|http://#{USERNAME}:#{PASSWORD}@api.tropo.com/v1/applications/#{APPLICATION_ID}|, 
+                         %r|https://#{USERNAME}:#{PASSWORD}@api.tropo.com/v1/applications/#{APPLICATION_ID}|, 
                          :body => ActiveSupport::JSON.encode({ "href" => "http://api.tropo.com/v1/applications/#{APPLICATION_ID}" }),
                          :status => ["200", "OK"])
 
@@ -229,7 +229,7 @@ describe "TropoProvisioning" do
     pending
     # Create an application       
     FakeWeb.register_uri(:post, 
-                         %r|http://#{USERNAME}:#{PASSWORD}@api.tropo.com/v1/applications|, 
+                         %r|https://#{USERNAME}:#{PASSWORD}@api.tropo.com/v1/applications|, 
                          :body => ActiveSupport::JSON.encode({ "href" => "http://api.tropo.com/provisioning/applications/#{APPLICATION_ID}" }),
                          :status => ["200", "OK"])
     
@@ -269,4 +269,4 @@ describe "TropoProvisioning" do
   #   result = @tp.delete_application(APPLICATION_ID)
   #   result.message.should == 'delete successful'
   # end
-end
+end

data/spec/tropo-provisioning_spec.rb

@@ -173,19 +173,19 @@ describe "TropoProvisioning" do
     
     # Applications
     FakeWeb.register_uri(:get, 
-                         %r|http://foo:bar@api.tropo.com/v1/applications|, 
+                         %r|https://foo:bar@api.tropo.com/v1/applications|, 
                          :body => ActiveSupport::JSON.encode(applications), 
                          :content_type => "application/json")
                          
     # Create an application       
     FakeWeb.register_uri(:post, 
-                         %r|http://foo:bar@api.tropo.com/v1/applications|, 
+                         %r|https://foo:bar@api.tropo.com/v1/applications|, 
                          :body => ActiveSupport::JSON.encode({ "href" => "http://api.tropo.com/v1/applications/108016" }),
                          :status => ["200", "OK"])
     
     # Update a specific application
     FakeWeb.register_uri(:put, 
-                         %r|http://foo:bar@api.tropo.com/v1/applications/108000|, 
+                         %r|https://foo:bar@api.tropo.com/v1/applications/108000|, 
                          :body => ActiveSupport::JSON.encode({ "href" => "http://api.tropo.com/v1/applications/108016" }),
                          :status => ["200", "OK"])
     
@@ -197,19 +197,19 @@ describe "TropoProvisioning" do
     
     # Get a specific address
     FakeWeb.register_uri(:get, 
-                         "http://foo:bar@api.tropo.com/v1/applications/108000/addresses/number/883510001812716", 
+                         "https://foo:bar@api.tropo.com/v1/applications/108000/addresses/number/883510001812716", 
                          :body => ActiveSupport::JSON.encode(@addresses[0]),
                          :content_type => "application/json")
 
     # Get a address that is an IM/username
     FakeWeb.register_uri(:get, 
-                         "http://foo:bar@api.tropo.com/v1/applications/108000/addresses/jabber/xyz123", 
+                         "https://foo:bar@api.tropo.com/v1/applications/108000/addresses/jabber/xyz123", 
                          :body => ActiveSupport::JSON.encode(@addresses[2]), 
                          :content_type => "application/json")
 
     # Get a address that is a token
     FakeWeb.register_uri(:get, 
-                         "http://foo:bar@api.tropo.com/v1/applications/108000/addresses/jabber/xyz123", 
+                         "https://foo:bar@api.tropo.com/v1/applications/108000/addresses/jabber/xyz123", 
                          :body => ActiveSupport::JSON.encode(@addresses[2]), 
                          :content_type => "application/json")
                                                 
@@ -221,80 +221,80 @@ describe "TropoProvisioning" do
                                                 
     # Get a address that is a token
     FakeWeb.register_uri(:get, 
-                         "http://foo:bar@api.tropo.com/v1/applications/108000/addresses/token/a1b2c3d4",
+                         "https://foo:bar@api.tropo.com/v1/applications/108000/addresses/token/a1b2c3d4",
                          :body => ActiveSupport::JSON.encode(@addresses[4]), 
                          :content_type => "application/json")
                                                 
     # Get a address that is a number
     FakeWeb.register_uri(:post, 
-                         "http://foo:bar@api.tropo.com/v1/applications/108000/addresses", 
+                         "https://foo:bar@api.tropo.com/v1/applications/108000/addresses", 
                          :body => ActiveSupport::JSON.encode({ "href" => "http://api.tropo.com/v1/applications/108000/addresses/number/7202551912" }), 
                          :content_type => "application/json")
     
     # Create a address that is an IM account               
     FakeWeb.register_uri(:post, 
-                         "http://foo:bar@api.tropo.com/v1/applications/108001/addresses", 
+                         "https://foo:bar@api.tropo.com/v1/applications/108001/addresses", 
                          :body => ActiveSupport::JSON.encode({ "href" => "http://api.tropo.com/v1/applications/108001/addresses/jabber/xyz123@bot.im" }), 
                          :content_type => "application/json")
     
      # Create a address that is a Token         
      FakeWeb.register_uri(:post, 
-                          "http://foo:bar@api.tropo.com/v1/applications/108002/addresses", 
+                          "https://foo:bar@api.tropo.com/v1/applications/108002/addresses", 
                           :body => ActiveSupport::JSON.encode({ "href" => "http://api.tropo.com/v1/applications/108002/addresses/token/12345679f90bac47a05b178c37d3c68aaf38d5bdbc5aba0c7abb12345d8a9fd13f1234c1234567dbe2c6f63b" }), 
                           :content_type => "application/json")
                           
     # Delete an application      
     FakeWeb.register_uri(:delete, 
-                         "http://foo:bar@api.tropo.com/v1/applications/108000", 
+                         "https://foo:bar@api.tropo.com/v1/applications/108000", 
                          :body => ActiveSupport::JSON.encode({ 'message' => 'delete successful' }), 
                          :content_type => "application/json",
                          :status => ["200", "OK"])
 
     # Exchanges
     FakeWeb.register_uri(:get, 
-                         "http://foo:bar@api.tropo.com/v1/exchanges", 
+                         "https://foo:bar@api.tropo.com/v1/exchanges", 
                          :body => exchanges, 
                          :status => ["200", "OK"],
                          :content_type => "application/json")
 
     # Delete a address
     FakeWeb.register_uri(:delete, 
-                         "http://foo:bar@api.tropo.com/v1/applications/108000/addresses/number/883510001812716", 
+                         "https://foo:bar@api.tropo.com/v1/applications/108000/addresses/number/883510001812716", 
                          :body => ActiveSupport::JSON.encode({ 'message' => 'delete successful' }), 
                          :content_type => "application/json",
                          :status => ["200", "OK"])
     
     # Add a specific address
     FakeWeb.register_uri(:post, 
-                         "http://foo:bar@api.tropo.com/v1/applications/108002/addresses/number/883510001812716", 
+                         "https://foo:bar@api.tropo.com/v1/applications/108002/addresses/number/883510001812716", 
                          :body => ActiveSupport::JSON.encode({ 'message' => 'delete successful' }), 
                          :content_type => "application/json",
                          :status => ["200", "OK"])
     
    # Create a new user
    FakeWeb.register_uri(:post, 
-                        "http://foo:bar@api.tropo.com/v1/users", 
+                        "https://foo:bar@api.tropo.com/v1/users", 
                         :body => @new_user_json, 
                         :content_type => "application/json",
                         :status => ["200", "OK"])
 
    # Get a specific user by user_id 
    FakeWeb.register_uri(:get, 
-                        "http://foo:bar@api.tropo.com/v1/users/12345",
+                        "https://foo:bar@api.tropo.com/v1/users/12345",
                         :body => ActiveSupport::JSON.encode(@existing_user), 
                         :content_type => "application/json",
                         :status => ["200", "OK"])
                         
    # Get a specific user by user_id 
    FakeWeb.register_uri(:get, 
-                        "http://foo:bar@api.tropo.com/v1/users/98765",
+                        "https://foo:bar@api.tropo.com/v1/users/98765",
                         :body => nil, 
                         :content_type => "application/json",
                         :status => ["404", "Got an error here!"])
                                               
    # Get a specific user by username
    FakeWeb.register_uri(:get, 
-                        "http://foo:bar@api.tropo.com/v1/users/foo",
+                        "https://foo:bar@api.tropo.com/v1/users/foo",
                         :body => ActiveSupport::JSON.encode(@existing_user), 
                         :content_type => "application/json",
                         :status => ["200", "OK"])
@@ -308,62 +308,62 @@ describe "TropoProvisioning" do
                         
    # Invalid credentials
    FakeWeb.register_uri(:get, 
-                        "http://bad:password@api.tropo.com/v1/users/bad",
+                        "https://bad:password@api.tropo.com/v1/users/bad",
                         :content_type => "application/json",
                         :status => ["401", "Unauthorized"])
                         
    # Confirm an account account
    FakeWeb.register_uri(:post, 
-                        "http://foo:bar@api.tropo.com/v1/users/12345/confirmations", 
+                        "https://foo:bar@api.tropo.com/v1/users/12345/confirmations", 
                         :body => ActiveSupport::JSON.encode({"message" => "successfully confirmed user 12345" }), 
                         :content_type => "application/json",
                         :status => ["200", "OK"])
                         
    # Return the payment method configured for a user
    FakeWeb.register_uri(:get, 
-                        "http://foo:bar@api.tropo.com/v1/users/12345/payment/method", 
+                        "https://foo:bar@api.tropo.com/v1/users/12345/payment/method", 
                         :body => ActiveSupport::JSON.encode(@payment_method), 
                         :content_type => "application/json",
                         :status => ["200", "OK"])                      
 
    # Return payment types
    FakeWeb.register_uri(:get, 
-                        "http://foo:bar@api.tropo.com/v1/types/payment", 
+                        "https://foo:bar@api.tropo.com/v1/types/payment", 
                         :body => ActiveSupport::JSON.encode(@payment_methods), 
                         :content_type => "application/json",
                         :status => ["200", "OK"])
    
    # Return features
    FakeWeb.register_uri(:get, 
-                        "http://foo:bar@api.tropo.com/v1/features", 
+                        "https://foo:bar@api.tropo.com/v1/features", 
                         :body => ActiveSupport::JSON.encode(@features), 
                         :content_type => "application/json",
                         :status => ["200", "OK"])                                          
 
    # Return features for a user
    FakeWeb.register_uri(:get, 
-                        "http://foo:bar@api.tropo.com/v1/users/12345/features", 
+                        "https://foo:bar@api.tropo.com/v1/users/12345/features", 
                         :body => ActiveSupport::JSON.encode(@user_features), 
                         :content_type => "application/json",
                         :status => ["200", "OK"])
 
   # Add a feature to a user
   FakeWeb.register_uri(:post, 
-                       "http://foo:bar@api.tropo.com/v1/users/12345/features", 
+                       "https://foo:bar@api.tropo.com/v1/users/12345/features", 
                        :body => ActiveSupport::JSON.encode(@feature), 
                        :content_type => "application/json",
                        :status => ["200", "OK"])
                                                     
   # Add a feature to a user
   FakeWeb.register_uri(:delete, 
-                       "http://foo:bar@api.tropo.com/v1/users/12345/features/8", 
+                       "https://foo:bar@api.tropo.com/v1/users/12345/features/8", 
                        :body => ActiveSupport::JSON.encode(@feature_delete_message), 
                        :content_type => "application/json",
                        :status => ["200", "OK"])
                        
   # Add payment info to a user
   FakeWeb.register_uri(:put, 
-                       "http://foo:bar@api.tropo.com/v1/users/12345/payment/method", 
+                       "https://foo:bar@api.tropo.com/v1/users/12345/payment/method", 
                        :body => ActiveSupport::JSON.encode(@payment_info_message),
                        :content_type => "application/json",
                        :status => ["200", "OK"])
@@ -371,103 +371,103 @@ describe "TropoProvisioning" do
                        
    # List an account, with bad credentials
    FakeWeb.register_uri(:get, 
-                        "http://evolution.voxeo.com/api/account/accesstoken/get.jsp?username=foobar7474&password=fooeyfooey", 
+                        "https://evolution.voxeo.com/api/account/accesstoken/get.jsp?username=foobar7474&password=fooeyfooey", 
                         :body => ActiveSupport::JSON.encode(@bad_account_creds), 
                         :content_type => "application/json",
                         :status => ["403", "Invalid Login."])
  
    # Get our search terms
    FakeWeb.register_uri(:get, 
-                        "http://foo:bar@api.tropo.com/v1/users/?username=foobar", 
+                        "https://foo:bar@api.tropo.com/v1/users/?username=foobar", 
                         :body => ActiveSupport::JSON.encode(@search_accounts), 
                         :content_type => "application/json",
                         :status => ["200", "OK"])
                         
    # Payment resource
    FakeWeb.register_uri(:post, 
-                        "http://foo:bar@api.tropo.com/v1/users/1234/payments", 
+                        "https://foo:bar@api.tropo.com/v1/users/1234/payments", 
                         :body => ActiveSupport::JSON.encode({ :message => "successfully posted payment for the amount 1.000000" }), 
                         :content_type => "application/json",
                         :status => ["200", "OK"])    
                         
    # Modify a user
    FakeWeb.register_uri(:put, 
-                        "http://foo:bar@api.tropo.com/v1/users/12345", 
+                        "https://foo:bar@api.tropo.com/v1/users/12345", 
                         :body => ActiveSupport::JSON.encode({ :href => "http://api-smsified-eng.voxeo.net/v1/users/12345" }), 
                         :content_type => "application/json",
                         :status => ["200", "OK"])
   
    # List available partitions
    FakeWeb.register_uri(:get, 
-                        "http://foo:bar@api.tropo.com/v1/partitions", 
+                        "https://foo:bar@api.tropo.com/v1/partitions", 
                         :body => ActiveSupport::JSON.encode(@partitions), 
                         :content_type => "application/json",
                         :status => ["200", "OK"])
                         
     # List available platforms
     FakeWeb.register_uri(:get, 
-                         "http://foo:bar@api.tropo.com/v1/partitions/staging/platforms", 
+                         "https://foo:bar@api.tropo.com/v1/partitions/staging/platforms", 
                          :body => ActiveSupport::JSON.encode(@platforms), 
                          :content_type => "application/json",
                          :status => ["200", "OK"])
                          
     # List balance
     FakeWeb.register_uri(:get, 
-                         "http://foo:bar@api.tropo.com/v1/users/12345/usage", 
+                         "https://foo:bar@api.tropo.com/v1/users/12345/usage", 
                          :body => ActiveSupport::JSON.encode(@balance), 
                          :content_type => "application/json",
                          :status => ["200", "OK"])
                          
    # Whitelist
    FakeWeb.register_uri(:get, 
-                        "http://foo:bar@api.tropo.com/v1/users/12345/partitions/production/platforms/sms/whitelist", 
+                        "https://foo:bar@api.tropo.com/v1/users/12345/partitions/production/platforms/sms/whitelist", 
                         :body => ActiveSupport::JSON.encode(@whitelist), 
                         :content_type => "application/json",
                         :status => ["200", "OK"])
     # Whitelist
      FakeWeb.register_uri(:get, 
-                          "http://foo:bar@api.tropo.com/v1/users/partitions/production/platforms/sms/whitelist", 
+                          "https://foo:bar@api.tropo.com/v1/users/partitions/production/platforms/sms/whitelist", 
                           :body => ActiveSupport::JSON.encode(@whitelist), 
                           :content_type => "application/json",
                           :status => ["200", "OK"])
                           
     # Whitelist create
     FakeWeb.register_uri(:post, 
-                         "http://foo:bar@api.tropo.com/v1/users/12345/partitions/production/platforms/sms/whitelist", 
+                         "https://foo:bar@api.tropo.com/v1/users/12345/partitions/production/platforms/sms/whitelist", 
                          :body => ActiveSupport::JSON.encode(@whitelist), 
                          :content_type => "application/json",
                          :status => ["200", "OK"])
     # Whitelist delete
     FakeWeb.register_uri(:delete, 
-                         "http://foo:bar@api.tropo.com/v1/users/12345/partitions/production/platforms/sms/whitelist/14155551212", 
+                         "https://foo:bar@api.tropo.com/v1/users/12345/partitions/production/platforms/sms/whitelist/14155551212", 
                          :body => ActiveSupport::JSON.encode(@whitelist), 
                          :content_type => "application/json",
                          :status => ["200", "OK"])
                          
     # Countries
     FakeWeb.register_uri(:get, 
-                         "http://foo:bar@api.tropo.com/v1/countries", 
+                         "https://foo:bar@api.tropo.com/v1/countries", 
                          :body => ActiveSupport::JSON.encode(@countries), 
                          :content_type => "application/json",
                          :status => ["200", "OK"])
 
     # States
     FakeWeb.register_uri(:get, 
-                         "http://foo:bar@api.tropo.com/v1/countries/36/states", 
+                         "https://foo:bar@api.tropo.com/v1/countries/36/states", 
                          :body => ActiveSupport::JSON.encode(@states), 
                          :content_type => "application/json",
                          :status => ["200", "OK"])
                          
     # Recurrency get
     FakeWeb.register_uri(:get, 
-                         "http://foo:bar@api.tropo.com/v1/users/1234/payment/recurrence", 
+                         "https://foo:bar@api.tropo.com/v1/users/1234/payment/recurrence", 
                          :body => ActiveSupport::JSON.encode(@recurrence), 
                          :content_type => "application/json",
                          :status => ["200", "OK"])
                          
     # Recurrency update
     FakeWeb.register_uri(:put, 
-                         "http://foo:bar@api.tropo.com/v1/users/1234/payment/recurrence", 
+                         "https://foo:bar@api.tropo.com/v1/users/1234/payment/recurrence", 
                          :body => ActiveSupport::JSON.encode(@recurrence_updated), 
                          :content_type => "application/json",
                          :status => ["200", "OK"])
@@ -479,63 +479,63 @@ describe "TropoProvisioning" do
 
     # List invitations
     FakeWeb.register_uri(:get, 
-                         "http://foo:bar@api.tropo.com/v1/invitations", 
+                         "https://foo:bar@api.tropo.com/v1/invitations", 
                          :body => ActiveSupport::JSON.encode(@invitations), 
                          :content_type => "application/json",
                          :status => ["200", "OK"])
 
     # Get an invitation
     FakeWeb.register_uri(:get, 
-                         "http://foo:bar@api.tropo.com/v1/invitations/ABC457", 
+                         "https://foo:bar@api.tropo.com/v1/invitations/ABC457", 
                          :body => ActiveSupport::JSON.encode(@invitations[1]), 
                          :content_type => "application/json",
                          :status => ["200", "OK"])
 
     # Update an invitation
     FakeWeb.register_uri(:put, 
-                         "http://foo:bar@api.tropo.com/v1/invitations/ABC457", 
+                         "https://foo:bar@api.tropo.com/v1/invitations/ABC457", 
                          :body => ActiveSupport::JSON.encode(@invitation_created), 
                          :content_type => "application/json",
                          :status => ["200", "OK"])
                          
     # Update an invitation
     FakeWeb.register_uri(:put, 
-                         "http://foo:bar@api.tropo.com/v1/users/15909/invitations/ABC457", 
+                         "https://foo:bar@api.tropo.com/v1/users/15909/invitations/ABC457", 
                          :body => ActiveSupport::JSON.encode(@invitation_created), 
                          :content_type => "application/json",
                          :status => ["200", "OK"])
                                               
     # Delete an invitation
     FakeWeb.register_uri(:delete, 
-                         "http://foo:bar@api.tropo.com/v1/invitations/ABC457", 
+                         "https://foo:bar@api.tropo.com/v1/invitations/ABC457", 
                          :body => ActiveSupport::JSON.encode(@deleted_invitation), 
                          :content_type => "application/json",
                          :status => ["200", "OK"])
                          
     # Delete an invitation
     FakeWeb.register_uri(:delete, 
-                         "http://foo:bar@api.tropo.com/v1/users/15909/invitations/ABC457", 
+                         "https://foo:bar@api.tropo.com/v1/users/15909/invitations/ABC457", 
                          :body => ActiveSupport::JSON.encode(@deleted_invitation), 
                          :content_type => "application/json",
                          :status => ["200", "OK"])
                          
     # Create invitation
     FakeWeb.register_uri(:post, 
-                         "http://foo:bar@api.tropo.com/v1/invitations", 
+                         "https://foo:bar@api.tropo.com/v1/invitations", 
                          :body => ActiveSupport::JSON.encode(@invitation_created), 
                          :content_type => "application/json",
                          :status => ["200", "OK"])
 
     # Create invitation
     FakeWeb.register_uri(:post, 
-                         "http://foo:bar@api.tropo.com/v1/users/15909/invitations", 
+                         "https://foo:bar@api.tropo.com/v1/users/15909/invitations", 
                          :body => ActiveSupport::JSON.encode(@invitation_created), 
                          :content_type => "application/json",
                          :status => ["200", "OK"])
                                               
     # List invitation for a user
     FakeWeb.register_uri(:get, 
-                         "http://foo:bar@api.tropo.com/v1/users/15909/invitations", 
+                         "https://foo:bar@api.tropo.com/v1/users/15909/invitations", 
                          :body => ActiveSupport::JSON.encode([@invitation_created]), 
                          :content_type => "application/json",
                          :status => ["200", "OK"])
@@ -549,7 +549,7 @@ describe "TropoProvisioning" do
                          
     # List invitation for a user
     FakeWeb.register_uri(:get, 
-                         "http://foo:bar@api.tropo.com/v1/users/15909/invitations/ABC457", 
+                         "https://foo:bar@api.tropo.com/v1/users/15909/invitations/ABC457", 
                          :body => ActiveSupport::JSON.encode(@invitations[1]), 
                          :content_type => "application/json",
                          :status => ["200", "OK"])
@@ -557,7 +557,7 @@ describe "TropoProvisioning" do
     @username_check = { 'available' => false, 'href' => "http://api.smsified.com/v1/usernames/jsgoecke", 'valid' => true }
     # List invitation for a user
     FakeWeb.register_uri(:get, 
-                         "http://foo:bar@api.tropo.com/v1/usernames/12345", 
+                         "https://foo:bar@api.tropo.com/v1/usernames/12345", 
                          :body => ActiveSupport::JSON.encode(@username_check), 
                          :content_type => "application/json",
                          :status => ["200", "OK"])
@@ -808,17 +808,21 @@ describe "TropoProvisioning" do
       end
     end
   
-    it "should add appropriate addresses" do  
+    it "should add appropriate number address" do  
       # Add a address based on a prefix
       result = tropo_provisioning.create_address('108000', { :type => 'number', :prefix => '1303' })
       result[:href].should == "http://api.tropo.com/v1/applications/108000/addresses/number/7202551912"
       result[:address].should == '7202551912'
+    end
     
+    it "should add appropriate jabber address" do  
       # Add a jabber account
       result = tropo_provisioning.create_address('108001', { :type => 'jabber', :username => 'xyz123@bot.im' })
       result[:href].should == "http://api.tropo.com/v1/applications/108001/addresses/jabber/xyz123@bot.im"
       result[:address].should == 'xyz123@bot.im' 
-    
+    end
+
+    it "should add appropriate token address" do  
       # Add a token
       result = tropo_provisioning.create_address('108002', { :type => 'token', :channel => 'voice' })
       result[:href].should == "http://api.tropo.com/v1/applications/108002/addresses/token/12345679f90bac47a05b178c37d3c68aaf38d5bdbc5aba0c7abb12345d8a9fd13f1234c1234567dbe2c6f63b"

data/tropo-provisioning.gemspec

@@ -27,9 +27,11 @@ Gem::Specification.new do |s|
   s.add_development_dependency("fakeweb")
   s.add_development_dependency("yard")
   s.add_development_dependency("rdoc")
+  s.add_development_dependency("rake")
     
   s.add_runtime_dependency("hashie", ">= 0.2.1")
   s.add_runtime_dependency("activesupport")
   s.add_runtime_dependency("i18n")
+  s.add_runtime_dependency("json") if RUBY_VERSION =~ /1.8/
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tropo-provisioning
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-05 00:00:00.000000000Z
+date: 2011-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70361391690020 !ruby/object:Gem::Requirement
+  requirement: &70314617321460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70361391690020
+  version_requirements: *70314617321460
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70361391688520 !ruby/object:Gem::Requirement
+  requirement: &70314617320080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70361391688520
+  version_requirements: *70314617320080
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70361391687380 !ruby/object:Gem::Requirement
+  requirement: &70314617319300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70361391687380
+  version_requirements: *70314617319300
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70361391686800 !ruby/object:Gem::Requirement
+  requirement: &70314617318680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70361391686800
+  version_requirements: *70314617318680
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70314617330920 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70314617330920
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70361391686000 !ruby/object:Gem::Requirement
+  requirement: &70314617329260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +77,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70361391686000
+  version_requirements: *70314617329260
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70361391685240 !ruby/object:Gem::Requirement
+  requirement: &70314617327680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +88,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70361391685240
+  version_requirements: *70314617327680
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70361391684580 !ruby/object:Gem::Requirement
+  requirement: &70314617326680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,7 +99,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70361391684580
+  version_requirements: *70314617326680
 description: Library for interacting with the Tropo Provisioning API
 email:
 - jsgoecke@voxeo.com
@@ -158,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: tropo-provisioning
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Library for interacting with the Tropo Provisioning API