active_analytics 0.1.0 → 0.2.0

data/app/assets/stylesheets/active_analytics/style.css

@@ -0,0 +1,161 @@
+body {
+  padding: 0;
+  margin: 0;
+  width: 100%;
+}
+
+body > header nav {
+  width: 100%;
+  max-width: 1280px;
+  margin: 0 auto;
+  padding: 24px;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  min-height: 88px;
+}
+
+header nav .menubutton {
+  margin-left: auto;
+}
+
+header .logo {
+  margin-right: 8px;
+}
+
+header .logo svg {
+  width: 24px;
+  height: 24px;
+  fill: none;
+  stroke: rgba(var(--color-blue-500), 1);
+  stroke-width: 1;
+}
+
+header .is-link {
+  text-transform: none;
+  text-decoration: none;
+  font-size: 1rem;
+  letter-spacing: 0;
+  font-weight: 400;
+  padding: 0 16px;
+  margin: 0;
+  min-height: 24px;
+  color: rgba(var(--color-grey-700), 1);
+}
+
+header .is-link:hover {
+  background: rgba(var(--color-grey-50), 1);
+}
+
+main {
+  width: 100%;
+  max-width: 1280px;
+  margin: 0 auto;
+  padding: 0 24px;
+}
+
+main h2 {
+  word-break: break-word;
+}
+
+section {
+  margin-bottom: var(--space-4x);
+}
+
+.grid-auto {
+  --col-min-width: calc(var(--space) * 38);
+}
+
+.tooltip-date {
+  color: rgba(var(--color-grey-100), 1);
+}
+
+.card {
+  position: relative;
+  overflow: visible;
+}
+
+.card h3 {
+  display: flex;
+}
+
+.card h3 a {
+  margin-left: auto;
+  font-weight: 400;
+  font-size: 1rem;
+}
+
+.card table {
+  margin: 0 -24px;
+  width: calc(100% + 48px);
+}
+
+.card table.charts-css {
+  margin-bottom: -24px;
+}
+
+tr td:first-of-type {
+  padding: 12px 0px 12px 24px;
+}
+
+tr td:last-of-type {
+  padding: 12px 24px 12px 0;
+}
+
+td a {
+  word-break: break-word;
+}
+
+td.number { 
+  text-align: right;
+  font-variant-numeric: tabular-nums;
+}
+
+.referer-favicon {
+  width: 16px;
+  height: 16px;
+  display: inline-block;
+  position: relative;
+  top: 3px;
+  margin-right: 4px;
+}
+
+div.is-empty {
+  display: flex;
+	align-items: center;
+  justify-content: center;
+  height: calc(100% - 72px);
+  width: 100%;
+  color: rgba(var(--color-grey-300), 1);
+}
+
+body > footer {
+  max-width: 1280px;
+  margin: 48px auto 0;
+  padding: 24px;
+}
+
+body > footer ul {
+  margin: 0;
+  list-style-type: none;
+  padding: 0;
+}
+
+body > footer .card {
+  margin: 0;
+  background: rgba(var(--color-grey-50), 1);
+}
+body > footer .card p {
+  padding: 0 0 2px;
+  color: rgba(var(--color-grey-400), 1);
+}
+
+@media (max-width: 480px) {
+  header nav .menubutton {
+    margin-top: 24px;
+  }
+
+  [role="dialog"] {
+    min-width: 280px;
+  }
+}

data/app/controllers/active_analytics/application_controller.rb

@@ -1,4 +1,16 @@
 module ActiveAnalytics
   class ApplicationController < ActionController::Base
+
+    private
+
+    def require_date_range
+      if params[:from].blank? || params[:to].blank?
+        redirect_to(params.to_unsafe_hash.merge(from: 7.days.ago.to_date, to: Date.today))
+      end
+    end
+
+    def current_views_per_days
+      ViewsPerDay.where(site: params[:site]).between_dates(params[:from], params[:to])
+    end
   end
 end

data/app/controllers/active_analytics/pages_controller.rb

@@ -4,19 +4,22 @@ module ActiveAnalytics
   class PagesController < ApplicationController
     include PagesHelper
 
+    before_action :require_date_range
+
     def index
-      scope = ViewsPerDay.where(site: params[:site]).after(30.days.ago)
-      @histogram = ViewsPerDay::Histogram.new(scope.order_by_date.group_by_date)
+      scope = ViewsPerDay.where(site: params[:site]).between_dates(params[:from], params[:to])
+      @histogram = ViewsPerDay::Histogram.new(scope.order_by_date.group_by_date, params[:from], params[:to])
       @pages = scope.top(100).group_by_page
     end
 
     def show
-      scope = ViewsPerDay.where(site: params[:site], page: page_from_params).after(30.days.ago)
-      @histogram = ViewsPerDay::Histogram.new(scope.order_by_date.group_by_date)
-      @referrers = scope.top.group_by_referrer_site
+      dates_scopes = ViewsPerDay.between_dates(params[:from], params[:to])
+      page_scope = dates_scopes.where(site: params[:site], page: page_from_params)
+      @histogram = ViewsPerDay::Histogram.new(page_scope.order_by_date.group_by_date, params[:from], params[:to])
+      @referrers = page_scope.top.group_by_referrer_site
 
-      @next_pages = ViewsPerDay.where(referrer_host: params[:site], referrer_path: page_from_params).top.group_by_page
-      @previous_pages = ViewsPerDay.where(site: params[:site], page: page_from_params).top.group_by_referrer_page
+      @next_pages = dates_scopes.where(referrer_host: params[:site], referrer_path: page_from_params).top(100).group_by_page
+      @previous_pages = dates_scopes.where(site: params[:site], page: page_from_params).where.not(referrer_path: nil).top(100).group_by_referrer_page
     end
   end
 end

data/app/controllers/active_analytics/referrers_controller.rb

@@ -2,15 +2,17 @@ require_dependency "active_analytics/application_controller"
 
 module ActiveAnalytics
   class ReferrersController < ApplicationController
+    before_action :require_date_range
+
     def index
-      scope = ViewsPerDay.where(site: params[:site])
+      scope = ViewsPerDay.where(site: params[:site]).between_dates(params[:from], params[:to])
       @referrers = scope.top(100).group_by_referrer_site
-      @histogram = ViewsPerDay::Histogram.new(scope.order_by_date.group_by_date)
+      @histogram = ViewsPerDay::Histogram.new(scope.order_by_date.group_by_date, params[:from], params[:to])
     end
 
     def show
-      scope = ViewsPerDay.where(site: params[:site], referrer_host: params[:referrer])
-      @histogram = ViewsPerDay::Histogram.new(scope.order_by_date.group_by_date)
+      scope = ViewsPerDay.where(site: params[:site], referrer_host: params[:referrer]).between_dates(params[:from], params[:to])
+      @histogram = ViewsPerDay::Histogram.new(scope.order_by_date.group_by_date, params[:from], params[:to])
       @previous_pages = scope.top(100).group_by_referrer_page
       @next_pages = scope.top(100).group_by_page
     end

data/app/controllers/active_analytics/sites_controller.rb

@@ -2,13 +2,16 @@ require_dependency "active_analytics/application_controller"
 
 module ActiveAnalytics
   class SitesController < ApplicationController
+    before_action :require_date_range, only: :show
+
     def index
       @sites = ViewsPerDay.after(30.days.ago).order_by_totals.group_by_site
+      redirect_to(site_path(@sites.first.host)) if @sites.size == 1
     end
 
     def show
-      scope = ViewsPerDay.where(site: params[:site]).after(30.days.ago)
-      @histogram = ViewsPerDay::Histogram.new(scope.order_by_date.group_by_date)
+      scope = current_views_per_days
+      @histogram = ViewsPerDay::Histogram.new(scope.order_by_date.group_by_date, params[:from], params[:to])
       @referrers = scope.top.group_by_referrer_site
       @pages = scope.top.group_by_page
     end

data/app/helpers/active_analytics/application_helper.rb

@@ -1,4 +1,7 @@
 module ActiveAnalytics
   module ApplicationHelper
+    def format_view_count(number)
+      number_with_delimiter(number.to_i)
+    end
   end
 end

data/app/helpers/active_analytics/sites_helper.rb

@@ -1,4 +1,7 @@
 module ActiveAnalytics
   module SitesHelper
+    def site_icon(host)
+      image_tag("https://icons.duckduckgo.com/ip3/#{host}.ico", referrerpolicy: "no-referrer", class: "referer-favicon")
+    end
   end
 end

data/app/models/active_analytics/views_per_day.rb

@@ -2,6 +2,7 @@ module ActiveAnalytics
   class ViewsPerDay < ApplicationRecord
     validates_presence_of :site, :page, :date
 
+    scope :between_dates, -> (from, to) { where("date BETWEEN ? AND ?", from, to) }
     scope :after, -> (date) { where("date > ?", date) }
     scope :order_by_totals, -> { order(Arel.sql("SUM(total) DESC")) }
     scope :order_by_date, -> { order(:date) }
@@ -33,21 +34,37 @@ module ActiveAnalytics
     end
 
     class Histogram
-      attr_reader :bars
+      attr_reader :bars, :from_date, :to_date
 
-      def initialize(scope)
+      def initialize(scope, from_date, to_date)
         @bars = scope.map { |day| Bar.new(day.day, day.total, self) }
+        fill_missing_days(@bars, Date.parse(from_date.to_s), Date.parse(to_date.to_s))
+      end
+
+      def fill_missing_days(bars, from, to)
+        i = 0
+        while (day = from + i) <= to
+          if !@bars[i] || @bars[i].label != day
+            @bars.insert(i, Bar.new(day, 0, self))
+          end
+          i += 1
+        end
+        @bars
       end
 
       def max_value
         @max_total ||= bars.map(&:value).max
       end
 
+      def total
+        @bars.reduce(0) { |sum, bar| sum += bar.value }
+      end
+
       class Bar
         attr_reader :label, :value, :histogram
 
         def initialize(label, value, histogram)
-          @label, @value,@histogram = label, value, histogram
+          @label, @value, @histogram = label, value, histogram
         end
 
         def height
@@ -91,10 +108,12 @@ module ActiveAnalytics
     end
 
     def self.append(params)
-      vpd = find_or_initialize_by(params)
-      vpd.referrer_path = nil if vpd.referrer_path?
-      vpd.total += 1 if vpd.persisted?
-      vpd.save!
+      params[:site] = params[:site].downcase if params[:site]
+      params[:page] = params[:page].downcase if params[:page]
+      params[:referrer_path] = nil if params[:referrer_path].blank?
+      params[:referrer_path] = params[:referrer_path].downcase if params[:referrer_path]
+      params[:referrer_host] = params[:referrer_host].downcase if params[:referrer_host]
+      find_or_create_by!(params) if where(params).update_all("total = total + 1") == 0
     end
   end
 end

data/app/views/active_analytics/pages/_table.html.erb

@@ -1,21 +1,33 @@
-<table>
-  <% for page in pages %>
-    <tr>
-      <td>
-        <% if page.host == params[:site] %>
-          <% if page.path.present? %>
-            <%= link_to page.path, page_path(site: page.host, page: page_to_params(page.path)) %>
+
+<% if pages.empty? %>
+  <div class="is-empty">
+    <span>no data</span>
+  </div>
+<% else %>
+  <table>
+    <% for page in pages %>
+      <tr>
+        <td>
+          <% if page.host == params[:site] %>
+            <% if page.path.present? %>
+              <%= link_to page.path, page_path(site: page.host, page: page_to_params(page.path), from: params[:from], to: params[:to]) %>
+            <% else %>
+              <%= site_icon page.host %>
+              <%= link_to page.host, site_path(site: page.host, from: params[:from], to: params[:to]) %>
+              <small>(page not provided <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Referrer-Policy#strict-origin-when-cross-origin">?</a>)</small>
+            <% end %>
+          <% elsif page.host.present? && page.path.present? %>
+            <%= link_to(referrer_path(site: params[:site], referrer: page.host, from: params[:from], to: params[:to])) { site_icon page.host } %>
+            <%= link_to page.url, referrer_path(site: params[:site], referrer: page.host, from: params[:from], to: params[:to]) %>
+          <% elsif page.host.present? %>
+            <%= site_icon page.host %>
+            <%= page.host %>
           <% else %>
-            <%= link_to page.host, site_path(site: page.host) %>
-            <small>(page not provided <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Referrer-Policy#strict-origin-when-cross-origin">?</a>)</small>
+            (None or direct)
           <% end %>
-        <% elsif page.host.present? && page.path.present? %>
-          <%= page.url %>
-        <% else %>
-          (None or direct)
-        <% end %>
-      </td>
-      <td><%= page.total %></td>
-    </tr>
-  <% end %>
-</table>
+        </td>
+        <td class="number"><%= format_view_count page.total %></td>
+      </tr>
+    <% end %>
+  </table>
+<% end %>

data/app/views/active_analytics/pages/index.html.erb

@@ -1,12 +1,9 @@
-<section>
-  <h2>Pages</h2>
-</section>
-
-<section>
+<section class="card">
+  <h3><%= format_view_count @histogram.total %> views</h3>
   <%= render "/active_analytics/sites/histogram", histogram: @histogram %>
 </section>
 
-<section>
-  <h3>Pages</h3>
+<section class="card">
+  <h3>Top pages</h3>
   <%= render "/active_analytics/pages/table", pages: @pages %>
 </section>

data/app/views/active_analytics/pages/show.html.erb

@@ -2,22 +2,25 @@
   <h2><%= page_from_params %></h2>
 </section>
 
-<section>
-  <h3>Views per day</h3>
+<section class="card">
+  <h3><%= format_view_count @histogram.total %> views</h3>
   <%= render "/active_analytics/sites/histogram", histogram: @histogram %>
 </section>
 
-<section>
-  <h3>Top referrers</h3>
-  <%= render "/active_analytics/referrers/table", referrers: @referrers %>
-</section>
-
-<section>
-  <h3>Previous Pages</h3>
-  <%= render "table", pages: @previous_pages %>
-</section>
+<ul class="grid-auto">
+  <li class="card">
+   <!-- <section>
+      <h3>Top sources</h3>
+      <%= render "/active_analytics/referrers/table", referrers: @referrers %>
+    </section> -->
+    <section>
+      <h3>Previous page</h3>
+      <%= render "table", pages: @previous_pages %>
+    </section>
+  </li>
 
-<section>
-  <h3>Next Pages</h3>
-  <%= render "table", pages: @next_pages %>
-</section>
+  <li class="card">
+    <h3>Next page</h3>
+    <%= render "table", pages: @next_pages %>
+  </li>
+</ul>