matey 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12a21ea4053dc459c4b23e8e3d2aba0f1214929392c281d40d7055e5a4de26e0
-  data.tar.gz: c2784dda2825209d14dfe8ee9bac7963236caf786a440d980ca1c40d66fcd3e2
+  metadata.gz: 81ed3e6b62f68768a94051796aa20b432002bc811d841b546e7632952816437e
+  data.tar.gz: 99e0970e24a51e1d6b438a8111591dc4c836d336a17e35089b98fba789c7687e
 SHA512:
-  metadata.gz: 02a283bbedef06f95cdbdfe30b00c803b35bd0e94f163921166eb82ab3cd53273fe3ac91776c0596d06c83f7c70a19687cd8611e183bb601bbb23811bdb60e57
-  data.tar.gz: b4488783a6edbf40c39b1eea8e181a7bad5788eb7246586f44a81a4f4dbdd88e3b9988be3de78b2b37806981422eff0e3a45510a7b2f8835fcf2b8639ac6e161
+  metadata.gz: 84b86437df09f3ffa853dbda7da8f21adb36de0c68695855ca1b24330d61ec156002d1295aed604f4fcbb9fee131bcc9cee1d0a168622d92cfc8a5ed1e8853ab
+  data.tar.gz: 4739f02fea2fe779525a2ff14c0ed83cfde865e4f4d91a4f7757100eaeddf5764d145ec5e9ce1922aa26409128e2f284ce647f07057fd9bac560d7ef93e6d7d7

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    matey (0.1.4)
+    matey (0.1.5)
       ahoy_matey (~> 4.0)
+      groupdate (~> 6.4.0)
       view_component (~> 2.74)
 
 GEM
@@ -95,6 +96,8 @@ GEM
       railties (>= 5.0.0)
     globalid (1.1.0)
       activesupport (>= 5.0)
+    groupdate (6.4.0)
+      activesupport (>= 6.1)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     io-console (0.6.0)

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

@@ -1,8 +1,8 @@
 <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 %>
-        <p>Excluding <%= @exclude_days%>
+      <% if @exclude_days.any? %>
+        <p>Excluding <%= @exclude_days.join(', ') %></p>
       <% end %>
     </div>
     <div class="card-body">
@@ -14,7 +14,7 @@
           </tr>
         </thead>
         <tbody class="text-dark border-dark">
-          <% @visits_by_day_of_week.each do |day_of_week, count| %>
+          <% visits_by_day_of_week.each do |day_of_week, count| %>
             <tr>
               <td><%= day_of_week %></td>
               <td class="text-end"><%= count %></td>

data/app/components/matey/visits_by_day_of_week_component.rb

@@ -1,24 +1,17 @@
 require "ahoy_matey"
+require "groupdate"
 
 class Matey::VisitsByDayOfWeekComponent < Matey::ApplicationComponent
-  def initialize(visits:, time_window: 1.month, limit: 10, exclude_days: [], color_scheme: "neutral")
+  def initialize(visits:, time_window: 1.month, exclude_days: [], color_scheme: "neutral")
+    @visits = visits
     @time_window = time_window
-
-    # query for all the visits
-    all_visits = visits.where(started_at: time_window.ago..)
-
-    visits_by_day_of_week = {}
-
-    # get day of week from each visit. Incrase value of dayOfWeek key by 1 if key is already there else initialize key with value of 1
-    all_visits.each { |visit| visits_by_day_of_week.key?(visit.started_at.strftime("%A")) ? visits_by_day_of_week[(visit.started_at.strftime("%A"))] += 1 : visits_by_day_of_week[visit.started_at.strftime("%A")] = 1 }
-
-    # take out items from visits_by_day_of_week  hashmap based on exclude_days parameter
-    if exclude_days.length > 0
-      exclude_days.each { |exclude| visits_by_day_of_week = visits_by_day_of_week.slice!(exclude) }
-    end
-
-    @visits_by_day_of_week = visits_by_day_of_week
-
+    @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/matey/version.rb

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

data/matey.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
 
   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.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Jon Loos
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-21 00:00:00.000000000 Z
+date: 2023-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: view_component
@@ -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