mole 1.0.1 → 1.0.2

data/lib/mole/models/mole_feature.rb

@@ -17,19 +17,28 @@ class MoleFeature < ActiveRecord::Base
     def find_exception_feature( app_name )         
       find_or_create_feature( exception, app_name )
     end
-    
+       
+    # Find the all feature ( wildcard feature for given app )
     def find_all_feature( app_name )
       find_or_create_feature( all, app_name )
     end
-             
+                     
+    # Find all the MOled applications                                       
+    def find_moled_application_names
+      res = find( :all, 
+                  :select => "distinct( app_name )", 
+                  :order  => "name asc" )            
+      res.map(&:app_name)             
+    end
+          
     # Finds all the features available for a given application
     def find_features( app_name )       
       # Creates the all feature if necessary    
       find_all_feature( app_name )
-      MoleFeature.find( :all, 
-                        :conditions => ["app_name = ?", app_name], 
-                        :select     => "id, name, context", 
-                        :order      => "name asc" )      
+      find( :all, 
+            :conditions => ["app_name = ?", app_name], 
+            :select     => "id, name, context", 
+            :order      => "name asc" )      
     end
       
     # locates an existing feature or create a new one if it does not exist.
@@ -37,9 +46,13 @@ class MoleFeature < ActiveRecord::Base
       if name.nil? or name.empty? 
         ::Mole.logger.error( "--- MOLE ERROR - Invalid feature. Empty or nil" ) 
         return nil
-      end                                
-      find_by_name_and_context_and_app_name( name, ctx_name, app_name ) ||     
-      create(:name => name,:context => ctx_name, :app_name => app_name )
+      end                          
+      if ctx_name      
+        res = find_by_name_and_context_and_app_name( name, ctx_name, app_name )
+      else
+        res = find_by_name_and_app_name( name, app_name )
+      end
+      res || create(:name => name,:context => ctx_name, :app_name => app_name )
     end   
   end
 end               

data/lib/mole/models/mole_log.rb

@@ -4,7 +4,7 @@
 class MoleLog < ActiveRecord::Base                                             
   belongs_to :mole_feature  
     
-  class << self                                         
+  class << self                                               
     # mole the bastard - create db entry into mole logs
     def log_it( context, feature, user_id, args )
       args    ||= "no args"                           
@@ -16,8 +16,8 @@ class MoleLog < ActiveRecord::Base
                       :params       => args.to_yaml,
                       :ip_address   => ip_addr, 
                       :browser_type => browser_type )
-    end
-                   
+    end               
+    
     # extract orginating ip address and browser type                                               
     def log_details( context ) #:nodoc:
       ip_addr, browser_type = nil
@@ -25,6 +25,7 @@ class MoleLog < ActiveRecord::Base
         ip_addr, browser_type = context.request.env['REMOTE_ADDR'], context.request.env['HTTP_USER_AGENT'] 
       end
       return ip_addr, browser_type
-    end        
-  end
+    end            
+  end          
+  
 end

data/lib/mole/version.rb

@@ -2,7 +2,7 @@ module Mole
   module Version
     MAJOR = 1
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
     
     # Returns the version string for the library.
     #

data/spec/models/mole_feature_spec.rb

@@ -3,7 +3,10 @@ require File.join(File.dirname(__FILE__), "..", "spec_helper" )
 describe MoleFeature do                         
   before( :each ) do                                                                    
     ::Mole.reset_configuration!
-    ::Mole.initialize( :mode => :persistent, :log_level => :debug, :moleable => true )
+    ::Mole.initialize( :application => "Test", 
+                       :mode        => :persistent, 
+                       :log_level   => :debug, 
+                       :moleable    => true )
   end
                       
   it "should find or create known features correctly" do
@@ -33,5 +36,13 @@ describe MoleFeature do
     MoleFeature.find_or_create_feature( "Fred", ::Mole.application, self.class.name )
     features = MoleFeature.find_features( ::Mole.application )
     features.should have(4).mole_features
+  end     
+  
+  it "should find moled application names correctly" do
+    MoleFeature.find_moled_application_names.should be_empty
+    %w[ all performance exception].each do |f|
+      feature = MoleFeature.send( "find_#{f}_feature".to_sym, ::Mole.application )
+    end
+    MoleFeature.find_moled_application_names.should == ["Test"]
   end
 end

data/spec/models/mole_log_spec.rb

@@ -1,4 +1,5 @@
 require File.join(File.dirname(__FILE__), "..", "spec_helper" )
+require 'ostruct'
            
 describe MoleLog do                           
   before( :each ) do    
@@ -42,8 +43,8 @@ describe MoleLog do
      log = check_it( feature, 400, @args )
      log.ip_address.should    == "1.1.1.1"
      log.browser_type.should  == "GodZilla"
-  end   
-  
+  end      
+    
   module Moled
     class Controller
       class Request

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: mole
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 date: 2008-03-02 00:00:00 -07:00
 summary: A flexible way to track user's interactions within your ruby web applications
 require_paths: