middleman-google-analytics 1.1.0 → 2.0.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a51b2ac371e8473750df8ecd42cc01e50a2ccfff
-  data.tar.gz: 4f8721f1ca33bdffecdc0da50645bfa418f8a8b1
+  metadata.gz: 4562d74185bf6d7801721146bdc888d3a1fb03bf
+  data.tar.gz: 85172e0dfcbfce86989c4100a49a3f0ecc0abf3c
 SHA512:
-  metadata.gz: 868b3bd4f25e4cb9655f55b78abb46a9e384f535cf7711e4d345bf536136b49b99850c181c2c0d6ae102e843774abbc8cfbe8813c0d09a8f19cdf8aafa6411bb
-  data.tar.gz: e7f1f30c3975d168d1c9c9d710c087c590bde2f45fa0daed5362611e53e35141cfbb4801b393d32f37b3e9b0604b2cb26576c50a1307c0c8a1e883a401535ecc
+  metadata.gz: 7c2d6ada2eed28d053bf4c96996804954530809cc77117d60e3778ca577655d764b3b1302f517d0410bc50a250cbee30f78b081745224ca50b13b455512cc04c
+  data.tar.gz: c42014798188072354996b085ed686e67f2b3e89412246b8ae661e42eca98e17754fe50768c3a82bee3ba789998a6875b71da67d5aff45d73ad0a85708be2379

data/.travis.yml

@@ -1,18 +1,30 @@
 language: ruby
+sudo: false
+cache: bundler
+before_script:
+  - bundle update
 
 rvm:
   - ruby-head
-  - 2.2.0
-  - 2.1.5
+  - 2.2.3
+  - 2.1.7
   - 2.0.0
-  - 1.9.3
-  - jruby-19mode
+
+os:
+  - linux
+  - osx
 
 matrix:
+  fast_finish: true
   allow_failures:
     - rvm: ruby-head
-    - rvm: jruby-19mode
 
-script: bundle exec rake test
+env:
+  global:
+    - TEST=true
 
-env: TEST=true
+gemfile:
+  - Gemfile
+  - Gemfile-v3
+
+script: bundle exec rake test

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 
-## HEAD (???)
+## 2.0.0 (???)
+
+* Middleman v4 support added.
+* Global google_analytics_settings removed.
+* Output option added.
+* Erubis instead of ERB.
+* Require Ruby 2.0 or greater.
+* Require Middleman 3.4 or greater.
 
 ## 1.1.0 (2015-01-06)
 

data/Gemfile

@@ -1,17 +1,15 @@
 source 'https://rubygems.org'
 
+gem 'middleman-core', github: 'middleman/middleman', branch: 'master'
+
 # Specify your gem's dependencies in middleman-google-analytics.gemspec
 gemspec
 
-group :development do
-  gem 'rake'
-  gem 'rdoc'
-  gem 'yard'
-end
+# Build and doc tools
+gem 'rake', '~> 10.3', require: false
+gem 'yard', '~> 0.8', require: false
 
-group :test do
-  gem 'cucumber'
-  gem 'fivemat', github: 'tpope/fivemat'
-  gem 'aruba'
-  gem 'rspec'
-end
+# Test tools
+gem 'cucumber', '~> 2.0', require: false
+gem 'aruba', '~> 0.7.4', require: false
+gem 'rspec', '~> 3.0', require: false

data/Gemfile-v3

@@ -0,0 +1,15 @@
+source 'https://rubygems.org'
+
+gem 'middleman-core', github: 'middleman/middleman', branch: 'v3-stable'
+
+# Specify your gem's dependencies in middleman-google-analytics.gemspec
+gemspec
+
+# Build and doc tools
+gem 'rake', '~> 10.3', require: false
+gem 'yard', '~> 0.8', require: false
+
+# Test tools
+gem 'cucumber', '~> 2.0', require: false
+gem 'aruba', '~> 0.7.4', require: false
+gem 'rspec', '~> 3.0', require: false

data/README.md

@@ -14,8 +14,7 @@ keeps your config in `config.rb`, where it belongs.
 1. Specify the dependency in your project's `Gemfile`:
 
   ```ruby
-  # Gemfile
-  gem "middleman-google-analytics"
+  gem 'middleman-google-analytics', '~> 2.0'
   ```
 
 2. Activate the Google Analytics extension in your project's `config.rb`:
@@ -54,6 +53,18 @@ keeps your config in `config.rb`, where it belongs.
   <%= google_analytics_universal_tag %>
   ```
 
+  **JavaScript with ERB (js.erb):**
+
+  ```erb
+  # Google Analytics
+  <%= google_analytics_tag %>
+  ```
+
+  ```erb
+  # Universal Analytics
+  <%= google_analytics_universal_tag %>
+  ```
+
 ## Configuration
 
 ```ruby
@@ -78,6 +89,9 @@ activate :google_analytics do |ga|
 
   # Compress the JavaScript code (default = false)
   ga.minify = false
+
+  # Output style - :html includes <script> tag (default = :html)
+  ga.output = :js
 end
 ```
 
@@ -92,6 +106,8 @@ display the GA tracking code.
   * For the initial code.
 * [Atsushi Nagase (@ngs)](https://github.com/ngs)
   * Cucumber tests and "Universal Analytics" support.
+* [Thomas Reynolds (tdreyno)](https://github.com/tdreyno)
+  * For the great support.
 * [Contributors](../../graphs/contributors)
 
 ## Contributing

data/Rakefile

@@ -4,10 +4,16 @@ Bundler::GemHelper.install_tasks
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t|
-  t.cucumber_opts = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}"
+  exempt_tags = ['--tags ~@wip']
+  t.cucumber_opts = "--color #{exempt_tags.join(' ')} --strict"
 end
 
 require 'rake/clean'
 
 task test: :cucumber
 task default: :test
+
+desc 'Build HTML documentation'
+task :doc do
+  sh 'bundle exec yard'
+end

data/features/google_analytics.feature

@@ -21,18 +21,18 @@ Feature: Google Analytics tag helper
     Given the Server is running at "debug-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(["_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/u/ga_debug.js';
-        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-      })();
-    </script>
-    """
+      """
+      <script type="text/javascript">
+        var _gaq = _gaq || [];
+        _gaq.push(["_setAccount", "UA-123456-78"]);
+        _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/u/ga_debug.js';
+          var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+        })();
+      </script>
+      """
 
   Scenario: Tracking across a domain and its subdomains
     Given the Server is running at "across-a-domain-app"
@@ -89,30 +89,18 @@ Feature: Google Analytics tag helper
       </script>
       """
 
-    Scenario: Disable tracking in development environment
-      Given the Server is running at "disable-app"
-      When I go to "/google-analytics.html"
-      Then I should see ""
-        But I should not see:
-          """
-          <script type="text/javascript">
-            var _gaq = _gaq || [];
-            _gaq.push(["_setAccount", "UA-123456-78"]);
-            (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: Disable tracking in development environment
+    Given the Server is running at "disable-app"
+    When I go to "/google-analytics.html"
+    Then I should see "0" lines
 
-    Scenario: Compress the JavaScript code
-      Given the Server is running at "compress-js-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(["_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: Compress the JavaScript code
+    Given the Server is running at "compress-js-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(["_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: Full options
     Given the Server is running at "full-app"
@@ -121,3 +109,18 @@ Feature: Google Analytics tag helper
       """
       <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>
       """
+
+  Scenario: JavaScript output style
+    Given the Server is running at "output-app"
+    When I go to "/javascripts/google_analytics.js"
+    Then I should see:
+      """
+      var _gaq = _gaq || [];
+      _gaq.push(["_setAccount", "UA-123456-78"]);
+      _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);
+      })();
+      """

data/features/google_analytics_universal.feature

@@ -61,28 +61,18 @@ Feature: Google Analytics Universal tag helper
       </script>
       """
 
-    Scenario: Disable tracking in development environment
-      Given the Server is running at "disable-app"
-      When I go to "/google-analytics-universal.html"
-      Then I should see ""
-        But I should not 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');
-          </script>
-          """
+  Scenario: Disable tracking in development environment
+    Given the Server is running at "disable-app"
+    When I go to "/google-analytics-universal.html"
+    Then I should see "0" lines
 
-    Scenario: Compress the JavaScript code
-      Given the Server is running at "compress-js-app"
-      When I go to "/google-analytics-universal.html"
-      Then I should see:
-        """
-        <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: Compress the JavaScript code
+    Given the Server is running at "compress-js-app"
+    When I go to "/google-analytics-universal.html"
+    Then I should see:
+      """
+      <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: Full options
     Given the Server is running at "full-app"
@@ -91,3 +81,16 @@ Feature: Google Analytics Universal tag helper
       """
       <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>
       """
+
+  Scenario: JavaScript output style
+    Given the Server is running at "output-app"
+    When I go to "/javascripts/google_analytics_universal.js"
+    Then I should see:
+      """
+      (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('send', 'pageview');
+      """

data/features/support/env.rb

@@ -1,4 +1,5 @@
 PROJECT_ROOT_PATH = File.dirname(File.dirname(File.dirname(__FILE__)))
+ENV['TEST'] = 'true'
 require 'middleman-core'
 require 'middleman-core/step_definitions'
 require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-google-analytics')

data/fixtures/full-app/config.rb

@@ -6,4 +6,5 @@ activate :google_analytics do |ga|
   ga.anonymize_ip = true
   ga.development = true
   ga.minify = true
+  ga.output = :html
 end

data/fixtures/output-app/config.rb

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

data/fixtures/output-app/source/javascripts/google_analytics.js.erb

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

data/fixtures/output-app/source/javascripts/google_analytics_universal.js.erb

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

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

@@ -1,15 +1,17 @@
 <%
-  create_options = []
-  create_options << "'#{@options.tracking_id}'"
-  create_options << "'#{@options.domain_name || :auto}'"
-  create_options << "{'allowLinker': true}" if @options.allow_linker
-  ga = []
-  ga << "ga('create', #{create_options.join(', ')});"
-  ga << "ga('set', 'anonymizeIp', true);" if @options.anonymize_ip
-  ga << "ga('send', 'pageview');"
+  file = @options.debug ? 'u/ga_debug' : 'ga'
+
+  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 << ['_trackPageview']
 %>
-  (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.join("\n  ") %>
+var _gaq = _gaq || [];
+<%= gaq.map! { |x| "_gaq.push(#{x});" }.join("\n") %>
+(function() {
+  var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+  ga.src = ('https:' == document.location.protocol ? '//ssl' : '//www') + '.google-analytics.com/<%= file %>.js';
+  var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+})();

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

@@ -0,0 +1,16 @@
+<%
+  create_options = []
+  create_options << "'#{@options.tracking_id}'"
+  create_options << "'#{@options.domain_name || :auto}'"
+  create_options << "{'allowLinker': true}" if @options.allow_linker
+
+  ga = []
+  ga << "ga('create', #{create_options.join(', ')});"
+  ga << "ga('set', 'anonymizeIp', true);" if @options.anonymize_ip
+  ga << "ga('send', 'pageview');"
+%>
+(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.join("\n") %>

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

@@ -2,6 +2,7 @@ require 'middleman-google-analytics/helpers'
 
 module Middleman
   class GoogleAnalyticsExtension < Extension
+
     option :tracking_id, nil, 'Property ID'
     option :anonymize_ip, false, 'Removing the last octet of the IP address'
     option :domain_name, nil, 'Tracking across a domain and its subdomains'
@@ -10,23 +11,24 @@ module Middleman
     option :debug, false, 'Tracking Code Debugger'
     option :development, true, 'Tracking in development environment'
     option :minify, false, 'Compress the JavaScript code'
-
-    def initialize(app, options_hash={}, &block)
-      super
-
-      app.set :google_analytics_settings, options
-    end
+    option :output, :html, 'Output style - :html includes <script> tag'
 
     def after_configuration
       unless options.tracking_id
         $stderr.puts 'Google Analytics: Please specify a property ID'
-        raise 'No property ID given' if display?
+        raise ArgumentError, 'No property ID given' if display?
       end
 
       if options.allow_linker and not options.domain_name
         $stderr.puts 'Google Analytics: Please specify a domain_name when ' \
                      'using allow_linker'
-        raise 'No domain_name given' if display?
+        raise ArgumentError, 'No domain_name given' if display?
+      end
+
+      unless [:html, :js].include?(options.output.try(:to_sym))
+        $stderr.puts 'Google Analytics: Please specify a valid output ' \
+                     'type (html|js).'
+        raise ArgumentError, 'Only "html" or "js" allowed' if display?
       end
     end
 

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

@@ -1,27 +1,49 @@
+require 'erubis'
 require 'uglifier'
+require 'active_support/core_ext/string/indent'
 
 module Middleman
   module GoogleAnalytics
     module Helpers
 
       def google_analytics_tag
-        render_script('ga.js.erb')
+        render_script('analytics.js.erb')
       end
 
       def google_analytics_universal_tag
-        render_script('analytics.js.erb')
+        render_script('analytics_universal.js.erb')
       end
 
       private
 
       def render_script(template)
-        return nil if development? && !google_analytics_settings.development
+        options = extensions[:google_analytics].options
+
+        return nil if legacy_development? && !options.development
 
-        @options = google_analytics_settings
         file = File.join(File.dirname(__FILE__), template)
-        content = ERB.new(File.read(file)).result(binding)
-        content = Uglifier.compile(content) if google_analytics_settings.minify
-        content_tag(:script, content, type: 'text/javascript')
+        context = { options: options }
+        content = Erubis::FastEruby.new(File.read(file)).evaluate(context)
+        content = Uglifier.compile(content) if options.minify
+
+        if options.output.to_sym == :html
+          content = indent(content) unless options.minify
+          content_tag(:script, content, type: 'text/javascript')
+        else
+          content
+        end
+      end
+
+      # Ugly but true
+      def indent(content)
+        str = "\n"
+        content.each_line { |line| str << line.indent(2) }
+        str
+      end
+
+      # Support for Middleman >= 3.4
+      def legacy_development?
+        try(:development?) || try(:app).development?
       end
 
     end

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

@@ -1,5 +1,5 @@
 module Middleman
   module GoogleAnalytics
-    VERSION = "1.1.0"
+    VERSION = '2.0.0.rc.1'
   end
 end

data/middleman-google-analytics.gemspec

@@ -1,24 +1,26 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "middleman-google-analytics/version"
+$:.push File.expand_path('../lib', __FILE__)
+require 'middleman-google-analytics/version'
 
 Gem::Specification.new do |s|
-  s.name = "middleman-google-analytics"
+  s.name = 'middleman-google-analytics'
   s.version = Middleman::GoogleAnalytics::VERSION
   s.platform = Gem::Platform::RUBY
-  s.authors = ["Daniel Bayerlein", "Jon Frisby"]
-  s.email = ["daniel.bayerlein@googlemail.com", "jfrisby@mrjoy.com"]
-  s.homepage = "https://github.com/danielbayerlein/middleman-google-analytics"
-  s.summary = "A Middleman plugin for handling Google Analytics tracking code."
-  s.description = "middleman-google-analytics is a Middleman extension that generates Google Analytics tracking code, and keeps your config in config.rb, where it belongs."
-  s.license = "MIT"
+  s.authors = ['Daniel Bayerlein', 'Jon Frisby']
+  s.email = ['daniel.bayerlein@googlemail.com', 'jfrisby@mrjoy.com']
+  s.homepage = 'https://github.com/danielbayerlein/middleman-google-analytics'
+  s.summary = 'A Middleman plugin for handling Google Analytics tracking code.'
+  s.description = 'middleman-google-analytics is a Middleman extension that generates Google Analytics tracking code, and keeps your config in config.rb, where it belongs.'
+  s.license = 'MIT'
 
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
 
   s.required_ruby_version = '>= 1.9.3'
-  s.add_dependency("middleman-core", ["~> 3.2"])
-  s.add_dependency("uglifier", [">= 2.1", "< 3.0"])
+  s.add_dependency('middleman-core', ['>= 3.4'])
+  s.add_dependency('uglifier', ['~> 2.6'])
+  s.add_dependency('activesupport', ['~> 4.1'])
+  s.add_dependency('erubis')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-google-analytics
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0.rc.1
 platform: ruby
 authors:
 - Daniel Bayerlein
@@ -9,42 +9,64 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
-    - - "<"
+        version: '2.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
-    - - "<"
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 description: middleman-google-analytics is a Middleman extension that generates Google
   Analytics tracking code, and keeps your config in config.rb, where it belongs.
 email:
@@ -58,6 +80,7 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile-v3
 - LICENSE
 - README.md
 - Rakefile
@@ -87,10 +110,13 @@ files:
 - fixtures/full-app/config.rb
 - fixtures/full-app/source/google-analytics-universal.html.erb
 - fixtures/full-app/source/google-analytics.html.erb
+- fixtures/output-app/config.rb
+- fixtures/output-app/source/javascripts/google_analytics.js.erb
+- fixtures/output-app/source/javascripts/google_analytics_universal.js.erb
 - lib/middleman-google-analytics.rb
 - lib/middleman-google-analytics/analytics.js.erb
+- lib/middleman-google-analytics/analytics_universal.js.erb
 - lib/middleman-google-analytics/extension.rb
-- lib/middleman-google-analytics/ga.js.erb
 - lib/middleman-google-analytics/helpers.rb
 - lib/middleman-google-analytics/version.rb
 - middleman-google-analytics.gemspec
@@ -109,9 +135,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5

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

@@ -1,16 +0,0 @@
-<%
-  file = @options.debug ? 'u/ga_debug' : 'ga'
-  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 << ['_trackPageview']
-%>
-  var _gaq = _gaq || [];
-  <%= gaq.map! { |x| "_gaq.push(#{x});" }.join("\n  ") %>
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? '//ssl' : '//www') + '.google-analytics.com/<%= file %>.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-  })();