all_seeing_eye 0.0.10 → 0.0.11

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.11

data/all_seeing_eye.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{all_seeing_eye}
-  s.version = "0.0.10"
+  s.version = "0.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh Symonds"]

data/lib/all_seeing_eye/server/views/layout.erb

@@ -21,7 +21,7 @@
         <%= tab 'Total' %>
         <%= tab 'Fields' %>
         <li class='right'>
-          <form action='/search' method='post'>
+          <form action='<%=u '/search' %>' method='post'>
             <label>Search</label>
             <input name='query' type='text'>
             <input type="submit" name="submit" value="Go" > 

data/lib/all_seeing_eye/server/views/left.erb

@@ -2,7 +2,7 @@
   <% if @id %>
     <div id='left'>
       <ul>
-        <li class=<%= current_page.split(CGI.escape(@id))[1] ? '' : 'current' %>><a href="<%= u "/fields/#{@field}/#{CGI.escape(@id)} " %>">Total</a></li>
+        <li class=<%= current_page.split(CGI.escape(@id))[1] ? '' : 'current' %>><a href="<%= u "fields/#{@field}/#{CGI.escape(@id)} " %>">Total</a></li>
         <% (tabs - [@field]).each do |t| %>
           <%= tab t, "fields/#{@field}/#{CGI.escape(@id)}" %>
         <% end %>
@@ -11,7 +11,7 @@
   <% elsif @query%>
     <div id='left'>
       <ul>
-        <li class=<%= current_page.split(CGI.escape(@query))[1] ? '' : 'current' %>><a href="/search/<%= CGI.escape(@query) %>">Total</a></li>
+        <li class=<%= current_page.split(CGI.escape(@query))[1] ? '' : 'current' %>><a href="<%= u "search/#{CGI.escape(@query) }" %>"}>Total</a></li>
         <% tabs.each do |t| %>
           <%= tab t, "search/#{CGI.escape(@query)}" %>
         <% end %>

data/lib/all_seeing_eye/server/views/total.erb

@@ -1,31 +1,5 @@
 <% if @field %>
   <%= partial(:left )%>
-<% elsif !@requests.empty? %>
-  <table cellspacing="0">
-    <tr>
-      <th></th>
-      <th>Today</th><th>Yesterday</th><th>This Week</th><th>All Time</th>
-    </tr>
-
-    <tr>
-      <th>Requests</th>
-      <td><%= AllSeeingEye::Request.count(:start => DateTime.now.beginning_of_day, :stop => DateTime.now.end_of_day) %></td>
-      <td><%= AllSeeingEye::Request.count(:start => DateTime.yesterday.beginning_of_day, :stop => DateTime.yesterday.end_of_day) %></td>
-      <td><%= AllSeeingEye::Request.count(:start => DateTime.now.beginning_of_week, :stop => DateTime.now.end_of_week) %></td>
-      <td><%= AllSeeingEye::Request.count %></td>
-    </tr>
-
-    <tr>
-      <th>Requests/Sec</th>
-      <td><%= round AllSeeingEye::Request.count(:start => DateTime.now.beginning_of_day, :stop => DateTime.now.end_of_day).to_f / (DateTime.now.to_f - DateTime.now.beginning_of_day.to_f) %></td>
-      <td><%= round AllSeeingEye::Request.count(:start => DateTime.yesterday.beginning_of_day, :stop => DateTime.yesterday.end_of_day).to_f / ((DateTime.now - 1.day).end_of_day.to_f - (DateTime.now - 1.day).beginning_of_day.to_f) %></td>
-      <td><%= round AllSeeingEye::Request.count(:start => DateTime.now.beginning_of_week, :stop => DateTime.now.end_of_week).to_f / (DateTime.now.to_f - DateTime.now.beginning_of_week.to_f) %></td>
-      <td><%= round AllSeeingEye::Request.count.to_f / (AllSeeingEye::Request.last.created_at.to_f - AllSeeingEye::Request.first.created_at.to_f) %></td>
-    </tr>
-  </table>
-<% end %>
-
-<% if @field %>
   <div id='right'>
     <% if @id %>
       <h1><a href='/fields/<%= @field %>'><%= humanize @field %></a> &raquo; <%= humanize @id %></h1>

data/lib/all_seeing_eye/server.rb

@@ -23,7 +23,8 @@ class AllSeeingEye
       end
 
       def url_path(*path_parts)
-        [ path_prefix, path_parts ].compact.join("/").squeeze('/')
+        path = [ path_prefix, path_parts ].compact.join("/")
+        ('/' + path).squeeze('/')
       end
       alias_method :u, :url_path
       
@@ -38,7 +39,7 @@ class AllSeeingEye
       def tab(name, prefix = nil)
         dname = name.to_s.downcase
         path = url_path(dname)
-        "<li #{class_if_current(path)}><a href='/#{prefix.nil? ? '' : "#{prefix}/"}#{path}'>#{humanize name}</a></li>"
+        "<li #{class_if_current(path)}><a href='#{prefix.nil? ? '' : "#{prefix}/"}#{path}'>#{humanize name}</a></li>"
       end
 
       def round(float, n = 2)
@@ -78,7 +79,7 @@ class AllSeeingEye
     end
     
     post '/search' do
-      redirect "/search/#{params[:query]}"
+      redirect url_path("/search/#{params[:query]}")
     end
     
     get '/search/:id' do
@@ -90,7 +91,7 @@ class AllSeeingEye
     end
     
     get "/fields" do
-      redirect "/fields/#{AllSeeingEye::Request.field_keys.first}"
+      redirect url_path("/fields/#{AllSeeingEye::Request.field_keys.first}")
     end
 
     AllSeeingEye::Request.field_keys.each do |field|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: all_seeing_eye
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - Josh Symonds