punchblock 0.4.2 → 0.4.3

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# develop
+
+# v0.4.3
+  * Feature: Support for meta-data on recordings (size & duration)
+  * Feature: Allow specifying all of Blather's setup options (required to use PB as an XMPP component)
+  * Bugfix: Rayo events are discarded if they don't come from the specified domain
+  * Bugfix: Component execution in the sample DSL now doesn't expect events on the main queue
+
 # v0.4.2
   * Bugfix: Conference complete event was not being handled
 

data/Gemfile

@@ -1,2 +1,4 @@
 source :rubygems
 gemspec
+
+gem 'bluecloth' unless RUBY_PLATFORM =~ /java/

data/Rakefile

@@ -17,7 +17,8 @@ RSpec::Core::RakeTask.new(:rcov) do |spec|
 end
 
 task :default => :spec
-task :hudson => ['ci:setup:rspec', :spec]
+task :ci => ['ci:setup:rspec', :spec]
+task :hudson => :ci
 
 require 'yard'
 YARD::Rake::YardocTask.new

data/bin/punchblock-console

@@ -73,7 +73,6 @@ connection_thread = Thread.new do
 end
 
 CALL_QUEUES = {}
-INFO_EVENT_QUEUE = Queue.new
 
 ### DISPATCHER THREAD
 # This thread multiplexes the event stream from the underlying connection handler and routes them
@@ -94,14 +93,11 @@ Thread.new do
       CALL_QUEUES[event.call_id] = Queue.new
       CALL_QUEUES[event.call_id].push event
       run_call connection, event
-    when Event::Info
-      INFO_EVENT_QUEUE.push event
-    when Event::Answered, Event::Complete, Event::End, Event::Ringing
+    when Event
       CALL_QUEUES[event.call_id].push event
     else
       puts "Unknown event: #{event.inspect}"
     end
-
   end
 end
 

data/lib/punchblock.rb

@@ -5,6 +5,19 @@
   has_guarded_handlers
 }.each { |l| require l }
 
+class Hash
+  def select(&block)
+    val = super(&block)
+    if val.is_a?(Array)
+      val = val.inject({}) do |accumulator, element|
+        accumulator[element[0]] = element[1]
+        accumulator
+      end
+    end
+    val
+  end
+end
+
 module Punchblock
   extend ActiveSupport::Autoload
 

data/lib/punchblock/component/record.rb

@@ -201,8 +201,16 @@ module Punchblock
           read_attr :uri
         end
 
+        def duration
+          read_attr :duration, :to_i
+        end
+
+        def size
+          read_attr :size, :to_i
+        end
+
         def inspect_attributes # :nodoc:
-          [:uri] + super
+          [:uri, :duration, :size] + super
         end
       end
 

data/lib/punchblock/connection.rb

@@ -23,11 +23,12 @@ module Punchblock
     #
     def initialize(options = {})
       super
-      raise ArgumentError unless @username = options.delete(:username)
-      raise ArgumentError unless options.has_key? :password
-      @rayo_domain = options[:rayo_domain] || Blather::JID.new(@username).domain
 
-      setup @username, options.delete(:password)
+      raise ArgumentError unless (@username = options[:username]) && options[:password]
+
+      setup *[:username, :password, :host, :port, :certs].map { |key| options.delete key }
+
+      @rayo_domain = options[:rayo_domain] || Blather::JID.new(@username).domain
 
       @callmap = {} # This hash maps call IDs to their XMPP domain.
 
@@ -124,7 +125,7 @@ module Punchblock
     private
 
     def handle_presence(p)
-      throw :pass unless p.rayo_event?
+      throw :pass unless p.rayo_event? && p.from.domain == @rayo_domain
       @logger.info "Receiving event for call ID #{p.call_id}" if @logger
       @callmap[p.call_id] = p.from.domain
       @logger.debug p.inspect if @logger

data/lib/punchblock/dsl.rb

@@ -4,43 +4,42 @@
 # THIS IS IMPERMANENT AND WILL DISAPPEAR
 module Punchblock
   class DSL
-    def initialize(protocol, call, queue) # :nodoc:
-      @protocol, @call, @queue = protocol, call, queue
+    def initialize(connection, call, queue) # :nodoc:
+      @connection, @call, @queue = connection, call, queue
     end
 
     def accept # :nodoc:
-      write @protocol.class::Command::Accept.new
+      write Command::Accept.new
     end
 
     def answer # :nodoc:
-      write @protocol.class::Command::Answer.new
+      write Command::Answer.new
     end
 
     def hangup # :nodoc:
-      write @protocol.class::Command::Hangup.new
+      write Command::Hangup.new
     end
 
     def reject(reason = nil) # :nodoc:
-      write @protocol.class::Command::Reject.new(:reason => reason)
+      write Command::Reject.new(:reason => reason)
     end
 
     def redirect(dest) # :nodoc:
-      write @protocol.class::Command::Redirect.new(:to => dest)
+      write Command::Redirect.new(:to => dest)
     end
 
     def record(options = {})
-      write @protocol.class::Component::Record.new(options)
+      write Component::Record.new(options)
     end
 
     def say(string, type = :text) # :nodoc:
-      write @protocol.class::Component::Tropo::Say.new(type => string)
-      puts "Waiting on the queue..."
-      response = @queue.pop
-      # TODO: Error handling
+      component = Component::Tropo::Say.new(type => string)
+      write component
+      component.complete_event.resource
     end
 
     def write(msg) # :nodoc:
-      @protocol.write @call, msg
+      @connection.write @call, msg
     end
   end
 end

data/lib/punchblock/version.rb

@@ -1,3 +1,3 @@
 module Punchblock
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 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.3"]
+  s.add_runtime_dependency %q<blather>, [">= 0.5.7"]
   s.add_runtime_dependency %q<pry>, [">= 0.8.3"]
   s.add_runtime_dependency %q<activesupport>, [">= 2.1.0"]
   s.add_runtime_dependency %q<state_machine>, [">= 1.0.1"]
@@ -34,7 +34,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency %q<rspec>, ["~> 2.3.0"]
   s.add_development_dependency %q<ci_reporter>, [">= 1.6.3"]
   s.add_development_dependency %q<yard>, ["~> 0.6.0"]
-  s.add_development_dependency %q<bluecloth>, [">= 0"]
   s.add_development_dependency %q<rcov>, [">= 0"]
   s.add_development_dependency %q<rake>, [">= 0"]
   s.add_development_dependency %q<mocha>, [">= 0"]

data/spec/punchblock/component/record_spec.rb

@@ -158,7 +158,7 @@ module Punchblock
           <<-MESSAGE
 <complete xmlns='urn:xmpp:rayo:ext:1'>
 <success xmlns='urn:xmpp:rayo:record:complete:1'/>
-<recording xmlns='urn:xmpp:rayo:record:complete:1' uri="file:/tmp/rayo7451601434771683422.mp3"/>
+<recording xmlns='urn:xmpp:rayo:record:complete:1' uri="file:/tmp/rayo7451601434771683422.mp3" duration="34000" size="23450"/>
 </complete>
           MESSAGE
         end
@@ -175,7 +175,9 @@ module Punchblock
           subject { RayoNode.import(parse_stanza(stanza).root).recording }
 
           it { should be_instance_of Record::Recording }
-          its(:uri) { should == "file:/tmp/rayo7451601434771683422.mp3" }
+          its(:uri)       { should == "file:/tmp/rayo7451601434771683422.mp3" }
+          its(:duration)  { should == 34000 }
+          its(:size)      { should == 23450 }
         end
       end
 

data/spec/punchblock/connection_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Punchblock
   describe Connection do
-    let(:connection) { Connection.new :username => 1, :password => 1 }
+    let(:connection) { Connection.new :username => '1@call.rayo.net', :password => 1 }
 
     subject { connection }
 
@@ -156,6 +156,28 @@ module Punchblock
 
           it { should be_empty }
         end
+
+        describe "from someone other than the rayo domain" do
+          let :irrelevant_xml do
+            <<-MSG
+<presence to='16577@app.rayo.net/1' from='9f00061@jabber.org/fgh4590'>
+  <complete xmlns='urn:xmpp:rayo:ext:1'>
+    <success xmlns='urn:xmpp:tropo:say:complete:1' />
+  </complete>
+</presence>
+            MSG
+          end
+
+          let(:example_irrelevant_event) { import_stanza irrelevant_xml }
+
+          before do
+            lambda { connection.__send__ :handle_presence, example_irrelevant_event }.should throw_symbol(:pass)
+          end
+
+          subject { connection.event_queue }
+
+          it { should be_empty }
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: punchblock
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,12 +11,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-21 00:00:00.000000000 +01:00
+date: 2011-09-30 00:00:00.000000000 +01:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: niceogiri
-  requirement: &2164697820 !ruby/object:Gem::Requirement
+  requirement: &2157505380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,21 +24,21 @@ dependencies:
         version: 0.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *2164697820
+  version_requirements: *2157505380
 - !ruby/object:Gem::Dependency
   name: blather
-  requirement: &2164697340 !ruby/object:Gem::Requirement
+  requirement: &2157504780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.5.7
   type: :runtime
   prerelease: false
-  version_requirements: *2164697340
+  version_requirements: *2157504780
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &2164696840 !ruby/object:Gem::Requirement
+  requirement: &2157504300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: 0.8.3
   type: :runtime
   prerelease: false
-  version_requirements: *2164696840
+  version_requirements: *2157504300
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2164696360 !ruby/object:Gem::Requirement
+  requirement: &2157503760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2164696360
+  version_requirements: *2157503760
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &2164695820 !ruby/object:Gem::Requirement
+  requirement: &2157503280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2164695820
+  version_requirements: *2157503280
 - !ruby/object:Gem::Dependency
   name: future-resource
-  requirement: &2164695340 !ruby/object:Gem::Requirement
+  requirement: &2157502680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2164695340
+  version_requirements: *2157502680
 - !ruby/object:Gem::Dependency
   name: has-guarded-handlers
-  requirement: &2164681760 !ruby/object:Gem::Requirement
+  requirement: &2157502200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +90,10 @@ dependencies:
         version: 0.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2164681760
+  version_requirements: *2157502200
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2164681240 !ruby/object:Gem::Requirement
+  requirement: &2157501720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -101,10 +101,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2164681240
+  version_requirements: *2157501720
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2164680720 !ruby/object:Gem::Requirement
+  requirement: &2157501140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -112,10 +112,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *2164680720
+  version_requirements: *2157501140
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2164680240 !ruby/object:Gem::Requirement
+  requirement: &2157500560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -123,10 +123,10 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *2164680240
+  version_requirements: *2157500560
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2164679720 !ruby/object:Gem::Requirement
+  requirement: &2157500040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -134,21 +134,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *2164679720
-- !ruby/object:Gem::Dependency
-  name: bluecloth
-  requirement: &2164679160 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2164679160
+  version_requirements: *2157500040
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2164678600 !ruby/object:Gem::Requirement
+  requirement: &2157499500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -156,10 +145,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164678600
+  version_requirements: *2157499500
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2164678100 !ruby/object:Gem::Requirement
+  requirement: &2157499000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -167,10 +156,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164678100
+  version_requirements: *2157499000
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2164677580 !ruby/object:Gem::Requirement
+  requirement: &2157498500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -178,10 +167,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164677580
+  version_requirements: *2157498500
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2164677040 !ruby/object:Gem::Requirement
+  requirement: &2157497940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -189,10 +178,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164677040
+  version_requirements: *2157497940
 - !ruby/object:Gem::Dependency
   name: countdownlatch
-  requirement: &2164676440 !ruby/object:Gem::Requirement
+  requirement: &2157480960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -200,7 +189,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164676440
+  version_requirements: *2157480960
 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