wheelhouse-google-analytics 1.0 → 1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a54cd70064201375d584eda8fc37a49ca4d144d7
+  data.tar.gz: 051ca45702b58ade6006ccf24b021125b2286cb1
+SHA512:
+  metadata.gz: f3b39b27fe48bb9dcc750f78224b8415a563faa6e23fbe1dfaa44252a338d7554039f001ef00da7b3b76e26431c7be7b9ad9b806ca668154664bed4306e8b9ce
+  data.tar.gz: 916929f6fb21f6f8e00bc301e5c2b7dc6123575782a352be80bba88b8808ecca438dd0592635f97a24aefd2e9a26c240212522c7c7e77659dcd926cb14df601b

data/LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2012-14 Sam Pohlenz
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/app/extensions/wheelhouse/site.rb

@@ -1,3 +1,4 @@
 Wheelhouse::Site.class_eval do
   property :google_analytics_code, String
+  validates_format_of :google_analytics_code, :with => /\AUA-\d{4,9}-\d{1,4}\Z/i, :allow_blank => true
 end

data/app/helpers/google_analytics/analytics_helper.rb

@@ -1,19 +1,9 @@
 module GoogleAnalytics::AnalyticsHelper
-  TRACKING_CODE = <<-EOJS
-    var _gaq = _gaq || [];
-    _gaq.push(['_setAccount', '{{CODE}}']);
-    _gaq.push(['_trackPageview']);
-
-    (function() {
-      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-    })();
-  EOJS
-  
   def google_analytics
-    if Rails.env.production? && site.google_analytics_code? && !controller.env['wheelhouse.preview']
-      javascript_tag(TRACKING_CODE.sub("{{CODE}}", site.google_analytics_code))
-    end
+    render "google_analytics/tracking_code" if render_google_analytics?
+  end
+  
+  def render_google_analytics?
+    Rails.env.production? && site.google_analytics_code? && !controller.env['wheelhouse.preview']
   end
 end

data/app/templates/google_analytics/_tracking_code.html.erb

@@ -0,0 +1,10 @@
+<script>
+  (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', '<%= site.google_analytics_code %>', '<%= site.domain %>');
+  ga('send', 'pageview');
+  
+</script>

data/config/locales/en.yml

@@ -3,3 +3,11 @@ en:
     attributes:
       wheelhouse/site:
         google_analytics_code: Google Analytics Tracking Code
+    
+    errors:
+      models:
+        wheelhouse/site:
+          attributes:
+            google_analytics_code:
+              invalid: A valid tracking code is required (e.g. UA-12345678-1)
+          

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: wheelhouse-google-analytics
 version: !ruby/object:Gem::Version
-  version: '1.0'
-  prerelease: 
+  version: '1.1'
 platform: ruby
 authors:
 - Sam Pohlenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-02 00:00:00.000000000 Z
+date: 2014-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wheelhouse
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 description: Integrates Google Analytics into your Wheelhouse CMS site.
@@ -33,35 +30,36 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.md
 - app/extensions/wheelhouse/site.rb
 - app/helpers/google_analytics/analytics_helper.rb
+- app/templates/google_analytics/_tracking_code.html.erb
 - app/views/google_analytics/_site_options.html.haml
 - config/locales/en.yml
 - lib/wheelhouse-google-analytics.rb
-- README.md
 homepage: https://www.wheelhousecms.com/
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Wheelhouse CMS Google Analytics plugin
 test_files: []
-has_rdoc: