ruby_ami 1.2.1 → 1.2.2

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # [develop](https://github.com/adhearsion/ruby_ami)
 
+# [1.2.2](https://github.com/adhearsion/ruby_ami/compare/v1.2.1...v1.2.2) - [2012-09-05](https://rubygems.org/gems/ruby_ami/versions/1.2.2)
+  * Streams now log syntax errors
+  * Celluloid dependency updated
+
 # [1.2.1](https://github.com/adhearsion/ruby_ami/compare/v1.2.0...v1.2.1) - [2012-07-19](https://rubygems.org/gems/ruby_ami/versions/1.2.1)
   * Use SecureRandom for UUIDs
 

data/Guardfile

@@ -1,3 +1,7 @@
+guard 'shell', :all_on_start => true do
+  watch("lib/ruby_ami/lexer_machine.rl") { `rake ragel` }
+end
+
 guard 'rspec', :version => 2, :cli => '--format documentation' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }

data/README.md

@@ -27,6 +27,23 @@ end
 client.start
 ```
 
+## Development Requirements
+
+ruby_ami uses [ragel](http://www.complang.org/ragel/) to generate some of it's
+files.
+
+On OS X (if you use homebrew):
+
+    brew install ragel
+
+On Linux:
+
+    apt-get install ragel OR yum install ragel
+
+Once you are inside the repository, before anything else, you will want to run:
+
+    rake ragel
+
 ## Links:
 * [Source](https://github.com/adhearsion/ruby_ami)
 * [Documentation](http://rdoc.info/github/adhearsion/ruby_ami/master/frames)

data/lib/ruby_ami/agi_result_parser.rb

@@ -4,8 +4,8 @@ module RubyAMI
   class AGIResultParser
     attr_reader :code, :result, :data
 
-    FORMAT          = /^(\d{3}) result=(-?\d*) ?(\(?.*\)?)?$/.freeze
-    DATA_KV_FORMAT  = /([\w\d]+)=([\w\d]*)/.freeze
+    FORMAT          = /^(?<code>\d{3}) result=(?<result>-?\d*) ?(?<data>\(?.*\)?)?$/.freeze
+    DATA_KV_FORMAT  = /(?<key>[\w\d]+)=(?<value>[\w\d]*)/.freeze
     DATA_CLEANER    = /(^\()|(\)$)/.freeze
 
     def initialize(result_string)
@@ -16,7 +16,7 @@ module RubyAMI
 
     def data_hash
       return unless data_kv_match
-      {data_kv_match[1] => data_kv_match[2]}
+      {data_kv_match[:key] => data_kv_match[:value]}
     end
 
     private
@@ -30,9 +30,9 @@ module RubyAMI
     end
 
     def parse
-      @code = match[1].to_i
-      @result = match[2].to_i
-      @data = match[3] ? match[3].gsub(DATA_CLEANER, '').freeze : nil
+      @code = match[:code].to_i
+      @result = match[:result].to_i
+      @data = match[:data] ? match[:data].gsub(DATA_CLEANER, '').freeze : nil
     end
 
     def data_kv_match

data/lib/ruby_ami/client.rb

@@ -45,7 +45,7 @@ module RubyAMI
       @actions_stream = new_stream lambda { |message| @message_processor << message }
       streams.each(&:run!)
       @state = :started
-      streams.each(&:join)
+      streams.each { |s| Celluloid::Actor.join s }
     end
 
     def stop

data/lib/ruby_ami/stream.rb

@@ -60,6 +60,10 @@ module RubyAMI
       @event_callback.call message
     end
 
+    def syntax_error_encountered(ignored_chunk)
+      logger.error "Encountered a syntax error. Ignoring chunk: #{ignored_chunk.inspect}"
+    end
+
     alias :error_received :message_received
 
     def finalize

data/lib/ruby_ami/version.rb

@@ -1,3 +1,3 @@
 module RubyAMI
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

data/ruby_ami.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency %q<celluloid-io>, ["~> 0.11.0"]
+  s.add_runtime_dependency %q<celluloid-io>, ["~> 0.12.0"]
   s.add_runtime_dependency %q<future-resource>, [">= 0"]
   s.add_runtime_dependency %q<girl_friday>, [">= 0"]
   s.add_runtime_dependency %q<countdownlatch>, ["~> 1.0"]
@@ -33,5 +33,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency %q<simplecov>, [">= 0"]
   s.add_development_dependency %q<simplecov-rcov>, [">= 0"]
   s.add_development_dependency %q<guard-rspec>
+  s.add_development_dependency %q<guard-shell>
   s.add_development_dependency %q<ruby_gntp>
 end

data/spec/ruby_ami/stream_spec.rb

@@ -28,8 +28,8 @@ module RubyAMI
       @stream = Stream.new '127.0.0.1', server_port, lambda { |m| client.message_received m }
       @stream.run!
       fake_client.call if fake_client.respond_to? :call
-      s.join
-      @stream.join
+      Celluloid::Actor.join s
+      Celluloid::Actor.join @stream
     end
 
     def expect_connected_event

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_ami
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-19 00:00:00.000000000 Z
+date: 2012-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-io
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: future-resource
   requirement: !ruby/object:Gem::Requirement
@@ -235,6 +235,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-shell
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
   requirement: !ruby/object:Gem::Requirement
@@ -314,7 +330,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 486749482907062449
+      hash: -4025771816081059304
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -323,10 +339,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 486749482907062449
+      hash: -4025771816081059304
 requirements: []
 rubyforge_project: ruby_ami
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Futzing with AMI so you don't have to