wackamole 0.0.3 → 0.0.4

data/spec/models/search_filter_spec.rb

@@ -20,6 +20,22 @@ describe Wackamole::SearchFilter do
     @filter.reset!
     check_filter( @filter, "today", "All", "", -1)
   end
+    
+  it "should retrieve the correct feature context" do
+    @filter.context_for( {'ctx' => "/blee/fred" } ).should == "/blee/fred"
+    @filter.context_for( {'ctl' => "blee", 'act' => "fred" } ).should == "blee#fred"
+  end
+  
+  it "should retrieve the correct start date" do
+    @filter.from_date_id.should_not be_nil
+  end
+  
+  it "should map id to type correctly" do
+    types = %w( Feature Perf Fault )
+    [0,1,2].each do |t|
+      @filter.send( :to_filter_type, t ).should == types[t]
+    end
+  end
   
   describe "series" do
     it "should generate the correct time_ids" do
@@ -59,7 +75,7 @@ describe Wackamole::SearchFilter do
       conds.should have(2).items
       conds.key?( :did ).should == true
       conds[:did].should == { "$gte" => @now.to_date_id.to_s }
-      conds[:bro].should == "Safari"
+      conds['bro.name'].should == "Safari"
     end
     
     it "should include mole type is specfied" do
@@ -70,7 +86,7 @@ describe Wackamole::SearchFilter do
       conds.should have(3).items
       conds.key?( :did ).should == true
       conds[:did].should == { "$gte" => @now.to_date_id.to_s }
-      conds[:bro].should == "Safari"
+      conds['bro.name'].should == "Safari"
       conds[:typ].should == Rackamole.feature
     end
 
@@ -91,6 +107,18 @@ describe Wackamole::SearchFilter do
         Wackamole::Control.db( "mole_fred_test_mdb" )
       end
       
+      it "should retrieve features correctly" do
+        features = @filter.features
+        features.should have(11).items
+        count = 0
+        features.each do |f|
+          f.should have(2).items
+          f.first.should == "All" if count == 0
+          f.first.should == "feature_#{count-1}" if count > 0
+          count += 1
+        end
+      end
+      
       it "should include user if specified" do
         @filter.search_terms = "user:blee_0@fred.test"    
         conds = @filter.to_conds
@@ -102,19 +130,19 @@ describe Wackamole::SearchFilter do
       end
       
       it "should include an adoc regexp if specified" do
-        @filter.search_terms = "key:blee"    
-        conds = @filter.to_conds
+        @filter.search_terms = "host:blee"    
+        conds = @filter.to_conds        
         conds.should have(2).items
-        conds['key'].should_not be_nil
-        conds['key'].should == /blee/
+        conds[:hos].should_not be_nil
+        conds[:hos].should == /blee/
       end
 
       it "should include an adoc regexp if specified" do
-        @filter.search_terms = "key:blee:duh"    
+        @filter.search_terms = "browser:name:duh"    
         conds = @filter.to_conds
         conds.should have(2).items
-        conds['key.blee'].should_not be_nil
-        conds['key.blee'].should == /duh/
+        conds['bro.name'].should_not be_nil
+        conds['bro.name'].should == /duh/
       end
       
       it "should raise an exception is search exp cannot be parsed" do

data/views/dashboard/_report.erb

@@ -1,5 +1,5 @@
 <div class="section" id="summary">
-  <p class="title">Current status</p>
+  <p class="title">this hour</p>
   <ul id="summary">
     <li>
       <p class="status">Users</p>
@@ -20,7 +20,7 @@
 </div>
 
 <div class="section" id="activity">
-  <p class="title">Today's activities</p>
+  <p class="title">day summary</p>
   <ul class="section">
     <li>
       <p id="faults">Faults</p>

data/views/dashboard/index.erb

@@ -1,3 +1,5 @@
+<%= javascripts %w[raphael.min g.raphael.min g.dot.min] %>
+
 <div id="dash">
   <%= partial :'dashboard/report' %>
 </div>

data/views/features/index.erb

@@ -1,6 +1,8 @@
+<%= javascripts %w[jquery.example] %>
+
 <%= partial :'shared/filter' %>
 
-<div id="features">
+<div id="features" class="spe_corners">
   <%= partial :'features/rows' %>
 </div>
 

data/views/layout.erb

@@ -6,28 +6,28 @@
     <link rel="icon" href="/images/small_logo.png" type="image/x-icon"/>
     <link rel="shortcut icon" href="/images/small_logo.png" type="image/x-icon"/>
     <%= stylesheets %w[wackamole] %>
-    <%= javascripts %w[jquery_min jquery_ui_min jquery.tools.min jquery.example application raphael.min g.raphael.min g.dot.min] %>
+    <%= javascripts %w[jquery_min jquery_ui_min] %>
   </head>
 
   <body id="body">
     <div id="overall">      
-      <div id="logo" style="margin-bottom:50px">
-        <%= link_to image_tag( 'wackamole_logo.png', :border => 0 ), '/mission' %>
+      <div id="logo" style="margin-bottom:5px">
+        <%= link_to image_tag( 'wackamole_logo.png', :border => 0 ), '/' %>
       </div>      
       <div id="app_info">
         <% if @app_info %>        
           <ul>
-            <li>&lt;<%=@app_info[:app_name]%>&gt;</li>
+            <li>&laquo;<span><%=@app_info[:app_name]%></span>&raquo;</li>
             <li id="env"><%=@app_info[:stage]%></li>
           <ul>
         <% end %>        
-        <p id="timestamp"><%=partial :'shared/timestamp'%></p>
+        <p><span id="timestamp"><%=partial :'shared/timestamp'%></span></p>
       </div>
       <div id="main">
         <div class="flash"></div>
         <% if @app_info %>        
-          <div id='navigation'>
-            <%=link_to "mission control", "/mission"                                               , :class => "site_link land" %>&nbsp;&bull;&nbsp;
+          <div id='navigation' class='corners'>
+            <%=link_to "mission control", "/"                                                      , :class => "site_link land" %>&nbsp;&bull;&nbsp;
             <%=link_to "dashboard"      , "/dashboard/#{@app_info[:app_name]}/#{@app_info[:stage]}", :class => "site_link dash" %>&nbsp;&bull;&nbsp;            
             <%=link_to "logs"           , "/logs/1"                                                , :class => "site_link logs" %>&nbsp;&bull;&nbsp;
             <%=link_to "features"       , "/features/1"                                            , :class => "site_link features" %>&nbsp;&bull;&nbsp;

data/views/logs/_rows.erb

@@ -2,6 +2,7 @@
   <%= page_entries_info @logs, :entry_name => 'log' %>
 </div>
   
+<% users={}; contexts={} %>
 <div id="content">
   <table class="logs">
     <thead>
@@ -17,14 +18,14 @@
     <tbody>
       <% count=0;@logs.each do |log| %>
         <tr class="<%=row_class_for log['typ'] %>" href="<%="/logs/#{log['_id']}/show"%>" rel='#details'>
-          <td><%=context_for log['fid'] %></td>
+          <td><%=context_for( contexts, log['fid']) %></td>
           <td><%=log['met']%></td>
-          <td><%=truncate( user_name_for( log['uid'] ), 30 )%></td>
+          <td><%=truncate( user_name_for( users, log['uid'] ), 30 )%></td>
           <td><%=log['ip']%></td>
           <td><%=format_host( log['hos'] )%></td>
           <td><%=timestamp_for log %></td>
           <td align="right"><%=request_time( log['rti'] )%></td>
-          <td align="right"><%=browser_icon( log['bro']['name'] )%></td>
+          <td align="right"><div class="browser <%=browser_class( log['bro'])%>"></div></td>
         </tr>
       <% count+=1;end %>
     </body>

data/views/logs/index.erb

@@ -1,8 +1,10 @@
+<%= javascripts %w[jquery.example jquery.tools.min] %>
+
 <div id="filter">
   <%= partial :'shared/filter' %>
 </div>
 
-<div id="logs">
+<div id="logs" class="spe_corners">
   <%= partial :'logs/rows' %>
 </div>
 

data/views/logs/show.erb

@@ -1,11 +1,7 @@
 <p id="info">
-  <%=image_tag mole_type_icon( @log['typ'] ), :border => 0 %>
-  <p class="title" id="type">
-    <%=human_type @log['typ'] %>
-  </p>
-  <p class="title" id="feature">  
-    <%=context_for @log['fid'] %>
-  </p>
+  <%=image_tag mole_type_icon( @log['typ'] ), :border => 0, :class => "info", :size => "35x35" %>  
+  <span id="type"><%=human_type @log['typ'] %></span>
+  <span id="feature"><%=context_for( {}, @log['fid'] ) %></span>
 </p>
 
 <div id="info">
@@ -19,7 +15,7 @@
       <% end %>      
       <tr>
         <td class="label">User</td>
-        <td><%=user_name_for @log['uid'] %></td>
+        <td><%=user_name_for( {}, @log['uid'] ) %></td>
       </tr>
       <tr>
         <td class="label">Method</td>

data/views/mission/_report.erb

@@ -1,49 +1,75 @@
-<% if @reports.count == 0 %>
+<style>
+table#mission {
+  width:  100%;
+  border: 1;
+  text-align: left;
+  min-height: 500px;
+}
+table#mission thead tr {
+  font-size: 1.2em;
+  color:     #808080;
+}
+table#mission tr.div {
+  border-bottom: 1px #c1c1c1 solid;
+}
+</style>
+
+<% applications = extract_applications( @pulse ) %>
+<% if applications.count == 0 %>
   <div class="doh">
     <p>Unable to find a Rackamole MongoDb database on this connection <%=Wackamole::Control.connection.host%>:<%=Wackamole::Control.connection.port%>.</p>
     <p>Make sure you moled database follows this naming convention</p>
     <p>mole_{<i>application name in lower case</i>}_{<i>environment</i>}_mdb</p>
   </div>
 <% else %>
-  <% @reports.each do |report| %>
-    <div class="mission">
-      <p class="app_name"><%= report['app'] %></p>
-      <% report['envs'].keys.sort.each do |env| %>
-        <div class="environment">
-          <div class="env">
-            <%= link_to env, "/dashboard/#{report['app']}/#{env}", :class => 'site_link app_link' %>
-          </div>
-          <div class="details">
-            <table border='0' width="100%">
-            <% report['envs'][env].each do |type, count| %>
-              <% diff = compute_diff( report['app'], env, type, count )%>
-              <tr>
-                <td class="<%=assign_class( type, count, diff )%>" align="left">
-                  <%=type.capitalize %>
-                </td> 
-                <td>
-                  <%=count%> 
-                </td>
-                <td>
-                  &lsaquo;<%= delta?( diff ) %>&rsaquo;
-                </td>
-                <% if type != 'features' and count > 0%>
-                  <td align='right'>
-                    <%= link_to_remote 'fixed', 
-                      "/mission/fixed/#{report['app']}/#{env}/#{type}", 
-                      :class => "fixed" %>
-                  </td>
-                <% else %>
-                  <td>
-                    <p style="width:30px"></p>
-                  </td>
-                <% end %>
-              </tr>
+  <table class="logs" id="mission">
+    <thead>
+      <tr>
+        <th width="25%">application</th>
+        <th width="10%">environment</th>
+        <th width="20%">to date</th>
+        <th width="20%">today</th>
+        <th width="20%">last tick</th>
+      </tr>
+    </thead>
+    <tbody>      
+      <% applications.each_pair do |app_name, envs| %>
+        <% envs.each do |env| %>
+          <tr class="div">
+            <td valign="top"><%= link_to app_name, "/dashboard/#{app_name}/#{env}", :class => 'site_link' %></td>
+            <td valign="top"><%= env %></td>
+            <% %w(to_date today last_tick).each do |period| %>
+              <% info = @pulse[period.to_sym][app_name][env] %>
+              <td>
+                <table border="0" width="100%">
+                  <tbody>
+                    <% info.each_pair do |type, count| %>
+                      <tr>
+                        <% clazz = ( (count > 0 and %w(last_tick today).include?(period)) ? assign_class( type, count ) : nil) %>
+                        <td width="25px">
+                          <% if( %w(last_tick today).include?( period ) and count > 0 ) %>
+                            <%= link_to Wackamole::Mission.to_type_name(type), "/dashboard/logs/#{app_name}/#{env}/#{type}", :class => "site_link" %>:
+                          <% else %>
+                            <%=Wackamole::Mission.to_type_name(type)%>:
+                          <% end %>
+                        </td>
+                        <td align='right'>
+                          <span class="<%= (clazz and count > 0 ? "#{period}_#{clazz}" : '') %>">
+                            &nbsp;<%= format_number(count) %>&nbsp;
+                          </span>
+                        </td>
+                        <!-- < if period == 'last_tick' %>
+                          <td width="5px" class="<=clazz%>">&nbsp;&nbsp;</td>
+                        < end %> -->
+                      </tr>
+                    <% end %>
+                  </tbody>
+                </table>
+              </td>
             <% end %>
-            </table>
-          </div>
-        </div>
+          </tr>        
+        <% end %>
       <% end %>
-    </div>
-  <% end %>
+    </tbody>
+  </table>
 <% end %>

data/views/mission/index.erb

@@ -1,6 +1,4 @@
-<p class="title">Mission Control</p>
-
-<div id="dash">
+<div id="mission">
   <%= partial :'mission/report' %>
 </div>
 

data/views/mission/refresh_js.erb

@@ -1,3 +1,6 @@
-$('p#timestamp').html( "<%=escape_javascript(partial(:'shared/timestamp'))%>" );
+$('span#timestamp').html( "<%=escape_javascript(partial(:'shared/timestamp'))%>" );
+$("span#timestamp").effect( 'pulsate', { times:1 }, 500 );
 
-$('div#dash').html( "<%=escape_javascript(partial(:'mission/report'))%>" );
+$('div#mission').html( "<%=escape_javascript(partial(:'mission/report'))%>" );
+
+$("span.last_tick_fault" ).effect( 'shake', { times: 3, distance: 5, direction: 'left' }, 300 );

data/views/mission/trash.txt

@@ -0,0 +1,50 @@
+<% applications = extract_applications( @pulse ) %>
+<% if applications.count == 0 %>
+  <div class="doh">
+    <p>Unable to find a Rackamole MongoDb database on this connection <%=Wackamole::Control.connection.host%>:<%=Wackamole::Control.connection.port%>.</p>
+    <p>Make sure you moled database follows this naming convention</p>
+    <p>mole_{<i>application name in lower case</i>}_{<i>environment</i>}_mdb</p>
+  </div>
+<% else %>
+  <% @.each do |report| %>
+    <div class="mission">
+      <p class="app_name"><%= report['app'] %></p>
+      <% report['envs'].keys.sort.each do |env| %>
+        <div class="environment">
+          <div class="env">
+            <%= link_to env, "/dashboard/#{report['app']}/#{env}", :class => 'site_link app_link' %>
+          </div>
+          <div class="details">
+            <table border='0' width="100%">
+            <% report['envs'][env].each do |type, count| %>
+              <% diff = compute_diff( report['app'], env, type, count )%>
+              <tr>
+                <td class="<%=assign_class( type, count, diff )%>" align="left">
+                  <%=type.capitalize %>
+                </td> 
+                <td>
+                  <%=count%> 
+                </td>
+                <td>
+                  &lsaquo;<%= delta?( diff ) %>&rsaquo;
+                </td>
+                <% if type != 'features' and count > 0%>
+                  <td align='right'>
+                    <%= link_to_remote 'fixed', 
+                      "/mission/fixed/#{report['app']}/#{env}/#{type}", 
+                      :class => "fixed" %>
+                  </td>
+                <% else %>
+                  <td>
+                    <p style="width:30px"></p>
+                  </td>
+                <% end %>
+              </tr>
+            <% end %>
+            </table>
+          </div>
+        </div>
+      <% end %>
+    </div>
+  <% end %>
+<% end %>

data/views/shared/_filter.erb

@@ -1,13 +1,5 @@
-<div id="filters">
+<div id="filters" class="corners">
   <form id="filter_form">
-  	<fieldset id="submit">
-  	  <label>
-  	    &nbsp;
-    	  <input type="submit" name="commit" value="Filter"/>
-        <%= image_tag 'loading.gif', :border => '0', :size => '24x24', :id => 'loading' %>
-  	  </label>
-  	</fieldset>
-
     <fieldset class="inline">
   		<label for="time_frame">
   		  Time range:
@@ -43,6 +35,13 @@
   		  </select>						  
   	  </label>
   	</fieldset>
+  	<fieldset id="submit">
+  	  <label>
+  	    &nbsp;
+    	  <input type="submit" name="commit" value="Filter"/>
+        <%= image_tag 'loading.gif', :border => '0', :size => '24x24', :id => 'loading' %>
+  	  </label>
+  	</fieldset>  	
   </form>
 </div>
 

data/views/shared/_search.erb

@@ -1,7 +1,7 @@
 <div id="search">
   <form id="search_form">
-    <input id="search_term" class="search" type="text" size="30" name="search_filter[search_terms]"/>
-    <%= image_tag 'loading.gif', :border => 0, :size => "22x22", :id => "search_loader" %>
+    <input id="search_term" class="search" type="text" size="50" name="search_filter[search_terms]"/>
+    <%= image_tag 'loading.gif', :border => 0, :size => "20x20", :id => "search_loader" %>
 	  <input type="submit" value="Search" style="display: none;" name="commit"/>
   </form>
 </div>