incoming.rb in trails-1.1.3

- old
+ new

@@ -6,11 +6,11 @@
         @request = request
         @account = Trails::Twilio::Account.from_request( request )
       end
 
       def twilio_data
-        @twilio_data ||= request.params.slice( INCOMING_VARS ).dup
+        request.params.slice( *INCOMING_VARS ).dup
       end
 
       def is_sms?
         !sms_message_sid.blank?
       end
@@ -45,17 +45,17 @@
                        'AccountSid',     # Account ID
                        'From',           # 
                        '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 
 
     end #
   end # module Twilio