rspec-rayo 0.1.15 → 0.1.16

data/lib/rspec-rayo/rayo/matchers.rb

@@ -1,33 +1,10 @@
 require 'rspec/expectations'
 
-def execution_expired?(event)
-  if event == "execution expired"
-    @error = 'event was not delivered to queue before read timeout'
-    raise RSpec::Expectations::ExpectationNotMetError
-  end
-end
-
-def uuid_match?(uuid, type)
-  if uuid.match(/\A[\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12}/).nil?
-    @error = "#{type} == #{uuid} - expected a GUID"
-    raise RSpec::Expectations::ExpectationNotMetError
-  end
-end
-
 def match_type(object, type)
   unless object.is_a?(type)
     @error = "expected reason to be #{type}, got #{object}"
     raise RSpec::Expectations::ExpectationNotMetError
   end
-end
-
-def basic_validation(object, klass, validate_component_id = false)
-  execution_expired? object
-
-  match_type object, klass
-
-  uuid_match? object.call_id, 'call_id'
-  uuid_match? object.component_id, 'cmd_id' if validate_component_id
 
   yield if block_given?
 
@@ -49,7 +26,7 @@ end
 
 RSpec::Matchers.define :have_executed_correctly do
   match_for_should do |command|
-    basic_validation command, Punchblock::CommandNode do
+    match_type command, Punchblock::CommandNode do
       unless command.executing?
         @error = "expected status to be #{:executing.inspect}, got #{command.state_name}"
         raise RSpec::Expectations::ExpectationNotMetError
@@ -68,7 +45,7 @@ end
 
 RSpec::Matchers.define :have_dialed_correctly do
   match_for_should do |call|
-    basic_validation call, RSpecRayo::Call do
+    match_type call, RSpecRayo::Call do
       call.ring_event.should be_a_valid_ringing_event
     end
   end
@@ -84,7 +61,7 @@ end
 
 RSpec::Matchers.define :be_a_valid_complete_hangup_event do
   match_for_should do |event|
-    basic_validation event, Punchblock::Event::Complete, true do
+    match_type event, Punchblock::Event::Complete do
       match_type event.reason, Punchblock::Event::Complete::Hangup
     end
   end
@@ -104,7 +81,7 @@ RSpec::Matchers.define :be_a_valid_complete_error_event do
   end
 
   match_for_should do |event|
-    basic_validation event, Punchblock::Event::Complete, true do
+    match_type event, Punchblock::Event::Complete do
       match_type event.reason, Punchblock::Event::Complete::Error
       @error = "The error message was not correct. Expected '#{@message}', got '#{event.reason.details}'" if @message && event.reason.details != @message
     end
@@ -123,7 +100,7 @@ end
 
 RSpec::Matchers.define :be_a_valid_complete_stopped_event do
   match_for_should do |event|
-    basic_validation event, Punchblock::Event::Complete, true do
+    match_type event, Punchblock::Event::Complete do
       match_type event.reason, Punchblock::Event::Complete::Stop
     end
   end

data/lib/rspec-rayo/rayo/matchers/ask.rb

@@ -8,7 +8,7 @@ RSpec::Matchers.define :be_a_valid_successful_ask_event do
   end
 
   match_for_should do |event|
-    basic_validation event, Punchblock::Event::Complete, true do
+    match_type event, Punchblock::Event::Complete do
       match_type event.reason, Punchblock::Component::Tropo::Ask::Complete::Success
       @error = "The utterance was not correct. Expected '#{@utterance}', got '#{event.reason.utterance}'" if @utterance && event.reason.utterance != @utterance
       @error = "The interpretation was not correct. Expected '#{@interpretation}', got '#{event.reason.interpretation}'" if @interpretation && event.reason.interpretation != @interpretation
@@ -29,7 +29,7 @@ end
 
 RSpec::Matchers.define :be_a_valid_ask_noinput_event do
   match_for_should do |event|
-    basic_validation event, Punchblock::Event::Complete, true do
+    match_type event, Punchblock::Event::Complete do
       match_type event.reason, Punchblock::Component::Tropo::Ask::Complete::NoInput
     end
   end
@@ -45,7 +45,7 @@ end
 
 RSpec::Matchers.define :be_a_valid_ask_nomatch_event do
   match_for_should do |event|
-    basic_validation event, Punchblock::Event::Complete, true do
+    match_type event, Punchblock::Event::Complete do
       match_type event.reason, Punchblock::Component::Tropo::Ask::Complete::NoMatch
     end
   end

data/lib/rspec-rayo/rayo/matchers/call_control.rb

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :be_a_valid_offer_event do
   match_for_should do |event|
-    basic_validation event, Punchblock::Event::Offer do
+    match_type event, Punchblock::Event::Offer do
       event.headers_hash.each do |k,v|
         if v.nil?
           @error = "#{k.to_s} is nil - expected a value"
@@ -21,7 +21,7 @@ end
 
 RSpec::Matchers.define :be_a_valid_answered_event do
   match_for_should do |event|
-    basic_validation event, Punchblock::Event::Answered
+    match_type event, Punchblock::Event::Answered
   end
 
   failure_message_for_should do |actual|
@@ -35,7 +35,7 @@ end
 
 RSpec::Matchers.define :be_a_valid_hangup_event do
   match_for_should do |event|
-    basic_validation event, Punchblock::Event::End do
+    match_type event, Punchblock::Event::End do
       unless event.reason == :hangup
         @error = "got #{event.reason.inspect} - expected :hangup"
         raise RSpec::Expectations::ExpectationNotMetError
@@ -54,7 +54,7 @@ end
 
 RSpec::Matchers.define :be_a_valid_ringing_event do
   match_for_should do |event|
-    basic_validation event, Punchblock::Event::Ringing
+    match_type event, Punchblock::Event::Ringing
   end
 
   failure_message_for_should do |actual|
@@ -68,7 +68,7 @@ end
 
 RSpec::Matchers.define :be_a_valid_redirect_event do
   match_for_should do |event|
-    basic_validation event, Punchblock::Event::End do
+    match_type event, Punchblock::Event::End do
       unless event.reason == :redirect
         @error = "got #{event.reason.inspect} - expected :redirect"
         raise RSpec::Expectations::ExpectationNotMetError
@@ -87,7 +87,7 @@ end
 
 RSpec::Matchers.define :be_a_valid_reject_event do
   match_for_should do |event|
-    basic_validation event, Punchblock::Event::End do
+    match_type event, Punchblock::Event::End do
       unless event.reason == :reject
         @error = "got #{event.reason.inspect} - expected :reject"
         raise RSpec::Expectations::ExpectationNotMetError

data/lib/rspec-rayo/rayo/matchers/conference.rb

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :be_a_valid_conference_offhold_event do
   match_for_should do |event|
-    basic_validation event, Punchblock::Component::Tropo::Conference::OffHold, true
+    match_type event, Punchblock::Component::Tropo::Conference::OffHold
   end
 
   failure_message_for_should do |actual|
@@ -18,7 +18,7 @@ RSpec::Matchers.define :be_a_valid_speaking_event do
   end
 
   match_for_should do |event|
-    basic_validation event, Punchblock::Component::Tropo::Conference::Speaking, true do
+    match_type event, Punchblock::Component::Tropo::Conference::Speaking do
       @error = "The speaking call ID was not correct. Expected '#{@call_id}', got '#{event.speaking_call_id}'" if @call_id && event.speaking_call_id != @call_id
     end
   end
@@ -40,7 +40,7 @@ RSpec::Matchers.define :be_a_valid_finished_speaking_event do
   end
 
   match_for_should do |event|
-    basic_validation event, Punchblock::Component::Tropo::Conference::FinishedSpeaking, true do
+    match_type event, Punchblock::Component::Tropo::Conference::FinishedSpeaking do
       @error = "The finished-speaking call ID was not correct. Expected '#{@call_id}', got '#{event.speaking_call_id}'" if @call_id && event.speaking_call_id != @call_id
     end
   end
@@ -58,7 +58,7 @@ end
 
 RSpec::Matchers.define :be_a_valid_conference_complete_terminator_event do
   match_for_should do |event|
-    basic_validation event, Punchblock::Event::Complete, true do
+    match_type event, Punchblock::Event::Complete do
       match_type event.reason, Punchblock::Component::Tropo::Conference::Complete::Terminator
     end
   end

data/lib/rspec-rayo/rayo/matchers/dtmf.rb

@@ -4,7 +4,7 @@ RSpec::Matchers.define :be_a_valid_dtmf_event do
   end
 
   match_for_should do |event|
-    basic_validation event, Punchblock::Event::DTMF do
+    match_type event, Punchblock::Event::DTMF do
       @error = "The signal was not correct. Expected '#{@signal}', got '#{event.signal}'" if @signal && event.signal != @signal
     end
   end

data/lib/rspec-rayo/rayo/matchers/input.rb

@@ -8,7 +8,7 @@ RSpec::Matchers.define :be_a_valid_successful_input_event do
   end
 
   match_for_should do |event|
-    basic_validation event, Punchblock::Event::Complete, true do
+    match_type event, Punchblock::Event::Complete do
       match_type event.reason, Punchblock::Component::Input::Complete::Success
       @error = "The utterance was not correct. Expected '#{@utterance}', got '#{event.reason.utterance}'" if @utterance && event.reason.utterance != @utterance
       @error = "The interpretation was not correct. Expected '#{@interpretation}', got '#{event.reason.interpretation}'" if @interpretation && event.reason.interpretation != @interpretation
@@ -29,7 +29,7 @@ end
 
 RSpec::Matchers.define :be_a_valid_input_noinput_event do
   match_for_should do |event|
-    basic_validation event, Punchblock::Event::Complete, true do
+    match_type event, Punchblock::Event::Complete do
       match_type event.reason, Punchblock::Component::Input::Complete::NoInput
     end
   end
@@ -45,7 +45,7 @@ end
 
 RSpec::Matchers.define :be_a_valid_input_nomatch_event do
   match_for_should do |event|
-    basic_validation event, Punchblock::Event::Complete, true do
+    match_type event, Punchblock::Event::Complete do
       match_type event.reason, Punchblock::Component::Input::Complete::NoMatch
     end
   end

data/lib/rspec-rayo/rayo/matchers/join.rb

@@ -8,7 +8,7 @@ RSpec::Matchers.define :be_a_valid_joined_event do
   end
 
   match_for_should do |event|
-    basic_validation event, Punchblock::Event::Joined do
+    match_type event, Punchblock::Event::Joined do
       @error = "The other call ID was not correct. Expected '#{@other_call_id}', got '#{event.other_call_id}'" if @other_call_id && event.other_call_id != @other_call_id
       @error = "The mixer ID was not correct. Expected '#{@mixer_id}', got '#{event.mixer_id}'" if @mixer_id && event.mixer_id != @mixer_id
     end
@@ -36,7 +36,7 @@ RSpec::Matchers.define :be_a_valid_unjoined_event do
   end
 
   match_for_should do |event|
-    basic_validation event, Punchblock::Event::Unjoined do
+    match_type event, Punchblock::Event::Unjoined do
       @error = "The other call ID was not correct. Expected '#{@other_call_id}', got '#{event.other_call_id}'" if @other_call_id && event.other_call_id != @other_call_id
       @error = "The mixer ID was not correct. Expected '#{@mixer_id}', got '#{event.mixer_id}'" if @mixer_id && event.mixer_id != @mixer_id
     end

data/lib/rspec-rayo/rayo/matchers/output.rb

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :be_a_valid_output_event do
   match_for_should do |event|
-    basic_validation event, Punchblock::Event::Complete, true do
+    match_type event, Punchblock::Event::Complete do
       match_type event.reason, Punchblock::Component::Output::Complete::Success
     end
   end

data/lib/rspec-rayo/rayo/matchers/recording.rb

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :be_a_valid_complete_recording_event do
   match_for_should do |event|
-    basic_validation event, Punchblock::Event::Complete, true do
+    match_type event, Punchblock::Event::Complete do
       match_type event.recording, Punchblock::Component::Record::Recording
     end
   end
@@ -16,7 +16,7 @@ end
 
 RSpec::Matchers.define :be_a_valid_stopped_recording_event do
   match_for_should do |event|
-    basic_validation event, Punchblock::Event::Complete, true do
+    match_type event, Punchblock::Event::Complete do
       match_type event.reason, Punchblock::Event::Complete::Stop
       match_type event.recording, Punchblock::Component::Record::Recording
     end

data/lib/rspec-rayo/rayo/matchers/say.rb

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :be_a_valid_say_event do
   match_for_should do |event|
-    basic_validation event, Punchblock::Event::Complete, true do
+    match_type event, Punchblock::Event::Complete do
       match_type event.reason, Punchblock::Component::Tropo::Say::Complete::Success
     end
   end

data/lib/rspec-rayo/rayo/matchers/transfer.rb

@@ -1,6 +1,6 @@
 RSpec::Matchers.define :be_a_valid_transfer_event do
   match_for_should do |event|
-    basic_validation event, Punchblock::Event::Complete, true do
+    match_type event, Punchblock::Event::Complete do
       match_type event.reason, Punchblock::Component::Tropo::Transfer::Complete::Success
     end
   end
@@ -16,7 +16,7 @@ end
 
 RSpec::Matchers.define :be_a_valid_transfer_timeout_event do
   match_for_should do |event|
-    basic_validation event, Punchblock::Event::Complete, true do
+    match_type event, Punchblock::Event::Complete do
       match_type event.reason, Punchblock::Component::Tropo::Transfer::Complete::Timeout
     end
   end

data/lib/rspec-rayo/version.rb

@@ -1,3 +1,3 @@
 module RSpecRayo
-  VERSION = "0.1.15"
+  VERSION = "0.1.16"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-rayo
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-07 00:00:00.000000000 -07:00
+date: 2011-10-10 00:00:00.000000000 -07:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153039060 !ruby/object:Gem::Requirement
+  requirement: &2169308840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 2.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153039060
+  version_requirements: *2169308840
 - !ruby/object:Gem::Dependency
   name: punchblock
-  requirement: &2153038540 !ruby/object:Gem::Requirement
+  requirement: &2169308220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 0.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *2153038540
+  version_requirements: *2169308220
 - !ruby/object:Gem::Dependency
   name: countdownlatch
-  requirement: &2153038020 !ruby/object:Gem::Requirement
+  requirement: &2169307540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153038020
+  version_requirements: *2169307540
 - !ruby/object:Gem::Dependency
   name: future-resource
-  requirement: &2153037420 !ruby/object:Gem::Requirement
+  requirement: &2169306880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2153037420
+  version_requirements: *2169306880
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2153018640 !ruby/object:Gem::Requirement
+  requirement: &2169306400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *2153018640
+  version_requirements: *2169306400
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2153018040 !ruby/object:Gem::Requirement
+  requirement: &2169305860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2153018040
+  version_requirements: *2169305860
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2153017440 !ruby/object:Gem::Requirement
+  requirement: &2169305240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153017440
+  version_requirements: *2169305240
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153016880 !ruby/object:Gem::Requirement
+  requirement: &2169304600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153016880
+  version_requirements: *2169304600
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2153016340 !ruby/object:Gem::Requirement
+  requirement: &2169304120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,7 +111,7 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *2153016340
+  version_requirements: *2169304120
 description: Rspec2 Matchers for Rayo
 email: jsgoecke@voxeo.com, ben@langfeld.me
 executables: []