all_seeing_eye 0.0.13 → 0.0.14

data/VERSION

@@ -1 +1 @@
-0.0.13
+0.0.14

data/all_seeing_eye.gemspec

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

data/lib/all_seeing_eye/model.rb

@@ -73,7 +73,17 @@ class AllSeeingEye::Model
   def self.count_by_field(field, options = {})
     options = {:start => '-inf', :stop => '+inf'}.merge(options)
 
-    raw_list = AllSeeingEye.redis.zrangebyscore("allseeingeye:#{self.model_name}:fields:#{field}", options[:start], options[:stop], :with_scores => true)
+    key = if options[:value]
+      "allseeingeye:#{self.model_name}:fields:#{field}:#{options[:value]}:count"
+    else
+      if AllSeeingEye.redis.exists("allseeingeye:#{self.model_name}:fields:#{field}:count")
+        "allseeingeye:#{self.model_name}:fields:#{field}:count"
+      else
+        "allseeingeye:#{self.model_name}:fields:#{field}"
+      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
@@ -82,7 +92,7 @@ class AllSeeingEye::Model
         list.last[1] = value.to_i
       end
     end
-    list.reverse
+    list.sort{|a, b| a.first.is_a?(String) ? b.last <=> a.last : a.first <=> b.first}
   end
   
   def self.first
@@ -133,22 +143,6 @@ class AllSeeingEye::Model
     tree.to_a
   end
   
-  def self.created_count(start = '-inf', stop = '+inf')
-    start ||= Chronic.parse(start).to_i
-    stop ||= Chronic.parse(stop).to_i
-    
-    raw_list = AllSeeingEye.redis.zrangebyscore("allseeingeye:#{self.model_name}:fields:created_at:count", start, stop, :with_scores => true)
-    list = []
-    raw_list.each_with_index do |value, index|
-      if index % 2 == 0
-        list << [value]
-      else
-        list.last[1] = value.to_i
-      end
-    end
-    list
-  end
-  
   def initialize
     self.class.field_names.each do |key|
       self.class.send(:attr_accessor, key.to_sym)
@@ -161,15 +155,18 @@ class AllSeeingEye::Model
   end
   
   def save
+    timestamp = (self.created_at.to_i / 60) * 60
+    
     AllSeeingEye.redis["allseeingeye:#{self.class.model_name}:#{id}"] = Marshal.dump(self)
     AllSeeingEye.redis.sadd("allseeingeye:#{self.class.model_name}:all", id)
     self.class.field_names.each do |field|
       value = self.send(field.to_sym)
       next if value.nil? || (value.respond_to?(:empty?) && value.empty?)
       if value.is_a?(Time) || value.is_a?(DateTime) || value.is_a?(Date)
+        AllSeeingEye.redis.zincrby("allseeingeye:#{self.class.model_name}:fields:#{field}:count", 1, timestamp)
         AllSeeingEye.redis.zadd("allseeingeye:#{self.class.model_name}:fields:#{field}", value.to_i, id)
-        AllSeeingEye.redis.zincrby("allseeingeye:#{self.class.model_name}:fields:#{field}:count", 1, (value.to_i / 60) * 60)
       else
+        AllSeeingEye.redis.zincrby("allseeingeye:#{self.class.model_name}:fields:#{field}:#{value}:count", 1, timestamp)
         AllSeeingEye.redis.lpush("allseeingeye:#{self.class.model_name}:fields:#{field}:#{value}", id)
         AllSeeingEye.redis.zincrby("allseeingeye:#{self.class.model_name}:fields:#{field}", 1, value)
       end

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

@@ -61,7 +61,7 @@
       
         $("#graph").bind("plotclick", function (event, pos, item) {
             if (item) {
-              window.location = "/fields/<%= @field %>/" + encodeURIComponent(ids[item.dataIndex])
+              window.location = '<%= u "fields/#{CGI::escape(@field)}/" %>' + encodeURIComponent(ids[item.dataIndex])
             }
         });
     </script>

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

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

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

@@ -18,7 +18,7 @@
   <script type='text/javascript'>
     $.plot($("#graph"),
       [{
-       data: [ <%= @counts.collect{|k,v| "[#{k * 1000}, #{v}]"}.join(',') %> ],
+       data: [ <%= @counts.collect{|count| "[#{count.first.to_i * 1000}, #{count.last.to_i}]"}.join(',') %> ],
        label: 'requests'
       }],
       {

data/lib/all_seeing_eye/server.rb

@@ -1,6 +1,7 @@
 require 'all_seeing_eye'
 require 'sinatra/base'
 require 'erb'
+require 'cgi'
 
 class AllSeeingEye
   class Server < Sinatra::Base
@@ -73,11 +74,11 @@ class AllSeeingEye
     end
     
     get '/total' do
-      @counts = AllSeeingEye::Request.created_count
+      @counts = AllSeeingEye::Request.count_by_field('created_at', :start => (DateTime.now - 1.month).to_i, :stop => DateTime.now.to_i)
       show :total
     end
     
-    post '/search' do
+    get '/search' do
       redirect url_path("/search/#{params[:query]}")
     end
     
@@ -126,8 +127,7 @@ class AllSeeingEye
       get %r{/fields/#{field}/(.*)$} do
         @field = field
         @id = params[:captures].first
-        @requests = AllSeeingEye::Request.find_by_field(@field, :value => @id)
-        @counts = AllSeeingEye::Request.conglomerate(@requests)
+        @counts = AllSeeingEye::Request.count_by_field(@field, :value => @id)
         show :total
       end
     end

data/test/model_test.rb

@@ -189,7 +189,7 @@ context 'class methods with setup' do
   
   test 'return count in a field' do
     counts = AllSeeingEye::Model.count_by_field('uri')
-    
+
     assert_equal '/test/', counts.first.first
     assert_equal 5, counts.first.last
     assert_equal '/', counts.last.first
@@ -230,7 +230,7 @@ context 'many objects' do
     @time = Time.now
     
     2000.times do |n|
-      instance_variable_set("@obj#{n}".to_sym, AllSeeingEye::Model.create(:uri => '/', :ip => '127.0.0.1', :created_at => @time - (n * (1999 - n)) * 60))
+      instance_variable_set("@obj#{n}".to_sym, AllSeeingEye::Model.create(:uri => '/', :ip => n % 2 == 0 ? '127.0.0.1' : '192.168.0.1', :created_at => @time - (n * (1999 - n)) * 60))
     end
   end
   
@@ -244,12 +244,18 @@ context 'many objects' do
   end
   
   test 'get the created count' do
-    counts = AllSeeingEye::Model.created_count
+    counts = AllSeeingEye::Model.count_by_field('created_at')
     
     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}
   end
+  
+  test 'get the created count for a value' do
+    counts = AllSeeingEye::Model.count_by_field('ip', :value => '192.168.0.1')
+    
+    assert_equal 1000, counts.inject(0) {|sum, k| sum + k.last}
+  end
 end
 
 context 'instance methods' do  

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: all_seeing_eye
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 0
-  - 13
-  version: 0.0.13
+  - 14
+  version: 0.0.14
 platform: ruby
 authors: 
 - Josh Symonds