comsat 0.0.7 → 0.0.8

data/lib/comsat/client.rb

@@ -21,18 +21,20 @@ module Comsat
 
     def notify(route, msg={})
       message = msg.inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
+
+      start = Time.now
+      Comsat.log(:fn => :notify, :route => "#{route}", :at => :start)
+      notify_route = @@routes.detect {|r| r.name == route } if message
+
       if notify_route.event_type
-        event = notify_route
+        event = notify_route.event_type
       elsif message[:message_type]
         event = message[:message_type]
       else
         event = "notice"
       end
 
-      start = Time.now
-      Comsat.log(:fn => :notify, :route => "#{route}", :at => :start)
-      notify_route = @@routes.detect {|r| r.name == route } if message
-      notify_route.services.each do |svc|
+      notify_route.services[event].each do |svc|
         Comsat.log(:fn => :notify, :service => "#{svc.class.to_s.downcase}", :event => event)
         svc.send("send_#{event}".to_sym, message)
       end

data/lib/comsat/route.rb

@@ -9,8 +9,7 @@ module Comsat
       @services = {
         "notice" => [],
         "alert" => [],
-        "resolve" => [],
-        "all" => []
+        "resolve" => []
       }
 
       urls.each do |url|
@@ -18,7 +17,9 @@ module Comsat
         if svc.respond_to?("send_#{@event_type}")
           @services[@event_type] << svc
         else
-          @services["all"] << svc
+          @services.keys.each do |k|
+            @services[k] << svc
+          end
         end
       end
     end

data/lib/comsat/version.rb

@@ -1,3 +1,3 @@
 module Comsat
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/client_spec.rb

@@ -27,11 +27,11 @@ describe Comsat::Client do
       end
 
       it "should have one service initiated on the event_type 'notice'" do
-        subject.routes.first.services["notice"].length.should == 1
+        subject.routes.first.services["notice"].compact.length.should == 1
       end
 
       it "should have a campfire service initiated" do
-        subject.routes.first.services["notice"].first.class.should == Comsat::Campfire
+        subject.routes.first.services["notice"].compact.first.class.should == Comsat::Campfire
       end
 
       it "should provide an event type" do
@@ -53,7 +53,9 @@ describe Comsat::Client do
       end
 
       it "should have one service initiated on all event_types" do
-        subject.routes.first.services["all"].length.should == 1
+        subject.routes.first.services["notice"].compact.length.should == 1
+        subject.routes.first.services["alert"].compact.length.should == 1
+        subject.routes.first.services["resolve"].compact.length.should == 1
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comsat
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-18 00:00:00.000000000 Z
+date: 2012-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70239639975100 !ruby/object:Gem::Requirement
+  requirement: &70200113020040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70239639975100
+  version_requirements: *70200113020040
 - !ruby/object:Gem::Dependency
   name: scrolls
-  requirement: &70239639974440 !ruby/object:Gem::Requirement
+  requirement: &70200113019260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70239639974440
+  version_requirements: *70200113019260
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70239639972620 !ruby/object:Gem::Requirement
+  requirement: &70200113017660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70239639972620
+  version_requirements: *70200113017660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70239639971220 !ruby/object:Gem::Requirement
+  requirement: &70200113008300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70239639971220
+  version_requirements: *70200113008300
 description: Notifications as a Gem
 email:
 - ops@heroku.com