trails 1.1.2 → 1.1.3

data/Manifest.txt

@@ -1,4 +1,3 @@
-.autotest
 History.txt
 Manifest.txt
 README.txt

data/README.txt

@@ -14,7 +14,7 @@ Support for SMS, twiml MimeType alias, functional test helpers.
 
  class ApplicationController < ActionController::Base
  ..
-	include Twilio::CallHandling
+	include Trails::Twilio::CallHandling
  ..
  end
 

data/lib/trails.rb

@@ -1,5 +1,5 @@
 module Trails
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 end
 begin
   TwilioRest

data/lib/trails/test_helper.rb

@@ -104,9 +104,11 @@ module Trails
       caller = as_twilio_opts[:caller] || '4155551212'
       called = as_twilio_opts[:called] || '6155556161'
       from = as_twilio_opts[:from] || '6665554321'
+      to = as_twilio_opts[:to] || '3334445678'
       params['Caller'] = caller
       params['Called'] = called
       params['From'] = from
+      params['To'] = to
       params['SmsMessageSid'] = 'DummyMessageSid' if( as_twilio_opts[:sms] )
     end
 

data/lib/trails/twilio/account.rb

@@ -52,8 +52,7 @@ module Trails
           'Method' => opts['Method'] || opts[:method] || 'GET',
           'Timeout' => opts['Timeout'] || opts[:timeout] || 15
         }
-        api_version = opts[:api_version] || '2008-08-01'
-        make_request( File.join( base_uri, 'Calls' ), 'POST', params )
+        request( 'Calls', 'POST', params )
       end
 
       MAX_SMS_LENGTH = 160
@@ -72,22 +71,22 @@ module Trails
           'Body' => body,
           'Method' => opts[:method] || 'POST'
         }
-        url =  File.join( base_uri, 'SMS/Messages' )
-        make_request(url, 'POST', params ) 
+        request( 'SMS/Messages', 'POST', params ) 
       end
 
+      # Sample Response: 
+      #  [{"SmsFallbackUrl"=>nil, "SmsUrl"=>nil, "PhoneNumber"=>"4253954994", "AccountSid"=>"AC6c25b3d8b4f0a2a4e49e4936398a2180", "Capabilities"=>{"SMS"=>"false", "Voice"=>"false"}, "Method"=>"POST", "Sid"=>"PNc939a026d5a332d22c23ca94a161ce29", "DateUpdated"=>"Sat, 20 Mar 2010 17:52:33 -0700", "DateCreated"=>"Sat, 20 Mar 2010 17:52:33 -0700", "Url"=>nil, "FriendlyName"=>"(425) 395-4994", "VoiceFallbackUrl"=>nil, "SmsFallbackMethod"=>"POST", "VoiceCallerIdLookup"=>"false", "SmsMethod"=>"POST", "VoiceFallbackMethod"=>"POST"}]
       def incoming_numbers( reset = false )
         if( @incoming_numbers.nil? || reset )
           response = 
-            make_request( File.join( base_uri, 'IncomingPhoneNumbers' ), 'GET' )
+            request( 'IncomingPhoneNumbers', 'GET' )
           
           if( 200 == response.code.to_i )
-            @raw_incoming_numbers = Hpricot( response.body ) 
+            @raw_incoming_numbers = Hash.from_xml( response.body ) 
           else
             raise "got response code #{response.code} and body #{response.body}"
           end
-          @incoming_numbers = @raw_incoming_numbers.search( '//phonenumber').
-            collect{|j| j.inner_html}
+          @incoming_numbers = [@raw_incoming_numbers['TwilioResponse']['IncomingPhoneNumbers']['IncomingPhoneNumber']].flatten # returns an array even when it's a single entry
         end
         return @incoming_numbers
       end
@@ -95,8 +94,7 @@ module Trails
       def outgoing_numbers( reset = false )
         if( @outgoing_numbers.nil? || reset )
           response = 
-            make_request( "/2008-08-01/Accounts/#{@sid}/OutgoingCallerIds",
-                          'GET' )
+            request( 'OutgoingCallerIds', 'GET' )
           @outgoing_numbers_raw = Hpricot( response.body ) if( 200 == response.code.to_i )
           @outgoing_numbers = @outgoing_numbers_raw.search( '//phonenumber').
             collect{|j| j.inner_html}
@@ -104,6 +102,55 @@ module Trails
         return @outgoing_numbers
       end
 
+      # options:         [:area_code, :friendly_name, :url, :sms_url]
+      # sameple return:
+      #    {"SmsFallbackUrl"=>nil,
+      #       "SmsUrl"=>nil,
+      #       "PhoneNumber"=>"4253954994",
+      #       "AccountSid"=>"AC6c25b3d8b4f0a2a4e49e4936398a2180",
+      #       "Capabilities"=>{"SMS"=>"false",
+      #       "Voice"=>"false"},
+      #       "Method"=>"POST",
+      #       "Sid"=>"PNc939a026d5a332d22c23ca94a161ce29",
+      #       "DateUpdated"=>"Sat,
+      #       20 Mar 2010 17:52:33 -0700",
+      #       "DateCreated"=>"Sat,
+      #       20 Mar 2010 17:52:33 -0700",
+      #       "Url"=>nil,
+      #       "FriendlyName"=>"(425) 395-4994",
+      #       "VoiceFallbackUrl"=>nil,
+      #       "SmsFallbackMethod"=>"POST",
+      #       "VoiceCallerIdLookup"=>"false",
+      #       "SmsMethod"=>"POST",
+      #       "VoiceFallbackMethod"=>"POST"}
+      def provision_number( options = {} )
+        params = {}
+        [:area_code, :friendly_name, :url, :sms_url].each do |key|
+          params[key.to_s.camelize] = options[key] if options.has_key?( key )
+        end
+
+        response = request( 'IncomingPhoneNumbers/Local', 'POST', params )
+        if( 201 == response.code.to_i )
+          raw_number_response = Hash.from_xml( response.body )
+        else
+          raise "while trying to acquire a new number, got response #{response.code} and body: #{response.body}"
+        end
+        raw_number_response["TwilioResponse"]["IncomingPhoneNumber"]
+      end
+
+      def release_number( sid )
+        request( File.join( 'IncomingPhoneNumbers', sid ), 'DELETE' )
+      end
+
+      # just specify the resource (e.g. 'Calls' ) and it will
+      # append it to the base uri ("/#{api_version}/Accounts/#{sid}/")
+      # and then call twilio.
+      def request( resource, method = 'GET', params = {})
+        url = File.join( base_uri, resource )
+        make_request( url, method, params )
+      end
+    
+
       protected
 
       

data/lib/trails/twilio/call_handling.rb

@@ -5,7 +5,7 @@ module Trails
         raise "can\'t include #{self} in #{klass} - not a Controller?" unless 
           klass.respond_to?( :before_filter )
         Mime::Type.register_alias( "text/html", :twiml ) unless Mime.const_defined?( 'TWIML' )
-        klass.send( :before_filter, :setup_incoming_call )
+        klass.send( :prepend_before_filter, :setup_incoming_call )
         klass.send( :attr_reader, :incoming_call )
         klass.send( :alias_method_chain, :protect_against_forgery?, :twilio )
         klass.send( :append_view_path, File.expand_path( File.join( File.dirname( __FILE__ ), 
@@ -29,7 +29,7 @@ module Trails
 
       def setup_incoming_call
         return unless is_twilio_call?
-        logger.debug( "at the beginning, request.params = #{request.parameters}" )
+        logger.debug{ "at the beginning, request.params = #{request.parameters}" }
         request.format = :twiml
         response.content_type = 'text/xml'
 

data/lib/trails/twilio/incoming.rb

@@ -8,7 +8,7 @@ module Trails
       end
 
       def twilio_data
-        @twilio_data ||= request.params.slice( INCOMING_VARS ).dup
+        request.params.slice( *INCOMING_VARS ).dup
       end
 
       def is_sms?
@@ -47,14 +47,14 @@ module Trails
                        'To',             #
                        'Body',           # 160 chars
 
-                      ]
+                      ].freeze
       public
       INCOMING_VARS.uniq.each do |pname|
         mname = pname.gsub( /[A-Z]/ ) { |s| "_#{s.downcase}" }.gsub( /^_/, '' )
         # some extra debugging code here:
         # ActionController::Base.logger.debug{ "defining method: #{mname} for param #{pname}" }
         define_method( mname ) do
-          return request.params[ pname ]
+          return request.params[ pname ] || request.env["HTTP_X_TWILIO_#{pname.upcase}"]
         end # define_method
       end # each 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: trails
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors: 
 - Hemant Bhanoo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-18 00:00:00 -07:00
+date: 2010-04-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.3
+        version: 2.0.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: gemcutter
@@ -56,7 +56,6 @@ extra_rdoc_files:
 - Manifest.txt
 - README.txt
 files: 
-- .autotest
 - History.txt
 - Manifest.txt
 - README.txt

data/.autotest

@@ -1,23 +0,0 @@
-# -*- ruby -*-
-
-require 'autotest/restart'
-
-# Autotest.add_hook :initialize do |at|
-#   at.extra_files << "../some/external/dependency.rb"
-#
-#   at.libs << ":../some/external"
-#
-#   at.add_exception 'vendor'
-#
-#   at.add_mapping(/dependency.rb/) do |f, _|
-#     at.files_matching(/test_.*rb$/)
-#   end
-#
-#   %w(TestA TestB).each do |klass|
-#     at.extra_class_map[klass] = "test/test_misc.rb"
-#   end
-# end
-
-# Autotest.add_hook :run_command do |at|
-#   system "rake build"
-# end