piwik-tracker 0.1.0 → 0.1.1

data/lib/piwik_tracker/middleware.rb

@@ -0,0 +1,32 @@
+module PiwikTracker
+  # rack middleware to extract piwik site id and visitor id from request
+  # cookies
+  class Middleware
+
+    def initialize(app)
+      @app = app
+    end
+
+    def call(env)
+      site_id, visitor_id = parse_cookie env
+      env['piwik'] = {
+        :site_id => site_id,
+        :visitor_id => visitor_id
+      }
+      @app.call(env)
+    end
+
+    private
+
+    def parse_cookie(env)
+      request = Rack::Request.new env
+      request.cookies.each_pair do |name, value|
+        if name =~ /^_pk_id\.(\d+)\.\w+$/
+          return [$1.to_i, value.split('.').first]
+        end
+      end
+      [nil, nil]
+    end
+
+  end
+end

data/lib/piwik_tracker/piwik.rb

@@ -18,31 +18,37 @@ module PiwikTracker
     USER_AGENT = "piwik-tracker/#{PiwikTracker::VERSION}"
     
     attr_accessor :debug
-    
+    attr_writer :logger
+
     # base_uri - the location of your Piwik installation, i.e. 'http://yoursite.com/piwik'.
     # site_id  - Id of the site to be tracked
     def initialize(base_uri, site_id)
       @base_uri = base_uri
       @site_id = site_id
     end
-    
+
     # sends a tracking request
     def track(params)
       send_request params.merge( 'idsite' => @site_id,
                                  'rec'    => 1,
                                  'rand'   => rand(MAX_INT) )
     end
-    
+
+
     protected
-    
+
+    def logger
+      @logger ||= (require 'logger'; Logger.new($stdout))
+    end
+
     def send_request(params)
       headers = { 'Accept-Language' => params.delete(:browser_language) }
       headers['User-Agent'] = params.delete(:user_agent) if params.key?(:user_agent)
       url = "piwik.php?#{hash_to_querystring(params)}"
-      puts "#{url} / #{headers.inspect}" if @debug
+      logger.debug "Piwik request:\n#{url}\n#{headers.inspect}"
       http.get url, headers
     end
-    
+
     def http
       @http ||= connect
     end
@@ -53,7 +59,7 @@ module PiwikTracker
         query_string << "#{URI.encode(key.to_s)}=#{URI.encode(hash[key].to_s)}"
       end
     end
-    
+
     def connect
       Patron::Session.new.tap do |session|
         session.timeout = HTTP_TIMEOUT
@@ -64,15 +70,15 @@ module PiwikTracker
 
 
     public
-    
+
     class Request
-      
+
       # Piwik API version
       VERSION = 1
-      
+
       # length of Piwik visitor ids
       VISITOR_ID_LENGTH = 16
-      
+
       def initialize(piwik, auth_token = nil)
         @piwik = piwik
         @custom_variables = []
@@ -202,4 +208,4 @@ module PiwikTracker
     end
   end
   
-end
+end

data/lib/piwik_tracker/version.rb

@@ -1,3 +1,3 @@
 module PiwikTracker
-  VERSION = "0.1.0"
-end
+  VERSION = "0.1.1"
+end

metadata

@@ -2,7 +2,7 @@
 name: piwik-tracker
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - "Jens Kr\xC3\xA4mer"
@@ -10,10 +10,20 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-13 00:00:00 +02:00
+date: 2011-06-14 00:00:00 +02:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: patron
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
 description: ""
 email: 
 - jk@jkraemer.net
@@ -24,6 +34,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- lib/piwik_tracker/middleware.rb
 - lib/piwik_tracker/piwik.rb
 - lib/piwik_tracker/version.rb
 - lib/piwik_tracker.rb