punchblock 0.7.0 → 0.7.1

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # develop
 
+# v0.7.1 - 2011-11-24
+  * [FEATURE] Add `Connection#not_ready!`, to instruct the server not to send any more offers.
+  * [BUGFIX] Translate all exceptions raised by the XMPP connection into a ProtocolError
+  * [UPDATE] Blather dependency to >= 0.5.9
+
 # v0.7.0 - 2011-11-22
   * Bugfix: Some spec mistakes
   * Feature: Allow execution of actions against global components on Asterisk

data/Rakefile

@@ -1,6 +1,6 @@
 require 'rubygems'
-require 'bundler'
-Bundler::GemHelper.install_tasks
+require 'bundler/gem_tasks'
+require 'bundler/setup'
 
 require 'rspec/core'
 require 'rspec/core/rake_task'

data/lib/punchblock/connection/generic_connection.rb

@@ -6,7 +6,9 @@ module Punchblock
       end
 
       def ready!
+      end
 
+      def not_ready!
       end
     end
   end

data/lib/punchblock/connection/xmpp.rb

@@ -76,7 +76,7 @@ module Punchblock
       def connect
         begin
           EM.run { client.run }
-        rescue Blather::SASLError, Blather::StreamError => e
+        rescue => e
           raise ProtocolError.new(e.class.to_s, e.message)
         end
       end
@@ -91,14 +91,23 @@ module Punchblock
       end
 
       def ready!
-        status = Blather::Stanza::Presence::Status.new :chat
-        status.to = @rayo_domain
-        client.write status
+        send_presence :chat
+        super
+      end
+
+      def not_ready!
+        send_presence :dnd
         super
       end
 
       private
 
+      def send_presence(presence)
+        status = Blather::Stanza::Presence::Status.new presence
+        status.to = @rayo_domain
+        client.write status
+      end
+
       def handle_presence(p)
         throw :pass unless p.rayo_event?
         pb_logger.info "Receiving event for call ID #{p.call_id}"

data/lib/punchblock/version.rb

@@ -1,3 +1,3 @@
 module Punchblock
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/punchblock.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.7") if s.respond_to? :required_rubygems_version=
 
   s.add_runtime_dependency %q<niceogiri>, [">= 0.0.4"]
-  s.add_runtime_dependency %q<blather>, [">= 0.5.7"]
+  s.add_runtime_dependency %q<blather>, [">= 0.5.9"]
   s.add_runtime_dependency %q<activesupport>, [">= 2.1.0"]
   s.add_runtime_dependency %q<state_machine>, [">= 1.0.1"]
   s.add_runtime_dependency %q<future-resource>, [">= 0.0.2"]

data/spec/punchblock/connection/xmpp_spec.rb

@@ -81,6 +81,26 @@ module Punchblock
         say.component_id.should == 'fgh4590'
       end
 
+      it 'should send a "Chat" presence when ready' do
+        client = connection.send :client
+        client.expects(:write).once.with do |stanza|
+          stanza.to.should == 'call.rayo.net' &&
+            stanza.is_a?(Blather::Stanza::Presence::Status) &&
+            stanza.chat?
+        end
+        connection.ready!
+      end
+
+      it 'should send a "Do Not Disturb" presence when not_ready' do
+        client = connection.send :client
+        client.expects(:write).once.with do |stanza|
+          stanza.to.should == 'call.rayo.net' &&
+            stanza.is_a?(Blather::Stanza::Presence::Status) &&
+            stanza.dnd?
+        end
+        connection.not_ready!
+      end
+
       describe '#handle_presence' do
         let :offer_xml do
           <<-MSG

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: punchblock
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-22 00:00:00.000000000 Z
+date: 2011-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: niceogiri
-  requirement: &2152241520 !ruby/object:Gem::Requirement
+  requirement: &2169359040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,21 +23,21 @@ dependencies:
         version: 0.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *2152241520
+  version_requirements: *2169359040
 - !ruby/object:Gem::Dependency
   name: blather
-  requirement: &2152240540 !ruby/object:Gem::Requirement
+  requirement: &2169357700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.7
+        version: 0.5.9
   type: :runtime
   prerelease: false
-  version_requirements: *2152240540
+  version_requirements: *2169357700
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2152237640 !ruby/object:Gem::Requirement
+  requirement: &2169356540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152237640
+  version_requirements: *2169356540
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &2152235840 !ruby/object:Gem::Requirement
+  requirement: &2169355640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2152235840
+  version_requirements: *2169355640
 - !ruby/object:Gem::Dependency
   name: future-resource
-  requirement: &2152460240 !ruby/object:Gem::Requirement
+  requirement: &2169355140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152460240
+  version_requirements: *2169355140
 - !ruby/object:Gem::Dependency
   name: has-guarded-handlers
-  requirement: &2152456100 !ruby/object:Gem::Requirement
+  requirement: &2169354420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152456100
+  version_requirements: *2169354420
 - !ruby/object:Gem::Dependency
   name: celluloid
-  requirement: &2152468640 !ruby/object:Gem::Requirement
+  requirement: &2169353200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152468640
+  version_requirements: *2169353200
 - !ruby/object:Gem::Dependency
   name: ruby_ami
-  requirement: &2152466340 !ruby/object:Gem::Requirement
+  requirement: &2169352440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: 0.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *2152466340
+  version_requirements: *2169352440
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152477180 !ruby/object:Gem::Requirement
+  requirement: &2169368900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -111,10 +111,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152477180
+  version_requirements: *2169368900
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152471200 !ruby/object:Gem::Requirement
+  requirement: &2169367920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,10 +122,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *2152471200
+  version_requirements: *2169367920
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2152483240 !ruby/object:Gem::Requirement
+  requirement: &2169366660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,10 +133,10 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *2152483240
+  version_requirements: *2169366660
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2152495500 !ruby/object:Gem::Requirement
+  requirement: &2169365560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -144,10 +144,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *2152495500
+  version_requirements: *2169365560
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2152493260 !ruby/object:Gem::Requirement
+  requirement: &2169364020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -155,10 +155,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152493260
+  version_requirements: *2169364020
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152489000 !ruby/object:Gem::Requirement
+  requirement: &2169363080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -166,10 +166,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152489000
+  version_requirements: *2169363080
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2152501500 !ruby/object:Gem::Requirement
+  requirement: &2169362260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -177,10 +177,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152501500
+  version_requirements: *2169362260
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2152499180 !ruby/object:Gem::Requirement
+  requirement: &2169377820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -188,10 +188,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152499180
+  version_requirements: *2169377820
 - !ruby/object:Gem::Dependency
   name: countdownlatch
-  requirement: &2152495980 !ruby/object:Gem::Requirement
+  requirement: &2169377080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -199,10 +199,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152495980
+  version_requirements: *2169377080
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2152510640 !ruby/object:Gem::Requirement
+  requirement: &2169375900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -210,7 +210,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152510640
+  version_requirements: *2169375900
 description: Like Rack is to Rails and Sinatra, Punchblock provides a consistent API
   on top of several underlying third-party call control protocols.
 email: punchblock@adhearsion.com
@@ -356,6 +356,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1064139490941906549
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -412,4 +415,3 @@ test_files:
 - spec/punchblock/translator/asterisk/component_spec.rb
 - spec/punchblock/translator/asterisk_spec.rb
 - spec/spec_helper.rb
-has_rdoc: