card-mod-google_analytics 0.11.7 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c62de7ae5b72ea83cd7fa399ec4479d7a409ebd828c4404c701c3b50ef82582
-  data.tar.gz: 04bae4fd6e6dbe93baed706f09dfc908ec76b026c9290ddd0152a0bdbb777235
+  metadata.gz: 5dcd36529299fa6c209403d904e0b455d9d0e3e8db3ac3ee9a0428fcbfe23e1c
+  data.tar.gz: 105361cca8e531c4f91c85161af734f1d5df844a541bad42230cf559f262dee8
 SHA512:
-  metadata.gz: f18385028bae1d28e5d1077933a9998635143fc1798f0e4c0b8424e94d44a3cb8c6997a5d4e8160e33c85559ed0a09f08dd7416015d4bb69246b7857fac0abce
-  data.tar.gz: e036842e0929c40b8f63f4977dc30d1414dae3ed3463addb1f8640cf7c58893a9122922e792444ba29bb3c1f0f5d998730d1326de48e37be883018ae485d24ab
+  metadata.gz: 9a05facf0d7bd4e0dfc24c9af7517d875c5aeb7e819aa7e1aeb0b385594e69bfe852b7948b8ef4c458faa6b5fe1fa029dfda8a37ebf693b64e955e9284e033dd
+  data.tar.gz: c90bfb04ceee1f794f7a840f2a129931f6b6597310a8d30e3cdb074c6cb54398ae7608f400cd8c83c9f5abc91625e3a2bde6a1b1134f60b35ef322812bb7feaa

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.11.7
+  version: 0.13.2
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-01 00:00:00.000000000 Z
+date: 2021-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.7
+        version: 1.103.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.7
+        version: 1.103.2
 - !ruby/object:Gem::Dependency
   name: staccato
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
 description: ''
 email:
 - info@decko.org