all_seeing_eye 0.0.14 → 0.0.15

data/VERSION

@@ -1 +1 @@
-0.0.14
+0.0.15

data/all_seeing_eye.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{all_seeing_eye}
-  s.version = "0.0.14"
+  s.version = "0.0.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh Symonds"]
-  s.date = %q{2011-08-11}
+  s.date = %q{2011-08-12}
   s.default_executable = %q{all-seeing-eye}
   s.description = %q{AllSeeingEye observes all requests, with parameters that you specify, to Redis. Then it composes them into graphs for you to see.}
   s.email = %q{veraticus@gmail.com}
@@ -44,7 +44,6 @@ Gem::Specification.new do |s|
     "lib/all_seeing_eye/server/views/layout.erb",
     "lib/all_seeing_eye/server/views/left.erb",
     "lib/all_seeing_eye/server/views/total.erb",
-    "lib/all_seeing_eye/server/views/view.erb",
     "test/base_test.rb",
     "test/fixtures/all_seeing_eye.yml",
     "test/fixtures/redis-test.conf",

data/lib/all_seeing_eye/model.rb

@@ -57,7 +57,7 @@ class AllSeeingEye::Model
   
   def self.find_by_field(field, options = {})
     if options[:value]
-      all = AllSeeingEye.redis.sort("allseeingeye:#{self.model_name}:fields:#{field}:#{options[:value]}", :by => 'nosort', :get => "allseeingeye:#{self.model_name}:*").collect{|o| self.load(o)}
+      all = AllSeeingEye.redis.sort("allseeingeye:#{self.model_name}:fields:#{field}:#{options[:value]}", :by => 'nosort', :get => "allseeingeye:#{self.model_name}:*", :limit => options[:offset] && options[:limit] ? [options[:offset], options[:limit]] : nil).collect{|o| self.load(o)}
       all = all.find_all{|o| o.created_at > options[:start]} if options[:start]
       all = all.find_all{|o| o.created_at < options[:stop]} if options[:stop]
       all
@@ -71,19 +71,18 @@ class AllSeeingEye::Model
   end
   
   def self.count_by_field(field, options = {})
-    options = {:start => '-inf', :stop => '+inf'}.merge(options)
+    options = {:start => '-inf', :stop => '+inf', :offset => nil, :limit => nil}.merge(options)
 
-    key = if options[:value]
-      "allseeingeye:#{self.model_name}:fields:#{field}:#{options[:value]}:count"
+    raw_list, needs_pruning = if options[:value]
+      [AllSeeingEye.redis.zrangebyscore("allseeingeye:#{self.model_name}:fields:#{field}:#{options[:value]}:count", '-inf', '+inf', :with_scores => true), true]
     else
       if AllSeeingEye.redis.exists("allseeingeye:#{self.model_name}:fields:#{field}:count")
-        "allseeingeye:#{self.model_name}:fields:#{field}:count"
+        [AllSeeingEye.redis.zrangebyscore("allseeingeye:#{self.model_name}:fields:#{field}:count", '-inf', '+inf', :with_scores => true), true]
       else
-        "allseeingeye:#{self.model_name}:fields:#{field}"
+        [AllSeeingEye.redis.zrangebyscore("allseeingeye:#{self.model_name}:fields:#{field}", options[:start], options[:stop], :with_scores => true), false]
       end
     end
     
-    raw_list = AllSeeingEye.redis.zrangebyscore(key, options[:start], options[:stop], :with_scores => true)
     list = []
     raw_list.each_with_index do |value, index|
       if index % 2 == 0
@@ -92,7 +91,11 @@ class AllSeeingEye::Model
         list.last[1] = value.to_i
       end
     end
-    list.sort{|a, b| a.first.is_a?(String) ? b.last <=> a.last : a.first <=> b.first}
+    if needs_pruning
+      list = list.find_all{|i| i.first.to_i > options[:start]} if options[:start] && options[:start] != '-inf'
+      list = list.find_all{|i| i.first.to_i < options[:stop]} if options[:stop] && options[:stop] != '+inf'
+    end
+    list.sort{|a, b| a.first.to_i == 0 ? b.last <=> a.last : a.first <=> b.first}
   end
   
   def self.first
@@ -105,15 +108,19 @@ class AllSeeingEye::Model
   
   def self.search(query, options = {})
     if query =~ /^[\sa-zA-Z0-9,-]*? to [\sa-zA-Z0-9,-]*?$/
-      start = Chronic.parse(query.split(' to ').first, :context => :past)
-      stop = Chronic.parse(query.split(' to ').last, :context => :past)
-      AllSeeingEye.redis.zrangebyscore("allseeingeye:#{self.model_name}:fields:created_at", start.to_i, stop.to_i, :with_scores => false).collect{|id| self.find(id)}
+      start = Chronic.parse(query.split(' to ').first, :context => :past).to_i
+      stop = Chronic.parse(query.split(' to ').last, :context => :past).to_i
+      if options[:count]
+        return self.count_by_field('created_at', :start => start, :stop => stop)
+      else
+        return AllSeeingEye.redis.zrangebyscore("allseeingeye:#{self.model_name}:fields:created_at", start, stop, :with_scores => false).collect{|id| self.find(id)}
+      end
     elsif query =~ /^(#{self.field_names.join('|')}):(.*)$/
-      self.find_by_field($1, :value => $2)
-    else
-      results = []
-      self.field_names.each {|f| results << self.find_by_field(f, :value => query)}
-      results.flatten.uniq
+      if options[:count]
+        self.count_by_field($1, :value => $2)
+      else
+        self.find_by_field($1, :value => $2)
+      end
     end
   end
   

data/lib/all_seeing_eye/server.rb

@@ -66,6 +66,7 @@ class AllSeeingEye
 
     def show(page, layout = true)
       response["Cache-Control"] = "max-age=0, private, must-revalidate"
+      @page = params[:page].blank? ? 1 : params[:page].to_i if page == :field || page == 'field'
       erb page.to_sym, {:layout => layout}
     end
 
@@ -85,8 +86,7 @@ class AllSeeingEye
     get '/search/:id' do
       @field = 'total'
       @query = params[:id]
-      @requests = AllSeeingEye::Request.search(@query)
-      @counts = AllSeeingEye::Request.conglomerate(@requests)
+      @requests = AllSeeingEye::Request.search(@query, :count => true)
       show :total
     end
     
@@ -117,10 +117,10 @@ class AllSeeingEye
           @id = params[:captures].first
           @view = f
           @requests = AllSeeingEye::Request.find_by_field(@field, :value => @id)
-          @counts = Hash.new(0)
-          @requests.each {|r| next if r.send(@view.to_sym).nil?; @counts[r.send(@view.to_sym)] += 1}
-          @counts = @counts.sort {|a, b| b.last <=> a.last}
-          show :view
+          counts = Hash.new(0)
+          @requests.each {|r| next if r.send(@view.to_sym).nil?; counts[r.send(@view.to_sym)] += 1}
+          @requests = counts.sort {|a, b| b.last <=> a.last}
+          show :field
         end
       end
       

data/lib/all_seeing_eye/server/public/style.css

@@ -228,4 +228,9 @@ tr:last-child td.last {
       }
       #page #graph {
         width: 98%; height: 500px; margin: 0 10px;
-      }
+      }
+      #page #pager {
+        width: 95%; height: 30px; margin: 10px 0; padding: 0 10px;
+      }
+        #pager #previous {float: left;}
+        #pager #next {float: right;}

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

@@ -1,23 +1,32 @@
 <%= partial(:left) %>
 
+<% paged_requests = @requests[((@page - 1) * 10)..(@page * 10)] %>
+
 <div id='right'>
   <% if @query %>
     <h1>Search &raquo; <%= humanize @query %> &raquo; <%= humanize @field %></h1>
+  <% elsif @view %>
+    <h1><a href='/fields/<%= @field %>'><%= humanize @field %></a> &raquo; <%= humanize @id %> &raquo; <%= humanize @view %></h1>
   <% else %>
     <h1><%= humanize @field %></h1>
   <% end %>
   
-  <% if @requests.empty? %>
+  <% if paged_requests.nil? || paged_requests.empty? %>
     <h2>No requests found.</h2>
   <% else %>
     <div id='graph'></div>
+    
+    <div id='pager'>
+      <% if @page != 1 %><a href='<%= u "#{current_page}?page=#{@page - 1}"%>' id='previous'>&laquo; previous</a><% end %>
+      <% if @requests.count > @page * 10 %><a href='<%= u "#{current_page}?page=#{@page + 1}"%>' id='next'>next &raquo;</a><% end %>
+    </div>
 
     <script type='text/javascript'>
-      var ids = [ <%= @requests[0..10].collect{|r| "'#{r.first}'"}.join(',') %>]
+      var ids = [ <%= paged_requests.collect{|r| "'#{r.first}'"}.join(',') %>]
   
       $.plot($("#graph"),
         [{
-         data: [ <%= @requests[0..10].enum_for(:each_with_index).collect {|f, i| "[#{i}, #{f.last}]"}.join(',') %> ],
+         data: [ <%= paged_requests.enum_for(:each_with_index).collect {|f, i| "[#{i}, #{f.last}]"}.join(',') %> ],
          label: 'requests'
         }],
         {
@@ -27,7 +36,7 @@
          grid: { hoverable: true, clickable: true },
          xaxis: {
            autoscaleMargin: 0.05,
-           ticks: [ <%= @requests[0..10].enum_for(:each_with_index).collect {|f, i| "[#{i}, '#{f.first.split(' ').join('\n').gsub('/','/\n')}']"}.join(',') %> ]
+           ticks: [ <%= paged_requests.enum_for(:each_with_index).collect {|f, i| "[#{i}, '#{f.first.split(' ').join('\n').gsub('/','/\n')}']"}.join(',') %> ]
          },
          yaxis: {
            autoscaleMargin: 0.01

data/test/model_test.rb

@@ -163,6 +163,10 @@ context 'class methods with setup' do
     assert results.collect(&:id).include?(@obj4.id)
   end
   
+  test 'find model objects with a limit and offset' do
+    
+  end
+  
   test 'find model objects by a date field' do
     results = AllSeeingEye::Model.find_by_field('created_at', :start => @obj1.created_at, :stop => @obj4.created_at)
     
@@ -215,12 +219,11 @@ context 'class methods with setup' do
     assert results.collect(&:id).include?(@obj6.id)
   end
   
-  test 'search without a specific field' do
-    results = AllSeeingEye::Model.search('192.168.0.1')
+  test 'search for a count on a specific field' do
+    results = AllSeeingEye::Model.search('uri:/test/', :count => true)
     
-    assert_equal 2, results.count
-    assert results.collect(&:id).include?(@obj4.id)
-    assert results.collect(&:id).include?(@obj6.id)
+    assert_equal 4, results.count
+    assert_equal results.last, [((@obj6.created_at.to_i / 60) * 60).to_s, 2]
   end
 end
 
@@ -246,6 +249,7 @@ context 'many objects' do
   test 'get the created count' do
     counts = AllSeeingEye::Model.count_by_field('created_at')
     
+    assert_equal counts, AllSeeingEye::Model.search('ten years ago to one year from now', :count => true)
     assert_equal (@obj999.created_at.to_i / 60) * 60, counts.first.first.to_i
     assert_equal (@obj0.created_at.to_i / 60) * 60, counts.last.first.to_i
     assert_equal 2000, counts.inject(0) {|sum, k| sum + k.last}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: all_seeing_eye
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 0
-  - 14
-  version: 0.0.14
+  - 15
+  version: 0.0.15
 platform: ruby
 authors: 
 - Josh Symonds
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-11 00:00:00 -05:00
+date: 2011-08-12 00:00:00 -05:00
 default_executable: all-seeing-eye
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -199,7 +199,6 @@ files:
 - lib/all_seeing_eye/server/views/layout.erb
 - lib/all_seeing_eye/server/views/left.erb
 - lib/all_seeing_eye/server/views/total.erb
-- lib/all_seeing_eye/server/views/view.erb
 - test/base_test.rb
 - test/fixtures/all_seeing_eye.yml
 - test/fixtures/redis-test.conf

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

@@ -1,63 +0,0 @@
-<%= partial(:left) %>
-
-<div id='right'>
-  <h1><a href='/fields/<%= @field %>'><%= humanize @field %></a> &raquo; <%= humanize @id %> &raquo; <%= humanize @view %></h1>
-
-  <% if @counts.flatten.empty? %>
-    <h2>No requests found.</h2>
-  <% else %>
-    <div id='graph'></div>
-
-    <script type='text/javascript'>
-    $.plot($("#graph"),
-      [{
-       data: [ <%= @counts.enum_for(:each_with_index).collect {|f, i| "[#{i}, #{f.last}]"}.join(',') %> ],
-       label: 'requests'
-      }],
-      {
-       series: {
-           bars: { show: true, align: "center", barWidth: 0.9}
-       },
-       grid: { hoverable: true, clickable: true },
-       xaxis: {
-         autoscaleMargin: 0.05,
-         ticks: [ <%= @counts.reverse.enum_for(:each_with_index).collect {|f, i| "[#{i}, '#{f.first.to_s.split(' ').join('\n').gsub('/','/\n')}']"}.join(',') %> ]
-       },
-       yaxis: {
-         autoscaleMargin: 0.01
-       },
-       legend: {
-         show: false
-       },
-       colors: ["#6bc2f6", "#d18b2c", "#dba255", "#919733"]
-      });
-  
-      var previousPoint = null;
-  
-      $("#graph").bind("plothover", function (event, pos, item) {
-        if (item) {
-            if (previousPoint != item.dataIndex) {
-                previousPoint = item.dataIndex;
-          
-                $("#tooltip").remove();
-                var x = item.datapoint[0].toFixed(2),
-                    y = item.datapoint[1].toFixed(2);
-          
-                showTooltip(item.pageX, item.pageY,
-                            Math.round(y) + ' ' + item.series.label + ' for ' + item.series.xaxis.ticks[item.dataIndex].label );
-            }
-        }
-        else {
-            $("#tooltip").remove();
-            previousPoint = null;            
-        }
-      });
-    
-      $("#graph").bind("plotclick", function (event, pos, item) {
-          if (item) {
-            window.location = "/fields/<%= @field %>/" + encodeURIComponent(ids[item.dataIndex])
-          }
-      });
-    </script>
-  <% end %>
-</div>