twilio-ruby 0.3.0 → 0.3.1

data/Rakefile

@@ -1,8 +1,16 @@
-require 'rake'
-require 'spec/rake/spectask'
+require 'rubygems'
+require 'rake/gempackagetask'
+require 'rspec/core/rake_task'
 
-Spec::Rake::SpecTask.new do |spec|
-  spec.spec_files = FileList['test/*_spec.rb']
-  spec.spec_opts << "--color"
-  spec.libs += ["lib", "test"]
+spec = eval(File.read('twilio-ruby.gemspec'))
+
+Rake::GemPackageTask.new(spec) do |p|
+  p.gem_spec = spec
+end
+
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = 'test/*_spec.rb'
+  t.rspec_opts = ['-c']
 end
+
+task :default => :spec

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

@@ -54,7 +54,7 @@ module Twilio
       end
     
       def url_encode(hash)
-        hash.to_a.map {|pair| pair.map {|e| CGI.escape e.to_s}.join '='}.join '&'
+        hash.to_a.map {|p| p.map {|e| CGI.escape e.to_s}.join '='}.join '&'
       end
     end
   end

data/lib/twilio-ruby.rb

@@ -10,32 +10,6 @@ require 'base64'
 require 'twilio-ruby/rest/utils'
 require 'twilio-ruby/rest/list_resource'
 require 'twilio-ruby/rest/instance_resource'
-require 'twilio-ruby/rest/sandbox/sandbox'
-require 'twilio-ruby/rest/accounts/account'
-require 'twilio-ruby/rest/accounts/accounts'
-require 'twilio-ruby/rest/calls/call'
-require 'twilio-ruby/rest/calls/calls'
-require 'twilio-ruby/rest/sms/sms'
-require 'twilio-ruby/rest/sms/message'
-require 'twilio-ruby/rest/sms/messages'
-require 'twilio-ruby/rest/outgoing_caller_ids/outgoing_caller_id'
-require 'twilio-ruby/rest/outgoing_caller_ids/outgoing_caller_ids'
-require 'twilio-ruby/rest/incoming_phone_numbers/incoming_phone_number'
-require 'twilio-ruby/rest/incoming_phone_numbers/incoming_phone_numbers'
-require 'twilio-ruby/rest/available_phone_numbers/available_phone_number'
-require 'twilio-ruby/rest/available_phone_numbers/available_phone_numbers'
-require 'twilio-ruby/rest/available_phone_numbers/country'
-require 'twilio-ruby/rest/available_phone_numbers/local'
-require 'twilio-ruby/rest/available_phone_numbers/toll_free'
-require 'twilio-ruby/rest/conferences/conference'
-require 'twilio-ruby/rest/conferences/conferences'
-require 'twilio-ruby/rest/conferences/participant'
-require 'twilio-ruby/rest/conferences/participants'
-require 'twilio-ruby/rest/recordings/recording'
-require 'twilio-ruby/rest/recordings/recordings'
-require 'twilio-ruby/rest/transcriptions/transcription'
-require 'twilio-ruby/rest/transcriptions/transcriptions'
-require 'twilio-ruby/rest/notifications/notification'
-require 'twilio-ruby/rest/notifications/notifications'
+Dir.glob('twilio-ruby/rest/*/*.rb').each {|f| require f}
 require 'twilio-ruby/rest/client'
 require 'twilio-ruby/twiml/response'

data/test/twilio_spec.rb

@@ -2,46 +2,46 @@ require 'rubygems'
 require 'twilio-ruby'
 require 'fakeweb'
 
-describe Twilio::Client do
+describe Twilio::REST::Client do
   before :all do
     FakeWeb.register_uri(:any, %r/http:\/\/api.twilio.com\//, :body => '{"message": "You tried to reach Twilio"}')
   end
 
-  it 'should set up a Twilio::Client' do
-    twilio = Twilio::Client.new('someSid', 'someToken', 'api-version')
+  it 'should set up a Twilio::REST::Client' do
+    twilio = Twilio::REST::Client.new('someSid', 'someToken', 'api-version')
     twilio.account_sid.should == 'someSid'
     twilio.instance_variable_get('@auth_token').should == 'someToken'
     twilio.api_version.should == 'api-version'
   end
   
   it 'should set up the proper default http ssl connection' do
-    twilio = Twilio::Client.new('someSid', 'someToken')
+    twilio = Twilio::REST::Client.new('someSid', 'someToken')
     twilio.instance_variable_get('@connection').address.should == 'api.twilio.com'
     twilio.instance_variable_get('@connection').port.should == 443
     twilio.instance_variable_get('@connection').use_ssl?.should == true
   end
   
   it 'should set up the proper http ssl connection when a different domain is given' do
-    twilio = Twilio::Client.new('someSid', 'someToken', '2008-08-01', 'api.faketwilio.com')
+    twilio = Twilio::REST::Client.new('someSid', 'someToken', '2008-08-01', 'api.faketwilio.com')
     twilio.instance_variable_get('@connection').address.should == 'api.faketwilio.com'
     twilio.instance_variable_get('@connection').port.should == 443
     twilio.instance_variable_get('@connection').use_ssl?.should == true
   end
 
   it 'should set up an accounts resources object' do
-    twilio = Twilio::Client.new('someSid', 'someToken')
+    twilio = Twilio::REST::Client.new('someSid', 'someToken')
     twilio.respond_to?(:accounts).should == true
     twilio.accounts.instance_variable_get('@uri').should == '/2010-04-01/Accounts'
   end
 
   it 'should set up an account object with the given sid' do
-    twilio = Twilio::Client.new('someSid', 'someToken')
+    twilio = Twilio::REST::Client.new('someSid', 'someToken')
     twilio.respond_to?(:account).should == true
     twilio.account.instance_variable_get('@uri').should == '/2010-04-01/Accounts/someSid'
   end
 
   it 'should convert all parameter names to Twilio-style names' do
-    twilio = Twilio::Client.new('someSid', 'someToken')
+    twilio = Twilio::REST::Client.new('someSid', 'someToken')
     untwilified = {:sms_url => 'someUrl', 'voiceFallbackUrl' => 'anotherUrl',
       'Status_callback' => 'yetAnotherUrl'}
     twilified = {:SmsUrl => 'someUrl', :VoiceFallbackUrl => 'anotherUrl',
@@ -52,87 +52,87 @@ describe Twilio::Client do
   end
 end
 
-describe Twilio::Account do
+describe Twilio::REST::Account do
   it 'should set up an incoming phone numbers resources object' do
-    account = Twilio::Account.new('someUri', 'someClient')
+    account = Twilio::REST::Account.new('someUri', 'someClient')
     account.respond_to?(:incoming_phone_numbers).should == true
     account.incoming_phone_numbers.instance_variable_get('@uri').should == 'someUri/IncomingPhoneNumbers'
   end
 
   it 'should set up an available phone numbers resources object' do
-    account = Twilio::Account.new('someUri', 'someClient')
+    account = Twilio::REST::Account.new('someUri', 'someClient')
     account.respond_to?(:available_phone_numbers).should == true
     account.available_phone_numbers.instance_variable_get('@uri').should == 'someUri/AvailablePhoneNumbers'
   end
 
   it 'should set up an outgoing caller ids resources object' do
-    account = Twilio::Account.new('someUri', 'someClient')
+    account = Twilio::REST::Account.new('someUri', 'someClient')
     account.respond_to?(:outgoing_caller_ids).should == true
     account.outgoing_caller_ids.instance_variable_get('@uri').should == 'someUri/OutgoingCallerIds'
   end
 
   it 'should set up a calls resources object' do
-    account = Twilio::Account.new('someUri', 'someClient')
+    account = Twilio::REST::Account.new('someUri', 'someClient')
     account.respond_to?(:calls).should == true
     account.calls.instance_variable_get('@uri').should == 'someUri/Calls'
   end
 
   it 'should set up a conferences resources object' do
-    account = Twilio::Account.new('someUri', 'someClient')
+    account = Twilio::REST::Account.new('someUri', 'someClient')
     account.respond_to?(:conferences).should == true
     account.conferences.instance_variable_get('@uri').should == 'someUri/Conferences'
   end
 
-  it 'should set up a sms messages resources object' do
-    account = Twilio::Account.new('someUri', 'someClient')
-    account.respond_to?(:sms_messages).should == true
-    account.sms_messages.instance_variable_get('@uri').should == 'someUri/SMS/Messages'
+  it 'should set up a sms resource object' do
+    account = Twilio::REST::Account.new('someUri', 'someClient')
+    account.respond_to?(:sms).should == true
+    account.sms.instance_variable_get('@uri').should == 'someUri/SMS'
   end
 
   it 'should set up a recordings resources object' do
-    account = Twilio::Account.new('someUri', 'someClient')
+    account = Twilio::REST::Account.new('someUri', 'someClient')
     account.respond_to?(:recordings).should == true
     account.recordings.instance_variable_get('@uri').should == 'someUri/Recordings'
   end
 
   it 'should set up a transcriptions resources object' do
-    account = Twilio::Account.new('someUri', 'someClient')
+    account = Twilio::REST::Account.new('someUri', 'someClient')
     account.respond_to?(:transcriptions).should == true
     account.transcriptions.instance_variable_get('@uri').should == 'someUri/Transcriptions'
   end
 
   it 'should set up a notifications resources object' do
-    account = Twilio::Account.new('someUri', 'someClient')
+    account = Twilio::REST::Account.new('someUri', 'someClient')
     account.respond_to?(:notifications).should == true
     account.notifications.instance_variable_get('@uri').should == 'someUri/Notifications'
   end
 end
 
-describe Twilio::Call do
+describe Twilio::REST::Call do
   it 'should set up a recordings resources object' do
-    call = Twilio::Call.new('someUri', 'someClient')
+    call = Twilio::REST::Call.new('someUri', 'someClient')
     call.respond_to?(:recordings).should == true
     call.recordings.instance_variable_get('@uri').should == 'someUri/Recordings'
   end
 
   it 'should set up a recordings resources object' do
-    call = Twilio::Call.new('someUri', 'someClient')
+    call = Twilio::REST::Call.new('someUri', 'someClient')
     call.respond_to?(:transcriptions).should == true
     call.transcriptions.instance_variable_get('@uri').should == 'someUri/Transcriptions'
   end
 end
 
-describe Twilio::Conference do
+describe Twilio::REST::Conference do
   it 'should set up a participants resources object' do
-    call = Twilio::Conference.new('someUri', 'someClient')
+    call = Twilio::REST::Conference.new('someUri', 'someClient')
     call.respond_to?(:participants).should == true
     call.participants.instance_variable_get('@uri').should == 'someUri/Participants'
   end
 end
 
-describe Twilio::Recording do
+describe Twilio::REST::Recording do
   it 'should set up a transcriptions resources object' do
-    call = Twilio::Recording.new('someUri', 'someClient')
+    call = Twilio::REST::Recording.new('someUri', 'someClient')
     call.respond_to?(:transcriptions).should == true
     call.transcriptions.instance_variable_get('@uri').should == 'someUri/Transcriptions'
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: twilio-ruby
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Andrew Benton
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-14 00:00:00 -07:00
+date: 2011-03-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A simple library for communicating with the Twilio REST API