active_analytics 0.2.1 → 0.3.0

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

@@ -1,4 +1,3 @@
-
 <% if pages.empty? %>
   <div class="is-empty">
     <span>no data</span>
@@ -8,26 +7,16 @@
     <% 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 %>
+          <% 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 %>
-            (None or direct)
+            <%= 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 %>
         </td>
         <td class="number"><%= format_view_count page.total %></td>
       </tr>
     <% end %>
   </table>
-<% end %>
+<% end %>

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

@@ -1,5 +1,5 @@
 <section class="card">
-  <h3><%= format_view_count @histogram.total %> views</h3>
+  <%= render "/active_analytics/sites/histogram_header", histogram: @histogram, previous_histogram: @previous_histogram %>
   <%= render "/active_analytics/sites/histogram", histogram: @histogram %>
 </section>
 

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

@@ -1,9 +1,12 @@
 <section>
-  <h2><%= page_from_params %></h2>
+  <h2>
+    <%= page_from_params %>
+    <%= link_to "", File.join("https://", params[:site], page_from_params), target: "_blank" %>
+  </h2>
 </section>
 
 <section class="card">
-  <h3><%= format_view_count @histogram.total %> views</h3>
+  <%= render "/active_analytics/sites/histogram_header", histogram: @histogram, previous_histogram: @previous_histogram %>
   <%= render "/active_analytics/sites/histogram", histogram: @histogram %>
 </section>
 
@@ -11,7 +14,7 @@
   <li class="card">
     <section>
       <h3>Previous page</h3>
-      <%= render "table", pages: @previous_pages %>
+      <%= render "/active_analytics/referrers/table", referrers: @previous_pages %>
     </section>
   </li>
 
@@ -19,4 +22,4 @@
     <h3>Next page</h3>
     <%= render "table", pages: @next_pages %>
   </li>
-</ul>
+</ul>

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

@@ -7,11 +7,18 @@
     <% for referrer in referrers %>
       <tr>
         <td>
-          <% if referrer.host %>
+          <% if referrer.try(:path) %>
+            <%= site_icon referrer.host %>
+            <% if referrer.host == params[:site] %>
+              <%= link_to referrer.path, page_path(site: referrer.host, page: page_to_params(referrer.path), from: params[:from], to: params[:to]) %>
+            <% else %>
+              <%= link_to referrer.url, referrer_path(site: params[:site], referrer: referrer.url.chomp("/"), from: params[:from], to: params[:to]) %>
+            <% end %>
+          <% elsif referrer.host %>
             <%= site_icon referrer.host %>
             <%= link_to referrer.host, referrer_path(site: params[:site], referrer: referrer.host, from: params[:from], to: params[:to]) %>
           <% else %>
-            <%= referrer.host %>
+            (None or direct)
           <% end %>
           </td>
         <td class="number"><%= format_view_count referrer.total %></td>

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

@@ -1,9 +1,9 @@
 <section class="card">
-  <h3><%= format_view_count @histogram.total %> views</h3>
+  <%= render "/active_analytics/sites/histogram_header", histogram: @histogram, previous_histogram: @previous_histogram %>
   <%= render "/active_analytics/sites/histogram", histogram: @histogram %>
 </section>
 
 <section class="card">
   <h3>Top sources</h3>
   <%= render "table", referrers: @referrers %>
-</section>
+</section>

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

@@ -1,15 +1,18 @@
 <section>
-  <h2>Source: <%= params[:referrer] %></h2>
+  <h2>
+    Source: <%= params[:referrer] %>
+    <%= link_to "", File.join("https://", params[:referrer]), target: "_blank" %>
+  </h2>
 </section>
 
 <section class="card">
-  <h3><%= format_view_count @histogram.total %> views</h3>
+  <%= render "/active_analytics/sites/histogram_header", histogram: @histogram, previous_histogram: @previous_histogram %>
   <%= render "/active_analytics/sites/histogram", histogram: @histogram %>
 </section>
 <ul class="grid-auto">
   <li class="card">
     <h3>Source page</h3>
-    <%= render "/active_analytics/pages/table", pages: @previous_pages %>
+    <%= render "/active_analytics/referrers/table", referrers: @previous_pages %>
   </li>
 
   <li class="card">

data/app/views/active_analytics/sites/_histogram.html.erb

@@ -3,11 +3,18 @@
     <tbody>
       <% for bar in histogram.bars %>
         <tr>
-          <th scope="row"><%= bar.label.day %></td>
-            <td style="--size: <%= bar.height %>; --color: rgba(var(--color-grey-100), 1);">
+          <th scope="row">
+            <% if bar.height > 0 %>
+              <%= link_to bar.label.day, url_for(params.merge(from: bar.label.to_date, to: bar.label.to_date).to_unsafe_hash) %>
+            <% else %>
+              <%= bar.label.day %>
+            <% end %>
+          </th>
+          <td style="--size: <%= bar.height %>; --color: rgba(var(--color-grey-100), 1);">
             <span class="data"><%= bar.value.to_i %></span>
             <span class="tooltip"><small class="tooltip-date"><%= l bar.label, format: :long%></small><br/><%= format_view_count bar.value %> views</span>
           </td>
+          </a>
         </tr>
       <% end %>
     </tbody>

data/app/views/active_analytics/sites/_histogram_header.html.erb

@@ -0,0 +1,10 @@
+<h3>
+  <%= format_view_count current_total = histogram.total %> views
+  <% if (previous_total = previous_histogram.total) > 0 %>
+    <% if (diff = current_total - previous_total) > 0 %>
+      &nbsp;<small class="is-success">+<%= number_to_percentage diff * 100.0 / previous_total, precision: 0 %></small>
+    <% elsif (diff = current_total - previous_total) < 0 %>
+      &nbsp;<small class="is-danger"><%= number_to_percentage diff * 100.0 / previous_total, precision: 0 %></small>
+    <% end %>
+  <% end %>
+</h3>

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

@@ -1,5 +1,5 @@
 <section class="card">
-  <h3><%= format_view_count @histogram.total %> views</h3>
+  <%= render "/active_analytics/sites/histogram_header", histogram: @histogram, previous_histogram: @previous_histogram %>
   <%= render "/active_analytics/sites/histogram", histogram: @histogram %>
 </section>
 
@@ -13,4 +13,4 @@
     <h3>Top pages <%= link_to "view all", pages_path(from: params[:from], to: params[:to]) %></h3>
     <%= render "/active_analytics/pages/table", pages: @pages %>
   </li>
-</ul>
+</ul>

data/app/views/layouts/active_analytics/_footer.html.erb

@@ -37,12 +37,12 @@
   <header id="custom-range-title">Custom range</header>
   <%= form_tag url_for(params.except(:from, :to).to_unsafe_hash), method: "get", id: "dateRangeForm" do %>
     <div role="group" class="is-block">
-      <label>From <%= text_field_tag :from, params[:from] %></label>
-      <label>To <%= text_field_tag :to, params[:to] %></label>
+      <label>From <%= date_field_tag :from, params[:from] %></label>
+      <label>To <%= date_field_tag :to, params[:to] %></label>
     </div>
   <% end %>
   <footer>
     <%= submit_tag "Change date range", form: "dateRangeForm" %>
     <button type="reset" onclick="Ariato.Dialog.close(this)">Close</button>
   </footer>
-</div>
+</div>

data/app/views/layouts/active_analytics/_header.html.erb

@@ -1,7 +1,5 @@
 <header data-ariato="ActiveAnalytics.Header">
-  <nav aria-label="site"> <!-- implicit role="navigation", aria label "site" is announced = "site navigation" -->
-    
-    <%#= link_to "Analytics", active_analytics_path, role: "button" %>
+  <nav aria-label="site">
     <%= link_to active_analytics_path, class: 'logo' do %>
       <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 11 11">
         <path class="a" d="M.5,5.5s0,2,1,2,1-2,1-2,0-2,1-2,1,2,1,2,0,2,1,2,1-2,1-2,0-2,1-2,1,2,1,2,0,2,1,2,1-2,1-2"/>

data/app/views/layouts/active_analytics/application.html.erb

@@ -1,13 +1,15 @@
 <!DOCTYPE html>
-<html>
+<html class="active-analytics">
   <head>
     <title>Active analytics</title>
     <meta name=viewport content="width=device-width, initial-scale=1">
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
 
-    <%= stylesheet_link_tag "active_analytics/application", media: "all" %>
-    <%= javascript_include_tag "active_analytics/application" %>
+    <%= tag.link rel: "stylesheet", href: asset_path(:ariato, format: :css) %>
+    <%= tag.link rel: "stylesheet", href: asset_path(:application, format: :css) %>
+    <%= tag.script "", src: asset_path(:ariato, format: :js) %>
+    <%= tag.script "", src: asset_path(:application, format: :js) %>
   </head>
 
   <body>

data/config/routes.rb

@@ -1,9 +1,10 @@
 ActiveAnalytics::Engine.routes.draw do
+  resources :assets, only: [:show]
   get "/:site", to: "sites#show", as: :site, constraints: {site: /[^\/]+/}
 
   # Referrers
   get "/:site/referrers", to: "referrers#index", constraints: {site: /[^\/]+/}, as: :referrers
-  get "/:site/referrers/:referrer", to: "referrers#show", constraints: {site: /[^\/]+/, referrer: /[^\/]+/}, as: :referrer
+  get "/:site/referrers/*referrer", to: "referrers#show", as: :referrer, constraints: {site: /[^\/]+/, referrer: /.+/}
 
   # Pages
   get "/:site/pages", to: "pages#index", constraints: {site: /[^\/]+/}, as: :pages

data/lib/active_analytics/engine.rb

@@ -1,9 +1,5 @@
 module ActiveAnalytics
   class Engine < ::Rails::Engine
     isolate_namespace ActiveAnalytics
-
-    initializer "active_analytics.assets.precompile" do |app|
-      app.config.assets.precompile += %w[active_analytics/application.js active_analytics/application.css]
-    end
   end
 end

data/lib/active_analytics/version.rb

@@ -1,3 +1,3 @@
 module ActiveAnalytics
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/lib/active_analytics.rb

@@ -2,6 +2,22 @@ require "active_analytics/version"
 require "active_analytics/engine"
 
 module ActiveAnalytics
+  def self.redis_url=(string)
+    @redis_url = string
+  end
+
+  def self.redis_url
+    @redis_url ||= ENV["ACTIVE_ANALYTICS_REDIS_URL"] || ENV["REDIS_URL"] || "redis://localhost"
+  end
+
+  def self.redis=(connection)
+    @redis = connection
+  end
+
+  def self.redis
+    @redis ||= Redis.new(url: redis_url)
+  end
+
   def self.record_request(request)
     params = {
       site: request.host,
@@ -9,9 +25,7 @@ module ActiveAnalytics
       date: Date.today,
     }
     if request.referrer.present?
-      referrer_uri = URI(request.referrer)
-      params[:referrer_host] = referrer_uri.host
-      params[:referrer_path] = referrer_uri.path
+      params[:referrer_host], params[:referrer_path] = ViewsPerDay.split_referrer(request.referrer)
     end
     ViewsPerDay.append(params)
   rescue => ex
@@ -22,4 +36,28 @@ module ActiveAnalytics
       Rails.logger.error(ex.backtrace.join("\n"))
     end
   end
+
+  SEPARATOR = "|"
+  QUEUE = "ActiveAnalytics::Queue"
+  OLD_QUEUE = "ActiveAnalytics::OldQueue"
+
+  def self.queue_request(request)
+    keys = [request.host, request.path]
+    if request.referrer.present?
+      keys.concat(ViewsPerDay.split_referrer(request.referrer))
+    end
+    redis.hincrby(QUEUE, keys.join(SEPARATOR).downcase, 1)
+  end
+
+  def self.flush_queue
+    return if !redis.exists?(QUEUE)
+    cursor = 0
+    date = Date.today
+    redis.rename(QUEUE, OLD_QUEUE)
+    redis.hscan_each(OLD_QUEUE) do |key, count|
+      site, page, referrer_host, referrer_path = key.split(SEPARATOR)
+      ViewsPerDay.append(date: date, site: site, page: page, referrer_host: referrer_host, referrer_path: referrer_path, total: count.to_i)
+    end
+    redis.del(OLD_QUEUE)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_analytics
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Alexis Bernard
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-25 00:00:00.000000000 Z
+date: 2023-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -39,13 +39,8 @@ files:
 - app/assets/config/active_analytics_manifest.js
 - app/assets/images/active_analytics.png
 - app/assets/images/active_analytics_screenshot.png
-- app/assets/javascripts/active_analytics/application.js
-- app/assets/javascripts/active_analytics/ariato.js
-- app/assets/stylesheets/active_analytics/application.css
-- app/assets/stylesheets/active_analytics/ariato.css
-- app/assets/stylesheets/active_analytics/charts.css
-- app/assets/stylesheets/active_analytics/style.css
 - app/controllers/active_analytics/application_controller.rb
+- app/controllers/active_analytics/assets_controller.rb
 - app/controllers/active_analytics/pages_controller.rb
 - app/controllers/active_analytics/referrers_controller.rb
 - app/controllers/active_analytics/sites_controller.rb
@@ -57,6 +52,12 @@ files:
 - app/mailers/active_analytics/application_mailer.rb
 - app/models/active_analytics/application_record.rb
 - app/models/active_analytics/views_per_day.rb
+- app/views/active_analytics/assets/_charts.css
+- app/views/active_analytics/assets/_style.css
+- app/views/active_analytics/assets/application.css.erb
+- app/views/active_analytics/assets/application.js
+- app/views/active_analytics/assets/ariato.css
+- app/views/active_analytics/assets/ariato.js
 - app/views/active_analytics/pages/_table.html.erb
 - app/views/active_analytics/pages/index.html.erb
 - app/views/active_analytics/pages/show.html.erb
@@ -64,6 +65,7 @@ files:
 - app/views/active_analytics/referrers/index.html.erb
 - app/views/active_analytics/referrers/show.html.erb
 - app/views/active_analytics/sites/_histogram.html.erb
+- app/views/active_analytics/sites/_histogram_header.html.erb
 - app/views/active_analytics/sites/index.html.erb
 - app/views/active_analytics/sites/show.html.erb
 - app/views/layouts/active_analytics/_footer.html.erb
@@ -98,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: First-party, privacy-focused traffic analytics for Ruby on Rails applications

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

@@ -1,15 +0,0 @@
-/*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
- * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
- * files in this directory. Styles in this file should be added after the last require_* statement.
- * It is generally better to create a new file per style scope.
- *
- *= require_tree .
- *= require_self
- */