card-mod-google_analytics 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e79ea19bd6bc2758e3b4b37031a7e518b7486d4ecbc673c3d139f208721d35c8
-  data.tar.gz: d94001d3d918020fb404904b2ca1fcaf702f4b25880011422cf3ddfee7341035
+  metadata.gz: bdd5b960c4dc367c9699ae0f7a7edac10a5ec0b169ce19c022c1125533dadf32
+  data.tar.gz: 63dbeffde312bbe58b5e51fb08e6db83f01bcc341f4fbc4875411939e18613cc
 SHA512:
-  metadata.gz: 349cbbc6f6180416b79d4b4422920ddc466202e12bca686feb1df4eb2884c81040b26d3247780c7065b7f9df6a53447b78a227c3d3cefb42c1d156c8905149ac
-  data.tar.gz: f8c850760cd1890db41eb2b723f405f6abb2cbe339111636ca8e0de9367ac8e2e0f3717e2b6ea848e4bc02110d09ab0f565a8ba02d632bf41bf5059a61c8499a
+  metadata.gz: 0a229def35771a05d67ac3eceaea271354286ff99704d27e781edfda6635e7915d3fa7f2dad36aec177e4ce5d859a26e7e6be75b76a0d79817ed7852dd095e72
+  data.tar.gz: cf9a74e60cddcd293f4bbe3d75991f1800e9749d81c60710d3b1374fdee38cae0457671b178b6031f0bc877fc142442074ef307c3b64da09f11f5d54e86df4a9

data/set/all/google_analytics.rb

@@ -1,32 +1,47 @@
 require "staccato"
 
-mattr_accessor :server_side_tracking_formats
-
-self.server_side_tracking_formats = %i[csv json]
+event :track_page, before: :show_page, when: :track_page_from_server? do
+  track_page!
+end
 
-event :track_page, before: :show_page, when: :track_page? do
-  tracker.pageview path: Env.controller.request&.path, host: Env.host, title: name
+def track_page!
+  tracker.pageview tracker_options
 end
 
-def track_page?
-  google_analytics_key &&
-    Env.controller&.response_format&.in?(server_side_tracking_formats)
+# TODO: optimize so it doesn't keep doing lookup if there is no key.
+def google_analytics_key
+  @google_analytics_key ||=
+    Card::Rule.global_setting(:google_analytics_key) ||
+    Card.config.google_analytics_key
 end
 
 def tracker
-  return unless google_analytics_key
+  tracker_key && ::Staccato.tracker(tracker_key) # , nil, ssl: true
+end
 
-  ::Staccato.tracker google_analytics_key # , nil, ssl: true
+# can override to have separate keys for web and API
+def tracker_key
+  google_analytics_key
 end
 
-def google_analytics_key
-  @google_analytics_key ||=
-    Card::Rule.global_setting(:google_analytics_key) ||
-    Card.config.google_analytics_key
+def tracker_options
+  r = Env.controller.request
+  {
+    path: r.path,
+    host: Env.host,
+    title: name,
+    user_id: Auth.current_id,
+    user_ip: r.remote_ip
+  }
+end
+
+# for override
+def track_page_from_server?
+  false
 end
 
 format :html do
-  delegate :tracker, :google_analytics_key, to: :card
+  delegate :google_analytics_key, to: :card
 
   def views_in_head
     super << :google_analytics_snippet

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-google_analytics
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-05 00:00:00.000000000 Z
+date: 2021-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.102.0
+        version: 1.103.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.102.0
+        version: 1.103.0
 - !ruby/object:Gem::Dependency
   name: staccato
   requirement: !ruby/object:Gem::Requirement
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Google Analytics support for decko