adhearsion 2.0.1 → 2.1.0

data/spec/spec_helper.rb

@@ -27,13 +27,12 @@ end
 
 Thread.abort_on_exception = true
 
-UUID.state_file = false
-
 Bundler.require(:default, :test) if defined?(Bundler)
 
 Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.mock_framework = :flexmock
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true
@@ -69,6 +68,6 @@ module MarmaladeIsBetterThanJam
 end
 
 def new_uuid
-  UUID.new.generate.to_s
+  SecureRandom.uuid
 end
 alias :random_call_id :new_uuid

data/spec/support/call_controller_test_helpers.rb

@@ -4,48 +4,49 @@ module CallControllerTestHelpers
   include FlexMock::ArgumentTypes
 
   def self.included(test_case)
-    test_case.let(:call_id) { new_uuid }
-    test_case.let(:call)    { Adhearsion::Call.new }
-    test_case.let(:block)   { nil }
-
-    test_case.subject do
-      case test_case.describes
-      when Class
-        test_case.describes
-      when Module
-        Class.new Adhearsion::CallController
-      end.new call, :doo => :dah, &block
-    end
+    test_case.let(:call_id)     { new_uuid }
+    test_case.let(:call)        { Adhearsion::Call.new }
+    test_case.let(:block)       { nil }
+    test_case.let(:controller)  { new_controller test_case.describes }
+
+    test_case.subject { controller }
 
     test_case.before do
       flexmock subject
+      flexmock controller
       flexmock call, :write_command => true, :id => call_id
     end
   end
 
-  def expect_message_waiting_for_response(message)
-    subject.should_receive(:write_and_await_response).once.with(message).and_return message
-    message.request!
-  end
-
-  def expect_message_of_type_waiting_for_response(message)
-    subject.should_receive(:write_and_await_response).once.with(message.class).and_return message
-    message.request!
-  end
-
-  def expect_component_execution(component)
-    subject.should_receive(:execute_component_and_await_completion).once.with(component).and_return(component)
+  def new_controller(target = nil)
+    case target
+    when Class
+      raise "Your described class should inherit from Adhearsion::CallController" unless target.ancestors.include?(Adhearsion::CallController)
+      target
+    when Module, nil
+      Class.new Adhearsion::CallController
+    end.new call, :doo => :dah, &block
   end
 
-  def mock_with_potential_matches(potential_matches)
-    Adhearsion::Punchblock::MenuDSL::CalculatedMatch.new :potential_matches => potential_matches
+  def expect_message_waiting_for_response(message, fail = false)
+    expectation = controller.should_receive(:write_and_await_response).once.with message
+    if fail
+      expectation.and_raise fail
+    else
+      expectation.and_return message
+    end
   end
 
-  def mock_with_exact_matches(exact_matches)
-    Adhearsion::Punchblock::MenuDSL::CalculatedMatch.new :exact_matches => exact_matches
+  def expect_message_of_type_waiting_for_response(message)
+    controller.should_receive(:write_and_await_response).once.with(message.class).and_return message
   end
 
-  def mock_with_potential_and_exact_matches(potential_matches, exact_matches)
-    Adhearsion::Punchblock::MenuDSL::CalculatedMatch.new :potential_matches => potential_matches, :exact_matches => exact_matches
+  def expect_component_execution(component, fail = false)
+    expectation = controller.should_receive(:execute_component_and_await_completion).once.with(component)
+    if fail
+      expectation.and_raise fail
+    else
+      expectation.and_return component
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adhearsion
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-04 00:00:00.000000000 Z
+date: 2012-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -213,7 +213,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -221,7 +221,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -270,38 +270,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: uuid
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
@@ -389,7 +373,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -397,7 +381,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
   requirement: !ruby/object:Gem::Requirement
@@ -512,6 +496,10 @@ files:
 - lib/adhearsion/call_controller/menu_dsl/range_match_calculator.rb
 - lib/adhearsion/call_controller/menu_dsl/string_match_calculator.rb
 - lib/adhearsion/call_controller/output.rb
+- lib/adhearsion/call_controller/output/abstract_player.rb
+- lib/adhearsion/call_controller/output/async_player.rb
+- lib/adhearsion/call_controller/output/formatter.rb
+- lib/adhearsion/call_controller/output/player.rb
 - lib/adhearsion/call_controller/record.rb
 - lib/adhearsion/call_controller/utility.rb
 - lib/adhearsion/calls.rb
@@ -567,7 +555,10 @@ files:
 - lib/adhearsion/punchblock_plugin.rb
 - lib/adhearsion/punchblock_plugin/initializer.rb
 - lib/adhearsion/router.rb
+- lib/adhearsion/router/evented_route.rb
+- lib/adhearsion/router/openended_route.rb
 - lib/adhearsion/router/route.rb
+- lib/adhearsion/router/unaccepting_route.rb
 - lib/adhearsion/rspec.rb
 - lib/adhearsion/script_ahn_loader.rb
 - lib/adhearsion/tasks.rb
@@ -587,6 +578,9 @@ files:
 - spec/adhearsion/call_controller/menu_dsl/menu_spec.rb
 - spec/adhearsion/call_controller/menu_dsl/range_match_calculator_spec.rb
 - spec/adhearsion/call_controller/menu_dsl/string_match_calculator_spec.rb
+- spec/adhearsion/call_controller/output/async_player_spec.rb
+- spec/adhearsion/call_controller/output/formatter_spec.rb
+- spec/adhearsion/call_controller/output/player_spec.rb
 - spec/adhearsion/call_controller/output_spec.rb
 - spec/adhearsion/call_controller/record_spec.rb
 - spec/adhearsion/call_controller/utility_spec.rb
@@ -604,7 +598,10 @@ files:
 - spec/adhearsion/process_spec.rb
 - spec/adhearsion/punchblock_plugin/initializer_spec.rb
 - spec/adhearsion/punchblock_plugin_spec.rb
+- spec/adhearsion/router/evented_route_spec.rb
+- spec/adhearsion/router/openended_route_spec.rb
 - spec/adhearsion/router/route_spec.rb
+- spec/adhearsion/router/unaccepting_route_spec.rb
 - spec/adhearsion/router_spec.rb
 - spec/adhearsion_spec.rb
 - spec/capture_warnings.rb
@@ -627,7 +624,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1504459880693852795
+      hash: -4451670451160143860
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -636,10 +633,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1504459880693852795
+      hash: -4451670451160143860
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Adhearsion, open-source telephony development framework
@@ -669,6 +666,9 @@ test_files:
 - spec/adhearsion/call_controller/menu_dsl/menu_spec.rb
 - spec/adhearsion/call_controller/menu_dsl/range_match_calculator_spec.rb
 - spec/adhearsion/call_controller/menu_dsl/string_match_calculator_spec.rb
+- spec/adhearsion/call_controller/output/async_player_spec.rb
+- spec/adhearsion/call_controller/output/formatter_spec.rb
+- spec/adhearsion/call_controller/output/player_spec.rb
 - spec/adhearsion/call_controller/output_spec.rb
 - spec/adhearsion/call_controller/record_spec.rb
 - spec/adhearsion/call_controller/utility_spec.rb
@@ -686,7 +686,10 @@ test_files:
 - spec/adhearsion/process_spec.rb
 - spec/adhearsion/punchblock_plugin/initializer_spec.rb
 - spec/adhearsion/punchblock_plugin_spec.rb
+- spec/adhearsion/router/evented_route_spec.rb
+- spec/adhearsion/router/openended_route_spec.rb
 - spec/adhearsion/router/route_spec.rb
+- spec/adhearsion/router/unaccepting_route_spec.rb
 - spec/adhearsion/router_spec.rb
 - spec/adhearsion_spec.rb
 - spec/capture_warnings.rb