rack-google-analytics 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 840b08567f04293f2ed02bb2dfc92c641e5e8a3e
-  data.tar.gz: 1f634376e3d0b0383867e8526f69ca0594cb640a
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OTVmMWNmY2UxNjEzMzhiOTEyMjY1NzA1NWY2MDg4MjdjZDhlNDM0Mg==
+  data.tar.gz: !binary |-
+    ZTlhZmVkNGJmNWMyZjc5ODMwNzkyN2JlODc3NDdhYzMwOGU4NDlmOQ==
 SHA512:
-  metadata.gz: c613036c7f762929586faaa4e9428943d6f7e3b59440f3cfa8f4f022db2b19fafea29fc24ea9bf4d710998376268e2d766b0c29b53f86d3168f4422a9c9f41f5
-  data.tar.gz: 3eb443013c95612cc8e8cd7b6697d8b888d2ebcfc50ea5b4724d4ea9bdd507b82ac6c736143cebe3c80e9b681bef41d5105853ec947a8de2da17124a9ecac758
+  metadata.gz: !binary |-
+    NDdiNDFmMTg5NDYxZjY0YzU0OTczMDZiMGNlOWJhYjI0OGE3ZWY4ZjYzOTc2
+    NjIwYTdmODIzZjcyOWVhN2ViZDdjOGM2NmVkMzlkYjIzZjYxZDNhN2Q2ZjE4
+    ZTgyYzRkZDljODg5MGViNjdiMGJiYWE4ODcwNDg5ZDdlNTY4MmM=
+  data.tar.gz: !binary |-
+    NzllNjIxZTEyNmE3OTYyNjBiMmYyZDc0MjMwOTQzMzZjMmI4OGI2ZDdjMmFi
+    OGUyM2JjZjE4N2UxNjUzNzExNjZkOGQzNGQ3N2MwOWJlZTA1MjZlOGVhODQz
+    M2JhZmQ0ZTI4NDAzMmI2Mjg0Y2RiNTI5MTJmMzc5OWQ1NDkzNWM=

data/README.md

@@ -36,7 +36,7 @@ config.gem 'rack-google-analytics', :lib => 'rack/google-analytics'
 config.middleware.use Rack::GoogleAnalytics, :tracker => 'UA-xxxxxx-x'
 ```
 
-#### Rails 3.X
+#### Rails 3.X and 4.X
 
 ```ruby
 ## application.rb:
@@ -90,6 +90,17 @@ In your application controller, you may push arbritrary data. For example:
 ga_push("_addItem", "ID", "SKU")
 ```
 
+## Dynamic Tracking Code
+
+You may instead define your tracking code as a lambda taking the Rack environment, so that you may set the tracking code
+dynamically based upon information in the Rack environment. For example:
+
+```ruby
+config.middleware.use Rack::GoogleAnalytics, :tracker => lambda { |env|
+        return env[:site_ga].tracker if env[:site_ga]
+}
+```
+
 
 ## Thread Safety
 

data/lib/rack/google-analytics.rb

@@ -7,10 +7,10 @@ module Rack
 
     EVENT_TRACKING_KEY = "google_analytics.event_tracking"
 
-    DEFAULT = { :async => true, :advertising => false }
+    DEFAULT = { :async => true, :advertising => false, :inpage_pageid => false }
 
     def initialize(app, options = {})
-      raise ArgumentError, "Tracker must be set!" unless options[:tracker] and !options[:tracker].empty?
+      raise ArgumentError, "Tracker must be set!" unless valid_tracker?(options[:tracker])
       @app, @options = app, DEFAULT.merge(options)
     end
 
@@ -34,6 +34,7 @@ module Rack
         # Store the events until next time
         env["rack.session"][EVENT_TRACKING_KEY] = env[EVENT_TRACKING_KEY]
       end
+      @tracker = tracker(env, @options[:tracker])
 
       @body.each { |fragment| response.write inject(fragment) }
       @body.close if @body.respond_to?(:close)
@@ -43,6 +44,12 @@ module Rack
 
     private
 
+    # tracker should be non-nil, non-empty string or a lambda
+    def valid_tracker?(tracker)
+      return false unless tracker
+      return (tracker.respond_to?(:call) && tracker.lambda?) || !tracker.empty?
+    end
+
     def html?; @headers['Content-Type'] =~ /html/; end
 
     def inject(response)
@@ -56,6 +63,12 @@ module Rack
       end
     end
 
+    # obtain tracking code dynamically if it's a lambda, use the string directly otherwise
+    def tracker(env, tracker)
+      return tracker unless tracker.respond_to?(:call)
+      return tracker.call(env)
+    end
+
   end
 
 end

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

@@ -1,5 +1,5 @@
 module Rack
   class GoogleAnalytics
-    VERSION = '0.13.0'
+    VERSION = '0.14.0'
   end
 end

data/lib/rack/templates/async.erb

@@ -1,7 +1,11 @@
 <script type="text/javascript">
 
   var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', <%= @options[:tracker].inspect %>]);
+<% if @options[:inpage_pageid] %>
+  var pluginUrl = '//www.google-analytics.com/plugins/ga/inpage_linkid.js';
+  _gaq.push(['_require', 'inpage_linkid', pluginUrl]);
+<% end %>
+  _gaq.push(['_setAccount', <%= @tracker.inspect %>]);
 <% if @options[:multiple] %>
   _gaq.push(['_setDomainName', <%= @options[:domain].inspect %>]);
 <% end %>

data/lib/rack/templates/sync.erb

@@ -4,7 +4,7 @@ document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.
 </script>
 <script type="text/javascript">
 try{
-var pageTracker = _gat._getTracker(<%= @options[:tracker].inspect %>);
+var pageTracker = _gat._getTracker(<%= @tracker.inspect %>);
 <% if @options[:anonymize_ip] %>
 _gat._anonymizeIp();
 <% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-google-analytics
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Lee Hambley
@@ -11,45 +11,45 @@ cert_chain: []
 date: 2013-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: actionpack
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -138,17 +138,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: Rack middleware to inject the Google Analytics tracking code into outgoing