middleman-google-analytics 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2daedda3dfd7762142d5fcb70a2af985c45b4e44
-  data.tar.gz: a6c542865b95fcd7dedeccd9f1c802c2291c2a64
+  metadata.gz: d8df82e8c98ac618f06e7549481055ed8875b932
+  data.tar.gz: bd957e790ddc53b8c246efc98c51e2067d22db50
 SHA512:
-  metadata.gz: dcd1af775dcd2b418d16d260c1a1f0b862f239e39e0ab6233f01d1045c53ecbd68f40e859c8e82db182e714950ee75d7c2a3572b64e5146a224ce53c92677424
-  data.tar.gz: e4a7764cdf5cf88ef6b65772a8e48aa22d826396ac1d3133331de44b89bc2f1b4c58fd7ff2f25517810467faf954bb78a0de789e48000b0c84ee57a89876f9d1
+  metadata.gz: e6f1eaeb419ea28835f1c3539328954c2e2075edeb1f21f0b1094a06f27cdab022caad8e7577ee2f6edfd218ed471e80833ed36107d7c18aa7efafce00ed8802
+  data.tar.gz: 17ff573c4a48a5842035c28f730c262afbbe2f941e85c4dbf2a14405e261a9f57efdca655bc54620b42607c238016059266291d839f6e747d6dd16eb4b6623ca

data/.travis.yml

@@ -6,6 +6,7 @@ before_script:
 
 rvm:
   - ruby-head
+  - 2.3.0
   - 2.2.4
   - 2.1.8
   - 2.0.0

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 2.1.0 (2016-02-21)
+
+* Support for Enhanced Link Attribution, see #25.
+
+## 2.0.1 (2015-12-18)
+
+* Patch for #legacy_development?, see #24.
+
 ## 2.0.0 (2015-12-16)
 
 * Middleman v4 support added.

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2015 Daniel Bayerlein
+Copyright (c) 2014-2016 Daniel Bayerlein
 Copyright (c) 2013 Jon Frisby
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

data/README.md

@@ -14,7 +14,7 @@ keeps your config in `config.rb`, where it belongs.
 1. Specify the dependency in your project's `Gemfile`:
 
   ```ruby
-  gem 'middleman-google-analytics', '~> 2.0'
+  gem 'middleman-google-analytics', '~> 2.1'
   ```
 
 2. Activate the Google Analytics extension in your project's `config.rb`:
@@ -65,9 +65,7 @@ keeps your config in `config.rb`, where it belongs.
   <%= google_analytics_universal_tag %>
   ```
 
-  :bulb: Note: [The Universal Analytics tag is the new operating standard for the Google Analytics tracking tag.][1]
-
-  [1]: https://support.google.com/tagmanager/answer/6107124?hl=en
+  :bulb: Note: [The Universal Analytics tag is the new operating standard for the Google Analytics tracking tag.](https://support.google.com/analytics/answer/2790010)
 
 ## Configuration
 
@@ -85,6 +83,9 @@ activate :google_analytics do |ga|
   # Tracking across multiple domains and subdomains (default = false)
   ga.allow_linker = false
 
+  # Enhanced Link Attribution (default = false)
+  ga.enhanced_link_attribution = false
+
   # Tracking Code Debugger (default = false)
   ga.debug = false
 
@@ -124,6 +125,6 @@ display the GA tracking code.
 
 ## License
 
-Copyright (c) 2014-2015 Daniel Bayerlein. See [LICENSE](./LICENSE) for details.
+Copyright (c) 2014-2016 Daniel Bayerlein. See [LICENSE](./LICENSE) for details.
 
 Copyright (c) 2013 Jon Frisby.

data/features/google_analytics.feature

@@ -102,12 +102,30 @@ Feature: Google Analytics tag helper
       <script type="text/javascript">var _gaq=_gaq||[];_gaq.push(["_setAccount","UA-123456-78"]),_gaq.push(["_trackPageview"]),function(){var t=document.createElement("script");t.type="text/javascript",t.async=!0,t.src=("https:"==document.location.protocol?"//ssl":"//www")+".google-analytics.com/ga.js";var e=document.getElementsByTagName("script")[0];e.parentNode.insertBefore(t,e)}();</script>
       """
 
+  Scenario: Enhanced Link Attribution
+    Given the Server is running at "enhanced-link-attribution-app"
+    When I go to "/google-analytics.html"
+    Then I should see:
+      """
+      <script type="text/javascript">
+        var _gaq = _gaq || [];
+        _gaq.push(["_setAccount", "UA-123456-78"]);
+        _gaq.push(["_require", "inpage_linkid", "//www.google-analytics.com/plugins/ga/inpage_linkid.js"]);
+        _gaq.push(["_trackPageview"]);
+        (function() {
+          var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+          ga.src = ('https:' == document.location.protocol ? '//ssl' : '//www') + '.google-analytics.com/ga.js';
+          var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+        })();
+      </script>
+      """
+
   Scenario: Full options
     Given the Server is running at "full-app"
     When I go to "/google-analytics.html"
     Then I should see:
       """
-      <script type="text/javascript">var _gaq=_gaq||[];_gaq.push(["_setAccount","UA-123456-78"]),_gaq.push(["_setDomainName","example.com"]),_gaq.push(["_setAllowLinker",!0]),_gaq.push(["_gat._anonymizeIp"]),_gaq.push(["_trackPageview"]),function(){var e=document.createElement("script");e.type="text/javascript",e.async=!0,e.src=("https:"==document.location.protocol?"//ssl":"//www")+".google-analytics.com/u/ga_debug.js";var a=document.getElementsByTagName("script")[0];a.parentNode.insertBefore(e,a)}();</script>
+      <script type="text/javascript">var _gaq=_gaq||[];_gaq.push(["_setAccount","UA-123456-78"]),_gaq.push(["_setDomainName","example.com"]),_gaq.push(["_setAllowLinker",!0]),_gaq.push(["_gat._anonymizeIp"]),_gaq.push(["_require","inpage_linkid","//www.google-analytics.com/plugins/ga/inpage_linkid.js"]),_gaq.push(["_trackPageview"]),function(){var e=document.createElement("script");e.type="text/javascript",e.async=!0,e.src=("https:"==document.location.protocol?"//ssl":"//www")+".google-analytics.com/u/ga_debug.js";var a=document.getElementsByTagName("script")[0];a.parentNode.insertBefore(e,a)}();</script>
       """
 
   Scenario: JavaScript output style

data/features/google_analytics_universal.feature

@@ -74,12 +74,28 @@ Feature: Google Analytics Universal tag helper
       <script type="text/javascript">!function(e,a,t,n,c,o,s){e.GoogleAnalyticsObject=c,e[c]=e[c]||function(){(e[c].q=e[c].q||[]).push(arguments)},e[c].l=1*new Date,o=a.createElement(t),s=a.getElementsByTagName(t)[0],o.async=1,o.src=n,s.parentNode.insertBefore(o,s)}(window,document,"script","//www.google-analytics.com/analytics.js","ga"),ga("create","UA-123456-78","auto"),ga("send","pageview");</script>
       """
 
+  Scenario: Enhanced Link Attribution
+    Given the Server is running at "enhanced-link-attribution-app"
+    When I go to "/google-analytics-universal.html"
+    Then I should see:
+      """
+      <script type="text/javascript">
+        (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+        (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+        })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+        ga('create', 'UA-123456-78', 'auto');
+        ga('require', 'linkid');
+        ga('send', 'pageview');
+      </script>
+      """
+
   Scenario: Full options
     Given the Server is running at "full-app"
     When I go to "/google-analytics-universal.html"
     Then I should see:
       """
-      <script type="text/javascript">!function(e,a,n,t,c,o,s){e.GoogleAnalyticsObject=c,e[c]=e[c]||function(){(e[c].q=e[c].q||[]).push(arguments)},e[c].l=1*new Date,o=a.createElement(n),s=a.getElementsByTagName(n)[0],o.async=1,o.src=t,s.parentNode.insertBefore(o,s)}(window,document,"script","//www.google-analytics.com/analytics.js","ga"),ga("create","UA-123456-78","example.com",{allowLinker:!0}),ga("set","anonymizeIp",!0),ga("send","pageview");</script>
+      <script type="text/javascript">!function(e,a,n,t,c,i,o){e.GoogleAnalyticsObject=c,e[c]=e[c]||function(){(e[c].q=e[c].q||[]).push(arguments)},e[c].l=1*new Date,i=a.createElement(n),o=a.getElementsByTagName(n)[0],i.async=1,i.src=t,o.parentNode.insertBefore(i,o)}(window,document,"script","//www.google-analytics.com/analytics.js","ga"),ga("create","UA-123456-78","example.com",{allowLinker:!0}),ga("set","anonymizeIp",!0),ga("require","linkid"),ga("send","pageview");</script>
       """
 
   Scenario: JavaScript output style

data/fixtures/enhanced-link-attribution-app/config.rb

@@ -0,0 +1,4 @@
+activate :google_analytics do |ga|
+  ga.tracking_id = 'UA-123456-78'
+  ga.enhanced_link_attribution = true
+end

data/fixtures/enhanced-link-attribution-app/source/google-analytics-universal.html.erb

@@ -0,0 +1 @@
+<%= google_analytics_universal_tag %>

data/fixtures/enhanced-link-attribution-app/source/google-analytics.html.erb

@@ -0,0 +1 @@
+<%= google_analytics_tag %>

data/fixtures/full-app/config.rb

@@ -3,6 +3,7 @@ activate :google_analytics do |ga|
   ga.domain_name = 'example.com'
   ga.debug = true
   ga.allow_linker = true
+  ga.enhanced_link_attribution = true
   ga.anonymize_ip = true
   ga.development = true
   ga.minify = true

data/lib/middleman-google-analytics/analytics.js.erb

@@ -1,11 +1,13 @@
 <%
   file = @options.debug ? 'u/ga_debug' : 'ga'
+  pluginUrl = '//www.google-analytics.com/plugins/ga/inpage_linkid.js'
 
   gaq = []
   gaq << ['_setAccount', "#{@options.tracking_id}"]
   gaq << ['_setDomainName', "#{@options.domain_name}"] if @options.domain_name
   gaq << ['_setAllowLinker', true] if @options.allow_linker
   gaq << ['_gat._anonymizeIp'] if @options.anonymize_ip
+  gaq << ['_require', 'inpage_linkid', pluginUrl] if @options.enhanced_link_attribution
   gaq << ['_trackPageview']
 %>
 var _gaq = _gaq || [];

data/lib/middleman-google-analytics/analytics_universal.js.erb

@@ -7,6 +7,7 @@
   ga = []
   ga << "ga('create', #{create_options.join(', ')});"
   ga << "ga('set', 'anonymizeIp', true);" if @options.anonymize_ip
+  ga << "ga('require', 'linkid');" if @options.enhanced_link_attribution
   ga << "ga('send', 'pageview');"
 %>
 (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){

data/lib/middleman-google-analytics/extension.rb

@@ -8,6 +8,7 @@ module Middleman
     option :domain_name, nil, 'Tracking across a domain and its subdomains'
     option :allow_linker, false, 'Tracking across multiple domains and ' \
                                  'subdomains'
+    option :enhanced_link_attribution, false, 'Enhanced Link Attribution'
     option :debug, false, 'Tracking Code Debugger'
     option :development, true, 'Tracking in development environment'
     option :minify, false, 'Compress the JavaScript code'

data/lib/middleman-google-analytics/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module GoogleAnalytics
-    VERSION = '2.0.1'
+    VERSION = '2.1.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-google-analytics
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Daniel Bayerlein
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2016-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -107,6 +107,9 @@ files:
 - fixtures/disable-app/config.rb
 - fixtures/disable-app/source/google-analytics-universal.html.erb
 - fixtures/disable-app/source/google-analytics.html.erb
+- fixtures/enhanced-link-attribution-app/config.rb
+- fixtures/enhanced-link-attribution-app/source/google-analytics-universal.html.erb
+- fixtures/enhanced-link-attribution-app/source/google-analytics.html.erb
 - fixtures/full-app/config.rb
 - fixtures/full-app/source/google-analytics-universal.html.erb
 - fixtures/full-app/source/google-analytics.html.erb
@@ -140,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Middleman plugin for handling Google Analytics tracking code.