jekyll-attendease 0.6.43.2 → 0.6.43.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36d0d817712d4126ee5f0676cd4144dcc5335beb
-  data.tar.gz: aec70c6a21e694d4f14d7ca85c94704f90354165
+  metadata.gz: 1fd982ba5a7fab63d1dd6c4fedc02de729f5b22e
+  data.tar.gz: f40d85fcabf1092cfd65ef5e39812764c570002a
 SHA512:
-  metadata.gz: f2fc7ad5c50e674d603aae04aee3324b289b3b1eb38809cac940cf4e8ff25716ff103f5edb4314023563b223c921be147906f394efbf7862f64889021025c304
-  data.tar.gz: 5e2b83f716a76393cb9b97b846cf38c262546b188735edeff3777e4fe0c01ae8d3a5b3140d363a854c69883fa67943e7ce1b94326f5855baccbf0b56e0332b4d
+  metadata.gz: 9c484e974e21529b3cbc326b8af17fe10c236ee22746ae550a063f1eeeb44e22eb901d8e78c56f1096c1b4c6c88cbb032e1224cb4d8f826ed1bcd8fd6ee4477a
+  data.tar.gz: f5787c010552bef0e81779f2200db19e0a48f57a9060c49a9a2f09f5afcbeefdea17f9e567887d1b700bb9342bef8ab72a0fbf29259a1657011d9f16e90defc6

data/lib/jekyll/attendease_plugin/tags.rb

@@ -322,21 +322,22 @@ _EOT
         site_settings = context.registers[:site].data['site_settings'].clone
         analytics = site_settings['analytics']
 
-        return '' if analytics.nil? \
-          || analytics['googleAnalyticsTrackingId'].nil? \
-          || analytics['googleAnalyticsTrackingId'].empty?
+        has_analytics_id = !analytics.nil? && !analytics['googleAnalyticsTrackingId'].nil? && !analytics['googleAnalyticsTrackingId'].empty?
+        has_adwords_id = !analytics.nil? && !analytics['googleAnalyticsAdwordsId'].nil? && !analytics['googleAnalyticsAdwordsId'].empty?
+        return '' if analytics.nil? || (!has_analytics_id && !has_adwords_id)
+
+        gtag_id = has_analytics_id ? analytics['googleAnalyticsTrackingId'] : analytics['googleAnalyticsAdwordsId']
 
-        adwordsId = analytics['googleAnalyticsAdwordsId']
         script = <<_EOT
 <!-- Global Site Tag (gtag.js) - Google Analytics -->
-<script async src="https://www.googletagmanager.com/gtag/js?id={{ site.data.site_settings.analytics.googleAnalyticsTrackingId }}"></script>
+<script async src="https://www.googletagmanager.com/gtag/js?id=#{gtag_id}"></script>
 <script>
   window.dataLayer = window.dataLayer || [];
   function gtag(){dataLayer.push(arguments);}
   gtag('js', new Date());
 
-  gtag('config', '#{analytics['googleAnalyticsTrackingId']}');
-#{ adwordsId ? "gtag('config', '#{adwordsId}');" : ''}
+#{ has_analytics_id ? "  gtag('config', '#{analytics['googleAnalyticsTrackingId']}');" : ''}
+#{ has_adwords_id ? "  gtag('config', '#{analytics['googleAnalyticsAdwordsId']}');" : ''}
 </script>
 _EOT
         script

data/lib/jekyll/attendease_plugin/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module AttendeasePlugin
-    VERSION = '0.6.43.2'
+    VERSION = '0.6.43.3'
   end
 end

data/spec/lib/jekyll/attendease_plugin/tags_spec.rb

@@ -134,7 +134,9 @@ RSpec.describe "Jekyll Attendease tags" do
     subject { cms_render("{% attendease_analytics_ga_gtag %}") }
 
     it { is_expected.to match(/Global Site Tag \(gtag.js\)/) }
-    it { is_expected.to match(/foo/) }
+    it { is_expected.to match(/js\?id=google_analytics/) }
+    it { is_expected.to match(/gtag\('config'\, 'google_analytics'\)/) }
+    it { is_expected.to match(/gtag\('config'\, 'adwords'\)/) }
   end
 
   describe "{% attendease_analytics_linked_in %}" do
@@ -155,7 +157,7 @@ RSpec.describe "Jekyll Attendease tags" do
     subject { cms_render("{% attendease_analytics_settings %}") }
 
     it { is_expected.to match(/Global Analytics Settings/) }
-    it { is_expected.to match(/googleAnalyticsTrackingId: "foo"/) }
+    it { is_expected.to match(/googleAnalyticsTrackingId: "google_analytics"/) }
     it { is_expected.to match(/window.AnalyticsSettings = /) }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-attendease
 version: !ruby/object:Gem::Version
-  version: 0.6.43.2
+  version: 0.6.43.3
 platform: ruby
 authors:
 - Michael Wood
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-28 00:00:00.000000000 Z
+date: 2018-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty