middleman-google-analytics 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b0f4748ef1258a98ff5b454fa83d4af3e3e2d9b
-  data.tar.gz: 931417ee7eecacde1df1aaa717792f8c0a6ea74e
+  metadata.gz: 2daedda3dfd7762142d5fcb70a2af985c45b4e44
+  data.tar.gz: a6c542865b95fcd7dedeccd9f1c802c2291c2a64
 SHA512:
-  metadata.gz: 7a5e6a6948f827a5a7699884bb4f462f839b41b5ab3aaba952794d63f31cb1c95b603ace5fa061679bcb2c08958f240ea9cc78bca02465db3d7f300935852d77
-  data.tar.gz: 69d34d337963d9a790cedca52af3260c2ae14ef99ca17128cd10b561ce64fe6f7d5ca65b7f30a72333d29f01a09c1f4146f5c7bac6a02fbda14a159a554f92ca
+  metadata.gz: dcd1af775dcd2b418d16d260c1a1f0b862f239e39e0ab6233f01d1045c53ecbd68f40e859c8e82db182e714950ee75d7c2a3572b64e5146a224ce53c92677424
+  data.tar.gz: e4a7764cdf5cf88ef6b65772a8e48aa22d826396ac1d3133331de44b89bc2f1b4c58fd7ff2f25517810467faf954bb78a0de789e48000b0c84ee57a89876f9d1

data/.travis.yml

@@ -6,13 +6,13 @@ before_script:
 
 rvm:
   - ruby-head
-  - 2.2.3
-  - 2.1.7
+  - 2.2.4
+  - 2.1.8
   - 2.0.0
 
 os:
   - linux
-  - osx
+  # - osx
 
 matrix:
   fast_finish: true

data/Gemfile

@@ -1,5 +1,6 @@
 source 'https://rubygems.org'
 
+gem 'middleman-cli', github: 'middleman/middleman', branch: 'master'
 gem 'middleman-core', github: 'middleman/middleman', branch: 'master'
 
 # Specify your gem's dependencies in middleman-google-analytics.gemspec

data/features/google_analytics.feature

@@ -124,3 +124,21 @@ Feature: Google Analytics tag helper
         var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
       })();
       """
+
+  Scenario: Build HTML with default configuration
+    Given a fixture app "basic-app"
+    And a successfully built app at "basic-app"
+    When I cd to "build"
+    Then the file "google-analytics.html" should contain:
+      """
+      <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/ga.js';
+          var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+        })();
+      </script>
+      """

data/features/google_analytics_universal.feature

@@ -94,3 +94,19 @@ Feature: Google Analytics Universal tag helper
       ga('create', 'UA-123456-78', 'auto');
       ga('send', 'pageview');
       """
+
+  Scenario: Build HTML with default configuration
+    Given a fixture app "basic-app"
+    And a successfully built app at "basic-app"
+    When I cd to "build"
+    Then the file "google-analytics-universal.html" should contain:
+      """
+      <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('send', 'pageview');
+      </script>
+      """

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

@@ -43,7 +43,14 @@ module Middleman
 
       # Support for Middleman >= 3.4
       def legacy_development?
-        try(:development?) || try(:app).development?
+        # Middleman 3.4
+        is_development = try(:development?)
+        unless is_development.nil?
+          return is_development
+        end
+
+        # Middleman 4.x
+        app.development?
       end
 
     end

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-google-analytics
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Daniel Bayerlein
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-16 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A Middleman plugin for handling Google Analytics tracking code.