all_seeing_eye 0.0.16 → 0.0.17

data/VERSION

@@ -1 +1 @@
-0.0.16
+0.0.17

data/all_seeing_eye.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{all_seeing_eye}
-  s.version = "0.0.16"
+  s.version = "0.0.17"
 
   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

@@ -47,12 +47,12 @@ class AllSeeingEye::Model
     all
   end
   
-  def self.count(options = {})
-    options[:start] = options[:start].to_i if options[:start] && (options[:start].is_a?(Time) || options[:start].is_a?(DateTime) || options[:start].is_a?(Date))
-    options[:stop] = options[:stop].to_i if options[:stop] && (options[:stop].is_a?(Time) || options[:stop].is_a?(DateTime) || options[:stop].is_a?(Date))
-    options = {:start => '-inf', :stop => '+inf'}.merge(options)
-
-    AllSeeingEye.redis.zrangebyscore("allseeingeye:#{self.model_name}:fields:created_at", options[:start], options[:stop], :with_scores => false).collect{|id| self.find(id)}.size
+  def self.count
+    AllSeeingEye.redis.scard("allseeingeye:#{self.model_name}:all").to_i
+  end
+  
+  def self.count_by_field(field, options = {})
+    AllSeeingEye.redis.llen("allseeingeye:#{self.model_name}:fields:#{field}:#{options[:value]}").to_i
   end
   
   def self.find_by_field(field, options = {})
@@ -70,16 +70,21 @@ class AllSeeingEye::Model
     end
   end
   
-  def self.count_by_field(field, options = {})
-    options = {:start => '-inf', :stop => '+inf', :offset => nil, :limit => nil}.merge(options)
+  def self.list_by_field(field, options = {})
+    options = {:start => '-inf', :stop => '+inf', :page => nil}.merge(options)
+    limit = if options[:page]
+      [(options[:page] - 1) * 10, 10]
+    else
+      nil
+    end
 
     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]
+      [AllSeeingEye.redis.zrangebyscore("allseeingeye:#{self.model_name}:fields:#{field}:#{options[:value]}:count", '-inf', '+inf', :with_scores => true, :limit => limit), true]
     else
       if AllSeeingEye.redis.exists("allseeingeye:#{self.model_name}:fields:#{field}:count")
-        [AllSeeingEye.redis.zrangebyscore("allseeingeye:#{self.model_name}:fields:#{field}:count", '-inf', '+inf', :with_scores => true), true]
+        [AllSeeingEye.redis.zrangebyscore("allseeingeye:#{self.model_name}:fields:#{field}:count", '-inf', '+inf', :with_scores => true, :limit => limit), true]
       else
-        [AllSeeingEye.redis.zrangebyscore("allseeingeye:#{self.model_name}:fields:#{field}", options[:start], options[:stop], :with_scores => true), false]
+        [AllSeeingEye.redis.zrangebyscore("allseeingeye:#{self.model_name}:fields:#{field}", options[:start], options[:stop], :with_scores => true, :limit => limit), false]
       end
     end
     
@@ -111,13 +116,13 @@ class AllSeeingEye::Model
       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)
+        return self.list_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('|')}):(.*)$/
       if options[:count]
-        self.count_by_field($1, :value => $2)
+        self.list_by_field($1, :value => $2)
       else
         self.find_by_field($1, :value => $2)
       end

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

@@ -1,12 +1,20 @@
 <%= partial(:left) %>
 
-<% paged_requests = @requests[((@page - 1) * 10)..(@page * 10)] %>
+<% 
+  if @count
+    count = @count
+    paged_requests = @requests
+  else
+    count = @requests.size
+    paged_requests = @requests[((@page - 1) * 10)..(@page * 10)]
+  end
+%>
 
 <div id='right'>
   <% if @query %>
     <h1>Search &raquo; <%= humanize @query %> &raquo; <%= humanize @field %></h1>
   <% elsif @view %>
-    <h1><a href='<%=u "/fields/<%= @field %>" %>'><%= humanize @field %></a> &raquo; <%= humanize @id %> &raquo; <%= humanize @view %></h1>
+    <h1><a href='<%=u "/fields/#{@field}" %>'><%= humanize @field %></a> &raquo; <%= humanize @id %> &raquo; <%= humanize @view %></h1>
   <% else %>
     <h1><%= humanize @field %></h1>
   <% end %>
@@ -18,7 +26,7 @@
     
     <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 %>
+      <% if count > @page * 10 %><a href='<%= u "#{current_page}?page=#{@page + 1}"%>' id='next'>next &raquo;</a><% end %>
     </div>
 
     <script type='text/javascript'>

data/lib/all_seeing_eye/server.rb

@@ -24,14 +24,14 @@ class AllSeeingEye
       end
 
       def url_path(*path_parts)
-        path_parts = path_parts.collect{|p| p.gsub(path_prefix, '')}
+        path_parts = path_parts.collect{|p| p.to_s.gsub(path_prefix, '')}
         path = [ path_prefix, path_parts ].compact.join("/")
-        ('/' + path).squeeze('/').squeeze(path_prefix + '/')
+        ('/' + path).squeeze('/')
       end
       alias_method :u, :url_path
       
       def path_prefix
-        ENV['PATH_PREFIX']
+        ENV['PATH_PREFIX'] || ''
       end
 
       def class_if_current(path = '')
@@ -67,7 +67,6 @@ 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
 
@@ -76,7 +75,7 @@ class AllSeeingEye
     end
     
     get '/total' do
-      @counts = AllSeeingEye::Request.count_by_field('created_at', :start => (DateTime.now - 2.days).to_i, :stop => DateTime.now.to_i)
+      @counts = AllSeeingEye::Request.list_by_field('created_at', :start => (DateTime.now - 2.days).to_i, :stop => DateTime.now.to_i)
       show :total
     end
     
@@ -97,8 +96,10 @@ class AllSeeingEye
 
     AllSeeingEye::Request.field_keys.each do |field|
       get "/fields/#{field}" do
+        @page = params[:page].blank? ? 1 : params[:page].to_i
         @field = field
-        @requests = AllSeeingEye::Request.count_by_field(@field)
+        @count = AllSeeingEye::Request.count
+        @requests = AllSeeingEye::Request.list_by_field(@field, :page => @page)
         show :field
       end
       
@@ -128,7 +129,7 @@ class AllSeeingEye
       get %r{/fields/#{field}/(.*)$} do
         @field = field
         @id = params[:captures].first
-        @counts = AllSeeingEye::Request.count_by_field(@field, :value => @id)
+        @counts = AllSeeingEye::Request.list_by_field(@field, :value => @id)
         show :total
       end
     end

data/test/model_test.rb

@@ -176,10 +176,6 @@ context 'class methods with setup' do
   end
   
   test 'count model objects' do
-    assert_equal 2, AllSeeingEye::Model.count(:start => @time - 11 * 60, :stop => @time - 4 * 60)
-    assert_equal 2, AllSeeingEye::Model.count(:start => @time + 2 * 60, :stop => @time + 2 * 60)
-    assert_equal 4, AllSeeingEye::Model.count(:stop => @time)
-    assert_equal 2, AllSeeingEye::Model.count(:start => @time)
     assert_equal 6, AllSeeingEye::Model.count
   end
   
@@ -192,7 +188,7 @@ context 'class methods with setup' do
   end
   
   test 'return count in a field' do
-    counts = AllSeeingEye::Model.count_by_field('uri')
+    counts = AllSeeingEye::Model.list_by_field('uri')
 
     assert_equal '/test/', counts.first.first
     assert_equal 5, counts.first.last
@@ -247,7 +243,7 @@ context 'many objects' do
   end
   
   test 'get the created count' do
-    counts = AllSeeingEye::Model.count_by_field('created_at')
+    counts = AllSeeingEye::Model.list_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
@@ -256,10 +252,36 @@ context 'many objects' do
   end
   
   test 'get the created count for a value' do
-    counts = AllSeeingEye::Model.count_by_field('ip', :value => '192.168.0.1')
+    counts = AllSeeingEye::Model.list_by_field('ip', :value => '192.168.0.1')
     
     assert_equal 1000, counts.inject(0) {|sum, k| sum + k.last}
   end
+  
+  test 'get only the first page of the count' do
+    counts = AllSeeingEye::Model.list_by_field('created_at', :page => 1)
+    
+    assert_equal 10, counts.size
+    assert_equal (@obj999.created_at.to_i / 60) * 60, counts.first.first.to_i
+    assert_equal (@obj990.created_at.to_i / 60) * 60, counts.last.first.to_i
+  end
+  
+  test 'get only the second page of the count' do
+    counts = AllSeeingEye::Model.list_by_field('created_at', :page => 2)
+    
+    assert_equal 10, counts.size
+    assert_equal (@obj989.created_at.to_i / 60) * 60, counts.first.first.to_i
+    assert_equal (@obj980.created_at.to_i / 60) * 60, counts.last.first.to_i
+  end
+  
+  test 'get only the first page of the count with a value' do
+    counts = AllSeeingEye::Model.list_by_field('ip', :value => '192.168.0.1', :page => 1)
+    
+    assert_equal 10, counts.size
+  end
+  
+  test 'return the count for a field with a given value' do
+    assert_equal 1000, AllSeeingEye::Model.count_by_field('ip', :value => '192.168.0.1')
+  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: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 0
-  - 16
-  version: 0.0.16
+  - 17
+  version: 0.0.17
 platform: ruby
 authors: 
 - Josh Symonds