rack-google-analytics 0.10.0 → 0.11.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Lee Hambley
+Copyright (c) 2009-2012 Lee Hambley
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,60 +1,57 @@
 # Rack google Analytics
 
-Simple Rack middleware to help injecting the google analytics tracking code into the footer of your websites.
+Simple Rack middleware to help injecting the Google Analytics tracking code in your website.
 
-This middleware injects either the synchronous or asynchronous google analytics tracker code into the correct place of any request with `Content-Type` containing `html` (therefore `text/html` and similar).
-
-Formerly this gem had an environments setting, that has been removed pending refactoring.
+This middleware injects either the synchronous or asynchronous Google Analytics tracking code into the correct place of any request only when the response's `Content-Type` header contains `html` (therefore `text/html` and similar).
 
 ## Usage
 
-#### Gemfile:
-    gem 'rack-google-analytics', :require => 'rack/google-analytics'
+#### Gemfile
+
+```ruby
+gem 'rack-google-analytics'
+```
 
 #### Sinatra
-    ## app.rb
-    use Rack::GoogleAnalytics, :tracker => 'UA-xxxxxx-x'
+
+```ruby
+## app.rb
+use Rack::GoogleAnalytics, :tracker => 'UA-xxxxxx-x'
+```
 
 #### Padrino
 
-    ## app/app.rb
-    use Rack::GoogleAnalytics, :tracker => 'UA-xxxxxx-x'
+```ruby
+## app/app.rb
+use Rack::GoogleAnalytics, :tracker => 'UA-xxxxxx-x'
+```
 
-#### Rails
+#### Rails 2.X
 
-    ## environment.rb:
-    config.gem 'rack-google-analytics', :lib => 'rack/google-analytics'
-    config.middleware.use Rack::GoogleAnalytics, :tracker => 'UA-xxxxxx-x'
+```ruby
+## environment.rb:
+config.gem 'rack-google-analytics', :lib => 'rack/google-analytics'
+config.middleware.use Rack::GoogleAnalytics, :tracker => 'UA-xxxxxx-x'
+```
 
 ### Options
 
-* :async      -  sets to use asyncronous tracker  
-* :multiple   -  sets track for multiple sub domains. (must also set :domain)
-* :top_level  -  sets tracker for multiple top-level domains. (must also set :domain)
+* `:async`      -  sets to use asynchronous tracker
+* `:multiple`   -  sets track for multiple subdomains. (must also set :domain)
+* `:top_level`  -  sets tracker for multiple top-level domains. (must also set :domain)
 
-Note: since 0.2.0 this will use the asynchronous google tracker code, for the traditional behaviour please use:
+Note: since 0.2.0 this will use the asynchronous Google Analytics tracking code, for the traditional behaviour please use:
 
-    use Rack::GoogleAnalytics, :tracker => 'UA-xxxxxx-x', :async => false
+```ruby
+use Rack::GoogleAnalytics, :tracker => 'UA-xxxxxx-x', :async => false
+```
 
-If you are not sure what's best, go with the defaults, and read here if you should opt-out
+If you are not sure what's best, go with the defaults, and read here if you should opt-out.
 
 ## Thread Safety
 
 This middleware *should* be thread safe. Although my experience in such areas is limited, having taken the advice of those with more experience; I defer the call to a shallow copy of the environment, if this is of consequence to you please review the implementation.
 
-## Change Log
-
-* 0.10.0 Include the Google pagespeed code, and `README` typos fixed.
-* 0.9.2  Fixed a bug with lots of missing files from the Gem... how silly!
-* 0.9.1  Updated readme to reflect 0.9.0 merge from achiu
-* 0.9.0  Include name changed from 'rack-google-analytics' to 'rack/google-analytics' more inline with the norm
-* 0.6.0  Class now named Rack::GoogleAnalytics, in 0.5 and earlier this was incorrectly documented as Rack::GoogleTracker
-* 0.2.0  Asynchronous code is now the default.
-
-* 22-07-2010 Major re-write from Arthur Chiu, now correctly writes the Content-Length leader, and comes with tests (High five to @achiu) - this patch also backs-out the changes from @cimm - but they were un-tested (I intend to bring these back as soon as possible; this will probably constitute a 1.0 release when it happens)
-* 19-01-2010 Second Release, patch from github.com/ralph - makes the default snippet the async version from google. Use regular synchronous code with: `:async => false`
-* 27-12-2009 First Release, extracted from the Capistrano-Website project and packaged with Jeweler.
-
 ## Note on Patches/Pull Requests
 
 * Fork the project.
@@ -67,5 +64,5 @@ This middleware *should* be thread safe. Although my experience in such areas is
 
 ## Copyright
 
-Copyright (c) 2009-2011 Lee Hambley. See LICENSE for details.
-With thanks to Ralph von der Heyden http://github.com/ralph/ and Simon `cimm` Schoeters http://github.com/cimm/ - And the biggest hand to Arthur `achiu` Chiu for the huge work that went into the massive 0.9 re-factor.
+Copyright (c) 2009-2012 Lee Hambley. See LICENSE for details.
+With thanks to [Ralph von der Heyden](https://github.com/ralph) and [Simon Schoeters](https://github.com/cimm) - And the biggest hand to [Arthur Chiu](https://github.com/achiu) for the huge work that went into the massive 0.9 re-factor.

data/lib/rack-google-analytics.rb

@@ -0,0 +1 @@
+require 'rack/google-analytics'

data/lib/rack/google-analytics.rb

@@ -4,7 +4,7 @@ require 'erb'
 module Rack
 
   class GoogleAnalytics
-    
+
     DEFAULT = { :async => true }
 
     def initialize(app, options = {})
@@ -15,10 +15,12 @@ module Rack
     def call(env); dup._call(env); end
 
     def _call(env)
-      @status, @headers, @response = @app.call(env)
-      return [@status, @headers, @response] unless html?
+      @status, @headers, @body = @app.call(env)
+      return [@status, @headers, @body] unless html?
       response = Rack::Response.new([], @status, @headers)
-      @response.each { |fragment| response.write inject(fragment) }
+      @body.each { |fragment| response.write inject(fragment) }
+      @body.close if @body.respond_to?(:close)
+
       response.finish
     end
 

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

@@ -0,0 +1,5 @@
+module Rack
+  class GoogleAnalytics
+    VERSION = '0.11.0'
+  end
+end

data/lib/rack/version.rb

@@ -0,0 +1,5 @@
+module Rack
+  class GoogleAnalytics
+    VERSION = '0.11.0'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-google-analytics
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,88 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-15 00:00:00.000000000Z
-dependencies: []
+date: 2012-08-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.5.1
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.11.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.11.3
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.4
 description: Simple Rack middleware for implementing google analytics tracking in
   your Ruby-Rack based project. Supports synchronous and asynchronous insertion and
   configurable load options.
@@ -20,9 +100,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/rack/google-analytics/version.rb
 - lib/rack/google-analytics.rb
 - lib/rack/templates/async.erb
 - lib/rack/templates/sync.erb
+- lib/rack/version.rb
+- lib/rack-google-analytics.rb
 - README.md
 - LICENSE
 homepage: https://github.com/leehambley/rack-google-analytics
@@ -45,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Rack middleware to inject the Google Analytics tracking code into outgoing