spree_google_analytics 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19ff839e89a8bdedb1da8ed93fa302c690211e56ab199beaae23278d51178af8
-  data.tar.gz: c55371fada9e8c6d34b82f7bf05ceed492180b492e8b141bee7748846a46c207
+  metadata.gz: f574ee77e62895d03183585199dc5f72802b17f5660343f75fedb32396d334ac
+  data.tar.gz: 1a02a1876b8b2b9cac0ab49b1b3b4734a9351eea64375cd4594913978efbea08
 SHA512:
-  metadata.gz: '0210987ac97d38ad1e72814a4eb391d2a887fea4af5c15ba429999b0d67ffe08da54d7f04b79a9f67445f7fcf36efa5137331209125e11fa288c30de4e2d35d7'
-  data.tar.gz: d777ce1865934d4739ec7c1c1c537b9e5b6987ffa88ba4accd47c5f0372281b8b8e8eb5564639b02d49365526a64cc60c3367633327fd60d1551cf4275e44e17
+  metadata.gz: b1c7831cb5e64a64cf09c3b2b225994308ff47911e02362d69e0f68a18e091c3575f391c1f08e9afb9bfba39499fb142bac68e585f2dee95f72f0e18bcaad50b
+  data.tar.gz: 4ee2bb04fef77fa6b25f8d1236075890f30b563b141bfc5d8e940690dad099d0f6e15eb6f0b3c299fee464d92d5f0b3c3ce76e04de8be56f896363aebee97406

data/app/views/spree_google_analytics/_cart.html.erb

@@ -1,19 +1,21 @@
 <% if store_integration('google_analytics').present? %>
-  <script>
-    <% if @order.present? && @line_items.any? %>
-      <% if use_gtm? %>
-        if (window.dataLayer) {
-          window.addEventListener('slideover:open', () => {
-            dataLayer.push(<%= google_analytics_view_cart_json %>);
-          })
-        }
-      <% else %>
-        if (window.gtag) {
-          window.addEventListener('slideover:open', () => {
-            gtag('event', 'view_cart', <%= google_analytics_view_cart_json %>);
-          })
-        }
+  <% cache [spree_base_cache_key, 'google_analytics_cart', @order].compact do %>
+    <script>
+      <% if @order.present? && @line_items.any? %>
+        <% if use_gtm? %>
+          if (window.dataLayer) {
+            window.addEventListener('slideover:open', () => {
+              dataLayer.push(<%= google_analytics_view_cart_json %>);
+            })
+          }
+        <% else %>
+          if (window.gtag) {
+            window.addEventListener('slideover:open', () => {
+              gtag('event', 'view_cart', <%= google_analytics_view_cart_json %>);
+            })
+          }
+        <% end %>
       <% end %>
-    <% end %>
-  </script>
+    </script>
+  <% end %>
 <% end %>

data/app/views/spree_google_analytics/_checkout_complete.html.erb

@@ -3,9 +3,9 @@
     <% safely do %>
       <% if use_gtm? %>
         if (window.dataLayer) {
-          <% if @order.user.present? %>
+          <% if @order.user.present? && !try_spree_current_user %>
             dataLayer.push({
-              user_id: "<%= @order.reload.user_id %>",
+              user_id: "<%= @order.user_id %>",
               user_properties: <%= google_analytics_user_properties_json(@order.user) %>
             });
           <% end %>
@@ -15,8 +15,8 @@
         }
       <% else %>
         if (window.gtag) {
-          <% if @order.user.present? %>
-            gtag('set', 'user_id', "<%= @order.reload.user_id %>");
+          <% if @order.user.present? && !try_spree_current_user %>
+            gtag('set', 'user_id', "<%= @order.user_id %>");
             gtag('set', 'user_properties', <%= google_analytics_user_properties_json(@order.user) %>);
           <% end %>
 

data/app/views/spree_google_analytics/_head.html.erb

@@ -1,21 +1,25 @@
-<% if store_integration('google_analytics').present? %>
+<% integration = store_integration('google_analytics') %>
+
+<% if integration.present? %>
   <% if use_gtm? %>
     <!-- Google Tag Manager -->
     <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
     new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
     j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
     'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-    })(window,document,'script','dataLayer','<%= store_integration('google_analytics').preferred_google_tag_manager_id %>');</script>
+    })(window,document,'script','dataLayer','<%= integration.preferred_google_tag_manager_id %>');</script>
     <!-- End Google Tag Manager -->
     
     <script>
       window.dataLayer = window.dataLayer || [];
       
       <% if try_spree_current_user %>
-        dataLayer.push({
-          user_id: "<%= try_spree_current_user.id %>",
-          user_properties: <%= google_analytics_user_properties_json(try_spree_current_user) %>
-        });
+        <% cache try_spree_current_user, expires_in: 1.hour do %>
+          dataLayer.push({
+            user_id: "<%= try_spree_current_user.id %>",
+            user_properties: <%= google_analytics_user_properties_json(try_spree_current_user) %>
+          });
+        <% end %>
       <% end %>
     </script>
   <% else %>
@@ -25,20 +29,8 @@
       window.dataLayer = window.dataLayer || [];
       function gtag(){dataLayer.push(arguments);}
 
-      <% if defined?(store_integration('cookie_first')) && store_integration('cookie_first').present? %>
-        gtag('consent', 'default', {
-        'ad_storage': 'denied',
-        'ad_user_data': 'denied',
-        'ad_personalization': 'denied',
-        'analytics_storage': 'denied',
-        'functionality_storage': 'denied',
-        'security_storage': 'granted',
-        'wait_for_update': 2000
-        });
-      <% end %>
-
       gtag('js', new Date());
-      GA_MEASUREMENT_ID = "<%= store_integration('google_analytics').preferred_measurement_id %>";
+      GA_MEASUREMENT_ID = "<%= integration.preferred_measurement_id %>";
 
       <% if ENV['GA_DEBUG_MODE'].present? %>
         gtag('config', GA_MEASUREMENT_ID, { "debug_mode": true });
@@ -47,8 +39,10 @@
       <% end %>
 
       <% if try_spree_current_user %>
-        gtag('set', 'user_id', "<%= try_spree_current_user.id %>");
-        gtag('set', 'user_properties', <%= google_analytics_user_properties_json(try_spree_current_user) %>);
+        <% cache try_spree_current_user, expires_in: 1.hour do %>
+          gtag('set', 'user_id', "<%= try_spree_current_user.id %>");
+          gtag('set', 'user_properties', <%= google_analytics_user_properties_json(try_spree_current_user) %>);
+        <% end %>
       <% end %>
     </script>
   <% end %>

data/app/views/spree_google_analytics/_product.html.erb

@@ -1,13 +1,15 @@
 <% if store_integration('google_analytics').present? %>
-  <script>
-    <% if use_gtm? %>
-      if (window.dataLayer) {
-        dataLayer.push(<%= google_analytics_view_item_json %>);
-      }
-    <% else %>
-      if (window.gtag) {
-        gtag('event', 'view_item', <%= google_analytics_view_item_json %>);
-      }
-    <% end %>
-  </script>
+  <% cache [spree_base_cache_key, @product, @selected_variant].compact do %>
+    <script>
+      <% if use_gtm? %>
+        if (window.dataLayer) {
+          dataLayer.push(<%= google_analytics_view_item_json %>);
+        }
+      <% else %>
+        if (window.gtag) {
+          gtag('event', 'view_item', <%= google_analytics_view_item_json %>);
+        }
+      <% end %>
+    </script>
+  <% end %>
 <% end %>

data/lib/spree_google_analytics/version.rb

@@ -1,5 +1,5 @@
 module SpreeGoogleAnalytics
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.1.1'.freeze
 
   def gem_version
     Gem::Version.new(VERSION)

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: spree_google_analytics
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Vendo Connect Inc.
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-06 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -16,42 +15,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0.beta
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0.beta
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: spree_storefront
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0.beta
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0.beta
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: spree_admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0.beta
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0.beta
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: spree_extension
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +65,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
 email: hello@spreecommerce.org
 executables: []
 extensions: []
@@ -75,17 +73,22 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
+- app/.gitkeep
 - app/assets/config/spree_google_analytics_manifest.js
 - app/assets/images/integration_icons/google-analytics-logo.png
+- app/controllers/.gitkeep
 - app/controllers/spree_google_analytics/store_controller_decorator.rb
 - app/helpers/spree_google_analytics/base_helper.rb
 - app/javascript/spree_google_analytics/application.js
 - app/javascript/spree_google_analytics/controllers/spree_google_analytics_controller.js
+- app/models/.gitkeep
 - app/models/spree/integrations/google_analytics.rb
 - app/presenters/spree_google_analytics/checkout_presenter.rb
 - app/presenters/spree_google_analytics/order_presenter.rb
 - app/presenters/spree_google_analytics/payment_presenter.rb
 - app/presenters/spree_google_analytics/product_presenter.rb
+- app/serializers/.gitkeep
+- app/services/.gitkeep
 - app/views/spree/admin/integrations/forms/_google_analytics.html.erb
 - app/views/spree_google_analytics/_add_to_cart.html.erb
 - app/views/spree_google_analytics/_add_to_wishlist.erb
@@ -107,11 +110,12 @@ files:
 - lib/spree_google_analytics/factories.rb
 - lib/spree_google_analytics/testing_support/factories/google_analytics_integration.rb
 - lib/spree_google_analytics/version.rb
+- vendor/javascript/.keep
+- vendor/stylesheets/.keep
 homepage: https://github.com/spree/spree_google_analytics
 licenses:
 - AGPL-3.0-or-later
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -127,8 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 4.0.2
 specification_version: 4
 summary: Spree Commerce Google analytics Extension
 test_files: []