rackamole 0.2.3 → 0.2.4

data/HISTORY

@@ -19,4 +19,7 @@
 0.2.3
 * Bug fixes
   * Fixed issue where session or param key falls under the format a.b.c which causes 
-    validation problems in mongoDB. Thanks Rafael!
+    validation problems in mongoDB. Thanks Rafael!
+    
+0.2.4
+* Breaking off action_mailer dependencies. Now leveraging Pony for sending out email alerts.

data/README.rdoc

@@ -40,7 +40,8 @@ interactions and leverage these findings for the next iteration of your applicat
 * MongoDb + mongo ruby adapter
 * Twitter4r
 * Chronic
-* Actionmailer
+* Erubis
+* Pony
 
 == INSTALL:
 

data/Rakefile

@@ -31,4 +31,5 @@ depend_on "mongo"        , ">= 0.17.1"
 depend_on "mongo_ext"    , ">= 0.17.1"
 depend_on "chronic"      , ">= 0.2.3"
 depend_on "twitter4r"    , ">= 0.3.0"
-depend_on "actionmailer" , ">= 2.1.0"
+depend_on "erubis"       , ">= 2.6.0"
+depend_on "pony"         , ">= 0.6"

data/a.rb

@@ -0,0 +1,18 @@
+require 'rubygems'
+require 'pony'
+
+# :to      => ['fernand.galiana@gmail.com', 'fernand@collectiveintellect.com'],
+
+result = Pony.mail( 
+  :from     => 'fernand@collectiveintellect.com',
+  :to      => 'fernand.galiana@gmail.com, fernand@collectiveintellect.com',
+  :subject => 'test4', 
+  :body    => "Hello World",
+  :via     => :smtp,
+  :smtp    => { :host => "exchange@collectiveintellect.com", :port => 25, : }
+  # :user    => 'fernand@collectiveintellect.com',
+  # :password => '$mistral1',
+  # :auth     => :plain
+)
+
+puts result.inspect

data/lib/rackamole.rb

@@ -1,7 +1,7 @@
 module Rackamole
 
   # :stopdoc:
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:

data/lib/rackamole/alert/emole.rb

@@ -1,45 +1,56 @@
-require 'action_mailer'
+require 'pony'
+require 'erubis'
 
 module Rackamole::Alert
-  class Emole < ActionMailer::Base        
-    self.template_root = File.join( File.dirname(__FILE__), %w[templates] )
+  class Emole
+    
+    # retrieves erb template dir
+    def self.template_root() @template_root ||= File.join( File.dirname(__FILE__), %w[templates] ); end
         
     # Send an email notification for particular moled feature. An email will
     # be sent based on the two configuration :emails and :mail_on defined on the
     # Rack::Mole component. These specify the to and from addresses and the conditions
     # that will trigger the email, currently :enabled and :features for the type of
-    # moled features to track via email. The notification will be sent via actionmailer,
+    # moled features to track via email. The notification will be sent via Pony,
     # so you will need to make sure it is properly configured for your domain.
     # NOTE: This is just a notification mechanism. All moled event will be either logged 
     # or persisted in the db regardless.
     #
     # === Parameters:
-    # from       :: The from address address. Must be a valid domain.
-    # recipients :: An array of email addresses for recipients to be notified.
+    # options    :: Hash minimaly containing :from for the from address. Must be a valid domain.
+    #            :: And a :to, n array of email addresses for recipients to be notified.
     # args       :: The gathered information from the mole.
     #
-    def alert( from, recipients, args )
-      buff = []
+    def self.deliver_alert( options, args )
+      params = options.clone
+      params[:to]      = options[:to].join( ", " )
+      params[:subject] = "[M()le] (#{alert_type( args )}#{request_time?( args )}) -#{args[:app_name]}@#{args[:host]}- for user #{args[:user_name]}"
       
-      dump( buff, args, 0 )
+      content = []
+      dump( content, args, 0 )
+      content = content.join( "\n" )
       
-      from        from
-      recipients  recipients
-      subject     "[M()le] (#{alert_type( args )}#{request_time?( args )}) -#{args[:app_name]}@#{args[:host]}- for user #{args[:user_name]}"        
-      body        :args  => args,
-                  :dump  => buff.join( "\n" )
+      tmpl     = File.join( template_root, %w[alert.erb] )
+      template = Erubis::Eruby.new( IO.read( tmpl ), :trim => true )
+      
+      output        = template.result( binding )
+      params[:body] = output
+      
+      Pony.mail( params )
+      
+      output
     end
-        
+            
     # =========================================================================               
     private
            
       # Dump request time if any...
-      def request_time?( args )
+      def self.request_time?( args )
         args[:type] == Rackamole.perf ? ":#{args[:request_time]}" : ''        
       end
       
       # Identify the type of alert...        
-      def alert_type( args ) 
+      def self.alert_type( args ) 
         case args[:type]
           when Rackamole.feature : "Feature"
           when Rackamole.perf    : "Performance"
@@ -48,7 +59,7 @@ module Rackamole::Alert
       end
 
       # Dump args...
-      def dump( buff, env, level=0 )
+      def self.dump( buff, env, level=0 )
         env.each_pair do |k,value|
           if value.respond_to?(:each_pair) 
             buff << "%s %-#{40-level}s" % ['  '*level,k]

data/lib/rackamole/alert/templates/alert.erb

@@ -0,0 +1,9 @@
+A watched feature was triggered in application `<%= args[:app_name] %> on host `<%=args[:host]%>
+
+Details...
+
+<%= content %>
+
+- Your Rackamole
+
+This message was generated automatically. Please do not respond directly.

data/lib/rackamole/alert/twitt.rb

@@ -83,11 +83,12 @@ module Rackamole::Alert
         ("%4.2f" % time).to_f
       end
       
-      # Truncate for twitt max size       
+      # Truncate for twitt max size      
+      # BOZO !! This will be hosed if not 1.9 for multibyte chars 
       def truncate(text, length = 140, truncate_string = "...")
         return "" if text.nil?
-        l = length - truncate_string.mb_chars.length
-        text.mb_chars.length > length ? (text.mb_chars[0...l] + truncate_string).to_s : text
+        l = length - truncate_string.size
+        text.size > length ? (text[0...l] + truncate_string).to_s : text
       end       
   end
 end

data/lib/rackamole/mole.rb

@@ -53,8 +53,9 @@ module Rack
     # ==== BOZO! currently there is not support for throttling or monitoring these alerts. 
     # ==
     # :email        :: The mole can be configured to send out emails bases on interesting mole features.
-    #                  This feature uses actionmailer. You must specify a hash with the following keys :from, :to 
-    #                  and :alert_on options to indicate which mole type your wish to be alerted on.
+    #                  This feature uses Pony to send out the email. You must specify a hash with the following keys :from, :to 
+    #                  and :alert_on options to indicate which mole type your wish to be alerted on. 
+    #                  See Pony docs for custom options for your emails
     # ==
     #   :email => { :from => 'fred@acme.com', :to => ['blee@acme.com', 'doh@acme.com'], :alert_on => [Rackamole.perf, Rackamole.fault]  }
     # ==
@@ -153,7 +154,7 @@ module Rack
         # send email alert ?
         if alertable?( :email, attrs[:type] )
           logger.debug ">>> Sending out email on mole type #{attrs[:type]} to #{options[:email][:to].join( ", ")}"
-          Rackamole::Alert::Emole.deliver_alert( options[:email][:from], options[:email][:to], attrs ) 
+          Rackamole::Alert::Emole.deliver_alert( options[:email], attrs ) 
         end
       
         # send twitter alert ?

data/spec/rackamole/alert/emole_spec.rb

@@ -22,17 +22,17 @@ describe Rackamole::Alert::Emole do
   describe "#alert" do
     
     it "should send a feature email correctly" do
-      @expected.subject = "[M()le] (Feature) -Test@Fred- for user Fernand"
+      # @expected.subject = "[M()le] (Feature) -Test@Fred- for user Fernand"
       @expected.body    = feature_body      
-      Rackamole::Alert::Emole.create_alert( @from, @to, @args ).body_port.to_s.should == @expected.body_port.to_s
+      Rackamole::Alert::Emole.deliver_alert( {:from => @from, :to => @to}, @args ).should == @expected.body_port.to_s
     end
 
     it "should send a perf email correctly" do
       @args[:type] = Rackamole.perf
       @args[:request_time] = 10.0
-      @expected.subject = "[M()le] (Performance:10.0) -Test@Fred- for user Fernand"
+      # @expected.subject = "[M()le] (Performance:10.0) -Test@Fred- for user Fernand"
       @expected.body    = perf_body
-      Rackamole::Alert::Emole.create_alert( @from, @to, @args ).body_port.to_s.should == @expected.body_port.to_s
+      Rackamole::Alert::Emole.deliver_alert( {:from => @from, :to => @to }, @args ).should == @expected.body_port.to_s
     end
 
     it "should send a fault email correctly" do
@@ -40,9 +40,9 @@ describe Rackamole::Alert::Emole do
       @args[:fault]  = 'Oh Snap!'
       @args[:stack]  = ['fred', 'blee']
       @args[:params] = { :id => 10 }
-      @expected.subject = "[M()le] (Fault) -Test@Fred- for user Fernand"
+      # @expected.subject = "[M()le] (Fault) -Test@Fred- for user Fernand"
       @expected.body    = fault_body
-      Rackamole::Alert::Emole.create_alert( @from, @to, @args ).body_port.to_s.should == @expected.body_port.to_s
+      Rackamole::Alert::Emole.deliver_alert( { :from => @from, :to => @to }, @args ).should == @expected.body_port.to_s
     end
 
   end

data/spec/rackamole/mole_spec.rb

@@ -1,4 +1,5 @@
 require File.join(File.dirname(__FILE__), %w[.. spec_helper])
+require 'action_controller'
 
 describe Rack::Mole do
   include Rack::Test::Methods
@@ -65,7 +66,7 @@ describe Rack::Mole do
         get "/", nil, @test_env
       rescue
         last_request.env['mole.stash'].should_not be_nil
-        fault = last_request.env['mole.stash'].send( :find_fault, "/", "./spec/rackamole/mole_spec.rb:44:in `error_app'" )
+        fault = last_request.env['mole.stash'].send( :find_fault, "/", "./spec/rackamole/mole_spec.rb:45:in `error_app'" )
         fault.should_not be_nil
         fault.count.should == 1
       end
@@ -78,7 +79,7 @@ describe Rack::Mole do
           get "/", nil, env
         rescue
           last_request.env['mole.stash'].should_not be_nil
-          fault = last_request.env['mole.stash'].send( :find_fault, "/", "./spec/rackamole/mole_spec.rb:44:in `error_app'" )
+          fault = last_request.env['mole.stash'].send( :find_fault, "/", "./spec/rackamole/mole_spec.rb:45:in `error_app'" )
           fault.should_not be_nil
           fault.count.should == i+1
           env = last_request.env
@@ -92,9 +93,9 @@ describe Rack::Mole do
         begin        
           env['PATH_INFO'] = "/#{i}"
           get "/#{i}", nil, env
-        rescue
+        rescue => boom
           last_request.env['mole.stash'].should_not be_nil
-          fault = last_request.env['mole.stash'].send( :find_fault, "/", "./spec/rackamole/mole_spec.rb:44:in `error_app'" )          
+          fault = last_request.env['mole.stash'].send( :find_fault, "/", "./spec/rackamole/mole_spec.rb:45:in `error_app'" )          
           fault.should_not be_nil
           fault.count.should == i+1
           env = last_request.env
@@ -155,7 +156,7 @@ describe Rack::Mole do
     rescue 
       @test_store.mole_result[:stack].should have(4).items
       last_request.env['mole.stash'].should_not be_nil
-      fault = last_request.env['mole.stash'].send( :find_fault, "/", "./spec/rackamole/mole_spec.rb:44:in `error_app'" )
+      fault = last_request.env['mole.stash'].send( :find_fault, "/", "./spec/rackamole/mole_spec.rb:45:in `error_app'" )
       fault.should_not be_nil
       fault.count.should == 1
     end
@@ -194,7 +195,7 @@ describe Rack::Mole do
         @test_store.mole_result[:stack].should have(4).items
         @test_store.mole_result[:fault].should == 'Oh snap!'
         last_request.env['mole.stash'].should_not be_nil
-        fault = last_request.env['mole.stash'].send( :find_fault, "/", "./spec/rackamole/mole_spec.rb:189" )
+        fault = last_request.env['mole.stash'].send( :find_fault, "/", "./spec/rackamole/mole_spec.rb:190" )
         fault.should_not be_nil
         fault.count.should == 1
       end

data/spec/spec_helper.rb

@@ -2,6 +2,9 @@ require 'rubygems'
 require 'rack'
 require 'rack/test'
 
+require 'active_support'
+require 'action_pack'
+
 require File.join(File.dirname(__FILE__), %w[.. lib rackamole])
 
 Spec::Runner.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rackamole
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Fernand Galiana
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-08 00:00:00 -07:00
+date: 2010-01-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,14 +73,24 @@ dependencies:
         version: 0.3.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: actionmailer
+  name: erubis
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.1.0
+        version: 2.6.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: pony
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0.6"
     version: 
 - !ruby/object:Gem::Dependency 
   name: bones
@@ -111,13 +121,14 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 - aaa.txt
-- lib/rackamole/alert/templates/rackamole/alert/emole/alert.erb
+- lib/rackamole/alert/templates/alert.erb
 - samples/rails/moled/public/robots.txt
 files: 
 - ...
 - HISTORY
 - README.rdoc
 - Rakefile
+- a.rb
 - aaa.txt
 - images/mole_logo.png
 - images/mole_logo.psd
@@ -125,7 +136,7 @@ files:
 - images/mole_logo_small.psd
 - lib/rackamole.rb
 - lib/rackamole/alert/emole.rb
-- lib/rackamole/alert/templates/rackamole/alert/emole/alert.erb
+- lib/rackamole/alert/templates/alert.erb
 - lib/rackamole/alert/twitt.rb
 - lib/rackamole/interceptor.rb
 - lib/rackamole/logger.rb

data/lib/rackamole/alert/templates/rackamole/alert/emole/alert.erb

@@ -1,9 +0,0 @@
-A watched feature was triggered in application `<%= @args[:app_name] %> on host `<%=@args[:host]%>
-
-Details...
-
-<%= @dump %>
-
-- Your Rackamole
-
-This message was generated automatically. Please do not respond directly.