gcstats 1.0.1 → 1.0.3

data/README.md

@@ -12,7 +12,7 @@ Also available online as a web app: <http://gcstats.heroku.com/>
 To install, change directory to where you have extracted the gcstats source files and issue:
 
     gem build gcstats.gemspec
-    gem install gcstats-*.gem
+    gem install gcstats
 
 ## Use ##
 

data/bin/gcstats

@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
 
-require 'rubygems'
 require 'zip/zip'
-require 'gcstats/mapping'
+require 'gcstats/caches'
 require 'gcstats/template'
 
 in_fn, out_fn = ARGV[0..1]
@@ -25,18 +24,18 @@ if File.extname(in_fn) == '.zip'
     end
   }
 else
-  data = File.read(in_fn)
+  data = (in_fn == '-') ? $stdin.read : File.read(in_fn)
   out_fn ||= File.basename(in_fn, File.extname(in_fn)) + '.html'
 end
 
-libdir = File.join(File.dirname(__FILE__), '..', 'lib', 'gcstats')
+datadir = File.join(File.dirname(__FILE__), '..', 'data', 'gcstats')
 
-rhtml = File.read(File.join(libdir, 'gcstats.rhtml'))
+rhtml = File.read(File.join(datadir, 'gcstats.rhtml'))
 caches = GCStats::Caches.from_xml(data)
 data = {:caches => caches, :start_ts => start_ts}
 html = GCStats::Template.new(rhtml, data).result
-html.sub!('/* %css% */', "\n" + File.read(File.join(libdir, 'gcstats.css')))
-html.sub!('/* %js% */', "\n" + File.read(File.join(libdir, 'gcstats.js')))
+html.sub!('/* %css% */', "\n" + File.read(File.join(datadir, 'gcstats.css')))
+html.sub!('/* %js% */', "\n" + File.read(File.join(datadir, 'gcstats.js')))
 
 if ARGV[1].nil? && caches[0] && caches[0].logs[0]
   out_fn = caches[0].logs[0].finder

data/{lib → data}/gcstats/gcstats.js

@@ -27,7 +27,7 @@ if (!GCStats) {
             var total_row, row_max, total_col, col_max, inner_cells, table_max;
 
             // total row
-            
+
             total_row = $(table).find('tr.total td');
 
             row_max = total_row.slice(0, -1).map(function () {
@@ -69,10 +69,12 @@ if (!GCStats) {
     };
 
     $(document).ready(function () {
-        GCStats.highlight_table($('#finds_by_day_of_week'));
-        GCStats.highlight_table($('#finds_by_year'));
-        GCStats.highlight_table($('#finds_by_date'));
-        GCStats.highlight_square_table($('#difficulty_terrain_combinations'));
-        GCStats.highlight_square_table($('#month_day_combinations'));
+        $('table.highlight:not(.square)').each(function () {
+          GCStats.highlight_table(this);
+        });
+
+        $('table.highlight.square').each(function () {
+          GCStats.highlight_square_table(this);
+        });
     });
 }

data/{lib → data}/gcstats/gcstats.rhtml

@@ -25,7 +25,7 @@
   </tr>
   <tr>
     <th class="l">Archived</th>
-    <td><%= total_archived %></td>
+    <td><%= '%d (%s)' % [total_archived, format_percent(total_archived, total_finds)] %></td>
   </tr>
   <tr>
     <th class="l">Caches/Day</th>
@@ -39,11 +39,25 @@
     <th class="l">Most in one day</th>
     <td><%= '%d (%s)' % [most_finds_in_a_day, most_finds_in_a_day_dates.join(', ')] %></td>
   </tr>
+  <tr>
+    <th class="l">Oldest cache</th>
+    <td>
+      <a href="<%=h oldest_cache_found.url %>"><%=h oldest_cache_found.name %></a>
+      (<%=h oldest_cache_found.published.strftime('%Y-%m-%d') %>)
+    </td>
+  </tr>
+  <tr>
+    <th class="l">Newest cache</th>
+    <td>
+      <a href="<%=h newest_cache_found.url %>"><%=h newest_cache_found.name %></a>
+      (<%=h newest_cache_found.published.strftime('%Y-%m-%d') %>)
+    </td>
+  </tr>
 </table>
 <%# }}} %>
 
 <%# {{{ finds by day of week %>
-<table id="finds_by_day_of_week">
+<table class="highlight">
   <caption>Finds by Day of Week</caption>
   <tr>
     <th>Day</th>
@@ -54,14 +68,14 @@
     <tr>
       <td><%= DAY_NAME[i] %></td>
       <td class="finds r"><%= finds %></td>
-      <td class="r"><%= '%.1f' % (finds / total_finds.to_f * 100) %>%</td>
+      <td class="r"><%= format_percent(finds, total_finds) %></td>
     </tr>
   <% } %>
 </table>
 <%# }}} %>
 
 <%# {{{ finds by year %>
-<table id="finds_by_year">
+<table class="highlight">
   <caption>Finds by Year</caption>
   <tr>
     <th>Year</th>
@@ -72,7 +86,7 @@
     <tr>
       <td><%= year %></td>
       <td class="finds r"><%= finds = finds_by_year[year] %></td>
-      <td class="r"><%= '%.1f' % (finds / total_finds.to_f * 100) %>%</td>
+      <td class="r"><%= format_percent(finds, total_finds) %></td>
     </tr>
   <% } %>
 </table>
@@ -90,7 +104,7 @@
     <tr>
       <td><%=h size %></td>
       <td class="r"><%= finds %></td>
-      <td class="r"><%= '%.1f' % (finds / total_finds.to_f * 100) %>%</td>
+      <td class="r"><%= format_percent(finds, total_finds) %></td>
     </tr>
   <% } %>
 </table>
@@ -108,7 +122,7 @@
     <tr>
       <td><%=h type %></td>
       <td class="r"><%= finds %></td>
-      <td class="r"><%= '%.1f' % (finds / total_finds.to_f * 100) %>%</td>
+      <td class="r"><%= format_percent(finds, total_finds) %></td>
     </tr>
   <% } %>
 </table>
@@ -126,14 +140,14 @@
     <tr>
       <td><%=h owner %></td>
       <td class="r"><%= finds %></td>
-      <td class="r"><%= '%.1f' % (finds / total_finds.to_f * 100) %>%</td>
+      <td class="r"><%= format_percent(finds, total_finds) %></td>
     </tr>
   <% } %>
 </table>
 <%# }}} %>
 
 <%# {{{ difficulty/terrain combinations %>
-<table id="difficulty_terrain_combinations" class="c">
+<table class="c highlight square">
   <caption>Difficulty/Terrain Combinations</caption>
   <tr>
     <th>D/T</th>
@@ -162,7 +176,7 @@
 <%# }}} %>
 
 <%# {{{ month/day combinations %>
-<table id="month_day_combinations" class="c">
+<table class="c highlight square">
   <caption>Month/Day Combinations</caption>
   <tr>
     <th>M/D</th>
@@ -198,11 +212,11 @@
     <th>Finds</th>
     <th>Percentage</th>
   </tr>
-  <% finds_by_country.sort {|x, y| y[1] <=> x[1] }.each {|country, finds| %>
+  <% finds_by_country.sort {|a, b| b[1] <=> a[1] }.each {|country, finds| %>
     <tr>
       <td><%=h country %></td>
       <td class="r"><%= finds %></td>
-      <td class="r"><%= '%.1f' % (finds / total_finds.to_f * 100) %>%</td>
+      <td class="r"><%= format_percent(finds, total_finds) %></td>
     </tr>
   <% } %>
 </table>
@@ -222,12 +236,12 @@
       <th>Total</th>
     </tr>
     <% country_finds = states.map {|s| s[1] }.sum %>
-    <% states.sort {|x, y| y[1] <=> x[1] }.each {|state, finds| %>
+    <% states.sort {|a, b| b[1] <=> a[1] }.each {|state, finds| %>
       <tr>
         <td><%=h state %></td>
         <td class="r"><%= finds %></td>
-        <td class="r"><%= '%.1f' % (finds / country_finds.to_f * 100) %>%</td>
-        <td class="r"><%= '%.1f' % (finds / total_finds.to_f * 100) %>%</td>
+        <td class="r"><%= format_percent(finds, country_finds) %></td>
+        <td class="r"><%= format_percent(finds, total_finds) %></td>
       </tr>
     <% } %>
   </table>
@@ -235,7 +249,7 @@
 <%# }}} %>
 
 <%# {{{ finds by date %>
-<table id="finds_by_date">
+<table class="highlight">
   <caption>Finds by Date</caption>
   <tr>
     <th>Date</th>

data/lib/gcstats/helpers.rb

@@ -22,7 +22,7 @@ module GCStats
     def days_cached
       @days_cached ||= begin
         dates = finds_by_date.keys.sort
-        (dates[-1] - dates[0]).to_i
+        (dates.last - dates.first).to_i
       end
     end
 
@@ -40,15 +40,11 @@ module GCStats
 
     def finds_by_date
       @finds_by_date ||= begin
-        finds = {}
+        finds = Hash.new(0)
 
         @caches.each {|cache|
           cache.find_dates.each {|find_date|
-            begin
-              finds[find_date] += 1
-            rescue
-              finds[find_date] = 1
-            end
+            finds[find_date] += 1
           }
         }
 
@@ -66,11 +62,7 @@ module GCStats
           wday = date.wday
         end
 
-        begin
-          finds[wday] += finds_on_date
-        rescue
-          finds[wday] = finds_on_date
-        end
+        finds[wday] += finds_on_date
       }
 
       finds
@@ -78,19 +70,15 @@ module GCStats
 
     def finds_by_year
       @finds_by_year ||= begin
-        finds = {}
+        finds = Hash.new(0)
 
         finds_by_date.each {|date, finds_on_date|
-          begin
-            finds[date.year] += finds_on_date
-          rescue
-            finds[date.year] = finds_on_date
-          end
+          finds[date.year] += finds_on_date
         }
 
-        # fill empty years with 0
+        # fill empty inner years with 0
         (finds.keys.min + 1...finds.keys.max).each {|year|
-          finds[year] ||= 0
+          finds[year] = [0, finds[year]].max
         }
 
         finds
@@ -98,31 +86,23 @@ module GCStats
     end
 
     def finds_by_size
-      finds = {}
+      finds = Hash.new(0)
 
       @caches.each {|cache|
-        begin
-          finds[cache.container] += cache.find_dates.size
-        rescue
-          finds[cache.container] = cache.find_dates.size
-        end
+        finds[cache.container] += cache.find_dates.size
       }
 
-      finds.to_a.sort {|x, y| y[1] <=> x[1] }
+      finds.sort {|a, b| b[1] <=> a[1] }
     end
 
     def finds_by_type
-      finds = {}
+      finds = Hash.new(0)
 
       @caches.each {|cache|
-        begin
-          finds[cache.type] += cache.find_dates.size
-        rescue
-          finds[cache.type] = cache.find_dates.size
-        end
+        finds[cache.type] += cache.find_dates.size
       }
 
-      finds.to_a.sort {|x, y| y[1] <=> x[1] }
+      finds.sort {|a, b| b[1] <=> a[1] }
     end
 
     def difficulty_terrain_combinations
@@ -162,14 +142,10 @@ module GCStats
 
     def finds_by_country
       @finds_by_country ||= begin
-        finds = {}
+        finds = Hash.new(0)
 
         @caches.each {|cache|
-          begin
-            finds[cache.country] += cache.find_dates.size
-          rescue
-            finds[cache.country] = cache.find_dates.size
-          end
+          finds[cache.country] += cache.find_dates.size
         }
 
         finds
@@ -194,22 +170,26 @@ module GCStats
 
     def finds_by_owner
       @finds_by_owner ||= begin
-        finds = {}
+        finds = Hash.new(0)
 
         @caches.each {|cache|
-          begin
-            finds[cache.owner] += cache.find_dates.size
-          rescue
-            finds[cache.owner] = cache.find_dates.size
-          end
+          finds[cache.owner] += cache.find_dates.size
         }
 
-        finds.sort {|x, y| y[1] <=> x[1] }[0..9]
+        finds.sort {|a, b| b[1] <=> a[1] }[0..9]
       end
     end
 
+    def oldest_cache_found
+      @oldest_cache_found ||= @caches.sort {|a, b| a.published <=> b.published }.first
+    end
+
+    def newest_cache_found
+      @newest_cache_found ||= @caches.sort {|a, b| a.published <=> b.published }.last
+    end
+
     def geocacher_name
-      @caches[0].logs[0].finder
+      @caches.first.logs.first.finder
     end
 
     def finds_dates
@@ -217,7 +197,11 @@ module GCStats
     end
 
     def render_time
-      Time.new - @start_ts
+      Time.now - @start_ts
+    end
+
+    def format_percent(value, total, precision = 1)
+      '%.*f%%' % [precision, value / total.to_f * 100]
     end
   end
 end

data/lib/gcstats/server.rb

@@ -1,11 +1,12 @@
-require 'gcstats/mapping'
+require 'gcstats/caches'
 require 'gcstats/template'
-require 'rubygems'
 require 'zip/zip'
 require 'sinatra'
 
-get '/' do
-  %{\
+module GCStats
+  module Server
+    get '/' do
+      %{\
 <html>
   <head>
     <title>gcstats</title>
@@ -23,43 +24,45 @@ get '/' do
       alt="Fork me on GitHub" /></a>
   </body>
 </html>
-}
-end
+    }
+    end
 
-post '/generate_stats' do
-  begin
-    start_ts = Time.new # for render_time helper
+    post '/generate_stats' do
+      begin
+        start_ts = Time.new # for render_time helper
 
-    pq = params['pq']
+        pq = params['pq']
 
-    if pq[:type] == 'application/zip'
-      data = nil
+        if pq[:type] == 'application/zip'
+          data = nil
 
-      Zip::ZipFile.foreach(pq[:tempfile].path) {|entry|
-        if File.extname(entry.name) == '.gpx'
-          data = entry.get_input_stream.read
-          break
+          Zip::ZipFile.foreach(pq[:tempfile].path) {|entry|
+            if File.extname(entry.name) == '.gpx'
+              data = entry.get_input_stream.read
+              break
+            end
+          }
+        else
+          data = pq[:tempfile].read
         end
-      }
-    else
-      data = pq[:tempfile].read
-    end
 
-    libdir = File.dirname(__FILE__)
+        datadir = File.join(File.dirname(__FILE__), '..', '..', 'data', 'gcstats')
 
-    rhtml = open(File.join(libdir, 'gcstats.rhtml')).read
-    caches = GCStats::Caches.from_xml(data)
-    data = {:caches => caches, :start_ts => start_ts}
-    html = GCStats::Template.new(rhtml, data).result
-    html.sub!('/* %css% */', "\n" + File.read(File.join(libdir, 'gcstats.css')))
-    html.sub!('/* %js% */', "\n" + File.read(File.join(libdir, 'gcstats.js')))
+        rhtml = open(File.join(datadir, 'gcstats.rhtml')).read
+        caches = GCStats::Caches.from_xml(data)
+        data = {:caches => caches, :start_ts => start_ts}
+        html = GCStats::Template.new(rhtml, data).result
+        html.sub!('/* %css% */', "\n" + File.read(File.join(datadir, 'gcstats.css')))
+        html.sub!('/* %js% */', "\n" + File.read(File.join(datadir, 'gcstats.js')))
 
-    return html
-  rescue
-    halt 500, '<h1>Internal Server Error</h1>'
-  end
-end
+        return html
+      rescue
+        halt 500, '<h1>Internal Server Error</h1>'
+      end
+    end
 
-not_found do
-  '<h1>Not Found</h1>'
+    not_found do
+      '<h1>Not Found</h1>'
+    end
+  end
 end

data/lib/gcstats/version.rb

@@ -1,3 +1,3 @@
 module GCStats
-  VERSION = '1.0.1'
+  VERSION = '1.0.3'
 end