call_center 0.1.3 → 0.1.6

data/Gemfile

@@ -1,19 +1,17 @@
-source 'http://rubygems.org'
+source :rubygems
 
 group :development do
-  gem 'shoulda', '>= 0'
-  gem 'bundler', '~> 1.0.0'
+  gem 'shoulda'
   gem 'jeweler', '~> 1.6.4'
-  gem 'rcov', '>= 0'
-  gem 'test-unit', :require => 'test/unit'
+  gem 'rcov'
   gem 'guard'
   gem 'guard-test'
-  gem 'actionpack', '~> 2.3.10'
+  gem 'actionpack', '~> 2.3.14'
   gem 'mocha'
-  gem 'bourne'
+  gem 'bourne', '>= 1.2.0'
   gem 'pre-commit'
-  gem 'minitest', '2.6.1'
-  gem 'minitest-reporters', :require => 'minitest/reporters'
+  gem 'minitest', '~> 3.3.0' # dots disappear at >= 3.4
+  gem 'minitest-reporters', :platform => :ruby_19 # https://github.com/busyloop/powerbar/pull/10
   gem 'guard-shell'
 end
 

data/Gemfile.lock

@@ -1,14 +1,14 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (2.3.12)
-      activesupport (= 2.3.12)
+    actionpack (2.3.14)
+      activesupport (= 2.3.14)
       rack (~> 1.1.0)
-    activesupport (2.3.12)
-    ansi (1.3.0)
-    bourne (1.0)
-      mocha (= 0.9.8)
-    builder (3.0.0)
+    activesupport (2.3.14)
+    ansi (1.4.3)
+    bourne (1.2.0)
+      mocha (= 0.12.3)
+    builder (3.1.3)
     execjs (1.2.0)
       multi_json (~> 1.0)
     git (1.2.5)
@@ -19,26 +19,35 @@ GEM
     guard-test (0.3.0)
       guard (>= 0.2.2)
       test-unit (~> 2.2)
+    hashie (1.2.0)
     hsume2-state_machine (1.0.5)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    minitest (2.6.1)
-    minitest-reporters (0.4.0)
+    metaclass (0.0.1)
+    minitest (3.3.0)
+    minitest-reporters (0.11.0)
       ansi
-      minitest (~> 2.0)
-      ruby-progressbar
-    mocha (0.9.8)
-      rake
+      builder
+      minitest (>= 2.12, < 4.0)
+      powerbar
+    mocha (0.12.3)
+      metaclass (~> 0.0.1)
     multi_json (1.0.3)
+    powerbar (1.0.9)
+      ansi (~> 1.4.0)
+      hashie (>= 1.1.0)
     pre-commit (0.1.13)
       execjs
-    rack (1.1.2)
-    rake (0.9.2)
+    rack (1.1.3)
+    rake (0.9.2.2)
     rcov (0.9.9)
-    ruby-progressbar (0.0.10)
-    shoulda (2.11.3)
+    shoulda (3.0.1)
+      shoulda-context (~> 1.0.0)
+      shoulda-matchers (~> 1.0.0)
+    shoulda-context (1.0.0)
+    shoulda-matchers (1.0.0)
     test-unit (2.3.0)
     thor (0.14.6)
 
@@ -46,19 +55,17 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionpack (~> 2.3.10)
-  bourne
+  actionpack (~> 2.3.14)
+  bourne (>= 1.2.0)
   builder
-  bundler (~> 1.0.0)
   guard
   guard-shell
   guard-test
   hsume2-state_machine (~> 1.0.5)
   jeweler (~> 1.6.4)
-  minitest (= 2.6.1)
+  minitest (~> 3.3.0)
   minitest-reporters
   mocha
   pre-commit
   rcov
   shoulda
-  test-unit

data/Rakefile

@@ -1,15 +1,6 @@
 # encoding: utf-8
-
 require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
+require 'bundler/setup'
 
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
@@ -27,14 +18,12 @@ Jeweler::RubygemsDotOrgTasks.new
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
   test.pattern = 'test/**/*_test.rb'
   test.verbose = true
 end
 
 require 'rcov/rcovtask'
 Rcov::RcovTask.new do |test|
-  test.libs << 'test'
   test.pattern = 'test/**/*_test.rb'
   test.verbose = true
   test.rcov_opts << '--exclude "gems/*,lib/call_center/core_ext/object_instance_exec.rb"'

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.6

data/call_center.gemspec

@@ -5,15 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = "call_center"
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Henry Hsu"]
-  s.date = "2012-06-19"
+  s.date = "2012-10-10"
   s.description = "Support for describing call center workflows"
   s.email = "hhsu@zendesk.com"
   s.extra_rdoc_files = [
-    "LICENSE.txt",
     "README.md"
   ]
   s.files = [
@@ -24,7 +23,7 @@ Gem::Specification.new do |s|
     "Gemfile.lock",
     "Guardfile",
     "Guardfile.minitest",
-    "LICENSE.txt",
+    "MIT-LICENSE.txt",
     "README.md",
     "Rakefile",
     "VERSION",
@@ -48,7 +47,6 @@ Gem::Specification.new do |s|
     "test/examples/legacy_call.rb",
     "test/examples/multiple_flow_call.rb",
     "test/examples/non_standard_call.rb",
-    "test/examples/outbound_call.rb",
     "test/helper.rb"
   ]
   s.homepage = "http://github.com/zendesk/call_center"
@@ -64,34 +62,30 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<builder>, [">= 0"])
       s.add_runtime_dependency(%q<hsume2-state_machine>, ["~> 1.0.5"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<test-unit>, [">= 0"])
       s.add_development_dependency(%q<guard>, [">= 0"])
       s.add_development_dependency(%q<guard-test>, [">= 0"])
-      s.add_development_dependency(%q<actionpack>, ["~> 2.3.10"])
+      s.add_development_dependency(%q<actionpack>, ["~> 2.3.14"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
       s.add_development_dependency(%q<bourne>, [">= 0"])
       s.add_development_dependency(%q<pre-commit>, [">= 0"])
-      s.add_development_dependency(%q<minitest>, ["= 2.6.1"])
+      s.add_development_dependency(%q<minitest>, ["~> 3.3.0"])
       s.add_development_dependency(%q<minitest-reporters>, [">= 0"])
       s.add_development_dependency(%q<guard-shell>, [">= 0"])
     else
       s.add_dependency(%q<builder>, [">= 0"])
       s.add_dependency(%q<hsume2-state_machine>, ["~> 1.0.5"])
       s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<test-unit>, [">= 0"])
       s.add_dependency(%q<guard>, [">= 0"])
       s.add_dependency(%q<guard-test>, [">= 0"])
-      s.add_dependency(%q<actionpack>, ["~> 2.3.10"])
+      s.add_dependency(%q<actionpack>, ["~> 2.3.14"])
       s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<bourne>, [">= 0"])
       s.add_dependency(%q<pre-commit>, [">= 0"])
-      s.add_dependency(%q<minitest>, ["= 2.6.1"])
+      s.add_dependency(%q<minitest>, ["~> 3.3.0"])
       s.add_dependency(%q<minitest-reporters>, [">= 0"])
       s.add_dependency(%q<guard-shell>, [">= 0"])
     end
@@ -99,17 +93,15 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<builder>, [">= 0"])
     s.add_dependency(%q<hsume2-state_machine>, ["~> 1.0.5"])
     s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<test-unit>, [">= 0"])
     s.add_dependency(%q<guard>, [">= 0"])
     s.add_dependency(%q<guard-test>, [">= 0"])
-    s.add_dependency(%q<actionpack>, ["~> 2.3.10"])
+    s.add_dependency(%q<actionpack>, ["~> 2.3.14"])
     s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<bourne>, [">= 0"])
     s.add_dependency(%q<pre-commit>, [">= 0"])
-    s.add_dependency(%q<minitest>, ["= 2.6.1"])
+    s.add_dependency(%q<minitest>, ["~> 3.3.0"])
     s.add_dependency(%q<minitest-reporters>, [">= 0"])
     s.add_dependency(%q<guard-shell>, [">= 0"])
   end

data/lib/call_center.rb

@@ -54,10 +54,6 @@ module CallCenter
     def current_state_machine
       self.state_machines[self.call_flow_state_machine_name]
     end
-
-    def inherited(subclass)
-      subclass.call_flow_state_machine_name ||= self.call_flow_state_machine_name
-    end
   end
 
   module InstanceMethods

data/lib/call_center/test/dsl.rb

@@ -1,8 +1,21 @@
+require 'action_pack/version'
+if ActionPack::VERSION::MAJOR == 2
+  require 'action_controller/assertions/selector_assertions'
+else
+  require 'action_dispatch/testing/assertions/selector'
+end
+
 module CallCenter
   module Test
     module DSL
       def self.included(base)
-        base.send(:include, ActionController::Assertions::SelectorAssertions)
+        if ActionPack::VERSION::MAJOR == 2
+          base.send(:include, ActionController::Assertions::SelectorAssertions)
+        else
+          base.send(:include, ActionController::Assertions::SelectorAssertions)
+          include ActionDispatch::Assertions::SelectorAssertions
+        end
+
         base.extend(ClassMethods)
         base.class_eval do
           def response_from_page_or_rjs_with_body

data/lib/call_center/test/minitest/dsl.rb

@@ -1,5 +1,10 @@
+require 'action_pack/version'
 require 'action_controller/vendor/html-scanner'
-require 'action_controller/assertions/selector_assertions'
+if ActionPack::VERSION::MAJOR == 2
+  require 'action_controller/assertions/selector_assertions'
+else
+  require 'action_dispatch/testing/assertions/selector'
+end
 require 'test/unit/assertions'
 
 module CallCenter
@@ -225,7 +230,11 @@ module CallCenter
 
         if defined?(::MiniTest::Spec)
           ::MiniTest::Spec.class_eval do
-            include ActionController::Assertions::SelectorAssertions
+            if ActionPack::VERSION::MAJOR == 2
+              include ActionController::Assertions::SelectorAssertions
+            else
+              include ActionDispatch::Assertions::SelectorAssertions
+            end
 
             def self.it_should_flow(&block)
               CallCenter::Test::MiniTest::DSL::ItShouldFlow.new(self, &block).verify

data/minitest/call_center/test/minitest_test.rb

@@ -5,7 +5,6 @@ require File.expand_path('../../../test/examples/call', File.dirname(__FILE__))
 require File.expand_path('../../../test/examples/dynamic_transition_call', File.dirname(__FILE__))
 
 describe CallCenter::Test::MiniTest::DSL do
-
   describe Call do
     subject { Call.new }
     let(:call_center_state_field) { :state }
@@ -37,5 +36,4 @@ describe CallCenter::Test::MiniTest::DSL do
     it_should_flow { on(:picks_up).from(:routing_on_client).to(:in_conference).unless(:out_of_area?) }
     it_should_flow { on(:picks_up).from(:routing_on_client).to(:cancelled).if(:out_of_area?) }
   end
-
 end

data/minitest/helper.rb

@@ -1,18 +1,15 @@
 require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
+require 'bundler/setup'
 require 'minitest/autorun'
 require 'mocha'
 require 'active_support'
 
+if RUBY_VERSION > "1.9.0"
+  require 'minitest/reporters'
+  MiniTest::Reporters.use! MiniTest::Reporters::DefaultReporter.new
+end
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'call_center'
 
 module CommonCallMethods

data/test/call_center_test.rb

@@ -1,11 +1,9 @@
-require 'helper'
+require File.expand_path("../helper", __FILE__)
 
 require 'call_center/test/dsl'
 
-require File.expand_path('../test/examples/legacy_call', File.dirname(__FILE__))
 require File.expand_path('../test/examples/legacy_call', File.dirname(__FILE__))
 require File.expand_path('../test/examples/call', File.dirname(__FILE__))
-require File.expand_path('../test/examples/outbound_call', File.dirname(__FILE__))
 require File.expand_path('../test/examples/non_standard_call', File.dirname(__FILE__))
 require File.expand_path('../test/examples/multiple_flow_call', File.dirname(__FILE__))
 require File.expand_path('../test/examples/dynamic_transition_call', File.dirname(__FILE__))
@@ -177,230 +175,227 @@ class CallCenterTest < Test::Unit::TestCase
     end
   end
 
-  ['Call', 'SubclassCall'].each do |class_name|
-    context class_name do
-      setup do
-        klass = class_name.constantize
-        @call = klass.new
-      end
+  context "call" do
+    setup do
+      @call = Call.new
+    end
 
-      should "render xml for initial state" do
-        @call.expects(:notify).with(:rendering_initial)
-        body @call.render
-        assert_select "Response>Say", "Hello World"
-      end
+    should "render xml for initial state" do
+      @call.expects(:notify).with(:rendering_initial)
+      body @call.render
+      assert_select "Response>Say", "Hello World"
+    end
 
-      should "return customer url for event" do
-        assert_equal("/voice/calls/flow?event=voicemail_complete&actor=customer", @call.customer(:voicemail_complete))
-      end
+    should "return customer url for event" do
+      assert_equal("/voice/calls/flow?event=voicemail_complete&actor=customer", @call.customer(:voicemail_complete))
+    end
 
-      should "return agent url for event" do
-        assert_equal("/voice/calls/flow?event=voicemail_complete&actor=agent", @call.agent(:voicemail_complete))
-      end
+    should "return agent url for event" do
+      assert_equal("/voice/calls/flow?event=voicemail_complete&actor=agent", @call.agent(:voicemail_complete))
+    end
 
-      should "render xml for voicemail state" do
-        @call.stubs(:agents_available?).returns(false)
-        @call.incoming_call!
-        @call.expects(:notify).with(:rendering_voicemail)
+    should "render xml for voicemail state" do
+      @call.stubs(:agents_available?).returns(false)
+      @call.incoming_call!
+      @call.expects(:notify).with(:rendering_voicemail)
 
-        body @call.render
-        assert_select "Response>Say"
-        assert_select "Response>Record[action=/voice/calls/flow?event=voicemail_complete&actor=customer]"
-      end
+      body @call.render
+      assert_select "Response>Say"
+      assert_select "Response>Record[action=/voice/calls/flow?event=voicemail_complete&actor=customer]"
+    end
 
-      should "render noop when no render block" do
-        @call.stubs(:agents_available?).returns(true)
-        @call.incoming_call!
+    should "render noop when no render block" do
+      @call.stubs(:agents_available?).returns(true)
+      @call.incoming_call!
 
-        body @call.render
-        assert_select "Response"
-      end
+      body @call.render
+      assert_select "Response"
+    end
 
-      should "execute callbacks" do
-        @call.state = 'cancelled'
+    should "execute callbacks" do
+      @call.state = 'cancelled'
 
-        @call.expects(:notify).with(:before_always).times(3)
-        @call.expects(:notify).with(:before_always_uniq).times(1)
+      @call.expects(:notify).with(:before_always).times(3)
+      @call.expects(:notify).with(:before_always_uniq).times(1)
 
-        @call.expects(:notify).with(:after_always).times(4)
-        @call.expects(:notify).with(:after_success).times(3)
-        @call.expects(:notify).with(:after_failure).times(1)
+      @call.expects(:notify).with(:after_always).times(4)
+      @call.expects(:notify).with(:after_success).times(3)
+      @call.expects(:notify).with(:after_failure).times(1)
 
-        @call.expects(:notify).with(:after_always_uniq).times(1)
-        @call.expects(:notify).with { |notification, transition| notification == :after_success_uniq && transition.kind_of?(StateMachine::Transition) }.times(1)
-        @call.expects(:notify).with(:after_failure_uniq).times(0)
+      @call.expects(:notify).with(:after_always_uniq).times(1)
+      @call.expects(:notify).with { |notification, transition| notification == :after_success_uniq && transition.kind_of?(StateMachine::Transition) }.times(1)
+      @call.expects(:notify).with(:after_failure_uniq).times(0)
 
-        @call.customer_end!
-        @call.customer_end!
-        @call.customer_end!
-        assert(!@call.customer_hangs_up)
-      end
+      @call.customer_end!
+      @call.customer_end!
+      @call.customer_end!
+      assert(!@call.customer_hangs_up)
+    end
 
-      should "execute callbacks in sequence" do
-        seq = sequence('callback_sequence')
-        @call.state = 'cancelled'
+    should "execute callbacks in sequence" do
+      seq = sequence('callback_sequence')
+      @call.state = 'cancelled'
 
-        @call.expects(:notify).with(:before_always).in_sequence(seq)
-        @call.expects(:notify).with(:before_always_uniq).in_sequence(seq)
+      @call.expects(:notify).with(:before_always).in_sequence(seq)
+      @call.expects(:notify).with(:before_always_uniq).in_sequence(seq)
 
-        @call.expects(:notify).with(:after_always).in_sequence(seq)
-        @call.expects(:notify).with(:after_success).in_sequence(seq)
+      @call.expects(:notify).with(:after_always).in_sequence(seq)
+      @call.expects(:notify).with(:after_success).in_sequence(seq)
 
-        @call.expects(:notify).with(:after_always_uniq).in_sequence(seq)
-        @call.expects(:notify).with(:after_success_uniq, anything).in_sequence(seq)
+      @call.expects(:notify).with(:after_always_uniq).in_sequence(seq)
+      @call.expects(:notify).with(:after_success_uniq, anything).in_sequence(seq)
 
-        @call.customer_end!
+      @call.customer_end!
+    end
+
+    should "defer callbacks" do
+      (class << @call; self; end).class_eval do
+        include CallCenter::DeferredCallbacks
       end
+      @call.state = 'cancelled'
 
-      should "defer callbacks" do
-        (class << @call; self; end).class_eval do
-          include CallCenter::DeferredCallbacks
-        end
-        @call.state = 'cancelled'
+      @call.expects(:notify).with(:before_always).never
+      @call.expects(:notify).with(:before_always_uniq).never
 
-        @call.expects(:notify).with(:before_always).never
-        @call.expects(:notify).with(:before_always_uniq).never
+      @call.expects(:notify).with(:after_always).never
+      @call.expects(:notify).with(:after_success).never
+      @call.expects(:notify).with(:after_failure).never
 
-        @call.expects(:notify).with(:after_always).never
-        @call.expects(:notify).with(:after_success).never
-        @call.expects(:notify).with(:after_failure).never
+      @call.expects(:notify).with(:after_always_uniq).never
+      @call.expects(:notify).with(:after_success_uniq, anything).never
 
-        @call.expects(:notify).with(:after_always_uniq).never
-        @call.expects(:notify).with(:after_success_uniq, anything).never
+      @call.customer_end!
+      assert(!@call.customer_hangs_up)
 
-        @call.customer_end!
-        assert(!@call.customer_hangs_up)
+      # Ready for deferred callbacks
 
-        # Ready for deferred callbacks
+      seq = sequence('callback_sequence')
 
-        seq = sequence('callback_sequence')
+      @call.expects(:notify).with(:before_always)
+      @call.expects(:notify).with(:before_always_uniq)
 
-        @call.expects(:notify).with(:before_always)
-        @call.expects(:notify).with(:before_always_uniq)
+      @call.call_flow_run_deferred(:before_transition)
 
-        @call.call_flow_run_deferred(:before_transition)
+      @call.expects(:notify).with(:after_always).times(2)
+      @call.expects(:notify).with(:after_success)
 
-        @call.expects(:notify).with(:after_always).times(2)
-        @call.expects(:notify).with(:after_success)
+      @call.expects(:notify).with(:after_always_uniq)
+      @call.expects(:notify).with(:after_success_uniq, anything)
 
-        @call.expects(:notify).with(:after_always_uniq)
-        @call.expects(:notify).with(:after_success_uniq, anything)
+      @call.call_flow_run_deferred(:after_transition)
 
-        @call.call_flow_run_deferred(:after_transition)
+      @call.expects(:notify).with(:after_always).times(2)
+      @call.expects(:notify).with(:after_failure)
+      @call.expects(:notify).with(:after_always_uniq)
 
-        @call.expects(:notify).with(:after_always).times(2)
-        @call.expects(:notify).with(:after_failure)
-        @call.expects(:notify).with(:after_always_uniq)
+      @call.call_flow_run_deferred(:after_failure)
 
-        @call.call_flow_run_deferred(:after_failure)
+      # Empty
+      @call.call_flow_run_deferred(:before_transition)
+      @call.call_flow_run_deferred(:after_transition)
+      @call.call_flow_run_deferred(:after_failure)
+    end
 
-        # Empty
-        @call.call_flow_run_deferred(:before_transition)
-        @call.call_flow_run_deferred(:after_transition)
-        @call.call_flow_run_deferred(:after_failure)
-      end
+    should "asynchronously perform event" do
+      @call.stubs(:agents_available?).returns(true)
+      @call.incoming_call!
+      @call.expects(:redirect_to).with(:start_conference)
 
-      should "asynchronously perform event" do
-        @call.stubs(:agents_available?).returns(true)
-        @call.incoming_call!
-        @call.expects(:redirect_to).with(:start_conference)
+      @call.redirect_and_start_conference!
+    end
 
-        @call.redirect_and_start_conference!
-      end
+    should "asynchronously perform event with options" do
+      @call.stubs(:agents_available?).returns(true)
+      @call.incoming_call!
+      @call.expects(:redirect_to).with(:start_conference, :status => 'completed')
 
-      should "asynchronously perform event with options" do
-        @call.stubs(:agents_available?).returns(true)
-        @call.incoming_call!
-        @call.expects(:redirect_to).with(:start_conference, :status => 'completed')
+      @call.redirect_and_start_conference!(:status => 'completed')
+    end
 
-        @call.redirect_and_start_conference!(:status => 'completed')
-      end
+    should "raise error on missing method" do
+      assert_raises {
+        @call.i_am_missing!
+      }
+    end
 
-      should "raise error on missing method" do
-        assert_raises {
-          @call.i_am_missing!
-        }
-      end
+    should "draw state machine digraph" do
+      Call.state_machines[:state].expects(:draw).with(:name => 'call_workflow', :font => 'Helvetica Neue')
+      @call.draw_call_flow(:name => 'call_workflow', :font => 'Helvetica Neue')
+    end
 
-      should "draw state machine digraph" do
-        Call.state_machines[:state].expects(:draw).with(:name => 'call_workflow', :font => 'Helvetica Neue')
-        @call.draw_call_flow(:name => 'call_workflow', :font => 'Helvetica Neue')
+    context "using test DSL:" do
+      should_flow :on => :incoming_call, :initial => :voicemail, :when => Proc.new {
+        @call.stubs(:agents_available?).returns(false)
+        @call.stubs(:notify)
+        @call.stubs(:customer).returns('the_flow')
+      } do
+        should_also { assert_received(@call, :notify) { |e| e.with(:rendering_voicemail) } }
+        and_also { assert_received(@call, :customer) { |e| e.with(:voicemail_complete) } }
+        and_render { "Response>Say" }
+        and_render { "Response>Record[action=the_flow]" }
       end
 
-      context "using test DSL:" do
-        should_flow :on => :incoming_call, :initial => :voicemail, :when => Proc.new {
-          @call.stubs(:agents_available?).returns(false)
-          @call.stubs(:notify)
-          @call.stubs(:customer).returns('the_flow')
-        } do
-          should_also { assert_received(@call, :notify) { |e| e.with(:rendering_voicemail) } }
-          and_also { assert_received(@call, :customer) { |e| e.with(:voicemail_complete) } }
-          and_render { "Response>Say" }
-          and_render { "Response>Record[action=the_flow]" }
-        end
+      should_flow :on => :incoming_call, :initial => :routing, :when => Proc.new {
+        @call.stubs(:agents_available?).returns(true)
+      } do
+        should_render { "Response" }
+      end
 
-        should_flow :on => :incoming_call, :initial => :routing, :when => Proc.new {
-          @call.stubs(:agents_available?).returns(true)
-        } do
-          should_render { "Response" }
-        end
+      should_flow :on => :customer_hangs_up, :routing => :cancelled, :when => Proc.new {
+        @call.stubs(:notify)
+      } do
+        should_also { assert_received(@call, :notify) { |e| e.with(:cancelled).once } }
+        and_also { assert @call.cancelled? }
 
-        should_flow :on => :customer_hangs_up, :routing => :cancelled, :when => Proc.new {
-          @call.stubs(:notify)
-        } do
-          should_also { assert_received(@call, :notify) { |e| e.with(:cancelled).once } }
+        should_flow :on => :customer_hangs_up, :cancelled => :cancelled do
+          should_also { assert_received(@call, :notify) { |e| e.with(:cancelled).once } } # For above
           and_also { assert @call.cancelled? }
 
           should_flow :on => :customer_hangs_up, :cancelled => :cancelled do
             should_also { assert_received(@call, :notify) { |e| e.with(:cancelled).once } } # For above
             and_also { assert @call.cancelled? }
-
-            should_flow :on => :customer_hangs_up, :cancelled => :cancelled do
-              should_also { assert_received(@call, :notify) { |e| e.with(:cancelled).once } } # For above
-              and_also { assert @call.cancelled? }
-            end
           end
         end
       end
+    end
 
-      context "deferred and using test DSL:" do
-        setup do
-          (class << @call; self; end).class_eval do
-            include CallCenter::DeferredCallbacks
-          end
+    context "deferred and using test DSL:" do
+      setup do
+        (class << @call; self; end).class_eval do
+          include CallCenter::DeferredCallbacks
         end
+      end
 
-        should_flow :on => :incoming_call, :initial => :voicemail, :when => Proc.new {
-          @call.stubs(:agents_available?).returns(false)
-          @call.stubs(:notify)
-          @call.stubs(:customer).returns('the_flow')
-        } do
-          should_also { assert_received(@call, :notify) { |e| e.with(:rendering_voicemail) } }
-          and_also { assert_received(@call, :customer) { |e| e.with(:voicemail_complete) } }
-          and_render { "Response>Say" }
-          and_render { "Response>Record[action=the_flow]" }
-        end
+      should_flow :on => :incoming_call, :initial => :voicemail, :when => Proc.new {
+        @call.stubs(:agents_available?).returns(false)
+        @call.stubs(:notify)
+        @call.stubs(:customer).returns('the_flow')
+      } do
+        should_also { assert_received(@call, :notify) { |e| e.with(:rendering_voicemail) } }
+        and_also { assert_received(@call, :customer) { |e| e.with(:voicemail_complete) } }
+        and_render { "Response>Say" }
+        and_render { "Response>Record[action=the_flow]" }
+      end
 
-        should_flow :on => :incoming_call, :initial => :routing, :when => Proc.new {
-          @call.stubs(:agents_available?).returns(true)
-        } do
-          should_render { "Response" }
-        end
+      should_flow :on => :incoming_call, :initial => :routing, :when => Proc.new {
+        @call.stubs(:agents_available?).returns(true)
+      } do
+        should_render { "Response" }
+      end
 
-        should_flow :on => :customer_hangs_up, :routing => :cancelled, :when => Proc.new {
-          @call.stubs(:notify)
-        } do
-          should_also { assert_received(@call, :notify) { |e| e.with(:cancelled).once } }
+      should_flow :on => :customer_hangs_up, :routing => :cancelled, :when => Proc.new {
+        @call.stubs(:notify)
+      } do
+        should_also { assert_received(@call, :notify) { |e| e.with(:cancelled).once } }
+        and_also { assert @call.cancelled? }
+
+        should_flow :on => :customer_hangs_up, :cancelled => :cancelled do
+          should_also { assert_received(@call, :notify) { |e| e.with(:cancelled).once } } # For above
           and_also { assert @call.cancelled? }
 
           should_flow :on => :customer_hangs_up, :cancelled => :cancelled do
             should_also { assert_received(@call, :notify) { |e| e.with(:cancelled).once } } # For above
             and_also { assert @call.cancelled? }
-
-            should_flow :on => :customer_hangs_up, :cancelled => :cancelled do
-              should_also { assert_received(@call, :notify) { |e| e.with(:cancelled).once } } # For above
-              and_also { assert @call.cancelled? }
-            end
           end
         end
       end

data/test/core_ext_test.rb

@@ -1,7 +1,6 @@
-require 'helper'
+require File.expand_path("../helper", __FILE__)
 
 class MyObject
-
 end
 
 class CoreExtTest < Test::Unit::TestCase

data/test/helper.rb

@@ -1,24 +1,16 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
+require 'bundler/setup'
 require 'test/unit'
 require 'shoulda'
 require 'mocha'
 require 'bourne'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'call_center'
 
 require 'active_support'
 require 'action_pack'
 require 'action_controller'
+
 class Test::Unit::TestCase
   def response_from_page_or_rjs
     HTML::Document.new(@body).root
@@ -35,4 +27,4 @@ module CommonCallMethods
   def voicemail; end
   def voicemail_completed; end
   def routing; end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: call_center
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Henry Hsu
@@ -15,12 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-19 00:00:00 Z
+date: 2012-10-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: builder
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -30,11 +29,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id001
+  requirement: *id001
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   name: hsume2-state_machine
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -46,11 +45,11 @@ dependencies:
         - 5
         version: 1.0.5
   type: :runtime
-  version_requirements: *id002
+  requirement: *id002
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -60,27 +59,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: bundler
+  requirement: *id003
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :development
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -92,11 +75,11 @@ dependencies:
         - 4
         version: 1.6.4
   type: :development
-  version_requirements: *id005
+  requirement: *id004
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   name: rcov
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -106,25 +89,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: test-unit
+  requirement: *id005
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: guard
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -134,11 +103,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id008
+  requirement: *id006
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   name: guard-test
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -148,27 +117,27 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id009
+  requirement: *id007
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   name: actionpack
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 31
         segments: 
         - 2
         - 3
-        - 10
-        version: 2.3.10
+        - 14
+        version: 2.3.14
   type: :development
-  version_requirements: *id010
+  requirement: *id008
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   name: mocha
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -178,25 +147,27 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id011
+  requirement: *id009
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   name: bourne
-  prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 31
         segments: 
+        - 1
+        - 2
         - 0
-        version: "0"
+        version: 1.2.0
   type: :development
-  version_requirements: *id012
+  requirement: *id010
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   name: pre-commit
-  prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -206,27 +177,27 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id013
+  requirement: *id011
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   name: minitest
-  prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 11
         segments: 
-        - 2
-        - 6
-        - 1
-        version: 2.6.1
+        - 3
+        - 3
+        - 0
+        version: 3.3.0
   type: :development
-  version_requirements: *id014
+  requirement: *id012
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   name: minitest-reporters
-  prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -236,11 +207,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id015
+  requirement: *id013
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   name: guard-shell
-  prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -250,7 +221,8 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id016
+  requirement: *id014
+  prerelease: false
 description: Support for describing call center workflows
 email: hhsu@zendesk.com
 executables: []
@@ -258,7 +230,6 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE.txt
 - README.md
 files: 
 - .document
@@ -268,7 +239,7 @@ files:
 - Gemfile.lock
 - Guardfile
 - Guardfile.minitest
-- LICENSE.txt
+- MIT-LICENSE.txt
 - README.md
 - Rakefile
 - VERSION
@@ -292,7 +263,6 @@ files:
 - test/examples/legacy_call.rb
 - test/examples/multiple_flow_call.rb
 - test/examples/non_standard_call.rb
-- test/examples/outbound_call.rb
 - test/helper.rb
 homepage: http://github.com/zendesk/call_center
 licenses: 

data/test/examples/outbound_call.rb

@@ -1,3 +0,0 @@
-class SubclassCall < Call
-
-end