rack-piwik 0.1.0 → 0.1.1

data/lib/rack/piwik.rb

@@ -3,12 +3,10 @@ require 'erb'
 
 module Rack
 
-  class GoogleAnalytics
+  class Piwik
     
-    DEFAULT = { :async => true }
-
     def initialize(app, options = {})
-      raise ArgumentError, "Tracker must be set!" unless options[:tracker] and !options[:tracker].empty?
+      raise ArgumentError, "piwik_url must be present" unless options[:piwik_url] and !options[:piwik_url].empty?
       @app, @options = app, DEFAULT.merge(options)
     end
 
@@ -27,15 +25,9 @@ module Rack
     def html?; @headers['Content-Type'] =~ /html/; end
 
     def inject(response)
-      file = @options[:async] ? 'async' : 'sync'
+      file = 'async' 
       @template ||= ::ERB.new ::File.read ::File.expand_path("../templates/#{file}.erb",__FILE__)
-      if @options[:async]
-        response.gsub(%r{</head>}, @template.result(binding) + "</head>")
-      else
-        response.gsub(%r{</body>}, @template.result(binding) + "</body>")
-      end
+      response.gsub(%r{</head>}, @template.result(binding) + "</head>")
     end
-
   end
-
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-piwik
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Maxwell Salzberg
@@ -28,7 +28,6 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/rack/google-analytics.rb
 - lib/rack/piwik.rb
 - lib/rack/templates/async.erb
 - README.md

data/lib/rack/google-analytics.rb

@@ -1,40 +0,0 @@
-require 'rack'
-require 'erb'
-
-module Rack
-
-  class Piwik
-    
-
-    def initialize(app, options = {})
-      raise ArgumentError, "piwik_url must be user" unless options[:piwik_url] and !options[:piwik_url].empty?
-      @app, @options = app, DEFAULT.merge(options)
-    end
-
-    def call(env); dup._call(env); end
-
-    def _call(env)
-      @status, @headers, @response = @app.call(env)
-      return [@status, @headers, @response] unless html?
-      response = Rack::Response.new([], @status, @headers)
-      @response.each { |fragment| response.write inject(fragment) }
-      response.finish
-    end
-
-    private
-
-    def html?; @headers['Content-Type'] =~ /html/; end
-
-    def inject(response)
-      file = @options[:async] ? 'async' : 'sync'
-      @template ||= ::ERB.new ::File.read ::File.expand_path("../templates/#{file}.erb",__FILE__)
-      if @options[:async]
-        response.gsub(%r{</head>}, @template.result(binding) + "</head>")
-      else
-        response.gsub(%r{</body>}, @template.result(binding) + "</body>")
-      end
-    end
-
-  end
-
-end