picky-statistics 4.5.1 → 4.5.2

data/lib/picky-statistics/application/app.rb

@@ -21,7 +21,7 @@ Stats = LogfileReader.new log_file
 class PickyStatistics < Sinatra::Base
   
   set :static, true
-  set :public, File.expand_path('.', Dir.pwd)
+  set :public_folder, File.expand_path('.', Dir.pwd)
   set :views,  File.expand_path('views', Dir.pwd)
   set :haml, { :format => :html5 }
   

data/lib/picky-statistics/application/javascripts/statistics.js

@@ -51,7 +51,6 @@ var allocationsScale = d3.scale.linear()
       .domain([0, 0])
       .rangeRound(chartWidth);
 
-
 var offsetScale = d3.scale.linear()
       .domain([0, 0])
       .rangeRound(chartWidth);
@@ -125,10 +124,10 @@ function renderAll() {
   
   // Render the total.
   //
-  d3.selectAll("#total")
+  d3.selectAll("aside.totals .total")
       .text(formatNumber(search.size()));
   
-  d3.select("#active").text(formatNumber(all.value()));
+  d3.selectAll("aside.totals .active").text(formatNumber(all.value()));
 }
 
 // Like d3.time.format, but faster.
@@ -156,12 +155,13 @@ window.reset = function(i) {
 
 var intervalUpdating = false;
 
-function updateStatistics(reloadAll) {
+function updateStatistics(reloadAll, seconds) {
   path = reloadAll ? 'index.json' : 'since_last.json';
   
-  showNotice();
+  if (!seconds || seconds >= 30) { showNotice(); }
+  
   d3.json(path, function(searches) {
-    if (searches.length == 0) { return; }
+    if (!searches || searches.length == 0) { return; }
     
     var totalMin = 1000000; // Highest minimum set to sane number.
     var totalMax = 0;
@@ -193,24 +193,23 @@ function updateStatistics(reloadAll) {
       if (durationMax < d.duration) { durationMax = d.duration; }
     });
     
-    // console.log([totalMin, totalMax]);
-    
     // Set scales.
     //
     var totalDomain = totalScale.domain();
-    totalScale.domain([d3.min([totalMin, totalDomain[0]])*0.9, d3.max([totalMax, totalDomain[1]])*1.1]);
+    totalScale.domain([d3.min([totalMin, totalDomain[0]])*0.9, d3.max([totalMax, totalDomain[1]])]);
     var allocationsDomain = allocationsScale.domain();
-    allocationsScale.domain([d3.min([allocationsMin, allocationsDomain[0]])*0.9, d3.max([allocationsMax, allocationsDomain[1]])*1.1]);
+    allocationsScale.domain([d3.min([allocationsMin, allocationsDomain[0]])*0.9, d3.max([allocationsMax, allocationsDomain[1]])]);
     var offsetDomain = offsetScale.domain();
-    offsetScale.domain([d3.min([offsetMin, offsetDomain[0]])*0.9, d3.max([offsetMax, offsetDomain[1]])*1.1]);
+    offsetScale.domain([d3.min([offsetMin, offsetDomain[0]])*0.9, d3.max([offsetMax, offsetDomain[1]])]);
     var durationDomain = durationScale.domain();
-    durationScale.domain([d3.min([durationMin, durationDomain[0]])*0.9, d3.max([durationMax, durationDomain[1]])*1.1]);
+    durationScale.domain([d3.min([durationMin, durationDomain[0]])*0.9, d3.max([durationMax, durationDomain[1]])]);
   
     search.add(searches);
   
     renderAll();
+    
+    if (!seconds || seconds >= 30) { hideNotice(); }
   });
-  hideNotice();
 };
 
 var periodicalUpdaterId;
@@ -218,7 +217,7 @@ var periodicalUpdaterId;
 function updateStatisticsPeriodically(seconds) {
   clearInterval(periodicalUpdaterId);
   periodicalUpdaterId = setInterval(function() {
-       updateStatistics();
+       updateStatistics(false, seconds);
   }, 1000*seconds);
   intervalUpdating = true;
 };

data/lib/picky-statistics/application/stylesheets/statistics.css

@@ -48,9 +48,6 @@ input {
   height: 4em;
   margin: -2em 0px 0px -5em;
 }
-#notice.show {
-  display: block;
-}
 
 .actions {
   padding: 5px;
@@ -171,6 +168,6 @@ span#active, span#total {
   color: green;
 }
 
-aside {
+aside.totals {
   float: right;
 }

data/lib/picky-statistics/application/views/index.haml

@@ -8,6 +8,13 @@
     %script{ :src => 'javascripts/statistics.js', :type => 'text/javascript' }
 
   %body{ :onload => "document.getElementsByTagName('input')[0].click(); updateStatistics(true);" }
+    %aside.totals
+      %span.active
+        -
+      of
+      %span.total
+        -
+      searches selected.
     %h1 Clam: Picky Statistics Interface.
     .actions
       %button{ :href => '#', :onclick => 'javascript:updateStatistics();' } Update now
@@ -15,6 +22,8 @@
       |
       %input{ :id => 'updateStop', :type => "radio", :name => "updating", :onclick => 'javascript:stopUpdatingStatistics();' }
       %label{ :for => 'updateStop' } Don't update
+      %input{ :id => 'update1', :type => "radio", :name => "updating", :onclick => 'javascript:updateStatisticsPeriodically(1);' }
+      %label{ :for => 'update1' } Every second
       %input{ :id => 'update3', :type => "radio", :name => "updating", :onclick => 'javascript:updateStatisticsPeriodically(3);' }
       %label{ :for => 'update3' } Every 3 seconds
       %input{ :id => 'update10', :type => "radio", :name => "updating", :onclick => 'javascript:updateStatisticsPeriodically(10);' }
@@ -39,11 +48,11 @@
   #duration-chart.chart
     %h2.title Duration
 
-%aside#totals
-  %span#active
+%aside.totals
+  %span.active
     -
   of
-  %span#total
+  %span.total
     -
   searches selected.
 

data/lib/picky-statistics/logfile_reader.rb

@@ -28,8 +28,8 @@ class LogfileReader
     @last_offset = 0
   end
 
-  def since log_offset = 0
-    @last_offset ||= 0
+  def since log_offset = nil
+    @last_offset = log_offset || 0
     
     start_time = Time.now
 
@@ -42,7 +42,7 @@ class LogfileReader
       File.open(statistics, 'r') do |file|
         while line = file.gets
           next if line =~ /\A\s*\#/
-          results << process(line)
+          results << process(line) rescue nil
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picky-statistics
 version: !ruby/object:Gem::Version
-  version: 4.5.1
+  version: 4.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70282333548640 !ruby/object:Gem::Requirement
+  requirement: &70341398424060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70282333548640
+  version_requirements: *70341398424060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70282333547780 !ruby/object:Gem::Requirement
+  requirement: &70341398437100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *70282333547780
+  version_requirements: *70341398437100
 description: Statistics interface for Picky, the fast Ruby search engine.
 email: florian.hanke+picky-statistics@gmail.com
 executables: []