rackamole 0.3.2 → 0.3.3

data/HISTORY

@@ -54,4 +54,8 @@
 0.3.2
 * Fix issue with excluded_path being nil.
 * Changed default excluded_path 
-* Added perf_excludes option to exempt alerts from being sent for known slower requests
+* Added perf_excludes option to exempt alerts from being sent for known slower requests
+
+0.3.3
+* Added support for rackamole store authentication
+* Fixed issue to enforce regexp when excluded path are specified as strings.

data/lib/rackamole.rb

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

data/lib/rackamole/alert/emole.rb

@@ -39,8 +39,7 @@ module Rackamole::Alert
       Pony.mail( params )      
       output
     rescue => boom
-      puts boom
-      boom.backtrace.each { |l| puts l }
+      boom.backtrace.each { |l| logger.error l }
       logger.error( "Rackamole email alert failed with error `#{boom}" )
     end
             

data/lib/rackamole/mole.rb

@@ -258,7 +258,11 @@ module Rack
     def mole_request?( request )
       if options.has_key?( :excluded_paths ) and options[:excluded_paths]
         options[:excluded_paths].each do |exclude_path|
-          return false if request.path =~ exclude_path
+          exclude_path = Regexp.new( exclude_path ) if exclude_path.is_a?( String )
+          if request.path =~ exclude_path
+            logger.debug ">>> Excluded request -- #{request.path} using exclude flag #{exclude_path}"
+            return false 
+          end
         end
       end
       true

data/lib/rackamole/store/mongo_db.rb

@@ -19,9 +19,11 @@ module Rackamole
       #
       # === Options
       #
-      # :host    :: The name of the host running the mongo server. Default: localhost
-      # :port    :: The port for the mongo server instance. Default: 27017
-      # :db_name :: The name of the mole databaase. Default: mole_mdb
+      # :host     :: The name of the host running the mongo server. Default: localhost
+      # :port     :: The port for the mongo server instance. Default: 27017
+      # :db_name  :: The name of the mole databaase. Default: mole_mdb
+      # :username :: username if the mongo db has auth setup. optional
+      # :password :: password if the mongo db has auth required. optional
       #
       def initialize( options={} )
         opts = default_options.merge( options )
@@ -79,9 +81,14 @@ module Rackamole
           @connection = Mongo::Connection.new( @host, @port, :logger => opts[:logger] )          
           @database   = @connection.db( @db_name )
           
-          @features   = database.collection( 'features' )
-          @logs       = database.collection( 'logs' )
-          @users      = database.collection( 'users' )
+          if opts[:username] and opts[:password]
+            authenticated = @database.authenticate( opts[:username], opts[:password] )
+            raise "Authentication failed for database #{@db_name}. Please check your credentials and try again" unless authenticated
+          end
+          
+          @features = database.collection( 'features' )
+          @logs     = database.collection( 'logs' )
+          @users    = database.collection( 'users' )
         end
 
         # Validates option hash.
@@ -91,14 +98,22 @@ module Rackamole
               raise "[MOle] Mongo store configuration error -- You must specify a value for option `:#{option}" 
             end
           end
+          # check for auth
+          if opts[:username]
+            %w(username password).each do |option|
+              unless opts[option.to_sym]
+                raise "[MOle] Mongo store configuration error -- You must specify a value for auth option `:#{option}" 
+              end
+            end
+          end
         end
                 
         # Set up mongo default options ie localhost host, default mongo port and
         # the database being mole_mdb      
         def default_options
           {
-             :host     => 'localhost',
-             :port     => Mongo::Connection::DEFAULT_PORT
+             :host => 'localhost',
+             :port => Mongo::Connection::DEFAULT_PORT
           }
         end
         

data/spec/rackamole/store/mongo_db_spec.rb

@@ -4,6 +4,7 @@ require 'chronic'
 describe Rackamole::Store::MongoDb do
   
   describe "#mole" do
+    
     before( :all ) do
       @now   = Chronic.parse( "11/27/2009" )
       @store = Rackamole::Store::MongoDb.new( 
@@ -11,18 +12,18 @@ describe Rackamole::Store::MongoDb do
         :port     => 27017, 
         :db_name  => 'mole_app_test_mdb',
         :logger   => Rackamole::Logger.new( :file_name => $stdout, :log_level => 'info' ) )
-      @db = @store.database
+      @db    = @store.database
     end
     
     before( :each ) do
       @store.send( :reset! )
       
       @args = OrderedHash.new
-      @args[:type]         = Rackamole.feature
-      @args[:app_name]     = "app"
-      @args[:environment]  = :test
-      @args[:perf_issue]   = false
-      @args[:ip]           = "1.1.1.1"
+      @args[:type]               = Rackamole.feature
+      @args[:app_name]           = "app"
+      @args[:environment]        = :test
+      @args[:perf_issue]         = false
+      @args[:ip]                 = "1.1.1.1"
       @args[:browser]            = OrderedHash.new
       @args[:browser][:name]     = "Ibrowse"
       @args[:browser][:version]  = "1.X"
@@ -30,15 +31,15 @@ describe Rackamole::Store::MongoDb do
       @args[:machine][:platform] = "Blee"
       @args[:machine][:os]       = "Windoze"
       @args[:machine][:version]  = "10.0"
-      @args[:user_id]      = 100
-      @args[:user_name]    = "Fernand"
-      @args[:request_time] = 1.0
-      @args[:url]          = "http://test_me/"
-      @args[:path]         = "/fred"
-      @args[:method]       = 'GET'
-      @args[:params]       = { :blee => "duh".to_json }
-      @args[:session]      = { :fred => 10.to_json }
-      @args[:created_at]   = @now.utc
+      @args[:user_id]            = 100
+      @args[:user_name]          = "Fernand"
+      @args[:request_time]       = 1.0
+      @args[:url]                = "http://test_me/"
+      @args[:path]               = "/fred"
+      @args[:method]             = 'GET'
+      @args[:params]             = { :blee => "duh".to_json }
+      @args[:session]            = { :fred => 10.to_json }
+      @args[:created_at]         = @now.utc
     end
         
     it "should mole a context based feature correctly" do
@@ -53,23 +54,23 @@ describe Rackamole::Store::MongoDb do
       feature['ctx'].should     == '/fred'
      
       log = @store.logs.find_one()
-      log.should_not        be_nil
-      log['typ'].should     == Rackamole.feature  
-      log['fid'].should_not be_nil
-      log['par'].should     == { 'blee' => 'duh'.to_json }
-      log['ip'].should      == '1.1.1.1'
+      log.should_not                be_nil
+      log['typ'].should             == Rackamole.feature  
+      log['fid'].should_not         be_nil
+      log['par'].should             == { 'blee' => 'duh'.to_json }
+      log['ip'].should              == '1.1.1.1'
       log['bro']['name'].should     == "Ibrowse"
       log['bro']['version'].should  == "1.X"
       log['mac']['platform'].should == "Blee"
       log['mac']['os'].should       == "Windoze"
       log['mac']['version'].should  == "10.0"
-      log['url'].should     == 'http://test_me/'
-      log['met'].should     == 'GET'
-      log['ses'].should     == { 'fred' => '10' }
-      log['uid'].should_not be_nil
-      log['rti'].should     == 1.0
-      log['did'].should     == '20091127'
-      log['tid'].should     == '190000'
+      log['url'].should             == 'http://test_me/'
+      log['met'].should             == 'GET'
+      log['ses'].should             == { 'fred' => '10' }
+      log['uid'].should_not         be_nil
+      log['rti'].should             == 1.0
+      log['did'].should             == '20091127'
+      log['tid'].should             == '190000'
 
       feature = @store.features.find_one( log['fid'] )
       feature.should_not     be_nil
@@ -164,4 +165,27 @@ describe Rackamole::Store::MongoDb do
     end
   end
   
+  describe( "authentication" ) do
+    it "should authenticate correctly if a store is setup with auth" do
+      store = Rackamole::Store::MongoDb.new( 
+        :host     => 'localhost', 
+        :port     => 27017, 
+        :db_name  => 'mole_sec_app_test_mdb',
+        :username => 'fred',
+        :password => 'letmein',
+        :logger   => Rackamole::Logger.new( :file_name => $stdout, :log_level => 'info' ) )
+    end
+    
+    it "should crap out if auth failed" do
+      lambda {
+        store = Rackamole::Store::MongoDb.new( 
+          :host     => 'localhost', 
+          :port     => 27017, 
+          :db_name  => 'mole_sec_app_test_mdb',
+          :username => 'fred',
+          :password => 'hoy',
+          :logger   => Rackamole::Logger.new( :file_name => $stdout, :log_level => 'info' ) )      
+      }.should raise_error( /Authentication failed/ )
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -2,9 +2,6 @@ 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|

data/spec/test_configs/rackamole_test.yml

@@ -37,6 +37,9 @@ production:
   <<:             *defaults
   :perf_threshold: 5
   :store:          !ruby/object:Rackamole::Store::MongoDb
-    host:    fred
-    port:    10
-    db_name: mole_fred_production    
+    host:          fred
+    port:          10
+    db_name:       mole_fred_production
+    username:      fred
+    password:      secret
+    

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rackamole
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - Fernand Galiana
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-11 00:00:00 -07:00
+date: 2010-02-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency