ruby_ami 0.1.1 → 0.1.2

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # develop
 
+# 0.1.2
+  * Bugfix: Prevent stream connection status events being passed up to the consumer event handler
+  * Bugfix: Corrected the README usage docs
+  * Bugfix: Alias Logger#trace to Logger#debug if the consumer is using a simple logger without a trace level
+
 # 0.1.1
   * Bugfix: Make countdownlatch and i18n runtime dependencies
   * Bugfig: Include the generated lexer file in the gem

data/README.md

@@ -8,26 +8,23 @@ RubyAMI is an AMI client library in Ruby and based on EventMachine with the sole
 ```ruby
 require 'ruby_ami'
 
-class MyAMIClient < RubyAMI::Client
-  def on_connect
-    puts "AMI Connected successfully"
-    write_action "Originate", ...some options...
-  end
-
-  def handle_event(event)
-    puts "Received an AMI event: #{event}"
-  end
-
-  def handle_error(error)
-    ...similar here...
-  end
-
-  def handle_response(response)
-    ...similar here...
+include RubyAMI
+
+client = Client.new :username       => 'test',
+                    :password       => 'test',
+                    :host           => '127.0.0.1',
+                    :port           => 5038,
+                    :event_handler  => lambda { |e| handle_event e },
+                    :logger         => Logger.new('ruby_ami.log')
+
+def handle_event(event)
+  case event.name
+  when 'FullyBooted'
+    client.send_action 'Originate', 'Channel' => 'SIP/foo'
   end
 end
 
-EM.run { MyAMIClient.run '127.0.0.1', 5038, 'admin', 'password' }
+client.start
 ```
 
 ## Links:

data/lib/ruby_ami/client.rb

@@ -90,12 +90,13 @@ module RubyAMI
 
     def handle_event(event)
       logger.trace "[RECV-EVENTS]: #{event.inspect}" if logger
-      pass_event event
       case event
       when Stream::Connected
         login_events
       when Stream::Disconnected
         unbind
+      else
+        pass_event event
       end
     end
 

data/lib/ruby_ami/version.rb

@@ -1,3 +1,3 @@
 module RubyAMI
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/ruby_ami.rb

@@ -15,6 +15,10 @@
   ruby_ami/metaprogramming
 }.each { |f| require f }
 
+class Logger
+  alias :trace :debug
+end
+
 module RubyAMI
   extend ActiveSupport::Autoload
 

data/spec/ruby_ami/client_spec.rb

@@ -84,6 +84,8 @@ module RubyAMI
           end
 
           subject.handle_event Stream::Connected.new
+
+          event_handler.should be_empty
         end
       end
     end
@@ -92,6 +94,7 @@ module RubyAMI
       it 'should unbind' do
         subject.expects(:unbind).once
         subject.handle_event Stream::Disconnected.new
+        event_handler.should be_empty
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_ami
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2164856540 !ruby/object:Gem::Requirement
+  requirement: &2168838980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *2164856540
+  version_requirements: *2168838980
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &2164855280 !ruby/object:Gem::Requirement
+  requirement: &2168838460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164855280
+  version_requirements: *2168838460
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2164854540 !ruby/object:Gem::Requirement
+  requirement: &2168837740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164854540
+  version_requirements: *2168837740
 - !ruby/object:Gem::Dependency
   name: future-resource
-  requirement: &2164853780 !ruby/object:Gem::Requirement
+  requirement: &2168837020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164853780
+  version_requirements: *2168837020
 - !ruby/object:Gem::Dependency
   name: girl_friday
-  requirement: &2164852500 !ruby/object:Gem::Requirement
+  requirement: &2168836320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164852500
+  version_requirements: *2168836320
 - !ruby/object:Gem::Dependency
   name: countdownlatch
-  requirement: &2164852020 !ruby/object:Gem::Requirement
+  requirement: &2168835000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2164852020
+  version_requirements: *2168835000
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2164851500 !ruby/object:Gem::Requirement
+  requirement: &2168833400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164851500
+  version_requirements: *2168833400
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2164850980 !ruby/object:Gem::Requirement
+  requirement: &2168832740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2164850980
+  version_requirements: *2168832740
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2164850420 !ruby/object:Gem::Requirement
+  requirement: &2168831600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *2164850420
+  version_requirements: *2168831600
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2164849900 !ruby/object:Gem::Requirement
+  requirement: &2168813300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164849900
+  version_requirements: *2168813300
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2164849400 !ruby/object:Gem::Requirement
+  requirement: &2168812140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *2164849400
+  version_requirements: *2168812140
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2164848720 !ruby/object:Gem::Requirement
+  requirement: &2168810900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *2164848720
+  version_requirements: *2168810900
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2164848020 !ruby/object:Gem::Requirement
+  requirement: &2168809620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164848020
+  version_requirements: *2168809620
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2164846940 !ruby/object:Gem::Requirement
+  requirement: &2168809100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164846940
+  version_requirements: *2168809100
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2164846340 !ruby/object:Gem::Requirement
+  requirement: &2168808600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164846340
+  version_requirements: *2168808600
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2164845360 !ruby/object:Gem::Requirement
+  requirement: &2168808100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164845360
+  version_requirements: *2168808100
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  requirement: &2164844160 !ruby/object:Gem::Requirement
+  requirement: &2168807580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164844160
+  version_requirements: *2168807580
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2164843760 !ruby/object:Gem::Requirement
+  requirement: &2168807200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,7 +208,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164843760
+  version_requirements: *2168807200
 description: A Ruby client library for the Asterisk Management Interface build on
   eventmachine.
 email: