active_analytics 0.2.1 → 0.4.0

data/lib/active_analytics/version.rb

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

data/lib/active_analytics.rb

@@ -1,7 +1,26 @@
 require "active_analytics/version"
 require "active_analytics/engine"
+require "browser"
 
 module ActiveAnalytics
+  mattr_accessor :base_controller_class, default: "ActionController::Base"
+
+  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,11 +28,12 @@ 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)
+
+    browser = Browser.new(request.headers["User-Agent"])
+    BrowsersPerDay.append(site: request.host, date: Date.today, name: browser.name, version: browser.version)
   rescue => ex
     if Rails.env.development? || Rails.env.test?
       raise ex
@@ -22,4 +42,58 @@ module ActiveAnalytics
       Rails.logger.error(ex.backtrace.join("\n"))
     end
   end
+
+  SEPARATOR = "|"
+
+  PAGE_QUEUE = "ActiveAnalytics::PageQueue"
+  BROWSER_QUEUE = "ActiveAnalytics::BrowserQueue"
+
+  OLD_PAGE_QUEUE = "ActiveAnalytics::OldPageQueue"
+  OLD_BROWSER_QUEUE = "ActiveAnalytics::BrowserQueue"
+
+  def self.queue_request(request)
+    queue_request_page(request)
+    queue_request_browser(request)
+  end
+
+  def self.queue_request_page(request)
+    keys = [request.host, request.path]
+    if request.referrer.present?
+      keys.concat(ViewsPerDay.split_referrer(request.referrer))
+    end
+    redis.hincrby(PAGE_QUEUE, keys.join(SEPARATOR).downcase, 1)
+  end
+
+  def self.queue_request_browser(request)
+    browser = Browser.new(request.headers["User-Agent"])
+    keys = [request.host.downcase, browser.name, browser.version]
+    redis.hincrby(BROWSER_QUEUE, keys.join(SEPARATOR), 1)
+  end
+
+  def self.flush_queue
+    flush_page_queue
+    flush_browser_queue
+  end
+
+  def self.flush_page_queue
+    return if !redis.exists?(PAGE_QUEUE)
+    date = Date.today
+    redis.rename(PAGE_QUEUE, OLD_PAGE_QUEUE)
+    redis.hscan_each(OLD_PAGE_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_PAGE_QUEUE)
+  end
+
+  def self.flush_browser_queue
+    return if !redis.exists?(BROWSER_QUEUE)
+    date = Date.today
+    redis.rename(BROWSER_QUEUE, OLD_BROWSER_QUEUE)
+    redis.hscan_each(OLD_BROWSER_QUEUE) do |key, count|
+      site, name, version = key.split(SEPARATOR)
+      BrowsersPerDay.append(date: date, site: site, name: name, version: version, total: count.to_i)
+    end
+    redis.del(OLD_BROWSER_QUEUE)
+  end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: active_analytics
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Alexis Bernard
 - Antoine Marguerie
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-25 00:00:00.000000000 Z
+date: 2025-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,6 +25,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.2.0
+- !ruby/object:Gem::Dependency
+  name: browser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: NO cookies, NO JavaScript, NO third parties and NO bullshit.
 email:
 - alexis@basesecrete.com
@@ -39,24 +53,45 @@ 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/browsers_controller.rb
 - app/controllers/active_analytics/pages_controller.rb
 - app/controllers/active_analytics/referrers_controller.rb
 - app/controllers/active_analytics/sites_controller.rb
 - app/helpers/active_analytics/application_helper.rb
+- app/helpers/active_analytics/browsers_helper.rb
 - app/helpers/active_analytics/pages_helper.rb
 - app/helpers/active_analytics/referrers_helper.rb
 - app/helpers/active_analytics/sites_helper.rb
 - app/jobs/active_analytics/application_job.rb
+- app/lib/active_analytics/histogram.rb
 - app/mailers/active_analytics/application_mailer.rb
 - app/models/active_analytics/application_record.rb
+- app/models/active_analytics/browsers_per_day.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/assets/browsers/arc.svg
+- app/views/active_analytics/assets/browsers/brave.svg
+- app/views/active_analytics/assets/browsers/chrome.svg
+- app/views/active_analytics/assets/browsers/default.svg
+- app/views/active_analytics/assets/browsers/firefox.svg
+- app/views/active_analytics/assets/browsers/internet_explorer.svg
+- app/views/active_analytics/assets/browsers/microsoft_edge.svg
+- app/views/active_analytics/assets/browsers/opera.svg
+- app/views/active_analytics/assets/browsers/safari.svg
+- app/views/active_analytics/assets/browsers/samsung_internet.svg
+- app/views/active_analytics/assets/browsers/vivaldi.svg
+- app/views/active_analytics/assets/browsers/yandex.svg
+- app/views/active_analytics/browsers/_table.html.erb
+- app/views/active_analytics/browsers/_version_table.html.erb
+- app/views/active_analytics/browsers/index.html.erb
+- app/views/active_analytics/browsers/show.html.erb
 - 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 +99,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
@@ -71,6 +107,7 @@ files:
 - app/views/layouts/active_analytics/application.html.erb
 - config/routes.rb
 - db/migrate/20210303094108_create_active_analytics_views_per_days.rb
+- db/migrate/20240823150626_create_active_analytics_browsers_per_days.rb
 - lib/active_analytics.rb
 - lib/active_analytics/engine.rb
 - lib/active_analytics/version.rb
@@ -83,7 +120,7 @@ metadata:
   homepage_uri: https://github.com/BaseSecrete/active_analytics
   source_code_uri: https://github.com/BaseSecrete/active_analytics
   changelog_uri: https://github.com/BaseSecrete/active_analytics
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -98,8 +135,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: First-party, privacy-focused traffic analytics for Ruby on Rails applications
 test_files: []

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
- */

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

@@ -1,296 +0,0 @@
-/*
- * Charts.css v0.9.0 (https://ChartsCSS.org/)
- * Copyright 2020 Rami Yushuvaev
- * Licensed under MIT
- */
-.charts-css {
-  --chart-bg-color: transparent;
-  --heading-size: 0px;
-  --primary-axis-color: rgba(var(--color-grey-100), 1);
-  --primary-axis-style: solid;
-  --primary-axis-width: 1px;
-  --secondary-axes-color: rgba(var(--color-grey-50), 1);
-  --secondary-axes-style: solid;
-  --secondary-axes-width: 1px;
-  --data-axes-color: rgba(var(--color-grey-200), 1);
-  --data-axes-style: solid;
-  --data-axes-width: 1px;
-  --legend-border-color: rgba(var(--color-grey-200), 1);
-  position: relative;
-  display: block;
-  margin: 0;
-  padding: 0;
-  border: 0;
-}
-
-/*
- * Chart wrapper element
- */
-
-.charts-css, .charts-css::after, .charts-css::before,
-.charts-css *,
-.charts-css *::after,
-.charts-css *::before {
-  -webkit-box-sizing: border-box;
-          box-sizing: border-box;
-}
-
-/*
- * Reset table element
- */
-table.charts-css {
-  border-collapse: collapse;
-  border-spacing: 0;
-  empty-cells: show;
-  overflow: initial;
-  background-color: transparent;
-}
-
-table.charts-css caption,
-table.charts-css colgroup,
-table.charts-css thead,
-table.charts-css tbody,
-table.charts-css tr,
-table.charts-css th,
-table.charts-css td {
-  display: block;
-  margin: 0;
-  padding: 0;
-  border: 0;
-  background-color: transparent;
-}
-
-table.charts-css colgroup,
-table.charts-css thead,
-table.charts-css tfoot {
-  display: none;
-}
-
-
-/*
- * Chart colors
- */ 
-
- .charts-css.column tbody tr td {
-   background: rgba(var(--color-grey-100), 1);
-   padding: 0;
- }
-
-/*
- * Chart data
- */
-.charts-css.hide-data .data {
-  opacity: 0;
-}
-
-.charts-css.show-data-on-hover .data {
-  -webkit-transition-duration: .3s;
-          transition-duration: .3s;
-  opacity: 0;
-}
-
-.charts-css.show-data-on-hover tr:hover .data {
-  -webkit-transition-duration: .3s;
-          transition-duration: .3s;
-  opacity: 1;
-}
-
-/*
- * Chart labels
- */
-
-.charts-css.column:not(.show-labels) {
-  --labels-size: 0;
-}
-
-.charts-css.column:not(.show-labels) tbody tr th {
-  display: none;
-}
-
-.charts-css.column.show-labels {
-  --labels-size: 1.5rem;
-}
-
-.charts-css.column.show-labels tbody tr th {
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: var(--labels-align, center);
-      -ms-flex-pack: var(--labels-align, center);
-          justify-content: var(--labels-align, center);
-  -webkit-box-align: center;
-      -ms-flex-align: center;
-          align-items: center;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
-      -ms-flex-direction: column;
-          flex-direction: column;
-}
-
-@media (max-width: 600px) {
-  .charts-css.column.show-labels {
-    --labels-size: 0;
-  }
-  
-  .charts-css.column.show-labels tbody tr th {
-    display: none;
-  }
-}
-
-/*
- * Chart axes
- */
-.charts-css.column.show-primary-axis:not(.reverse) tbody tr {
-  -webkit-border-after: var(--primary-axis-width) var(--primary-axis-style) var(--primary-axis-color);
-          border-block-end: var(--primary-axis-width) var(--primary-axis-style) var(--primary-axis-color);
-}
-
-.charts-css.column.show-primary-axis.reverse tbody tr {
-  -webkit-border-before: var(--primary-axis-width) var(--primary-axis-style) var(--primary-axis-color);
-          border-block-start: var(--primary-axis-width) var(--primary-axis-style) var(--primary-axis-color);
-}
-
-.charts-css.column.show-5-secondary-axes:not(.reverse) tbody tr {
-  background-size: 100% 20%;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(var(--secondary-axes-color)), to(transparent));
-  background-image: linear-gradient(var(--secondary-axes-color) var(--secondary-axes-width), transparent var(--secondary-axes-width));
-}
-
-.charts-css.column.show-5-secondary-axes.reverse tbody tr {
-  background-size: 100% 20%;
-  background-image: -webkit-gradient(linear, left bottom, left top, from(var(--secondary-axes-color)), to(transparent));
-  background-image: linear-gradient(0deg, var(--secondary-axes-color) var(--secondary-axes-width), transparent var(--secondary-axes-width));
-}
-
-/*
- * Chart tooltips
- */
-.charts-css .tooltip {
-  position: absolute;
-  z-index: 1;
-  bottom: 50%;
-  left: 50%;
-  -webkit-transform: translateX(-50%);
-          transform: translateX(-50%);
-  width: -webkit-max-content;
-  width: -moz-max-content;
-  width: max-content;
-  padding: 5px 10px;
-  border-radius: 6px;
-  visibility: hidden;
-  opacity: 0;
-  -webkit-transition: opacity .3s;
-  transition: opacity .3s;
-  background-color: rgba(var(--color-grey-500), 1);
-  color: rgba(var(--color-grey-00), 1);
-  text-align: center;
-  font-size: .9rem;
-}
-
-.charts-css .tooltip::after {
-  content: "";
-  position: absolute;
-  top: 100%;
-  left: 50%;
-  margin-left: -5px;
-  border-width: 5px;
-  border-style: solid;
-  border-color: rgba(var(--color-grey-500), 1) transparent transparent;
-}
-
-.charts-css tr:hover .tooltip {
-  visibility: visible;
-  opacity: 1;
-}
-
-/*
- * Column Chart
- */
-.charts-css.column tbody {
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: justify;
-      -ms-flex-pack: justify;
-          justify-content: space-between;
-  -webkit-box-align: stretch;
-      -ms-flex-align: stretch;
-          align-items: stretch;
-  width: 100%;
-  height: calc(100% - var(--heading-size));
-}
-
-.charts-css.column tbody tr {
-  position: relative;
-  -webkit-box-flex: 1;
-      -ms-flex-positive: 1;
-          flex-grow: 1;
-  -ms-flex-negative: 1;
-      flex-shrink: 1;
-  -ms-flex-preferred-size: 0;
-      flex-basis: 0;
-  overflow-wrap: anywhere;
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: start;
-      -ms-flex-pack: start;
-          justify-content: flex-start;
-  min-width: 0;
-}
-
-.charts-css.column tbody tr th {
-  position: absolute;
-  right: 0;
-  left: 0;
-}
-
-.charts-css.column tbody tr td {
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: center;
-      -ms-flex-pack: center;
-          justify-content: center;
-  width: 100%;
-  height: calc(100% * var(--size, 1));
-  position: relative;
-}
-
-.charts-css.column:not(.reverse) tbody tr {
-  -webkit-box-align: end;
-      -ms-flex-align: end;
-          align-items: flex-end;
-  -webkit-margin-after: var(--labels-size);
-          margin-block-end: var(--labels-size);
-}
-
-.charts-css.column:not(.reverse) tbody tr th {
-  bottom: calc(-1 * var(--labels-size) - var(--primary-axis-width));
-  height: var(--labels-size);
-  color: rgba(var(--color-grey-400), 1);
-  font-weight: 400;
-}
-
-.charts-css.column:not(.reverse) tbody tr td {
-  -webkit-box-align: start;
-      -ms-flex-align: start;
-          align-items: flex-start;
-}
-
-.charts-css.column:not(.stacked) tbody tr td {
-  -webkit-box-flex: 1;
-      -ms-flex-positive: 1;
-          flex-grow: 1;
-  -ms-flex-negative: 1;
-      flex-shrink: 1;
-  -ms-flex-preferred-size: 0;
-      flex-basis: 0;
-}
-
-.charts-css.column:not(.reverse-data) tbody {
-  -webkit-box-orient: horizontal;
-  -webkit-box-direction: normal;
-      -ms-flex-direction: row;
-          flex-direction: row;
-}