matrioska 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97fa774330c3c99750e07cba0a43977c191e18bb
-  data.tar.gz: 7ae46033c383b6b3e2fd17aae1f16fabe3b8df6d
+  metadata.gz: dc5710bb33c4c4ec260526fb66e7053f669fbb5c
+  data.tar.gz: d50e98d2d805e576d48c1db9afd43fbbfb93c117
 SHA512:
-  metadata.gz: 6e4b7426ee636edb6ec407ea7c7a8932f1e1ab0369f5083a82d303c6cc7b6223a731408669f29674a5873d3090dd83908e1ce10baf11547745a82df69c0d9874
-  data.tar.gz: 4315f6b5bebcf743733c52eb2fe3c3b1ea54d0a851794cc116d0872930144154c91f77003b9bdc726555e0f2113839ef44ea5e2863d315decbe0509c17c80671
+  metadata.gz: ce872c227620f228c643d520a2e6b342561fe5b5b8bc9f2b2079102f0dcd947a13d278470c7076f72062cfa8eba3eb07184262b78a71929adc54083a8213169f
+  data.tar.gz: 4e5231d6481d3a1d804745463dc1ee8ef5c7dec190b296eb2fa91c1aa51066f52bd6a0286460df038431da77a37ca964b2dac01dd88939e367c909379294c21d

data/.travis.yml

@@ -0,0 +1,13 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - jruby-19mode
+  - rbx-19mode
+  - ruby-head
+matrix:
+  allow_failures:
+    - rvm: 1.9.2
+    - rvm: rbx-19mode
+    - rvm: ruby-head

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # develop
 
+# Version 0.2.0
+  * Added `#dial_with_apps` to combine `#dial_with_local_apps` and `#dial_with_remote_apps`
+  * Allow stopping a runner
+
 # Version 0.1.0
   * Added DialWithApps for a simple integration with `#dial`
   * Bugfixes

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://secure.travis-ci.org/adhearsion/matrioska.png?branch=develop)](http://travis-ci.org/adhearsion/matrioska)
+
 # Matrioska
 
 Matrioska is an Adhearsion plugin for running in-call apps at the press of a DTMF.
@@ -8,7 +10,7 @@ By mapping controllers or blocks to the desired applications, a listener object
 
 ```ruby
 # inside your controller
-runner = Matrioska::AppRunner.new self
+runner = Matrioska::AppRunner.new call
 runner.map_app 3 do
   logger.info "hi there!"
 end
@@ -17,9 +19,23 @@ runner.map_app 5, AppController
 runner.start
 ```
 
-### Author
+### Using local and remote apps with at the same time with a parallel dial
+```ruby
+# inside your controller
+dial_with_apps ['user/userb'] do |dial|
+  local do |runner|
+    runner.map_app '1' do
+      say 'Gosh you sound stunning today leg a'
+    end
+  end
 
-Original author: [Luca Pradovera](https://github.com/polysics)
+  remote do |runner|
+    runner.map_app '2' do
+      say 'Gosh you sound stunning today leg b'
+    end
+  end
+end
+```
 
 ### Links
 
@@ -32,10 +48,18 @@ Original author: [Luca Pradovera](https://github.com/polysics)
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
+* Commit, do not mess with Rakefile, version, or history.
   * If you want to have your own version, that is fine but bump version in a commit by itself so I can ignore when I pull
 * Send me a pull request. Bonus points for topic branches.
 
+### Credits
+
+Original author: [Luca Pradovera](https://github.com/polysics)
+
+Developed by [Mojo Lingo](http://mojolingo.com) in partnership with [RingPlus](http://ringplus.net).
+
+Thanks to [RingPlus](http://ringplus.net) for ongoing sponsorship of Matrioska.
+
 ### Copyright
 
 Copyright (c) 2013 Adhearsion Foundation Inc. MIT license (see LICENSE for details).

data/Rakefile

@@ -1 +1,8 @@
-require "bundler/gem_tasks"
+# -*- ruby -*-
+require 'bundler/gem_tasks'
+require 'bundler/setup'
+
+task :default => :spec
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new :spec

data/lib/matrioska/app_runner.rb

@@ -9,17 +9,35 @@ module Matrioska
     end
 
     def start
+      @state = :started
       logger.debug "MATRIOSKA START CALLED"
       unless @running
-        component = Punchblock::Component::Input.new mode: :dtmf, grammar: { value: grammar_accept }
+        @component = Punchblock::Component::Input.new mode: :dtmf, grammar: { value: grammar_accept }
         logger.debug "MATRIOSKA STARTING LISTENER"
-        component.register_event_handler Punchblock::Event::Complete do |event|
+        @component.register_event_handler Punchblock::Event::Complete do |event|
           handle_input_complete event
         end
-        @call.write_and_await_response component if @call.active?
+        @call.write_and_await_response @component if @call.active?
       end
     end
 
+    def stop!
+      @state = :stopped
+      @component.stop! if @component && @component.executing?
+    end
+
+    def status
+      @state
+    end
+
+    def started?
+      @state == :started
+    end
+
+    def stopped?
+      @state == :stopped
+    end
+
     def map_app(digit, controller = nil, &block)
       digit = digit.to_s
       range = "1234567890*#"
@@ -40,6 +58,10 @@ module Matrioska
     end
 
     def handle_input_complete(event)
+      if @state == :stopped
+        logger.warn "Stopped runner #{self} received event."
+        return
+      end
       logger.debug "MATRIOSKA HANDLING INPUT"
       result = event.reason.respond_to?(:utterance) ? event.reason.utterance : nil
       digit = parse_dtmf result
@@ -60,7 +82,7 @@ module Matrioska
           @running = false
           logger.debug "MATRIOSKA CALLBACK RESTARTING LISTENER"
           if call.active?
-            start
+            start unless stopped?
           else
             logger.debug "MATRIOSKA CALLBACK NOT DOING ANYTHING BECAUSE CALL IS DEAD"
           end

data/lib/matrioska/dial_with_apps.rb

@@ -33,5 +33,38 @@ module Matrioska
       dial.cleanup_calls
       dial.status
     end
+
+    def dial_with_apps(to, options = {}, &block)
+      dial = Adhearsion::CallController::Dial::ParallelConfirmationDial.new to, options, call
+      yield dial
+
+      local_runner = Matrioska::AppRunner.new call
+      @local_runner_block.call local_runner
+      local_runner.start
+
+      dial.prep_calls do |new_call|
+        new_call.on_joined call do
+          remote_runner = Matrioska::AppRunner.new new_call
+          @remote_runner_block.call remote_runner
+          remote_runner.start
+        end
+      end
+
+      dial.track_originating_call
+      dial.place_calls
+      dial.await_completion
+      dial.cleanup_calls
+      dial.status
+    end
+
+  private
+
+    def local(&block)
+      @local_runner_block = block
+    end
+
+    def remote(&block)
+      @remote_runner_block = block
+    end
   end
 end

data/lib/matrioska/version.rb

@@ -1,3 +1,3 @@
 module Matrioska
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/matrioska/app_runner_spec.rb

@@ -37,6 +37,24 @@ module Matrioska
       it "should start the appropriate component" do
         call.should_receive(:write_and_await_response).with(input_component)
         subject.start
+        subject.status.should == :started
+      end
+    end
+
+    describe "#stop!" do
+      let(:mock_component) { double Punchblock::Component::Input, register_event_handler: true }
+
+      before do
+        Punchblock::Component::Input.stub(:new).and_return mock_component
+        call.stub(:write_and_await_response)
+        subject.start
+      end
+
+      it "stops the runner" do
+        mock_component.should_receive(:executing?).and_return true
+        mock_component.should_receive :stop!
+        subject.stop!
+        subject.status.should == :stopped
       end
     end
 

data/spec/matrioska/dial_with_apps_spec.rb

@@ -95,4 +95,55 @@ describe Matrioska::DialWithApps do
       dial_thread.join.should be_true
     end
   end
+
+  describe "#dial_with_apps" do
+    let(:mock_local_runner)  { Matrioska::AppRunner.new call }
+    let(:mock_remote_runner) { Matrioska::AppRunner.new second_other_mock_call }
+
+    before do
+      Matrioska::AppRunner.stub(:new).with(call).and_return mock_local_runner
+      Matrioska::AppRunner.stub(:new).with(second_other_mock_call).and_return mock_remote_runner
+
+      Adhearsion::OutboundCall.should_receive(:new).and_return other_mock_call, second_other_mock_call
+    end
+
+    it "starts an app listener on both ends of the call" do
+      call.should_receive(:answer).once
+
+      mock_local_runner.should_receive(:foo).once
+      mock_local_runner.should_receive(:start).once
+
+      mock_remote_runner.should_receive(:bar).once
+      mock_remote_runner.should_receive(:start).once
+
+      other_mock_call.should_receive(:dial).with(to, from: 'foo').once
+      other_mock_call.should_receive(:hangup).once.and_return do
+        other_mock_call << mock_end
+      end
+
+      second_other_mock_call.should_receive(:dial).with(second_to, from: 'foo').once
+      second_other_mock_call.should_receive(:join).once.and_return do
+        second_other_mock_call << Punchblock::Event::Joined.new(call_uri: call_id)
+      end
+
+      dial_thread = Thread.new do
+        controller.instance_exec(to,second_to) do |to, second_to|
+            dial_with_apps([to, second_to], from: 'foo') do |dial|
+            local do |runner|
+              runner.foo
+            end
+
+            remote do |runner|
+              runner.bar
+            end
+          end
+        end
+      end
+
+      sleep 0.1
+      second_other_mock_call << mock_answered
+      second_other_mock_call << mock_end
+      dial_thread.join.should be_true
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: matrioska
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Luca Pradovera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2013-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adhearsion
@@ -90,6 +90,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - Guardfile