matey 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5991529e6b95d161fa55e0b72a16fb4d22afd2f1d3fd3e657e6c834b5baca48f
-  data.tar.gz: 7764c92bd83d7d7796b7e8737af3c8a6c5007b444238d4307f82790413da249c
+  metadata.gz: 81ed3e6b62f68768a94051796aa20b432002bc811d841b546e7632952816437e
+  data.tar.gz: 99e0970e24a51e1d6b438a8111591dc4c836d336a17e35089b98fba789c7687e
 SHA512:
-  metadata.gz: 2cdb414b9eef61de45dc70babff6c441ff54cceebe2c3b6f515c79c52c8b3f4678f8e65bd41d3ca03f00317f21d634c5780263e9004eedcb607ecbdc7260cb65
-  data.tar.gz: 91e809d70fead673bfa1d308db1edefb5872da969f322f2ac813569de19d18d08657beb21cd31789fbb6e41f04466dad9b054ceecd36cf785b33c3bdb051f243
+  metadata.gz: 84b86437df09f3ffa853dbda7da8f21adb36de0c68695855ca1b24330d61ec156002d1295aed604f4fcbb9fee131bcc9cee1d0a168622d92cfc8a5ed1e8853ab
+  data.tar.gz: 4739f02fea2fe779525a2ff14c0ed83cfde865e4f4d91a4f7757100eaeddf5764d145ec5e9ce1922aa26409128e2f284ce647f07057fd9bac560d7ef93e6d7d7

data/.devcontainer/devcontainer.json

@@ -8,7 +8,7 @@
 			// Update 'VARIANT' to pick a Ruby version: 3, 3.1, 3.0, 2, 2.7, 2.6
 			// Append -bullseye or -buster to pin to an OS version.
 			// Use -bullseye variants on local on arm64/Apple Silicon.
-			"VARIANT": "3.1",
+			"VARIANT": "3.2",
 			// Options
 			"NODE_VERSION": "lts/*"
 		}

data/COLOR_SCHEMES.md

@@ -0,0 +1,24 @@
+# Color Schemes
+
+## Available Colors
+
+- [Neutral](#neutral) _(default)_
+- [Blue](#blue)
+
+### Neutral _(default)_
+
+![Neutral Color Scheme](./images/colorSchemeNeutral.png)
+
+```ruby
+<%= render Matey::[ComponentType].new(..., color_scheme: "neutral") %>
+```
+
+Note: If `color_scheme` argument is omitted, color scheme value defaults to `neutral`
+
+### Blue
+
+![Blue Color Scheme](./images/colorSchemeBlue.png)
+
+```ruby
+<%= render Matey::[ComponentType].new(..., color_scheme: 'blue') %>
+```

data/Gemfile

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 gemspec
 
 rails_version = (ENV["RAILS_VERSION"] || "~> 7").to_s
-gem "rails", rails_version == "main" ? {git: "https://github.com/rails/rails", ref: "main"} : rails_version
+gem "rails", (rails_version == "main") ? {git: "https://github.com/rails/rails", ref: "main"} : rails_version
 
 gem "debug", platforms: %i[mri mingw x64_mingw]
 

data/Gemfile.lock

@@ -1,173 +1,186 @@
 PATH
   remote: .
   specs:
-    matey (0.1.3)
+    matey (0.1.5)
       ahoy_matey (~> 4.0)
-      view_component (~> 2.74.1)
+      groupdate (~> 6.4.0)
+      view_component (~> 2.74)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.0.4)
-      actionpack (= 7.0.4)
-      activesupport (= 7.0.4)
+    actioncable (7.0.5)
+      actionpack (= 7.0.5)
+      activesupport (= 7.0.5)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.4)
-      actionpack (= 7.0.4)
-      activejob (= 7.0.4)
-      activerecord (= 7.0.4)
-      activestorage (= 7.0.4)
-      activesupport (= 7.0.4)
+    actionmailbox (7.0.5)
+      actionpack (= 7.0.5)
+      activejob (= 7.0.5)
+      activerecord (= 7.0.5)
+      activestorage (= 7.0.5)
+      activesupport (= 7.0.5)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.4)
-      actionpack (= 7.0.4)
-      actionview (= 7.0.4)
-      activejob (= 7.0.4)
-      activesupport (= 7.0.4)
+    actionmailer (7.0.5)
+      actionpack (= 7.0.5)
+      actionview (= 7.0.5)
+      activejob (= 7.0.5)
+      activesupport (= 7.0.5)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.4)
-      actionview (= 7.0.4)
-      activesupport (= 7.0.4)
-      rack (~> 2.0, >= 2.2.0)
+    actionpack (7.0.5)
+      actionview (= 7.0.5)
+      activesupport (= 7.0.5)
+      rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.4)
-      actionpack (= 7.0.4)
-      activerecord (= 7.0.4)
-      activestorage (= 7.0.4)
-      activesupport (= 7.0.4)
+    actiontext (7.0.5)
+      actionpack (= 7.0.5)
+      activerecord (= 7.0.5)
+      activestorage (= 7.0.5)
+      activesupport (= 7.0.5)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.4)
-      activesupport (= 7.0.4)
+    actionview (7.0.5)
+      activesupport (= 7.0.5)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.4)
-      activesupport (= 7.0.4)
+    activejob (7.0.5)
+      activesupport (= 7.0.5)
       globalid (>= 0.3.6)
-    activemodel (7.0.4)
-      activesupport (= 7.0.4)
-    activerecord (7.0.4)
-      activemodel (= 7.0.4)
-      activesupport (= 7.0.4)
-    activestorage (7.0.4)
-      actionpack (= 7.0.4)
-      activejob (= 7.0.4)
-      activerecord (= 7.0.4)
-      activesupport (= 7.0.4)
+    activemodel (7.0.5)
+      activesupport (= 7.0.5)
+    activerecord (7.0.5)
+      activemodel (= 7.0.5)
+      activesupport (= 7.0.5)
+    activestorage (7.0.5)
+      actionpack (= 7.0.5)
+      activejob (= 7.0.5)
+      activerecord (= 7.0.5)
+      activesupport (= 7.0.5)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (7.0.4)
+    activesupport (7.0.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    ahoy_matey (4.1.0)
+    ahoy_matey (4.2.1)
       activesupport (>= 5.2)
       device_detector
       safely_block (>= 0.2.1)
     ast (2.4.2)
     builder (3.2.4)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     crass (1.0.6)
-    debug (1.6.3)
-      irb (>= 1.3.6)
+    date (3.3.3)
+    debug (1.8.0)
+      irb (>= 1.5.0)
       reline (>= 0.3.1)
-    device_detector (1.0.7)
+    device_detector (1.1.0)
     diff-lcs (1.5.0)
-    errbase (0.2.2)
-    erubi (1.11.0)
+    erubi (1.12.0)
     factory_bot (6.2.1)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    globalid (1.0.0)
+    globalid (1.1.0)
       activesupport (>= 5.0)
-    i18n (1.12.0)
+    groupdate (6.4.0)
+      activesupport (>= 6.1)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    io-console (0.5.11)
-    irb (1.4.2)
+    io-console (0.6.0)
+    irb (1.7.0)
       reline (>= 0.3.0)
-    json (2.6.2)
-    loofah (2.19.0)
+    json (2.6.3)
+    language_server-protocol (3.17.0.3)
+    lint_roller (1.0.0)
+    loofah (2.21.3)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
       mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
     marcel (1.0.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
-    minitest (5.16.3)
-    net-imap (0.3.1)
+    minitest (5.18.1)
+    net-imap (0.3.6)
+      date
       net-protocol
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.1.3)
+    net-protocol (0.2.1)
       timeout
     net-smtp (0.3.3)
       net-protocol
-    nio4r (2.5.8)
-    nokogiri (1.13.9-x86_64-darwin)
+    nio4r (2.5.9)
+    nokogiri (1.15.2-aarch64-linux)
+      racc (~> 1.4)
+    nokogiri (1.15.2-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.9-x86_64-linux)
+    nokogiri (1.15.2-x86_64-linux)
       racc (~> 1.4)
-    parallel (1.22.1)
-    parser (3.1.2.1)
+    parallel (1.23.0)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
-    racc (1.6.0)
-    rack (2.2.4)
-    rack-test (2.0.2)
+      racc
+    racc (1.7.1)
+    rack (2.2.7)
+    rack-test (2.1.0)
       rack (>= 1.3)
-    rails (7.0.4)
-      actioncable (= 7.0.4)
-      actionmailbox (= 7.0.4)
-      actionmailer (= 7.0.4)
-      actionpack (= 7.0.4)
-      actiontext (= 7.0.4)
-      actionview (= 7.0.4)
-      activejob (= 7.0.4)
-      activemodel (= 7.0.4)
-      activerecord (= 7.0.4)
-      activestorage (= 7.0.4)
-      activesupport (= 7.0.4)
+    rails (7.0.5)
+      actioncable (= 7.0.5)
+      actionmailbox (= 7.0.5)
+      actionmailer (= 7.0.5)
+      actionpack (= 7.0.5)
+      actiontext (= 7.0.5)
+      actionview (= 7.0.5)
+      activejob (= 7.0.5)
+      activemodel (= 7.0.5)
+      activerecord (= 7.0.5)
+      activestorage (= 7.0.5)
+      activesupport (= 7.0.5)
       bundler (>= 1.15.0)
-      railties (= 7.0.4)
+      railties (= 7.0.5)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
-    railties (7.0.4)
-      actionpack (= 7.0.4)
-      activesupport (= 7.0.4)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    railties (7.0.5)
+      actionpack (= 7.0.5)
+      activesupport (= 7.0.5)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
       zeitwerk (~> 2.5)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.6.0)
-    reline (0.3.1)
+    regexp_parser (2.8.1)
+    reline (0.3.5)
       io-console (~> 0.5)
     rexml (3.2.5)
-    rspec-core (3.12.0)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.0)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-rails (5.1.2)
@@ -179,51 +192,60 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.12.0)
-    rubocop (1.35.1)
+    rubocop (1.52.1)
       json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.2.2.3)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.23.0)
-      parser (>= 3.1.1.0)
-    rubocop-performance (1.14.3)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.29.0)
+      parser (>= 3.2.1.0)
+    rubocop-performance (1.18.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    ruby-progressbar (1.11.0)
-    safely_block (0.3.0)
-      errbase (>= 0.1.1)
-    sprockets (4.1.1)
+    ruby-progressbar (1.13.0)
+    safely_block (0.4.0)
+    sprockets (4.2.0)
       concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
+      rack (>= 2.2.4, < 4)
     sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.5.3-x86_64-darwin)
-    sqlite3 (1.5.3-x86_64-linux)
-    standard (1.16.1)
-      rubocop (= 1.35.1)
-      rubocop-performance (= 1.14.3)
-    thor (1.2.1)
-    timeout (0.3.0)
-    tzinfo (2.0.5)
+    sqlite3 (1.6.3-aarch64-linux)
+    sqlite3 (1.6.3-x86_64-darwin)
+    sqlite3 (1.6.3-x86_64-linux)
+    standard (1.29.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.52.0)
+      standard-custom (~> 1.0.0)
+      standard-performance (~> 1.1.0)
+    standard-custom (1.0.1)
+      lint_roller (~> 1.0)
+    standard-performance (1.1.0)
+      lint_roller (~> 1.0)
+      rubocop-performance (~> 1.18.0)
+    thor (1.2.2)
+    timeout (0.3.2)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.3.0)
-    view_component (2.74.1)
-      activesupport (>= 5.0.0, < 8.0)
+    unicode-display_width (2.4.2)
+    view_component (2.82.0)
+      activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.6.4)
+    zeitwerk (2.6.8)
 
 PLATFORMS
+  aarch64-linux
   x86_64-darwin-21
   x86_64-linux
 
@@ -242,4 +264,4 @@ DEPENDENCIES
   standard (~> 1.3)
 
 BUNDLED WITH
-   2.3.7
+   2.4.10

data/README.md

@@ -45,6 +45,8 @@ the `time_window`, which is the period to report on.
 
 It is that simple! There should now be a card displaying the number of active users within the past week.
 
+View the available component color schemes [here](COLOR_SCHEMES.md).
+
 View the list of available components [here](COMPONENTS.md).
 
 **Note**: The more data, the more interesting the components will be. A common and helpful pattern is to capture events on all controller actions. Details on doing this can be found [here](https://github.com/ankane/ahoy#ruby).
@@ -55,10 +57,13 @@ After checking out the repository, run the following commands to get started:
 
 ```bash
 # install required packages
-bin/setup  
+bin/setup
+
+# install spec/sample packages
+bundle install --gemfile spec/sample/Gemfile
 
 # run test cases and ensure everything is passing
-rake spec  
+rake spec
 
 # an interactive prompt that will allow you to experiment with matey (currently broken!)
 bin/console
@@ -74,7 +79,7 @@ To use the sample application:
 
 1. `cd spec/sample`
 2. `bundle`
-3. `rails s`
+3. `bundle exec rails s`
 4. Open a browser to `localhost:3000`
 
 ## Testing

data/app/components/matey/active_users_component.html.erb

@@ -1,4 +1,4 @@
-<div class="card bg-primary text-light">
+<div class="card <%= @color_scheme %>">
   <div class="card-body">
     <div class="row">
       <div class="col">

data/app/components/matey/active_users_component.rb

@@ -1,7 +1,7 @@
 require "ahoy_matey"
 
-class Matey::ActiveUsersComponent < ApplicationComponent
-  def initialize(events:, time_window: 1.week)
+class Matey::ActiveUsersComponent < Matey::ApplicationComponent
+  def initialize(events:, time_window: 1.week, color_scheme: "neutral")
     raise ArgumentError unless events.is_a?(ActiveRecord::Relation)
     raise ArgumentError unless time_window.is_a?(Integer)
 
@@ -9,8 +9,10 @@ class Matey::ActiveUsersComponent < ApplicationComponent
     previous_period = events.where(time: (2 * time_window).ago..time_window.ago).pluck(:user_id).uniq.count
 
     @change_active_number = @current_period - previous_period
-    @change_active_percent = ((@change_active_number.to_f / (previous_period == 0 ? 1 : previous_period)) * 100).truncate(2)
+    @change_active_percent = ((@change_active_number.to_f / ((previous_period == 0) ? 1 : previous_period)) * 100).truncate(2)
 
     @time_window = time_window
+
+    @color_scheme = color_scheme(scheme: color_scheme)
   end
 end

data/app/components/{application_component.rb → matey/application_component.rb}

@@ -1,8 +1,10 @@
 require "view_component"
 require "ahoy_matey"
+require_relative "../../../lib/helpers"
 
-class ApplicationComponent < ViewComponent::Base
+class Matey::ApplicationComponent < ViewComponent::Base
   include ActiveModel::Validations
+  include ColorSchemeHelper
 
   def before_render
     validate!

data/app/components/matey/bounce_rate_component.html.erb

@@ -1,4 +1,4 @@
-<div class="card bg-primary text-light">
+<div class="card <%= @color_scheme %>">
   <div class="card-body">
     <h5 class = "text-center"><strong>The Bounce Rate of your Application is: <u><%= @percentage_of_visits_that_were_bounced %>%</u></strong></h5>
     <div>
@@ -21,7 +21,7 @@
             <th class="text-end">Bounce Count</th>
           </tr>
         </thead>
-        <tbody class="text-light">
+        <tbody class="text-dark border-dark">
           <% @most_bounced_pages.each do |controller_name_and_action, count| %>
             <tr>
               <td><%= controller_name_and_action %></td>

data/app/components/matey/bounce_rate_component.rb

@@ -1,7 +1,7 @@
 require "ahoy_matey"
 
-class Matey::BounceRateComponent < ApplicationComponent
-  def initialize(events:, visits:, limit: 5)
+class Matey::BounceRateComponent < Matey::ApplicationComponent
+  def initialize(events:, visits:, limit: 5, color_scheme: "neutral")
     # Determine the total number of user sessions to the website
     @total_number_of_user_visits = events.pluck(:visit_id).uniq.count
 
@@ -17,6 +17,8 @@ class Matey::BounceRateComponent < ApplicationComponent
     @most_bounced_pages = @single_event_visits_landing_page_count.sort_by { |controller_name_and_action, count| count }.last(limit).reverse
 
     # Get the percentage as #-One-Page-Visits / Total-#-Of-Visits
-    @percentage_of_visits_that_were_bounced = ((@total_number_of_single_event_visits.to_f / (@total_number_of_user_visits == 0 ? 1 : @total_number_of_user_visits)) * 100).round(1)
+    @percentage_of_visits_that_were_bounced = ((@total_number_of_single_event_visits.to_f / ((@total_number_of_user_visits == 0) ? 1 : @total_number_of_user_visits)) * 100).round(1)
+
+    @color_scheme = color_scheme(scheme: color_scheme)
   end
 end

data/app/components/matey/browser_os_breakdown_component.html.erb

@@ -0,0 +1,38 @@
+<div class="card <%= @color_scheme %>">
+  <div class="card-body">
+    <div class="row">
+      <h5 class="text-center">Browser and OS Breakdown</h5>
+      <div class="col">
+        <p class="text-center">Since <%= time_ago_in_words(@time_window.ago).titleize %> Ago</p>
+        <table class='table table-hover table-borderless'>
+          <thead class='table-dark'>
+            <th>Browser</th>
+            <th class='text-center'>Visitor Count</th>
+          </thead>
+          <tbody class='text-dark border-dark'>
+            <% @browsers.each do |browser_name, visitor_count| %>
+              <tr>
+                <td><%= browser_name %></td>
+                <td class='text-center'><%= visitor_count %></td>
+              </tr>
+            <% end %>
+          </tbody>
+        </table>
+        <table class='table table-hover table-borderless'>
+          <thead class='table-dark'>
+            <th>OS</th>
+            <th class='text-center'>Visitor Count</th>
+          </thead>
+          <tbody class='text-dark border-dark'>
+            <% @operating_systems.each do |operating_system, visitor_count| %>
+              <tr>
+                <td><%= operating_system %></td>
+                <td class='text-center'><%= visitor_count %></td>
+              </tr>
+            <% end %>
+          </tbody>
+        </table>
+      </div>
+    </div>
+  </div>
+</div>

data/app/components/matey/browser_os_breakdown_component.rb

@@ -0,0 +1,11 @@
+class Matey::BrowserOsBreakdownComponent < Matey::ApplicationComponent
+  def initialize(visits:, time_window:, color_scheme: "neutral")
+    visits_in_time_window = visits.where(started_at: time_window.ago..)
+    @visits_in_time_window = visits_in_time_window.count
+    @browsers = visits_in_time_window.group(:browser).count
+    @operating_systems = visits_in_time_window.group(:os).count
+    @time_window = time_window
+
+    @color_scheme = color_scheme(scheme: color_scheme)
+  end
+end

data/app/components/matey/daily_active_users_component.html.erb

@@ -0,0 +1,15 @@
+<div class="card <%= @color_scheme %>">
+  <div class="card-body">
+    <div class="col">
+      <div class="col">
+        <h5>Daily Active Users</h5>
+      </div>
+      <div class="col-auto">
+        <p>Since <%= time_ago_in_words(@time_window.ago).titleize %> Ago</p>
+        <p><%= @distinct_user_visits_by_day %></p>
+        <p><%# @distinct_user_visits_by_day2 %></p>
+        <%# @visits.each {|e| e} %>
+      </div>
+    </div>
+  </div>
+</div>

data/app/components/matey/daily_active_users_component.rb

@@ -0,0 +1,11 @@
+class Matey::DailyActiveUsersComponent < Matey::ApplicationComponent
+  def initialize(visits:, time_window:, color_scheme: "neutral")
+    @visits = visits
+    @time_window = time_window
+    visits_in_time_window = visits.where(started_at: time_window.ago..)
+    @distinct_user_visits_by_day = visits_in_time_window.order(:day).group(:day).uniq.count
+    # @distinct_user_visits_by_day2 = visits_in_time_window.order(:day).group("DATE(started_at)").map { |k, v| [k, v] }.sort
+
+    @color_scheme = color_scheme(scheme: color_scheme)
+  end
+end

data/app/components/matey/new_activity_component.html.erb

@@ -1,4 +1,4 @@
-<div class="card bg-primary text-light">
+<div class="card <%= @color_scheme %>">
   <div class="card-body">
     <div class="row">
       <div class="col">

data/app/components/matey/new_activity_component.rb

@@ -1,5 +1,5 @@
-class Matey::NewActivityComponent < ApplicationComponent
-  def initialize(events:, time_window: 1.week)
+class Matey::NewActivityComponent < Matey::ApplicationComponent
+  def initialize(events:, time_window: 1.week, color_scheme: "neutral")
     raise ArgumentError unless events.is_a?(ActiveRecord::Relation)
     raise ArgumentError unless time_window.is_a?(Integer)
 
@@ -7,8 +7,10 @@ class Matey::NewActivityComponent < ApplicationComponent
     previous_period = events.where(time: (2 * time_window).ago..time_window.ago).pluck(:user_id).count
 
     @change_active_number = @current_period - previous_period
-    @change_active_percent = ((@change_active_number.to_f / (previous_period == 0 ? 1 : previous_period)) * 100).truncate(2)
+    @change_active_percent = ((@change_active_number.to_f / ((previous_period == 0) ? 1 : previous_period)) * 100).truncate(2)
 
     @time_window = time_window
+
+    @color_scheme = color_scheme(scheme: color_scheme)
   end
 end

data/app/components/matey/new_users_component.html.erb

@@ -1,4 +1,4 @@
-<div class="card bg-primary text-light">
+<div class="card <%= @color_scheme %>">
   <div class="card-body">
     <div class="row">
       <div class="col">

data/app/components/matey/new_users_component.rb

@@ -1,11 +1,13 @@
-class Matey::NewUsersComponent < ApplicationComponent
-  def initialize(users:, time_window: 1.week)
+class Matey::NewUsersComponent < Matey::ApplicationComponent
+  def initialize(users:, time_window: 1.week, color_scheme: "neutral")
     @current_period = users.where(created_at: time_window.ago..Time.current).count
     previous_period = users.where(created_at: (2 * time_window).ago..time_window.ago).count
 
     @change_new_number = @current_period - previous_period
-    @change_new_percent = ((@change_new_number.to_f / (previous_period == 0 ? 1 : previous_period)) * 100).truncate(2)
+    @change_new_percent = ((@change_new_number.to_f / ((previous_period == 0) ? 1 : previous_period)) * 100).truncate(2)
 
     @time_window = time_window
+
+    @color_scheme = color_scheme(scheme: color_scheme)
   end
 end

data/app/components/matey/top_events_component.html.erb

@@ -1,6 +1,6 @@
 
 
-<div class="card bg-primary text-light">
+<div class="card <%= @color_scheme %>">
   <div class="card-body">
     <h5>Top Events Since <%= time_ago_in_words(@time_window.ago).titleize %> Ago (<%= @time_window.ago.strftime("%m/%d/%Y") %>)</h5>
     <div>
@@ -11,7 +11,7 @@
             <th>Count</th>
           </tr>
         </thead>
-        <tbody class="text-light">
+        <tbody class="text-dark border-dark">
           <% @events.each do |action, count| %>
             <tr>
               <td><%= action %></td>

data/app/components/matey/top_events_component.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
-class Matey::TopEventsComponent < ApplicationComponent
-  def initialize(events:, time_window: 1.week, limit: 5)
+class Matey::TopEventsComponent < Matey::ApplicationComponent
+  def initialize(events:, time_window: 1.week, limit: 5, color_scheme: "neutral")
     raise ArgumentError unless events.is_a?(ActiveRecord::Relation)
     raise ArgumentError unless time_window.is_a?(Integer)
 
     @events = events.where(time: time_window.ago..Time.current).limit(limit).order("count(name) DESC").group(:name).count
     @time_window = time_window
+
+    @color_scheme = color_scheme(scheme: color_scheme)
   end
 end

data/app/components/matey/top_visited_pages_table_component.html.erb

@@ -1,4 +1,4 @@
-<div class="card bg-primary text-light">
+<div class="card <%= @color_scheme %>">
   <div class="card-body">
     <h5>Top Landing Page Visits Since <%= time_ago_in_words(@time_window.ago).titleize %> Ago (<%= @time_window.ago.strftime("%m/%d/%Y") %>)</h5>
     <div>
@@ -9,7 +9,7 @@
             <th>Count</th>
           </tr>
         </thead>
-        <tbody class="text-light">
+        <tbody class="text-dark border-dark">
           <% @user_count_by_event.each do |controller_name_and_action, count| %>
             <tr>
               <td><%= controller_name_and_action %></td>

data/app/components/matey/top_visited_pages_table_component.rb

@@ -1,5 +1,5 @@
-class Matey::TopVisitedPagesTableComponent < ApplicationComponent
-  def initialize(events:, time_window: 1.week, limit: 10)
+class Matey::TopVisitedPagesTableComponent < Matey::ApplicationComponent
+  def initialize(events:, time_window: 1.week, limit: 10, color_scheme: "neutral")
     # Group events by controller (:name) and action. Aggregate number of unique user actions
     @user_count_by_event = events.where(started_at: time_window.ago..).pluck(:landing_page).tally
 
@@ -7,5 +7,7 @@ class Matey::TopVisitedPagesTableComponent < ApplicationComponent
     @user_count_by_event = @user_count_by_event.sort_by { |controller_name_and_action, count| count }.last(limit).reverse
 
     @time_window = time_window
+
+    @color_scheme = color_scheme(scheme: color_scheme)
   end
 end

data/app/components/matey/user_engagement_component.html.erb

@@ -1,4 +1,4 @@
-<div class="card bg-primary text-light">
+<div class="card <%= @color_scheme %>">
   <div class="card-body">
     <h5>User Activity for <i>user id: <%=@user_id%></i> since <i><%= time_ago_in_words(@time_window.ago).titleize %></i> ago </h5>
     <div>
@@ -9,7 +9,7 @@
             <th class="text-end">Count</th>
           </tr>
         </thead>
-        <tbody class="text-light">
+        <tbody class="text-dark border-dark">
           <% @count_by_event.each do |event, count| %>
             <tr>
               <td><%= event %></td>

data/app/components/matey/user_engagement_component.rb

@@ -1,10 +1,12 @@
 require "ahoy_matey"
 
-class Matey::UserEngagementComponent < ApplicationComponent
-  def initialize(events:, user_id:, time_window: 1.week, limit: 10)
+class Matey::UserEngagementComponent < Matey::ApplicationComponent
+  def initialize(events:, user_id:, time_window: 1.week, limit: 10, color_scheme: "neutral")
     @events_for_user = events.where_props(user_id: user_id).where(time: time_window.ago..Time.current).group(:name).count
     @count_by_event = @events_for_user.sort_by { |event, count| count }.last(limit).reverse
     @time_window = time_window
     @user_id = user_id
+
+    @color_scheme = color_scheme(scheme: color_scheme)
   end
 end

data/app/components/matey/visits_by_day_of_week_component.html.erb

@@ -0,0 +1,26 @@
+<div class="card <%= @color_scheme %>">
+    <div class="card-header">
+      <h5>Visits By Day of Week since <%= time_ago_in_words(@time_window.ago).titleize %> Ago (<%= @time_window.ago.strftime("%m/%d/%Y") %>) </h5>
+      <% if @exclude_days.any? %>
+        <p>Excluding <%= @exclude_days.join(', ') %></p>
+      <% end %>
+    </div>
+    <div class="card-body">
+      <table class="table table-hover table-borderless table-sm">
+        <thead class="table-dark">
+          <tr>
+            <th class="text-start">DayOfWeek</th>
+            <th class="text-end">Count</th>
+          </tr>
+        </thead>
+        <tbody class="text-dark border-dark">
+          <% visits_by_day_of_week.each do |day_of_week, count| %>
+            <tr>
+              <td><%= day_of_week %></td>
+              <td class="text-end"><%= count %></td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div><!-- .card-body -->
+</div><!-- .card -->

data/app/components/matey/visits_by_day_of_week_component.rb

@@ -0,0 +1,17 @@
+require "ahoy_matey"
+require "groupdate"
+
+class Matey::VisitsByDayOfWeekComponent < Matey::ApplicationComponent
+  def initialize(visits:, time_window: 1.month, exclude_days: [], color_scheme: "neutral")
+    @visits = visits
+    @time_window = time_window
+    @exclude_days = exclude_days
+    @color_scheme = color_scheme(scheme: color_scheme)
+  end
+
+  # group visits by day in provided time window
+  def visits_by_day_of_week
+    visits_by_day_of_week = @visits.group_by_day_of_week(:started_at, format: "%A", range: @time_window.ago..).count
+    visits_by_day_of_week.except!(*@exclude_days) if @exclude_days.any?
+  end
+end

data/lib/helpers.rb

@@ -0,0 +1,12 @@
+module ColorSchemeHelper
+  def color_scheme(scheme: "blue")
+    case scheme
+    when "blue"
+      "bg-primary text-light"
+    when "neutral"
+      "bg-light text-dark border-dark"
+    else
+      "bg-light text-dark border-dark"
+    end
+  end
+end

data/lib/matey/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Matey
-  VERSION = "0.1.3"
+  VERSION = "0.1.5"
 end

data/lib/matey.rb

@@ -2,7 +2,7 @@
 
 require_relative "matey/version"
 
-require_relative "../app/components/application_component"
+require_relative "../app/components/matey/application_component"
 require_relative "../app/components/matey/active_users_component"
 require_relative "../app/components/matey/bounce_rate_component"
 require_relative "../app/components/matey/new_activity_component"
@@ -10,6 +10,9 @@ require_relative "../app/components/matey/new_users_component"
 require_relative "../app/components/matey/top_events_component"
 require_relative "../app/components/matey/top_visited_pages_table_component"
 require_relative "../app/components/matey/user_engagement_component"
+require_relative "../app/components/matey/daily_active_users_component"
+require_relative "../app/components/matey/visits_by_day_of_week_component"
+require_relative "../app/components/matey/browser_os_breakdown_component"
 
 module Matey
   class Error < StandardError; end

data/matey.gemspec

@@ -34,8 +34,9 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "view_component", "~> 2.74.1"
+  spec.add_dependency "view_component", "~> 2.74"
   spec.add_dependency "ahoy_matey", "~> 4.0"
+  spec.add_dependency "groupdate", "~> 6.4.0"
 
   spec.add_development_dependency "rspec-rails", "~> 5.0"
   spec.add_development_dependency "factory_bot_rails", "~> 6.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: matey
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Jon Loos
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-04 00:00:00.000000000 Z
+date: 2023-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: view_component
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.74.1
+        version: '2.74'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.74.1
+        version: '2.74'
 - !ruby/object:Gem::Dependency
   name: ahoy_matey
   requirement: !ruby/object:Gem::Requirement
@@ -39,6 +39,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: groupdate
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.4.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -153,17 +167,22 @@ files:
 - ".standard.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
+- COLOR_SCHEMES.md
 - COMPONENTS.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
-- app/components/application_component.rb
 - app/components/matey/active_users_component.html.erb
 - app/components/matey/active_users_component.rb
+- app/components/matey/application_component.rb
 - app/components/matey/bounce_rate_component.html.erb
 - app/components/matey/bounce_rate_component.rb
+- app/components/matey/browser_os_breakdown_component.html.erb
+- app/components/matey/browser_os_breakdown_component.rb
+- app/components/matey/daily_active_users_component.html.erb
+- app/components/matey/daily_active_users_component.rb
 - app/components/matey/new_activity_component.html.erb
 - app/components/matey/new_activity_component.rb
 - app/components/matey/new_users_component.html.erb
@@ -174,14 +193,19 @@ files:
 - app/components/matey/top_visited_pages_table_component.rb
 - app/components/matey/user_engagement_component.html.erb
 - app/components/matey/user_engagement_component.rb
+- app/components/matey/visits_by_day_of_week_component.html.erb
+- app/components/matey/visits_by_day_of_week_component.rb
 - docs/CONTRIBUTING.md
 - images/.DS_Store
 - images/activeUsersComponent.png
 - images/bounceRateComponent.png
+- images/colorSchemeBlue.png
+- images/colorSchemeNeutral.png
 - images/newActivityComponent.png
 - images/newUsersComponent.png
 - images/topEventsComponent.png
 - images/topVisitedPages.png
+- lib/helpers.rb
 - lib/matey.rb
 - lib/matey/version.rb
 - matey.gemspec
@@ -208,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Track user engagement using Ahoy and ViewComponents.