rack-piwik 0.1.2 → 0.1.3

data/README.md

@@ -19,8 +19,8 @@ Simple Rack middleware to help injecting the Piwik tracking code into the footer
 
 #### Rails
 
-    ## environment.rb:
-    config.gem 'rack-piwik', :lib => 'rack/piwik
+    ## application.rb:
+    config.gem 'rack-piwik', :lib => 'rack/piwik'
     config.middleware.use Rack::Piwik, :piwik_url => '<url of your piwik site here>', :piwik_id => '<your piwik id here>'
 
 ## Thread Safety

data/lib/rack/piwik.rb

@@ -8,6 +8,7 @@ module Rack
 
     def initialize(app, options = {})
       raise ArgumentError, "piwik_url must be present" unless options[:piwik_url] and !options[:piwik_url].empty?
+      raise ArgumentError, "piwik_id must be present" unless options[:piwik_id] and !options[:piwik_id].empty?
       @app, @options = app, DEFAULT.merge(options)
     end
 
@@ -28,7 +29,7 @@ module Rack
     def inject(response)
       file = 'async' 
       @template ||= ::ERB.new ::File.read ::File.expand_path("../templates/#{file}.erb",__FILE__)
-      response.gsub(%r{</head>}, @template.result(binding) + "</head>")
+      response.gsub(%r{</body>}, @template.result(binding) + "</body>")
     end
   end
 end

data/lib/rack/templates/async.erb

@@ -1,12 +1,21 @@
 <!-- Piwik -->
 <script type="text/javascript">
-var pkBaseURL = (("https:" == document.location.protocol) ? "https://<%= @options[:piwik_url]%>/" : "http://<%= @options[:piwik_url]%>/");
-document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+    var pkBaseURL = (("https:" == document.location.protocol) ? "https://<%= @options[:piwik_url]%>/" : "http://<%= @options[:piwik_url]%>/");
+    document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
 </script><script type="text/javascript">
 try {
-  var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", <%= @options[:piwik_id]%>);
-  piwikTracker.trackPageView();
-  piwikTracker.enableLinkTracking();
+    var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", <%= @options[:piwik_id]%>);
+
+    <%# If this is a 404 page, provide additional information to Piwik %>
+    <% if @status.equal?(404) %>
+        piwikTracker.setDocumentTitle('404/URL = ' +
+                String(document.location.pathname + document.location.search).replace(/\//g,"%2f") +
+                '/From = ' + String(document.referrer).replace(/\//g,"%2f"));
+    <% end %>
+
+    piwikTracker.trackPageView();
+    piwikTracker.enableLinkTracking();
 } catch( err ) {}
 </script>
+<noscript><img src="http://<%= @options[:piwik_url]%>/piwik.php?idsite=<%= @options[:piwik_id]%>" alt="" /></noscript>
 <!-- End Piwik Code -->

metadata

@@ -1,70 +1,52 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rack-piwik
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 0.1.3
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 2
-  version: 0.1.2
 platform: ruby
-authors: 
+authors:
 - Maxwell Salzberg
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-05 00:00:00 Z
+date: 2012-07-21 00:00:00.000000000 Z
 dependencies: []
-
-description: Simple Rack middleware for implementing piwik Analytics racking in your Ruby-Rack based project.
-email: 
+description: Simple Rack middleware for implementing piwik Analytics racking in your
+  Ruby-Rack based project.
+email:
 - maxwell@joindiaspora.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/rack/piwik.rb
 - lib/rack/templates/async.erb
 - README.md
 - LICENSE
-homepage: https://github.com/leehambley/rack-google-analytics
+homepage: https://github.com/maxwell/rack-piwik
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
-summary: Rack middleware to inject the Piwik tracking code into outgoing responses. Adapted from rack-google-analytics
+summary: Rack middleware to inject the Piwik tracking code into outgoing responses.
+  Adapted from rack-google-analytics
 test_files: []
-
 has_rdoc: