adhearsion 0.8.2 → 0.8.3

data/lib/adhearsion/voip/asterisk/manager_interface/ami_lexer.rl.rb

@@ -193,7 +193,8 @@ module Adhearsion
           end
   
           def follows_text_stops
-            text = @data[@last_seen_value_end..(@current_pointer - "\r\n--END COMMAND--".size)]
+            text = @data[@last_seen_value_end..@current_pointer]
+            text.sub! /\r?\n--END COMMAND--/, ""
             @current_message.text_body = text
             @follows_text_start = nil
           end
@@ -283,4 +284,4 @@ VVVVVVVVVVVVVVVVVVVVVVVVVVVVV
       end
     end
   end
-end
+end

data/lib/adhearsion/voip/asterisk/manager_interface/ami_protocol_lexer_machine.rl

@@ -24,10 +24,10 @@ rest_of_line = (any* -- crlf); # Match all characters until the next line sepera
 
 Prompt = "Asterisk Call Manager/" digit+ >version_starts "." digit+ %version_stops crlf;
 
-Key = ((alnum | print) -- (cr | lf))+;
+Key = ((alnum | print) -- (cr | lf | ":"))+;
 KeyValuePair = Key >key_starts %key_stops colon rest_of_line >value_starts %value_stops crlf;
 
-FollowsDelimiter = crlf "--END COMMAND--";
+FollowsDelimiter = loose_newline "--END COMMAND--";
 
 Response = "Response"i colon;
 
@@ -81,7 +81,7 @@ success := KeyValuePair* crlf @message_received @{fgoto protocol;};
 response_follows := |*
     KeyValuePair+;
     FollowsBody;
-    crlf @{ message_received; fgoto protocol; };
+    crlf @{ message_received @current_message; fgoto protocol; };
 *|;
  
 }%%

data/lib/adhearsion/voip/call.rb

@@ -318,7 +318,15 @@ module Adhearsion
                   if Adhearsion::VoIP::DSL::NumericalString.starts_with_leading_zero?(value)
                     Adhearsion::VoIP::DSL::NumericalString.new(value)
                   else
-                    is_float ? value.to_f : value.to_i
+                    if is_float
+                      if key == :uniqueid
+                        value
+                      else
+                        value.to_f
+                      end
+                    else
+                      value.to_i
+                    end
                   end
                 else
                   value
@@ -343,9 +351,10 @@ module Adhearsion
           end
           
           def coerce_request_into_uri_object(variables)
-            returning variables do
+            if variables[:request]
               variables[:request] = URI.parse(variables[:request]) unless variables[:request].kind_of? URI
             end
+            variables
           end
           
           def coerce_type_of_number_into_symbol(variables)
@@ -356,7 +365,7 @@ module Adhearsion
 
           def decompose_uri_query_into_hash(variables)
             returning variables do
-              if variables[:request].query
+              if variables[:request] && variables[:request].query
                 variables[:query] = variables[:request].query.split('&').inject({}) do |query_string_parameters, key_value_pair|
                   parameter_name, parameter_value = *key_value_pair.match(/(.+)=(.*)/).captures
                   query_string_parameters[parameter_name] = parameter_value

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: adhearsion
 version: !ruby/object:Gem::Version 
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors: 
 - Jay Phillips
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-21 00:00:00 -06:00
+date: 2008-08-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -152,8 +152,10 @@ files:
 - lib/theatre/version.rb
 - LICENSE
 - Rakefile
-has_rdoc: false
+has_rdoc: true
 homepage: http://adhearsion.com
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -174,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: adhearsion
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Adhearsion, open-source telephony development framework