adhearsion 2.1.2 → 2.1.3

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # [develop](https://github.com/adhearsion/adhearsion)
 
+# [2.1.3](https://github.com/adhearsion/adhearsion/compare/v2.1.2...v2.1.3) - [2012-10-11](https://rubygems.org/gems/adhearsion/versions/2.1.3)
+  * Bugfix: Originating call is now answered before joining calls using `CallController#dial`
+  * Bugfix: Output controller methods no longer falsely detect a string with a colon as a URI for an audio file
+  * Bugfix: `CallController#record` takes timeout in seconds instead of milliseconds
+  * Bugfix: Generating controllers given lower case names now works properly
+  * Update: Bump Celluloid dependency
+  * CS: Log when a controller is executed on a call
+
 # [2.1.2](https://github.com/adhearsion/adhearsion/compare/v2.1.1...v2.1.2) - [2012-09-16](https://rubygems.org/gems/adhearsion/versions/2.1.2)
   * Bugfix: Celluloid 0.12.x dependency now disallowed due to incompatible API changes.
   * Bugfix: Generated Gemfiles no longer pessimistically locked. Matches promise of SemVer compliance.

data/adhearsion.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'activesupport', ["~> 3.0"]
   s.add_runtime_dependency 'adhearsion-loquacious', ["~> 1.9"]
   s.add_runtime_dependency 'bundler', ["~> 1.0"]
-  s.add_runtime_dependency 'celluloid', ["~> 0.11.0"]
+  s.add_runtime_dependency 'celluloid', ["~> 0.12", ">= 0.12.1"]
   s.add_runtime_dependency 'countdownlatch'
   s.add_runtime_dependency 'deep_merge'
   s.add_runtime_dependency 'ffi', ["~> 1.0"]

data/features/controller_generator.feature

@@ -17,3 +17,18 @@ Feature: Adhearsion controller generator
 
     And the file "lib/test_controller.rb" should contain "class TestController < Adhearsion::CallController"
     And the file "spec/test_controller_spec.rb" should contain "describe TestController"
+
+  Scenario: Generate a controller with lower-case name
+    When I run `ahn create path/somewhere`
+    And I cd to "path/somewhere"
+    And I run `ahn generate controller test_controller`
+    Then the following directories should exist:
+      | lib                           |
+      | spec                          |
+
+    And the following files should exist:
+      | lib/test_controller.rb         |
+      | spec/test_controller_spec.rb |
+
+    And the file "lib/test_controller.rb" should contain "class TestController < Adhearsion::CallController"
+    And the file "spec/test_controller_spec.rb" should contain "describe TestController"

data/lib/adhearsion/call.rb

@@ -321,18 +321,10 @@ module Adhearsion
     end
 
     def execute_controller(controller = nil, completion_callback = nil, &block)
-      raise ArgumentError if controller && block_given?
-      call = current_actor
-      controller ||= CallController.new call, &block
-      Thread.new do
-        catching_standard_errors do
-          begin
-            CallController.exec controller
-          ensure
-            completion_callback.call call if completion_callback
-          end
-        end
-      end.tap { |t| Adhearsion::Process.important_threads << t }
+      raise ArgumentError, "Cannot supply a controller and a block at the same time" if controller && block_given?
+      controller ||= CallController.new current_actor, &block
+      logger.info "Executing controller #{controller.inspect}"
+      controller.bg_exec completion_callback
     end
 
     # @private

data/lib/adhearsion/call_controller.rb

@@ -41,12 +41,7 @@ module Adhearsion
       # @param [CallController] controller
       #
       def exec(controller)
-        new_controller = catch :pass_controller do
-          controller.execute!
-          nil
-        end
-
-        exec new_controller if new_controller
+        controller.exec
       end
 
       #
@@ -76,6 +71,32 @@ module Adhearsion
       @call, @metadata, @block = call, metadata || {}, block
     end
 
+    #
+    # Execute the controller, allowing passing control to another controller
+    #
+    def exec(controller = self)
+      new_controller = catch :pass_controller do
+        controller.execute!
+        nil
+      end
+
+      exec new_controller if new_controller
+    end
+
+    def bg_exec(completion_callback = nil)
+      Thread.new do
+        catching_standard_errors do
+          exec_with_callback completion_callback
+        end
+      end.tap { |t| Adhearsion::Process.important_threads << t }
+    end
+
+    def exec_with_callback(completion_callback = nil)
+      exec
+    ensure
+      completion_callback.call call if completion_callback
+    end
+
     # @private
     def execute!(*options)
       call.register_controller! self
@@ -243,7 +264,7 @@ module Adhearsion
 
     # @private
     def inspect
-      "#<#{self.class} call=#{call.id}, metadata=#{metadata.inspect}>"
+      "#<#{self.class} call=#{call.alive? ? call.id : ''}, metadata=#{metadata.inspect}>"
     end
   end#class
 end

data/lib/adhearsion/call_controller/dial.rb

@@ -118,6 +118,7 @@ module Adhearsion
 
               if new_call.alive? && new_call.active?
                 logger.debug "#dial joining call #{new_call.id} to #{@call.id}"
+                @call.answer
                 new_call.join @call
                 status.answer!
               end

data/lib/adhearsion/call_controller/output/formatter.rb

@@ -20,11 +20,25 @@ module Adhearsion
           end
 
           def detect_type(output)
-            result = nil
-            result = :time if [Date, Time, DateTime].include? output.class
-            result = :numeric if output.kind_of?(Numeric) || output =~ /^\d+$/
-            result = :audio if !result && (/^\//.match(output.to_s) || URI::regexp.match(output.to_s))
-            result ||= :text
+            case output
+            when Date, Time, DateTime
+              :time
+            when Numeric, /^\d+$/
+              :numeric
+            when /^\//, ->(string) { uri? string }
+              :audio
+            else
+              :text
+            end
+          end
+
+          def uri?(string)
+            uri = URI.parse string
+            !!uri.scheme
+          rescue URI::BadURIError
+            false
+          rescue URI::InvalidURIError
+            false
           end
 
           #

data/lib/adhearsion/call_controller/record.rb

@@ -21,11 +21,11 @@ module Adhearsion
       # @option options [Boolean, Optional] :async Execute asynchronously. Defaults to false
       # @option options [Boolean, Optional] :start_beep Indicates whether subsequent record will be preceded with a beep. Default is true.
       # @option options [Boolean, Optional] :start_paused Whether subsequent record will start in PAUSE mode. Default is false.
-      # @option options [String, Optional] :max_duration Indicates the maximum duration (milliseconds) for a recording.
+      # @option options [String, Optional] :max_duration Indicates the maximum duration (seconds) for a recording.
       # @option options [String, Optional] :format File format used during recording.
       # @option options [String, Optional] :format File format used during recording.
-      # @option options [String, Optional] :initial_timeout Controls how long (milliseconds) the recognizer should wait after the end of the prompt for the caller to speak before sending a Recorder event.
-      # @option options [String, Optional] :final_timeout Controls the length (milliseconds) of a period of silence after callers have spoken to conclude they finished.
+      # @option options [String, Optional] :initial_timeout Controls how long (seconds) the recognizer should wait after the end of the prompt for the caller to speak before sending a Recorder event.
+      # @option options [String, Optional] :final_timeout Controls the length (seconds) of a period of silence after callers have spoken to conclude they finished.
       # @option options [Boolean, Optional] :interruptible Allows the recording to be terminated by any single DTMF key, default is false
       #
       # @return Punchblock::Component::Record
@@ -35,6 +35,9 @@ module Adhearsion
         interruptible = options.delete :interruptible
         interrupt_key = '0123456789#*'
         stopper_component = nil
+        [:max_duration, :initial_timeout, :final_timeout].each do |k|
+          options[k] = options[k].to_i * 1000 if options[k]
+        end
 
         component = Punchblock::Component::Record.new options
         component.register_event_handler Punchblock::Event::Complete do |event|

data/lib/adhearsion/generators/controller/templates/lib/controller.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-class <%= @controller_name %> < Adhearsion::CallController
+class <%= @controller_name.camelcase %> < Adhearsion::CallController
   def run
   end
 end  

data/lib/adhearsion/generators/controller/templates/spec/controller_spec.rb

@@ -1,10 +1,10 @@
 # encoding: utf-8
 
-describe <%= @controller_name %> do
+describe <%= @controller_name.camelcase %> do
 
   let(:mock_call) { mock 'Call', :to => '1112223333', :from => "2223334444" }
   let(:metadata) { {} }
-  subject { <%= @controller_name %>.new(mock_call, metadata) }
+  subject { <%= @controller_name.camelcase %>.new(mock_call, metadata) }
 
   it "should have empty metadata" do
     subject.metadata.should eq({})

data/lib/adhearsion/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Adhearsion
-  VERSION = '2.1.2'
+  VERSION = '2.1.3'
 end

data/spec/adhearsion/call_controller/dial_spec.rb

@@ -89,6 +89,7 @@ module Adhearsion
           end
 
           it "joins the new call to the existing one on answer" do
+            flexmock(call).should_receive(:answer).once
             flexmock(other_mock_call).should_receive(:join).once.with(call)
 
             dial_in_thread
@@ -102,6 +103,7 @@ module Adhearsion
           end
 
           it "hangs up the new call when the dial unblocks" do
+            flexmock(call).should_receive(:answer).once
             flexmock(other_mock_call).should_receive(:join).once.with(call)
 
             dial_in_thread
@@ -148,6 +150,7 @@ module Adhearsion
 
           context "when the call is answered and joined" do
             it "has an overall dial status of :answer" do
+              flexmock(call).should_receive(:answer).once
               flexmock(other_mock_call).should_receive(:join).once.with(call)
 
               t = dial_in_thread
@@ -208,6 +211,7 @@ module Adhearsion
           end
 
           it "dials all parties and joins the first one to answer, hanging up the rest" do
+            flexmock(call).should_receive(:answer).once
             flexmock(other_mock_call).should_receive(:join).once.with(call)
             flexmock(second_other_mock_call).should_receive(:hangup).once
 
@@ -232,6 +236,7 @@ module Adhearsion
           end
 
           it "unblocks when the joined call unjoins, allowing it to proceed further" do
+            flexmock(call).should_receive(:answer).once
             flexmock(other_mock_call).should_receive(:join).once.with(call)
             flexmock(second_other_mock_call).should_receive(:hangup).once
 
@@ -344,6 +349,7 @@ module Adhearsion
 
           context "when a call is answered and joined, and the other ends with an error" do
             it "has an overall dial status of :answer" do
+            flexmock(call).should_receive(:answer).once
               flexmock(other_mock_call).should_receive(:join).once.with(call)
               flexmock(second_other_mock_call).should_receive(:hangup).once
 
@@ -392,6 +398,7 @@ module Adhearsion
           describe "if someone answers before the timeout elapses" do
             it "should not abort until the far end hangs up" do
               flexmock(other_mock_call).should_receive(:dial).once.with(to, hsh(:timeout => timeout))
+              flexmock(call).should_receive(:answer).once
               flexmock(other_mock_call).should_receive(:join).once.with(call)
               flexmock(other_mock_call).should_receive(:hangup).once
               flexmock(OutboundCall).should_receive(:new).and_return other_mock_call
@@ -464,6 +471,7 @@ module Adhearsion
             it "should join the calls if the call is still active after execution of the call controller" do
               flexmock(other_mock_call).should_receive(:hangup).once
               other_mock_call['confirm'] = true
+              flexmock(call).should_receive(:answer).once
               flexmock(other_mock_call).should_receive(:join).once.with(call)
 
               t = dial_in_thread
@@ -485,6 +493,7 @@ module Adhearsion
                 other_mock_call << mock_end
               end
               other_mock_call['confirm'] = false
+              flexmock(call).should_receive(:answer).never
               flexmock(other_mock_call).should_receive(:join).never.with(call)
 
               t = dial_in_thread

data/spec/adhearsion/call_controller/output/formatter_spec.rb

@@ -79,9 +79,10 @@ module Adhearsion
             subject.detect_type(number).should be :numeric
           end
 
-          it "returns text as a fallback" do
-            output = "Hello"
-            subject.detect_type(output).should be :text
+          ["Foo", "Foo bar", "The answer: foo", "The answer could be foo/bar"].each do |string|
+            it "detects '#{string}' as text" do
+              subject.detect_type(string).should be :text
+            end
           end
         end
       end

data/spec/adhearsion/call_controller/record_spec.rb

@@ -8,19 +8,23 @@ module Adhearsion
       include CallControllerTestHelpers
 
       describe "#record" do
+        let(:max_duration) { 5 }
         let(:options) do
           {
             :start_beep => true,
-            :max_duration => 5000
+            :max_duration => max_duration
           }
         end
-        let(:component) { Punchblock::Component::Record.new options }
+        let(:parsed_options) do
+          options.merge(max_duration: max_duration * 1000)
+        end
+        let(:component) { Punchblock::Component::Record.new parsed_options }
         let(:response)  { Punchblock::Event::Complete.new }
 
         describe "with :async => true and an :on_complete callback" do
           before do
             component
-            flexmock(Punchblock::Component::Record).should_receive(:new).once.with(options).and_return component
+            flexmock(Punchblock::Component::Record).should_receive(:new).once.with(parsed_options).and_return component
             expect_message_waiting_for_response component
             @rec = Queue.new
             subject.record(options.merge(async: true)) { |rec| @rec.push rec }
@@ -63,7 +67,7 @@ module Adhearsion
         describe "with :async => false" do
           before do
             component
-            flexmock(Punchblock::Component::Record).should_receive(:new).once.with(options).and_return component
+            flexmock(Punchblock::Component::Record).should_receive(:new).once.with(parsed_options).and_return component
             expect_component_execution component
             @rec = Queue.new
             subject.record(options.merge(:async => false)) { |rec| @rec.push rec }
@@ -113,7 +117,7 @@ module Adhearsion
         describe "check for the return value" do
           it "returns a Record component" do
             component
-            flexmock(Punchblock::Component::Record).should_receive(:new).once.with(options).and_return component
+            flexmock(Punchblock::Component::Record).should_receive(:new).once.with(parsed_options).and_return component
             expect_component_execution component
             subject.record(options.merge(:async => false)).should be == component
             component.request!

data/spec/adhearsion/call_controller_spec.rb

@@ -177,7 +177,7 @@ module Adhearsion
         call.should_receive(:answer).once.ordered
         subject.should_receive(:after).never.ordered
 
-        CallController.exec subject
+        subject.exec
       end
 
       it "should execute after_call callbacks before passing control" do
@@ -185,7 +185,7 @@ module Adhearsion
         subject.should_receive(:foobar).once.ordered
         call.should_receive(:answer).once.ordered
 
-        CallController.exec subject
+        subject.exec
       end
     end
 

data/spec/adhearsion/call_spec.rb

@@ -735,20 +735,21 @@ module Adhearsion
 
       describe "#execute_controller" do
         let(:latch)           { CountDownLatch.new 1 }
-        let(:mock_controller) { flexmock 'CallController' }
+        let(:mock_controller) { flexmock CallController.new(subject) }
 
         before do
           flexmock subject.wrapped_object, :write_and_await_response => true
         end
 
-        it "should call #execute on the controller instance" do
-          flexmock(CallController).should_receive(:exec).once.with mock_controller
+        it "should call #bg_exec on the controller instance" do
+          mock_controller.should_receive(:exec).once
           subject.execute_controller mock_controller, lambda { |call| latch.countdown! }
           latch.wait(3).should be_true
         end
 
         it "should use the passed block as a controller if none is specified" do
-          flexmock(CallController).should_receive(:exec).once.with CallController
+          mock_controller.should_receive(:exec).once
+          flexmock(CallController).should_receive(:new).once.and_return mock_controller
           subject.execute_controller nil, lambda { |call| latch.countdown! } do
             foo
           end

data/spec/adhearsion/calls_spec.rb

@@ -46,7 +46,7 @@ module Adhearsion
       context "by dead call object" do
         before do
           @call_id = deleted_call.id
-          deleted_call.kill
+          Celluloid::Actor.kill deleted_call
           deleted_call.should_not be_alive
           subject.remove_inactive_call deleted_call
         end

data/spec/adhearsion/punchblock_plugin/initializer_spec.rb

@@ -55,7 +55,7 @@ module Adhearsion
 
       let(:call_id)   { rand }
       let(:offer)     { Punchblock::Event::Offer.new.tap { |o| o.target_call_id = call_id } }
-      let(:mock_call) { flexmock('Call', :id => call_id).tap { |call| call.should_ignore_missing } }
+      let(:mock_call) { flexmock Call.new, :id => call_id }
 
       describe "starts the client with the default values" do
         subject { initialize_punchblock }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adhearsion
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-16 00:00:00.000000000 Z
+date: 2012-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -69,7 +69,10 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0.12'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -77,7 +80,10 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0.12'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.12.1
 - !ruby/object:Gem::Dependency
   name: countdownlatch
   requirement: !ruby/object:Gem::Requirement
@@ -624,7 +630,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3730460706990513122
+      hash: -4325641181526579229
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -633,7 +639,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3730460706990513122
+      hash: -4325641181526579229
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23