punchblock 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60e6ce85c4eb99dac8e18f5b06f868e13562fa64
-  data.tar.gz: 70ce395958873bbb5078caf5bd9ba517015d4e35
+  metadata.gz: a847554d66bf45ee14cc93803271b60890cfff96
+  data.tar.gz: 43d698af41a3b374c3b39bacdf29dbce822020bc
 SHA512:
-  metadata.gz: deb55ad4aa2888d889f33b55c769d567b837849475fd594ba9e8a07b3628d43880ccb25ef8e9ea1d05889481b4c423b994ce15cad5fe015791baa3525b3f11a5
-  data.tar.gz: 758ccbfed733614dbede05e2dd94525103085c7b5a0b6cf5e0bccb6e89f024e93a802716ae862157c6d87dd3d9a5a97d18444fe0673b471ddfc1520598a42a3c
+  metadata.gz: 6c9373c2cb2e3831e1938924197c8c141fda152423a4f985e9f3c84c38f099185cdeaeed8275f8e111c2d9f77dd39c4caad635b9031fe63786b09eb3fb53d6df
+  data.tar.gz: 6474dd87f25053eb002212c18744f2c216cc153c4d9df1b7938f4e45faa224988b6f5ff296b4729bbd0c538887e43897aac1c9fff83f3eccc995fc726793a313

data/.travis.yml

@@ -11,6 +11,6 @@ matrix:
   allow_failures:
     - rvm: 1.9.2
     - rvm: ruby-head
-    - rvm: rbx-19mode
+    - rvm: rbx-2.1.1
 notifications:
   irc: "irc.freenode.org#adhearsion"

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # [develop](https://github.com/adhearsion/punchblock)
 
+# [v2.3.0](https://github.com/adhearsion/punchblock/compare/v2.2.2...v2.3.0) - [2014-01-30](https://rubygems.org/gems/punchblock/versions/2.3.0)
+  * Feature: Add input-timers-started event
+  * Feature: Allow client to send XMPP messages through Blather
+  * Bugfix: Ensure that max duration expiration of Asterisk recordings does not crash the translator when it extends past the call's destruction
+
 # [v2.2.2](https://github.com/adhearsion/punchblock/compare/v2.2.1...v2.2.2) - [2014-01-21](https://rubygems.org/gems/punchblock/versions/2.2.2)
   * Bugfix: Delay sending Answered event on call until AsyncAGI is invoked
 

data/lib/punchblock/client.rb

@@ -10,7 +10,7 @@ module Punchblock
 
     attr_reader :connection, :component_registry
 
-    delegate :run, :stop, :to => :connection
+    delegate :run, :stop, :send_message, :to => :connection
 
     # @param [Hash] options
     # @option options [Connection::XMPP] :connection The Punchblock connection to use for this session

data/lib/punchblock/command_node.rb

@@ -31,6 +31,7 @@ module Punchblock
       return if @response.set_yet?
       @response.resource = other
       execute!
+    rescue FutureResource::ResourceAlreadySetException
     end
   end # CommandNode
 end # Punchblock

data/lib/punchblock/connection/xmpp.rb

@@ -69,6 +69,13 @@ module Punchblock
         end
       end
 
+      def send_message(call_id, domain, body, options = {})
+        jid = Blather::JID.new(call_id, domain || root_domain).to_s
+        message = Blather::Stanza::Message.new(jid, body, :normal)
+        message.subject = options[:subject]
+        client.write message
+      end
+
       ##
       # Fire up the connection
       #

data/lib/punchblock/event.rb

@@ -14,6 +14,7 @@ end
   joined
   offer
   ringing
+  input_timers_started
   unjoined
   started_speaking
   stopped_speaking

data/lib/punchblock/event/input_timers_started.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+
+module Punchblock
+  class Event
+    class InputTimersStarted < Event
+      register :'input-timers-started', :prompt
+    end
+  end
+end

data/lib/punchblock/translator/asterisk/ami_error_converter.rb

@@ -4,12 +4,12 @@ module Punchblock
   module Translator
     class Asterisk
       module AMIErrorConverter
-        def self.convert
+        def self.convert(result = ->(e) { raise ChannelGoneError, e.message } )
           yield
         rescue RubyAMI::Error => e
           case e.message
           when 'No such channel', /Channel (\S+) does not exist./
-            raise ChannelGoneError, e.message
+            result.call e if result
           else
             raise e
           end

data/lib/punchblock/translator/asterisk/component/record.rb

@@ -33,7 +33,7 @@ module Punchblock
             ami_client.send_action 'Monitor', 'Channel' => call.channel, 'File' => filename, 'Format' => @format, 'Mix' => true
             unless max_duration == -1
               call.after max_duration/1000 do
-                ami_client.send_action 'StopMonitor', 'Channel' => call.channel
+                stop
               end
             end
 
@@ -69,6 +69,12 @@ module Punchblock
 
           private
 
+          def stop
+            AMIErrorConverter.convert(nil) do
+              ami_client.send_action 'StopMonitor', 'Channel' => call.channel
+            end
+          end
+
           def filename
             File.join RECORDING_BASE_PATH, id
           end

data/lib/punchblock/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Punchblock
-  VERSION = "2.2.2"
+  VERSION = "2.3.0"
 end

data/spec/punchblock/client_spec.rb

@@ -32,6 +32,14 @@ module Punchblock
       end
     end
 
+    describe '#send_message' do
+      it 'should send a message' do
+        args = [ "someone", "example.org", "Hello World!" ]
+        connection.should_receive(:send_message).with(*args).once
+        subject.send_message *args
+      end
+    end
+
     it 'should handle connection events' do
       subject.should_receive(:handle_event).with(mock_event).once
       connection.event_handler.call mock_event

data/spec/punchblock/connection/xmpp_spec.rb

@@ -124,6 +124,36 @@ module Punchblock
         connection.not_ready!
       end
 
+      describe '#send_message' do
+        it 'should send a "normal" message to the given user and domain' do
+          client = connection.send :client
+          client.should_receive(:write).once.with do |stanza|
+            stanza.to.should be == 'someone@example.org'
+            stanza.should be_a Blather::Stanza::Message
+            stanza.type.should == :normal
+            stanza.body.should be == 'Hello World!'
+            stanza.subject.should be_nil
+          end
+          connection.send_message 'someone', 'example.org', 'Hello World!'
+        end
+
+        it 'should default to the root domain' do
+          client = connection.send :client
+          client.should_receive(:write).once.with do |stanza|
+            stanza.to.should be == 'someone@rayo.net'
+          end
+          connection.send_message "someone", nil, nil
+        end
+
+        it 'should send a message with the given subject' do
+          client = connection.send :client
+          client.should_receive(:write).once.with do |stanza|
+            stanza.subject.should be == "Important Message"
+          end
+          connection.send_message nil, nil, nil, :subject => "Important Message"
+        end
+      end
+
       describe '#handle_presence' do
         let :complete_xml do
           <<-MSG

data/spec/punchblock/event/input_timers_started_spec.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+module Punchblock
+  class Event
+    describe InputTimersStarted do
+      it 'registers itself' do
+        RayoNode.class_from_registration(:'input-timers-started', 'urn:xmpp:rayo:prompt:1').should be == described_class
+      end
+
+      describe "from a stanza" do
+        let(:stanza) { "<input-timers-started xmlns='urn:xmpp:rayo:prompt:1' />" }
+
+        subject { RayoNode.from_xml parse_stanza(stanza).root, '9f00061', '1' }
+
+        it { should be_instance_of described_class }
+
+        it_should_behave_like 'event'
+      end
+    end
+  end
+end

data/spec/punchblock/translator/asterisk/component/record_spec.rb

@@ -297,6 +297,15 @@ module Punchblock
                   sleep 1.2
                 end
 
+                it "should not kill the translator if the channel is down" do
+                  ami_client.should_receive :send_action
+                  error = RubyAMI::Error.new.tap { |e| e.message = 'No such channel' }
+                  ami_client.should_receive(:send_action).once.with('StopMonitor', 'Channel' => channel).and_raise error
+                  subject.execute
+                  sleep 1.2
+                  translator.should be_alive
+                end
+
                 it "sends the correct complete event" do
                   full_filename = "file://#{Record::RECORDING_BASE_PATH}/#{subject.id}.wav"
                   subject.execute

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: punchblock
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Jason Goecke
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -429,6 +429,7 @@ files:
 - lib/punchblock/event/complete.rb
 - lib/punchblock/event/dtmf.rb
 - lib/punchblock/event/end.rb
+- lib/punchblock/event/input_timers_started.rb
 - lib/punchblock/event/joined.rb
 - lib/punchblock/event/offer.rb
 - lib/punchblock/event/ringing.rb
@@ -504,6 +505,7 @@ files:
 - spec/punchblock/event/complete_spec.rb
 - spec/punchblock/event/dtmf_spec.rb
 - spec/punchblock/event/end_spec.rb
+- spec/punchblock/event/input_timers_started_spec.rb
 - spec/punchblock/event/joined_spec.rb
 - spec/punchblock/event/offer_spec.rb
 - spec/punchblock/event/ringing_spec.rb
@@ -592,6 +594,7 @@ test_files:
 - spec/punchblock/event/complete_spec.rb
 - spec/punchblock/event/dtmf_spec.rb
 - spec/punchblock/event/end_spec.rb
+- spec/punchblock/event/input_timers_started_spec.rb
 - spec/punchblock/event/joined_spec.rb
 - spec/punchblock/event/offer_spec.rb
 - spec/punchblock/event/ringing_spec.rb