adhearsion 2.5.3 → 2.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ac84f37abcd4d6065f62cb0cbfbe7221a411467
-  data.tar.gz: d383c431622464439af224ddbe10e69f3a527bf2
+  metadata.gz: 934b35739888ae39b19f72ea09e02289ebc56bb5
+  data.tar.gz: 8f84e7ccdc30266aff7fe3ff47854dff86511efb
 SHA512:
-  metadata.gz: 386c467d760ee74861f1d4a409ab3f189343e21cdfc43a88649ebd49a0611588876632f6a8ed34ba2b32beb6e1d2e355371fbce3856bbcf0f7bff4f011ef6c9c
-  data.tar.gz: 358821502c81b271be52f17ce523bb6cdca04f06388743b0051f0c5eb01a74bcae891c9149023a5c3ca416159fa80d19459c29b282c54a94d60d7fcc7d203bad
+  metadata.gz: f23fb10c0bdaa93a47f4a4516d756d452a611d07282c8f1396b2c4132f08e7ff1be4af6cec65ebb40a0752d15e6509c04621fb1a13853e4da33f693eae15075d
+  data.tar.gz: 5516860dc709922c9d7babe161d5f760a91a1ce20c9af8cdf68ee2ac3d737258a1acd62d896ffb76c45ffd6405c1a3f3c62d0277b93bbe5b69e494593904b149

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # [develop](https://github.com/adhearsion/adhearsion)
 
+# [2.5.4](https://github.com/adhearsion/adhearsion/compare/v2.5.3...v2.5.4) - [2014-07-18](https://rubygems.org/gems/adhearsion/versions/2.5.4)
+  * Bugfix: Ignore dead calls when searching by tag
+  * Bugfix: Routing a dead call should end cleanly ([#441](https://github.com/adhearsion/adhearsion/issues/441))
+  * Bugfix: Ensure config gets correctly loaded by application
+
 # [2.5.3](https://github.com/adhearsion/adhearsion/compare/v2.5.2...v2.5.3) - [2014-04-25](https://rubygems.org/gems/adhearsion/versions/2.5.3)
   * Bugfix: Do not quiesce until the second SIGTERM, as per documentation ([#483](https://github.com/adhearsion/adhearsion/issues/483))
   * Bugfix: Consistent support for output options in all output methods ([#481](https://github.com/adhearsion/adhearsion/issues/481))

data/lib/adhearsion/calls.rb

@@ -38,7 +38,11 @@ module Adhearsion
 
     def with_tag(tag)
       values.find_all do |call|
-        call.tagged_with? tag
+        begin
+          call.tagged_with? tag
+        rescue Call::ExpiredError
+          false
+        end
       end
     end
 

data/lib/adhearsion/initializer.rb

@@ -195,17 +195,17 @@ module Adhearsion
     end
 
     def load_config_file
-      require "#{Adhearsion.config.root}/config/adhearsion.rb"
+      load "#{Adhearsion.config.root}/config/adhearsion.rb"
     end
 
     def load_events_file
       path = "#{Adhearsion.config.root}/config/events.rb"
-      require path if File.exists?(path)
+      load path if File.exists?(path)
     end
 
     def load_routes_file
       path = "#{Adhearsion.config.root}/config/routes.rb"
-      require path if File.exists?(path)
+      load path if File.exists?(path)
     end
 
     def init_get_logging_appenders

data/lib/adhearsion/router/route.rb

@@ -48,6 +48,8 @@ module Adhearsion
           end
           callback.call if callback
         }
+      rescue Call::Hangup, Call::ExpiredError
+        logger.info "Call routing could not be completed because call was unavailable."
       end
 
       def evented?

data/lib/adhearsion/version.rb

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

data/spec/adhearsion/calls_spec.rb

@@ -72,13 +72,25 @@ module Adhearsion
       end
     end
 
-    it "finding calls by a tag" do
-      calls.each { |call| subject << call }
+    context "tagged calls" do
+      it "finding calls by a tag" do
+        calls.each { |call| subject << call }
+
+        tagged_call = calls.last
+        tagged_call.tag :moderator
+
+        subject.with_tag(:moderator).should be == [tagged_call]
+      end
+
+      it "when a call is dead, ignore it in the search" do
+        calls.each { |call| subject << call }
 
-      tagged_call = calls.last
-      tagged_call.tag :moderator
+        tagged_call = calls.last
+        tagged_call.tag :moderator
+        Celluloid::Actor.kill tagged_call
 
-      subject.with_tag(:moderator).should be == [tagged_call]
+        subject.with_tag(:moderator).should be == []
+      end
     end
 
     it "finding calls by uri" do

data/spec/adhearsion/router/route_spec.rb

@@ -139,6 +139,14 @@ module Adhearsion
             latch.wait(2).should be true
           end
 
+          context "when the call has already ended before routing can begin" do
+            before { Celluloid::Actor.kill call }
+
+            it "should fall through cleanly" do
+              expect { route.dispatch call }.not_to raise_error
+            end
+          end
+
           context "when the CallController mutates its metadata" do
             let :controller do
               Class.new CallController do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adhearsion
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 2.5.4
 platform: ruby
 authors:
 - Jay Phillips
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-25 00:00:00.000000000 Z
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport