ruby_ami 1.2.3 → 1.2.4

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # [develop](https://github.com/adhearsion/ruby_ami)
 
+# [1.2.4](https://github.com/adhearsion/ruby_ami/compare/v1.2.3...v1.2.4) - [2012-10-13](https://rubygems.org/gems/ruby_ami/versions/1.2.4)
+  * Bugfix: No longer suffer "invalid byte sequence" exceptions due to encoding mismatch. Thanks tboyko
+
 # [1.2.3](https://github.com/adhearsion/ruby_ami/compare/v1.2.2...v1.2.3) - [2012-09-20](https://rubygems.org/gems/ruby_ami/versions/1.2.3)
   * Streams now inherit the client's logger
 

data/lib/ruby_ami/async_agi_environment_parser.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'cgi'
 
 module RubyAMI

data/lib/ruby_ami/client.rb

@@ -1,10 +1,11 @@
+# encoding: utf-8
 module RubyAMI
   class Client
     attr_reader :options, :action_queue, :events_stream, :actions_stream
 
     def initialize(options)
       @options          = options
-      @logger           = options[:logger]
+      @logger           = options[:logger] || Logger.new(STDOUT)
       @logger.level     = options[:log_level] || Logger::DEBUG if @logger
       @event_handler    = @options[:event_handler]
       @state            = :stopped

data/lib/ruby_ami/error.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module RubyAMI
   class Error < StandardError
     attr_accessor :message, :action
@@ -22,4 +23,4 @@ module RubyAMI
       "#<#{self.class} #{[:message, :headers].map { |c| "#{c}=#{self.__send__(c).inspect rescue nil}" }.compact * ', '}>"
     end
   end
-end # RubyAMI
+end # RubyAMI

data/lib/ruby_ami/event.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'ruby_ami/response'
 
 module RubyAMI

data/lib/ruby_ami/lexer.rb

@@ -1,5 +1,6 @@
 
 # line 1 "lib/ruby_ami/lexer.rl.rb"
+# encoding: utf-8
 module RubyAMI
   class Lexer
 
@@ -27,20 +28,20 @@ module RubyAMI
       ]
 
     
-# line 68 "lib/ruby_ami/lexer.rl.rb"
+# line 69 "lib/ruby_ami/lexer.rl.rb"
 ##
 
     attr_accessor :ami_version
 
     def initialize(delegate = nil)
       @delegate = delegate
-      @data = ""
+      @data = ''.encode('ISO-8859-1', 'ISO-8859-1')
       @current_pointer = 0
       @ragel_stack = []
       @ami_version = 0.0
 
       
-# line 44 "lib/ruby_ami/lexer.rb"
+# line 45 "lib/ruby_ami/lexer.rb"
 class << self
 	attr_accessor :_ami_protocol_parser_actions
 	private :_ami_protocol_parser_actions, :_ami_protocol_parser_actions=
@@ -857,7 +858,7 @@ end
 self.ami_protocol_parser_en_response_follows = 268;
 
 
-# line 861 "lib/ruby_ami/lexer.rb"
+# line 862 "lib/ruby_ami/lexer.rb"
 begin
 	     @current_pointer ||= 0
 	    @data_ending_pointer ||=   @data.length
@@ -868,7 +869,7 @@ begin
 	   @ragel_act = 0
 end
 
-# line 96 "lib/ruby_ami/lexer.rl.rb"
+# line 97 "lib/ruby_ami/lexer.rl.rb"
 ##
     end
 
@@ -879,7 +880,7 @@ end
 
     def resume!
       
-# line 883 "lib/ruby_ami/lexer.rb"
+# line 884 "lib/ruby_ami/lexer.rb"
 begin
 	_klen, _trans, _keys, _acts, _nacts = nil
 	_goto_level = 0
@@ -913,7 +914,7 @@ begin
 		begin
     @token_start =      @current_pointer
 		end
-# line 917 "lib/ruby_ami/lexer.rb"
+# line 918 "lib/ruby_ami/lexer.rb"
 		end # from state action switch
 	end
 	if _trigger_goto
@@ -981,87 +982,87 @@ begin
 			_acts += 1
 			case _ami_protocol_parser_actions[_acts - 1]
 when 0 then
-# line 33 "lib/ruby_ami/lexer.rl.rb"
+# line 34 "lib/ruby_ami/lexer.rl.rb"
 		begin
  init_success 		end
 when 1 then
-# line 35 "lib/ruby_ami/lexer.rl.rb"
+# line 36 "lib/ruby_ami/lexer.rl.rb"
 		begin
  init_response_follows 		end
 when 2 then
-# line 37 "lib/ruby_ami/lexer.rl.rb"
+# line 38 "lib/ruby_ami/lexer.rl.rb"
 		begin
  init_error 		end
 when 3 then
-# line 39 "lib/ruby_ami/lexer.rl.rb"
+# line 40 "lib/ruby_ami/lexer.rl.rb"
 		begin
  message_received @current_message 		end
 when 4 then
-# line 40 "lib/ruby_ami/lexer.rl.rb"
+# line 41 "lib/ruby_ami/lexer.rl.rb"
 		begin
    error_received @current_message 		end
 when 5 then
-# line 42 "lib/ruby_ami/lexer.rl.rb"
+# line 43 "lib/ruby_ami/lexer.rl.rb"
 		begin
  version_starts 		end
 when 6 then
-# line 43 "lib/ruby_ami/lexer.rl.rb"
+# line 44 "lib/ruby_ami/lexer.rl.rb"
 		begin
  version_stops  		end
 when 7 then
-# line 45 "lib/ruby_ami/lexer.rl.rb"
+# line 46 "lib/ruby_ami/lexer.rl.rb"
 		begin
  key_starts 		end
 when 8 then
-# line 46 "lib/ruby_ami/lexer.rl.rb"
+# line 47 "lib/ruby_ami/lexer.rl.rb"
 		begin
  key_stops  		end
 when 9 then
-# line 48 "lib/ruby_ami/lexer.rl.rb"
+# line 49 "lib/ruby_ami/lexer.rl.rb"
 		begin
  value_starts 		end
 when 10 then
-# line 49 "lib/ruby_ami/lexer.rl.rb"
+# line 50 "lib/ruby_ami/lexer.rl.rb"
 		begin
  value_stops  		end
 when 11 then
-# line 51 "lib/ruby_ami/lexer.rl.rb"
+# line 52 "lib/ruby_ami/lexer.rl.rb"
 		begin
  error_reason_starts 		end
 when 12 then
-# line 52 "lib/ruby_ami/lexer.rl.rb"
+# line 53 "lib/ruby_ami/lexer.rl.rb"
 		begin
  error_reason_stops  		end
 when 13 then
-# line 54 "lib/ruby_ami/lexer.rl.rb"
+# line 55 "lib/ruby_ami/lexer.rl.rb"
 		begin
  syntax_error_starts 		end
 when 14 then
-# line 55 "lib/ruby_ami/lexer.rl.rb"
+# line 56 "lib/ruby_ami/lexer.rl.rb"
 		begin
  syntax_error_stops  		end
 when 15 then
-# line 57 "lib/ruby_ami/lexer.rl.rb"
+# line 58 "lib/ruby_ami/lexer.rl.rb"
 		begin
  immediate_response_starts 		end
 when 16 then
-# line 58 "lib/ruby_ami/lexer.rl.rb"
+# line 59 "lib/ruby_ami/lexer.rl.rb"
 		begin
  immediate_response_stops  		end
 when 17 then
-# line 60 "lib/ruby_ami/lexer.rl.rb"
+# line 61 "lib/ruby_ami/lexer.rl.rb"
 		begin
  follows_text_starts 		end
 when 18 then
-# line 61 "lib/ruby_ami/lexer.rl.rb"
+# line 62 "lib/ruby_ami/lexer.rl.rb"
 		begin
  follows_text_stops  		end
 when 19 then
-# line 63 "lib/ruby_ami/lexer.rl.rb"
+# line 64 "lib/ruby_ami/lexer.rl.rb"
 		begin
  event_name_starts 		end
 when 20 then
-# line 64 "lib/ruby_ami/lexer.rl.rb"
+# line 65 "lib/ruby_ami/lexer.rl.rb"
 		begin
  event_name_stops  		end
 when 21 then
@@ -1385,7 +1386,7 @@ end
 end
 end 
 			end
-# line 1389 "lib/ruby_ami/lexer.rb"
+# line 1390 "lib/ruby_ami/lexer.rb"
 			end # action switch
 		end
 	end
@@ -1410,7 +1411,7 @@ when 29 then
 		begin
    @ragel_act = 0
 		end
-# line 1414 "lib/ruby_ami/lexer.rb"
+# line 1415 "lib/ruby_ami/lexer.rb"
 		end # to state action switch
 	end
 	if _trigger_goto
@@ -1441,7 +1442,7 @@ end
 	end
 	end
 
-# line 105 "lib/ruby_ami/lexer.rl.rb"
+# line 106 "lib/ruby_ami/lexer.rl.rb"
 ##
     end
 
@@ -1464,7 +1465,7 @@ end
         @data.slice! 0...length
         adjust_pointers -length
       end
-      @data << new_data
+      @data << new_data.encode('ISO-8859-1', 'ISO-8859-1')
       @data_ending_pointer = @data.size
     end
 

data/lib/ruby_ami/lexer.rl.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module RubyAMI
   class Lexer
 
@@ -71,7 +72,7 @@ module RubyAMI
 
     def initialize(delegate = nil)
       @delegate = delegate
-      @data = ""
+      @data = ''.encode('ISO-8859-1', 'ISO-8859-1')
       @current_pointer = 0
       @ragel_stack = []
       @ami_version = 0.0
@@ -124,7 +125,7 @@ module RubyAMI
         @data.slice! 0...length
         adjust_pointers -length
       end
-      @data << new_data
+      @data << new_data.encode('ISO-8859-1', 'ISO-8859-1')
       @data_ending_pointer = @data.size
     end
 

data/lib/ruby_ami/metaprogramming.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 class Object
   def metaclass
     class << self

data/lib/ruby_ami/response.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module RubyAMI
   ##
   # This is the object containing a response from Asterisk.

data/lib/ruby_ami/stream.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module RubyAMI
   class Stream
     class ConnectionStatus

data/lib/ruby_ami/version.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module RubyAMI
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end

data/spec/ruby_ami/action_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec_helper'
 
 module RubyAMI

data/spec/ruby_ami/agi_result_parser_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec_helper'
 
 module RubyAMI

data/spec/ruby_ami/async_agi_environment_parser_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec_helper'
 
 module RubyAMI

data/spec/ruby_ami/client_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec_helper'
 
 module RubyAMI

data/spec/ruby_ami/error_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec_helper'
 
 module RubyAMI

data/spec/ruby_ami/event_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec_helper'
 
 module RubyAMI

data/spec/ruby_ami/response_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec_helper'
 
 module RubyAMI

data/spec/ruby_ami/stream_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'spec_helper'
 
 module RubyAMI

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 begin
   require 'simplecov'
   require 'simplecov-rcov'

data/spec/support/mock_server.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 MockServer = Class.new
 
 class ServerMock

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_ami
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-20 00:00:00.000000000 Z
+date: 2012-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-io
@@ -330,7 +330,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -814081533276479548
+      hash: -2097569653935330103
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -339,7 +339,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -814081533276479548
+      hash: -2097569653935330103
 requirements: []
 rubyforge_project: ruby_ami
 rubygems_version: 1.8.23