connfu-client 0.1.2 → 0.1.3

data/README.rdoc

@@ -1,4 +1,4 @@
-== Welcome to connfu-client {<img src="http://travis-ci.org/bluevialabs/connfu-client.png" />}[http://travis-ci.org/bluevialabs/connfu-client]
+== Welcome to connfu-client {<img src="https://secure.travis-ci.org/bluevialabs/connfu-client.png" />}[http://travis-ci.org/bluevialabs/connfu-client]
 
 connFu gem provides an easy way to get access to connFu platform using the defined DSL and the provisioning API.
 

data/examples/provisioning/voice/dtmf/create.rb

@@ -0,0 +1,28 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'lib')
+
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', '..')
+
+require 'connfu'
+
+require 'examples/provisioning/setup'
+
+ARGV.length < 4 and
+(
+  puts "Please include as argument the api_key, the channel name, the tone and the message to be used"
+  exit
+)
+
+api_key = ARGV.shift
+channel_name = ARGV.shift
+tone = ARGV.shift
+message = ARGV.shift
+
+application = Connfu::Provisioning::Application.new(api_key, CONNFU_ENDPOINT)
+
+begin
+  puts application.add_dtmf(channel_name, tone, message)
+rescue Exception => ex
+  puts "There was an error: #{ex.inspect}"
+  puts "Exception message: #{ex.message}"
+end
+

data/examples/provisioning/voice/dtmf/delete.rb

@@ -0,0 +1,32 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'lib')
+
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', '..')
+
+require 'connfu'
+
+require 'examples/provisioning/setup'
+
+ARGV.length < 2 and
+(
+  puts "Please include as argument the api_key, the channel and the dtmf (optional) to be deleted"
+  exit
+)
+
+api_key = ARGV.shift
+channel = ARGV.shift
+dtmf = if ARGV.length < 1
+         ""
+       else
+         ARGV.shift
+       end
+
+
+application = Connfu::Provisioning::Application.new(api_key, CONNFU_ENDPOINT)
+
+begin
+  puts application.delete_dtmf(channel, dtmf)
+rescue Exception => ex
+  puts "There was an error:"
+  puts "Exception message: #{ex.message}"
+end
+

data/examples/provisioning/voice/dtmf/get.rb

@@ -0,0 +1,38 @@
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'lib')
+
+$:.unshift File.join(File.dirname(__FILE__), '..', '..', '..', '..')
+
+require 'connfu'
+
+require 'examples/provisioning/setup'
+
+ARGV.length < 2 and
+    (
+    puts "Please include as argument the api_key, the channel and optionally the dtmf tone"
+    exit
+    )
+
+api_key = ARGV.shift
+
+channel = ARGV.shift
+
+dtmf = if ARGV.length < 1
+                ""
+              else
+                ARGV.shift
+              end
+
+
+Connfu.log_level = Logger::DEBUG
+
+application = Connfu::Provisioning::Application.new(api_key, CONNFU_ENDPOINT)
+
+
+begin
+  phones = application.get_dtmf(channel, dtmf)
+  p phones
+rescue Exception => ex
+  puts "There was an error:"
+  puts "Exception message: #{ex.message}"
+end
+

data/lib/connfu/provisioning/application.rb

@@ -151,11 +151,12 @@ module Connfu
             users = params[:origin]
           end
 
-          @base.post("channels/twitter",
+          data = @base.post("channels/twitter",
                      {:uid => key,
                       :accounts => users.collect { |item| {:name => item} },
                       :filter => filter
                      })
+          Twitter.unmarshal(ActiveSupport::JSON.decode(data))
         else
           # retrieve users mentions
           users = params[:mentions]
@@ -165,11 +166,12 @@ module Connfu
             user_filter = filter.dup
             user_filter << "recipients:#{user}"
 
-            locations << @base.post("channels/twitter",
+            data = @base.post("channels/twitter",
                                     {:uid => key,
                                      :accounts => [{:name => user}],
                                      :filter => "(#{user_filter.join(' AND ')})"
                                     })
+            locations << Twitter.unmarshal(ActiveSupport::JSON.decode(data))
           }
           locations
         end
@@ -231,7 +233,7 @@ module Connfu
       # * +country+ country to allocate a DID
       #
       def create_voice_channel(name, country, privacy = Voice::Privacy::WHITELIST)
-        @base.post("channels/voice", {:uid => name, :country => country, :privacy => privacy})
+        Voice.unmarshal(ActiveSupport::JSON.decode(@base.post("channels/voice", {:uid => name, :country => country, :privacy => privacy})))
       end
 
       ##
@@ -272,6 +274,32 @@ module Connfu
         @base.post("channels/voice/#{voice}/phones", {:country => country})
       end
 
+      ##
+      # Retrieve a voice channel dtmf tones, that's the list of actions associated to a IVR voice channel
+      # ==== Parameters
+      # * +voice+ Voice channel identifier
+      # * +dtmf+ (optional) specific Dtmf tone to retrieve. If it is not specified, all the list is fetched
+      def get_dtmf(voice, dtmf = "")
+        Dtmf.unmarshal(voice, ActiveSupport::JSON.decode(@base.get("channels/voice/#{voice}/dtmf/#{dtmf}")))
+      end
+
+      ##
+      # Delete one dtmf action or the whole dtmf actions
+      # ==== Parameters
+      # * +voice+: Voice channel identifier
+      # * +dtmf+: specific dtmf tone to delete.
+      def delete_dtmf(voice, dtmf)
+        @base.delete("channels/voice/#{voice}/dtmf/#{dtmf}")
+      end
+
+      ##
+      # Add a new dtmf action to the Voice channel
+      # ==== Parameters
+      # * +voice+: Voice channel identifier
+      # * +dtmf+: for the phone number to be allocated
+      def add_dtmf(voice, tone, message)
+        @base.post("channels/voice/#{voice}/dtmf", {:tone => tone, :message => message})
+      end
 
       ##
       # Voice channel Whitelist management
@@ -296,22 +324,25 @@ module Connfu
         @base.delete("channels/voice/#{voice}/whitelisted/#{number}")
       end
 
-      #
+      ##
       # Create a new item in the whitelist
-      # @param *args:
+      # ===== Parameters
+      # * *args:
       #      - First parameter: voice channel identifier
       #      - Second parameter can be either:
       #          - WhitelistUser object with the name and phone information
       #          - two arguments name, phone
       #
+      # ==== Return
+      # * Whitelist object
       def add_whitelist(*args)
-
+        voice_id = args[0]
         if args.length.eql?(2)
-          @base.post("channels/voice/#{args[0]}/whitelisted", {:name => args[1].name, :phone => args[1].phone})
+          whitelist = @base.post("channels/voice/#{voice_id}/whitelisted", {:name => args[1].name, :phone => args[1].phone})
         else
-          @base.post("channels/voice/#{args[0]}/whitelisted", {:name => args[1], :phone => args[2]})
+          whitelist = @base.post("channels/voice/#{voice_id}/whitelisted", {:name => args[1], :phone => args[2]})
         end
-
+        WhitelistUser.unmarshal(ActiveSupport::JSON.decode(whitelist))
       end
 
       #
@@ -348,7 +379,9 @@ module Connfu
       # @param uri RSS endpoint
       #
       def create_rss_channel(name, uri)
-        @base.post("channels/rss", {:uid => name, :uri => uri})
+        data = @base.post("channels/rss", {:uid => name, :uri => uri})
+        data = ActiveSupport::JSON.decode(data)
+        Rss.unmarshal(data)
       end
 
       #

data/lib/connfu/provisioning/base.rb

@@ -41,10 +41,6 @@ module Connfu
         RestClient.post("#{@endpoint}/#{path}", ActiveSupport::JSON.encode(body), headers) { |response, request, result|
           case response.code
             when 200..201
-              # If there is a :location header, return it
-              if response.headers.has_key?(:location)
-                return response.headers[:location]
-              end
               # else, do the normal stuff
               if block_given?
                 response.return!(request, result, &Proc.new)

data/lib/connfu/provisioning/channel.rb

@@ -17,12 +17,12 @@ module Connfu
       attr_accessor :uid
 
       # channel type
-      attr_accessor :type
+      attr_accessor :channel_type
 
       # Creates a Channel instance using a Hash values
       # It creates an instance variable per each hash key
       def initialize(params)
-        self.type = self.class.to_s.downcase
+        self.channel_type = self.class.to_s.downcase
         params.each_pair { |key, value|
           self.instance_variable_set("@#{key}", value)
         }
@@ -52,14 +52,13 @@ module Connfu
         #
         # * +data+ - hash containing channel information retrieved using the connFu API
         def unmarshal(data)
-
-          # Helper to get the channel class using the type attribute (we are
+          # Helper to get the channel class using the channel_type attribute (we are
           # retrieving all the channels) or the client class (we are retrieving
           # specific a channel type)
           create_channel = lambda { |channel|
-            if channel.has_key?("type") # get the class from type attribute (get all channels)
-              type = channel["type"].capitalize
-              Connfu::Provisioning.const_get(type).new(channel)
+            if channel.has_key?("type") && ListenerChannel::CHANNEL_TYPES.include?(channel["type"].to_sym) # get the class from type attribute (get all channels)
+              channel_type = channel["type"].capitalize
+              Connfu::Provisioning.const_get(channel_type).new(channel)
             else # get the class from class
               self.new(channel)
             end

data/lib/connfu/provisioning/dtmf.rb

@@ -0,0 +1,55 @@
+module Connfu
+
+  module Provisioning
+
+    #
+    # connFu Dtmf press key (belongs to a Voice channel)
+    #
+    class Dtmf
+
+      # tone
+      attr_accessor :tone
+
+      # message
+      attr_accessor :message
+
+      # voice channel unique identifier
+      attr_reader :voice
+
+      # @param voice voice channel identifier
+      # @param tone
+      # @param message
+      def initialize(voice, tone, message = "")
+        @voice = voice
+        @tone = tone
+        @message = message
+      end
+      
+      # Hash way to retrieve attributes
+      def [](value)
+        self.respond_to?(value.to_sym) ? self.send(value.to_sym) : nil
+      end
+
+      def to_hash
+        {"tone" => tone, "message" => message}
+      end
+
+      def to_s
+        "#{self.class.to_s}: #{to_hash}"
+      end
+
+      #
+      # Creates a Dtmf object using the raw data from the provisioning API
+      # @param voice channel unique identifier
+      # @param data Hash containing the raw data
+      def self.unmarshal(voice, data)
+        if data.is_a?(Array)
+          data.map{|item| Dtmf.new(voice, item["tone"], item["message"])}
+        else
+          Dtmf.new(voice, data["tone"], data["message"])
+        end
+      end
+
+    end
+  end
+end

data/lib/connfu/provisioning/rss.rb

@@ -9,11 +9,11 @@ module Connfu
 
       def initialize(params)
         super(params)
-        self.type = "rss"
+        self.channel_type = "rss"
       end
 
       def to_hash
-        {"uid" => uid, "type" => type, "uri" => uri}
+        {"uid" => uid, "channel_type" => channel_type, "uri" => uri}
       end
 
     end

data/lib/connfu/provisioning/twitter.rb

@@ -15,12 +15,12 @@ module Connfu
 
       def initialize(params)
         super(params)
-        self.type = "twitter"
+        self.channel_type = "twitter"
       end
 
       # Creates a hash with the Twitter instance info
       def to_hash
-        {"uid" => uid, "type" => type, "accounts" => accounts, "filter" => filter}
+        {"uid" => uid, "channel_type" => channel_type, "accounts" => accounts, "filter" => filter}
       end
 
     end

data/lib/connfu/provisioning/voice.rb

@@ -1,4 +1,3 @@
-require 'connfu/provisioning/whitelist'
 
 module Connfu
 
@@ -15,7 +14,7 @@ module Connfu
       end
       
       # Voice channel attributes that could be updated
-      UPDATE_ATTRIBUTES = ["topic", "welcome_message", "rejected_message", "privacy"]
+      UPDATE_ATTRIBUTES = ["topic", "welcome_message", "rejected_message", "privacy", "type"]
 
       _values = UPDATE_ATTRIBUTES.dup
       _values.each { |value|
@@ -39,11 +38,11 @@ module Connfu
 
       def initialize(params)
         super(params)
-        self.type = "voice"
+        self.channel_type = "voice"
       end
 
       def to_hash
-        {"uid" => uid, "type" => type, "phones" => phones.map(&:to_hash)}
+        {"uid" => uid, "channel_type" => channel_type, "phones" => phones.map(&:to_hash)}
       end
 
       # access the Voice channel Whitelist

data/lib/connfu/provisioning/whitelist.rb

@@ -2,10 +2,6 @@ module Connfu
 
   module Provisioning
 
-    ##
-    # This class defines a whitelist user (whitelist item)
-    WhitelistUser = Struct.new(:name, :phone)
-
     ##
     # This class models a conference whitelist
     class Whitelist

data/lib/connfu/provisioning/whitelist_user.rb

@@ -0,0 +1,18 @@
+module Connfu
+  module Provisioning
+    ##
+    # This class defines a whitelist user (whitelist item)
+    class WhitelistUser < Struct.new(:name, :phone)
+
+      ##
+      # Creates a WhitelistUser object using the raw data from the provisioning API
+      # ==== Parameters
+      # * +data+ raw data retrieved using the connFu API
+      def self.unmarshal(data)
+        WhitelistUser.new(*data.values)
+      end
+
+    end
+    
+  end
+end

data/lib/connfu/provisioning.rb

@@ -1,10 +1,13 @@
 require 'connfu/provisioning/application'
 require 'connfu/provisioning/base'
 require 'connfu/provisioning/channel'
+require 'connfu/provisioning/dtmf'
 require 'connfu/provisioning/phone'
 require 'connfu/provisioning/rss'
 require 'connfu/provisioning/twitter'
 require 'connfu/provisioning/voice'
+require 'connfu/provisioning/whitelist'
+require 'connfu/provisioning/whitelist_user'
 
 module Connfu
   module Provisioning

data/lib/connfu/version.rb

@@ -2,5 +2,5 @@
 module Connfu
   ##
   # Current connFu DSL version
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/provisioning/channel_shared_examples.rb

@@ -12,7 +12,7 @@ def channel_attrs
 end
 
 
-shared_examples_for "Channel" do |channel, type|
+shared_examples_for "Channel" do |channel, channel_type|
 
 
   RSpec::Matchers.define :have_defined_channel_attributes do |expected|
@@ -20,7 +20,7 @@ shared_examples_for "Channel" do |channel, type|
       channel_attrs.keys.each { |attribute|
         channel.send(attribute).should eql(expected[attribute])
       }
-      channel.type.should be_instance_of(String)
+      channel.channel_type.should be_instance_of(String)
       channel.uid.should be_instance_of(String)
     end
   end

data/spec/provisioning/voice_spec.rb

@@ -26,7 +26,7 @@ describe Connfu::Provisioning::Voice do
         [:uid, :topic, :welcome_message, :rejected_message].each { |attribute|
           voice.send(attribute).should eql(expected[attribute])
         }
-        voice.type.should eql("voice")
+        voice.channel_type.should eql("voice")
       end
     end
     
@@ -82,12 +82,12 @@ describe Connfu::Provisioning::Voice do
         match do |actual| # actual should be the Connfu::Provisioning::Voice instance
           actual.should be_instance_of(Hash)
           
-          ["uid", "type", "phones"].each{|key|
+          ["uid", "channel_type", "phones"].each{|key|
             actual.should have_key(key)
           }
 
           actual["uid"].should eql(uid)
-          actual["type"].should eql("voice")
+          actual["channel_type"].should eql("voice")
           
           actual["phones"].should be_instance_of(Array)
           actual["phones"].length.should eql(phones.length)
@@ -103,25 +103,25 @@ describe Connfu::Provisioning::Voice do
         end
       end
 
-      it "should retrieved uid, type and phones attributes (empty phones)" do
+      it "should retrieved uid, channel_type and phones attributes (empty phones)" do
         voice = Connfu::Provisioning::Voice.new(voice_attrs)
         voice.to_hash.should have_voice_details(VOICE_KEY, [])
       end
 
-      it "should retrieved uid, type and phones attributes (phones with elements)" do
+      it "should retrieved uid, channel_type and phones attributes (phones with elements)" do
         voice = Connfu::Provisioning::Voice.new(voice_attrs)
         voice << phone
         voice.to_hash.should have_voice_details(VOICE_KEY, [phone])
       end
 
-      it "should retrieved uid, type and phones attributes (phones two elements)" do
+      it "should retrieved uid, channel_type and phones attributes (phones two elements)" do
         voice = Connfu::Provisioning::Voice.new(voice_attrs)
         voice << phone
         voice << phone
         voice.to_hash.should have_voice_details(VOICE_KEY, [phone, phone])
       end
 
-      it "should retrieved uid, type and phones attributes (phones hundred elements)" do
+      it "should retrieved uid, channel_type and phones attributes (phones hundred elements)" do
         voice = Connfu::Provisioning::Voice.new(voice_attrs)
         data = []
         100.times do

data/spec/provisioning_spec.rb

@@ -18,11 +18,11 @@ describe Connfu::Provisioning do
   RSpec::Matchers.define :be_well_defined_as_voice do |uid, phones|
     match do |actual| # actual should be the Connfu::Provisioning::Voice instance
       actual.should be_instance_of(Connfu::Provisioning::Voice)
-      ["uid", "type", "phones"].each { |key|
+      ["uid", "channel_type", "phones"].each { |key|
         actual.to_hash.should have_key(key)
       }
       actual.uid.should eql(uid)
-      actual.type.should eql("voice")
+      actual.channel_type.should eql("voice")
       
       actual.should respond_to("topic")
       actual.should respond_to("welcome_message")
@@ -46,12 +46,12 @@ describe Connfu::Provisioning do
   RSpec::Matchers.define :be_well_defined_as_twitter do |uid, twitter_accounts|
     match do |actual| # actual should be the Connfu::Provisioning::Twitter instance
       actual.should be_instance_of(Connfu::Provisioning::Twitter)
-      ["uid", "type", "accounts"].each { |key|
+      ["uid", "channel_type", "accounts"].each { |key|
         actual.to_hash.should have_key(key)
       }
 
       actual.uid.should eql(uid)
-      actual.type.should eql("twitter")
+      actual.channel_type.should eql("twitter")
 
       actual.accounts.should be_instance_of(Array)
       actual.accounts.length.should eql(twitter_accounts.length)
@@ -85,56 +85,57 @@ describe Connfu::Provisioning do
       it "should create a Twitter channel application with one origin speficied as array" do
         stub_request(:post, "#{ENDPOINT}/channels/twitter").
             with(:body => create_twitter_channel_request(["juan"]), :headers => {'Accept'=>'application/json', 'Content-Type' => 'application/json', 'AUTH_TOKEN' => "#{API_KEY}"}).
-            to_return(:status => 201, :body => "", :headers => {:location => "#{ENDPOINT}/channels/twitter/#{TWITTER_KEY}"})
+            to_return(:status => 201, :body => "{'accounts':[{'name':'juan'}],'created_at':'2011-09-06T05:33:39+00:00','filter':'','uid':'#{TWITTER_KEY}','updated_at':'2011-09-06T05:33:39+00:00'}", :headers => {:location => "#{ENDPOINT}/channels/twitter/#{TWITTER_KEY}"})
 
         response = @application.create_twitter_channel(TWITTER_KEY, ["juan"])
-        response.should eql("#{ENDPOINT}/channels/twitter/#{TWITTER_KEY}")
+        response.should be_well_defined_as_twitter(TWITTER_KEY, ['juan'])
       end
 
       it "should create a Twitter channel application with one origins speficied as hash (string)" do
         stub_request(:post, "#{ENDPOINT}/channels/twitter").
             with(:body => create_twitter_channel_request(["juan"]), :headers => {'Accept'=>'application/json', 'Content-Type' => 'application/json', 'AUTH_TOKEN' => "#{API_KEY}"}).
-            to_return(:status => 201, :body => "", :headers => {:location => "#{ENDPOINT}/channels/twitter/#{TWITTER_KEY}"})
+            to_return(:status => 201, :body => "{'accounts':[{'name':'juan'}],'created_at':'2011-09-06T05:33:39+00:00','filter':'','uid':'#{TWITTER_KEY}','updated_at':'2011-09-06T05:33:39+00:00'}", :headers => {:location => "#{ENDPOINT}/channels/twitter/#{TWITTER_KEY}"})
 
         response = @application.create_twitter_channel(TWITTER_KEY, {:origin => "juan"})
-        response.should eql("#{ENDPOINT}/channels/twitter/#{TWITTER_KEY}")
+        response.should be_well_defined_as_twitter(TWITTER_KEY, ['juan'])
       end
 
       it "should create a Twitter channel application with one origins speficied as hash (array)" do
         stub_request(:post, "#{ENDPOINT}/channels/twitter").
             with(:body => create_twitter_channel_request(["juan"]), :headers => {'Accept'=>'application/json', 'Content-Type' => 'application/json', 'AUTH_TOKEN' => "#{API_KEY}"}).
-            to_return(:status => 201, :body => "", :headers => {:location => "#{ENDPOINT}/channels/twitter/#{TWITTER_KEY}"})
+            to_return(:status => 201, :body => "{'accounts':[{'name':'juan'}],'created_at':'2011-09-06T05:33:39+00:00','filter':'','uid':'#{TWITTER_KEY}','updated_at':'2011-09-06T05:33:39+00:00'}", :headers => {:location => "#{ENDPOINT}/channels/twitter/#{TWITTER_KEY}"})
 
         response = @application.create_twitter_channel(TWITTER_KEY, {:origin => ["juan"]})
-        response.should eql("#{ENDPOINT}/channels/twitter/#{TWITTER_KEY}")
+        response.should be_well_defined_as_twitter(TWITTER_KEY, ['juan'])
       end
 
       it "should create a Twitter channel application with two origins speficied as Hash" do
         stub_request(:post, "#{ENDPOINT}/channels/twitter").
             with(:body => create_twitter_channel_request(["juan", "connfu"]), :headers => {'Accept'=>'application/json', 'Content-Type' => 'application/json', 'AUTH_TOKEN' => "#{API_KEY}"}).
-            to_return(:status => 201, :body => "", :headers => {:location => "#{ENDPOINT}/channels/twitter/#{TWITTER_KEY}"})
+            to_return(:status => 201, :body => "{'accounts':[{'name':'juan'},{'name':'connfu'}],'created_at':'2011-09-06T05:33:39+00:00','filter':'','uid':'#{TWITTER_KEY}','updated_at':'2011-09-06T05:33:39+00:00'}", :headers => {:location => "#{ENDPOINT}/channels/twitter/#{TWITTER_KEY}"})
 
         response = @application.create_twitter_channel(TWITTER_KEY, {:origin => ["juan", "connfu"]})
-        response.should eql("#{ENDPOINT}/channels/twitter/#{TWITTER_KEY}")
+        response.should be_well_defined_as_twitter(TWITTER_KEY, ['juan', 'connfu'])
       end
 
       it "should create a Twitter channel application with two origins speficied as Array" do
         stub_request(:post, "#{ENDPOINT}/channels/twitter").
             with(:body => create_twitter_channel_request(["juan", "connfu"]), :headers => {'Accept'=>'application/json', 'Content-Type' => 'application/json', 'AUTH_TOKEN' => "#{API_KEY}"}).
-            to_return(:status => 201, :body => "", :headers => {:location => "#{ENDPOINT}/channels/twitter/#{TWITTER_KEY}"})
+            to_return(:status => 201, :body => "{'accounts':[{'name':'juan'},{'name':'connfu'}],'created_at':'2011-09-06T05:33:39+00:00','filter':'','uid':'#{TWITTER_KEY}','updated_at':'2011-09-06T05:33:39+00:00'}", :headers => {:location => "#{ENDPOINT}/channels/twitter/#{TWITTER_KEY}"})
 
         response = @application.create_twitter_channel(TWITTER_KEY, ["juan", "connfu"])
-        response.should eql("#{ENDPOINT}/channels/twitter/#{TWITTER_KEY}")
+        response.should be_well_defined_as_twitter(TWITTER_KEY, ['juan', 'connfu'])
       end
 
       it "should create a Twitter channel application with one mention" do
         stub_request(:post, "#{ENDPOINT}/channels/twitter").
             with(:body => create_twitter_channel_request(["juan"], TWITTER_KEY, "(recipients:juan)"), :headers => {'Accept'=>'application/json', 'Content-Type' => 'application/json', 'AUTH_TOKEN' => "#{API_KEY}"}).
-            to_return(:status => 201, :body => "", :headers => {:location => "#{ENDPOINT}/channels/twitter/#{TWITTER_KEY}"})
+            to_return(:status => 201, :body => "{'accounts':[{'name':'juan'}],'created_at':'2011-09-06T05:33:39+00:00','filter':'','uid':'#{TWITTER_KEY}','updated_at':'2011-09-06T05:33:39+00:00'}", :headers => {:location => "#{ENDPOINT}/channels/twitter/#{TWITTER_KEY}"})
 
         response = @application.create_twitter_channel(TWITTER_KEY, {:mentions => ["juan"]})
-        response.should be_kind_of(Array)
-        response[0].should eql("#{ENDPOINT}/channels/twitter/#{TWITTER_KEY}")
+        response.should be_instance_of(Array)
+        response.length.should be(1)
+        response[0].should be_well_defined_as_twitter(TWITTER_KEY, ["juan"])
       end
 
       it "should retrieve a channel information when the channel exists" do
@@ -180,29 +181,32 @@ describe Connfu::Provisioning do
 
       it "should create a Voice channel application with the default privacy attribute" do
         stub_request(:post, "#{ENDPOINT}/channels/voice").
-            with(:body => "{\"uid\":\"#{VOICE_KEY}\",\"country\":\"de\",\"privacy\":\"whitelisted\"}", :headers => {'Accept'=>'application/json', 'Content-Type' => 'application/json', 'AUTH_TOKEN' => "#{API_KEY}"}).
-            to_return(:status => 201, :body => "", :headers => {:location => "#{ENDPOINT}/channels/voice/#{VOICE_KEY}"})
+            with(:body => "{\"uid\":\"#{VOICE_KEY}\",\"country\":\"#{COUNTRY}\",\"privacy\":\"whitelisted\"}", :headers => {'Accept'=>'application/json', 'Content-Type' => 'application/json', 'AUTH_TOKEN' => "#{API_KEY}"}).
+            to_return(:status => 201, :body => "{'created_at':'2011-08-25T14:16:44+03:00','rejected_message':'You are not allowed to join this conference','privacy':'whitelisted','topic':'hello_man','uid':'#{VOICE_KEY}','updated_at':'2011-08-25T15:10:12+03:00','welcome_message':'Welcome to connFu, you are going to join the conference','phones':[{'country':'#{COUNTRY}','phone_number':'#{PHONE_NUMBER}'}]}", :headers => {:location => "#{ENDPOINT}/channels/voice/#{VOICE_KEY}"})
 
-        response = @application.create_voice_channel(VOICE_KEY, "de")
-        response.should eql("#{ENDPOINT}/channels/voice/#{VOICE_KEY}")
+        response = @application.create_voice_channel(VOICE_KEY, COUNTRY)
+        response.should be_well_defined_as_voice(VOICE_KEY, [{:phone_number => PHONE_NUMBER, :country => COUNTRY}])
+        response.privacy.should eql("whitelisted")
       end
 
       it "should create a Voice channel application with a privacy attribute (public)" do
         stub_request(:post, "#{ENDPOINT}/channels/voice").
-            with(:body => "{\"uid\":\"#{VOICE_KEY}\",\"country\":\"de\",\"privacy\":\"public\"}", :headers => {'Accept'=>'application/json', 'Content-Type' => 'application/json', 'AUTH_TOKEN' => "#{API_KEY}"}).
-            to_return(:status => 201, :body => "", :headers => {:location => "#{ENDPOINT}/channels/voice/#{VOICE_KEY}"})
+            with(:body => "{\"uid\":\"#{VOICE_KEY}\",\"country\":\"#{COUNTRY}\",\"privacy\":\"public\"}", :headers => {'Accept'=>'application/json', 'Content-Type' => 'application/json', 'AUTH_TOKEN' => "#{API_KEY}"}).
+            to_return(:status => 201, :body => "{'created_at':'2011-08-25T14:16:44+03:00','rejected_message':'You are not allowed to join this conference','privacy':'public','topic':'hello_man','uid':'#{VOICE_KEY}','updated_at':'2011-08-25T15:10:12+03:00','welcome_message':'Welcome to connFu, you are going to join the conference','phones':[{'country':'#{COUNTRY}','phone_number':'#{PHONE_NUMBER}'}]}", :headers => {:location => "#{ENDPOINT}/channels/voice/#{VOICE_KEY}"})
 
-        response = @application.create_voice_channel(VOICE_KEY, "de", Connfu::Provisioning::Voice::Privacy::PUBLIC)
-        response.should eql("#{ENDPOINT}/channels/voice/#{VOICE_KEY}")
+        response = @application.create_voice_channel(VOICE_KEY, COUNTRY, Connfu::Provisioning::Voice::Privacy::PUBLIC)
+        response.should be_well_defined_as_voice(VOICE_KEY, [{:phone_number => PHONE_NUMBER, :country => COUNTRY}])
+        response.privacy.should eql("public")
       end
 
       it "should create a Voice channel application with a privacy attribute (whitelisted)" do
         stub_request(:post, "#{ENDPOINT}/channels/voice").
-            with(:body => "{\"uid\":\"#{VOICE_KEY}\",\"country\":\"de\",\"privacy\":\"whitelisted\"}", :headers => {'Accept'=>'application/json', 'Content-Type' => 'application/json', 'AUTH_TOKEN' => "#{API_KEY}"}).
-            to_return(:status => 201, :body => "", :headers => {:location => "#{ENDPOINT}/channels/voice/#{VOICE_KEY}"})
+            with(:body => "{\"uid\":\"#{VOICE_KEY}\",\"country\":\"#{COUNTRY}\",\"privacy\":\"whitelisted\"}", :headers => {'Accept'=>'application/json', 'Content-Type' => 'application/json', 'AUTH_TOKEN' => "#{API_KEY}"}).
+            to_return(:status => 201, :body => "{'created_at':'2011-08-25T14:16:44+03:00','rejected_message':'You are not allowed to join this conference','privacy':'whitelisted','topic':'hello_man','uid':'#{VOICE_KEY}','updated_at':'2011-08-25T15:10:12+03:00','welcome_message':'Welcome to connFu, you are going to join the conference','phones':[{'country':'#{COUNTRY}','phone_number':'#{PHONE_NUMBER}'}]}", :headers => {:location => "#{ENDPOINT}/channels/voice/#{VOICE_KEY}"})
 
-        response = @application.create_voice_channel(VOICE_KEY, "de", Connfu::Provisioning::Voice::Privacy::WHITELIST)
-        response.should eql("#{ENDPOINT}/channels/voice/#{VOICE_KEY}")
+        response = @application.create_voice_channel(VOICE_KEY, COUNTRY, Connfu::Provisioning::Voice::Privacy::WHITELIST)
+        response.should be_well_defined_as_voice(VOICE_KEY, [{:phone_number => PHONE_NUMBER, :country => COUNTRY}])
+        response.privacy.should eql("whitelisted")
       end
 
       it "should retrieve a channel information when the channel exists" do
@@ -419,22 +423,24 @@ describe Connfu::Provisioning do
 
           stub_request(:post, "#{ENDPOINT}/channels/voice/#{VOICE_KEY}/whitelisted").
               with(:body => "{\"name\":\"juan\",\"phone\":\"#{PHONE_NUMBER}\"}", :headers => {'Accept'=>'application/json', 'AUTH_TOKEN' => "#{API_KEY}"}).
-              to_return(:status => 200, :body => "", :headers => {})
+              to_return(:status => 200, :body => "{\"name\":\"juan\",\"phone\":\"#{PHONE_NUMBER}\"}", :headers => {:location => "#{ENDPOINT}/channels/voice/#{VOICE_KEY}/whitelisted/#{PHONE_NUMBER}"})
 
           response = @application.add_whitelist(VOICE_KEY, 'juan', PHONE_NUMBER)
-          response.should eql("")
-
+          response.should be_instance_of(Connfu::Provisioning::WhitelistUser)
+          response.name.should eql("juan")
+          response.phone.should eql(PHONE_NUMBER)
         end
 
         it "should create a whitelist number with 1 parameter (WhitelistUser)" do
 
           stub_request(:post, "#{ENDPOINT}/channels/voice/#{VOICE_KEY}/whitelisted").
               with(:body => "{\"name\":\"juan\",\"phone\":\"#{PHONE_NUMBER}\"}", :headers => {'Accept'=>'application/json', 'AUTH_TOKEN' => "#{API_KEY}"}).
-              to_return(:status => 200, :body => "", :headers => {})
+              to_return(:status => 200, :body => "{'name':'juan','phone':'#{PHONE_NUMBER}'}", :headers => {:location => "#{ENDPOINT}/channels/voice/#{VOICE_KEY}/whitelisted/#{PHONE_NUMBER}"})
 
           response = @application.add_whitelist(VOICE_KEY, Connfu::Provisioning::WhitelistUser.new('juan', PHONE_NUMBER))
-          response.should eql("")
-
+          response.should be_instance_of(Connfu::Provisioning::WhitelistUser)
+          response.name.should eql("juan")
+          response.phone.should eql(PHONE_NUMBER)
         end
 
         it "should update a whitelist number with 1 parameter (WhitelistUser)" do
@@ -454,10 +460,11 @@ describe Connfu::Provisioning do
       it "should create a RSS channel application" do
         stub_request(:post, "#{ENDPOINT}/channels/rss").
             with(:body => "{\"uid\":\"#{RSS_KEY}\",\"uri\":\"http://connfu.com/rss\"}", :headers => {'Accept'=>'application/json', 'Content-Type' => 'application/json', 'AUTH_TOKEN' => "#{API_KEY}"}).
-            to_return(:status => 201, :body => "", :headers => {:location => "#{ENDPOINT}/channels/voice/#{RSS_KEY}"})
+            to_return(:status => 201, :body => "{'created_at':'2011-07-17T20:57:01+03:00','uri':'http://connfu.com/rss','uid':#{RSS_KEY},'updated_at':'2011-07-17T20:57:01+03:00'}", :headers => {:location => "#{ENDPOINT}/channels/voice/#{RSS_KEY}"})
 
-        response = @application.create_rss_channel(RSS_KEY, "http://connfu.com/rss")
-        response.should eql("#{ENDPOINT}/channels/voice/#{RSS_KEY}")
+        rss = @application.create_rss_channel(RSS_KEY, "http://connfu.com/rss")
+        rss.uid.should eql(RSS_KEY)
+        rss.uri.should eql("http://connfu.com/rss")
       end
 
       it "should retrieve a RSS channel information when the channel exists" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: connfu-client
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-30 00:00:00.000000000Z
+date: 2011-10-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2152345960 !ruby/object:Gem::Requirement
+  requirement: &2152266480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *2152345960
+  version_requirements: *2152266480
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2152344940 !ruby/object:Gem::Requirement
+  requirement: &2152265500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152344940
+  version_requirements: *2152265500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152343700 !ruby/object:Gem::Requirement
+  requirement: &2152257780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152343700
+  version_requirements: *2152257780
 - !ruby/object:Gem::Dependency
   name: flog
-  requirement: &2152342580 !ruby/object:Gem::Requirement
+  requirement: &2152256520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 2.5.1
   type: :development
   prerelease: false
-  version_requirements: *2152342580
+  version_requirements: *2152256520
 - !ruby/object:Gem::Dependency
   name: flay
-  requirement: &2152341620 !ruby/object:Gem::Requirement
+  requirement: &2152254840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.4.2
   type: :development
   prerelease: false
-  version_requirements: *2152341620
+  version_requirements: *2152254840
 - !ruby/object:Gem::Dependency
   name: roodi
-  requirement: &2152340500 !ruby/object:Gem::Requirement
+  requirement: &2152253620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *2152340500
+  version_requirements: *2152253620
 - !ruby/object:Gem::Dependency
   name: reek
-  requirement: &2152336640 !ruby/object:Gem::Requirement
+  requirement: &2152252180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 1.2.8
   type: :development
   prerelease: false
-  version_requirements: *2152336640
+  version_requirements: *2152252180
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2152335400 !ruby/object:Gem::Requirement
+  requirement: &2152251040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *2152335400
+  version_requirements: *2152251040
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2152334360 !ruby/object:Gem::Requirement
+  requirement: &2152246400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152334360
+  version_requirements: *2152246400
 - !ruby/object:Gem::Dependency
   name: sdoc
-  requirement: &2152332840 !ruby/object:Gem::Requirement
+  requirement: &2152245100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152332840
+  version_requirements: *2152245100
 - !ruby/object:Gem::Dependency
   name: metric_fu
-  requirement: &2152331340 !ruby/object:Gem::Requirement
+  requirement: &2152243580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152331340
+  version_requirements: *2152243580
 - !ruby/object:Gem::Dependency
   name: metrical
-  requirement: &2152329160 !ruby/object:Gem::Requirement
+  requirement: &2152241660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152329160
+  version_requirements: *2152241660
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152326400 !ruby/object:Gem::Requirement
+  requirement: &2152240520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152326400
+  version_requirements: *2152240520
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &2152325260 !ruby/object:Gem::Requirement
+  requirement: &2152238980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,7 +165,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152325260
+  version_requirements: *2152238980
 description: This gem provides a smooth access to connFu capabilities
 email:
 - devs@connfu.com
@@ -204,6 +204,9 @@ files:
 - examples/provisioning/twitter/put.rb
 - examples/provisioning/voice/create.rb
 - examples/provisioning/voice/delete.rb
+- examples/provisioning/voice/dtmf/create.rb
+- examples/provisioning/voice/dtmf/delete.rb
+- examples/provisioning/voice/dtmf/get.rb
 - examples/provisioning/voice/get.rb
 - examples/provisioning/voice/phones/create.rb
 - examples/provisioning/voice/phones/delete.rb
@@ -228,11 +231,13 @@ files:
 - lib/connfu/provisioning/application.rb
 - lib/connfu/provisioning/base.rb
 - lib/connfu/provisioning/channel.rb
+- lib/connfu/provisioning/dtmf.rb
 - lib/connfu/provisioning/phone.rb
 - lib/connfu/provisioning/rss.rb
 - lib/connfu/provisioning/twitter.rb
 - lib/connfu/provisioning/voice.rb
 - lib/connfu/provisioning/whitelist.rb
+- lib/connfu/provisioning/whitelist_user.rb
 - lib/connfu/version.rb
 - lib/rdoc/generator/template/connfu/_context.rhtml
 - lib/rdoc/generator/template/connfu/_head.rhtml