rakwik 0.2.0 → 0.3.0

data/.ruby-gemset

@@ -0,0 +1 @@
+rakwik

data/.ruby-version

@@ -0,0 +1 @@
+ruby-1.9.3-p429

data/.travis.yml

@@ -0,0 +1,15 @@
+language: ruby
+rvm:
+  - "1.8.7"
+  - "1.9.2"
+  - "1.9.3"
+  - jruby-18mode # JRuby in 1.8 mode
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx-18mode
+  - rbx-19mode
+# uncomment this line if your project needs to run something other than `rake`:
+# script: bundle exec rspec spec
+matrix:
+  allow_failures:
+    - rvm: jruby-18mode
+    - rvm: jruby-19mode

data/Gemfile

@@ -2,3 +2,10 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rakwik.gemspec
 gemspec
+
+gem 'rake'
+
+group :test do
+  gem 'rack-test'
+  gem 'webmock'
+end

data/README.md

@@ -1,5 +1,7 @@
 # Rakwik
 
+[![Build Status](https://travis-ci.org/datenimperator/rakwik.png)](https://travis-ci.org/datenimperator/rakwik)
+
 *Server-side* integration of web tracking methods does not require Javascript snippets
 or tracking images to be includd in the actual frontend. Rakwik implements asynchronous
 tracking, so it tries to keep the time low that is needed to count a particular request.

data/Rakefile

@@ -1,7 +1,6 @@
 #!/usr/bin/env rake
 require 'bundler'
 require 'rspec/core/rake_task'
-
 Bundler::GemHelper.install_tasks
 
 RSpec::Core::RakeTask.new(:spec)

data/lib/rakwik/tracker.rb

@@ -2,9 +2,11 @@ require 'em-http'
 
 module Rakwik
   class Tracker
-  
+
     include Rack::Response::Helpers
-    
+
+    attr_accessor :status
+
     DEFAULT = {
       :track_404 => true
     }
@@ -16,13 +18,15 @@ module Rakwik
     end
 
     def call(env)
+      start = Time.now
       @status, @headers, @body = @app.call(env)
+      env['rakwik.duration'] = (Time.now - start)*1000
       track Rack::Request.new(env) if track?
       [@status, @headers, @body]
     end
 
     private
-    
+
     def track?
       ok? || (not_found? && @options[:track_404] === true)
     end
@@ -38,10 +42,10 @@ module Rakwik
     def token_auth
       @options[:token_auth]
     end
-    
+
     def extract(request)
       header = {
-        'User-Agent' => request.user_agent
+        'User-Agent' => (request.user_agent || "Rakwik Tracker #{Rakwik::VERSION}")
       }
       header['Accept-Language'] = request.env['HTTP_ACCEPT_LANGUAGE'] unless request.env['HTTP_ACCEPT_LANGUAGE'].nil?
       header['DNT'] = request.env['HTTP_DNT'] unless request.env['HTTP_DNT'].nil?
@@ -61,22 +65,25 @@ module Rakwik
         'url'        => request.url,
         'cip'        => request.ip,
         'rand'       => rand(1000000),
-        'apiv'       => 1
+        'apiv'       => 1,
+        'gt_ms'      => request.env['rakwik.duration'],
+        'ua'         => request.user_agent
       }
       data['action_name'] = request.env['rakwik.action_name'] unless request.env['rakwik.action_name'].nil?
       data['urlref'] = request.referer unless request.referer.nil?
-      
+      data['gt_ms'] = request.env['rakwik.duration']
+
       if not_found? && @options[:track_404] === true
         data['action_name'] = "404/URL = #{data['url'].gsub(/\//, '%2f')}/From = #{data['urlref'].gsub(/\//, '%2f')}"
       end
-      
+
       [header, data]
     end
 
     def track(request)
       h, d = extract(request)
       EventMachine.schedule do
-        http = connection(piwik_url).get :head => h, :query => d
+        http = connection(piwik_url).post :head => h, :body => d
         http.errback {
           time = Time.now.strftime("%Y-%m-%d %H:%M:%S")
           request.env['rack.errors'].puts "[#{time}] ERROR Rakwik::Tracker: #{http.error}"
@@ -89,4 +96,4 @@ module Rakwik
     end
 
   end
-end
+end

data/lib/rakwik/version.rb

@@ -1,3 +1,3 @@
 module Rakwik
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/rakwik.gemspec

@@ -3,7 +3,7 @@ require File.expand_path('../lib/rakwik/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.authors       = ["Christian Aust"]
-  gem.email         = ["github@kontakt.software-consultant.net"]
+  gem.email         = ["git@kontakt.software-consultant.net"]
   gem.description   = %q{Rakwik is a server-side tracker integration for the Piwik opensource
 web statistics software. It's easy to integrate into rack-based applications and does not require
 frontend Javascript inclusion.}

data/spec/lib/compat.rb

@@ -0,0 +1,5 @@
+module URI
+  def self.decode_www_form(raw)
+  	raw.split('&').map{|s|s.split('=').map{|v| CGI::unescape(v)}}
+  end
+end

data/spec/lib/rakwik/tracker_spec.rb

@@ -1,4 +1,39 @@
 require 'spec_helper'
 
 describe Rakwik::Tracker do
+  extend Rack::Test::Methods
+
+  let(:tracker_data) {
+    {
+      :piwik_url => 'http://example.com/piwik.php',
+      :site_id => 1,
+      :token_auth => 'foobar'
+    }
+  }
+
+  def app
+    Rakwik::Tracker.new(
+      lambda { |env| [200, {"Content-Type"=>"text/plain"}, ["Hello. The time is #{Time.now}"]] },
+      tracker_data
+    )
+  end
+
+  before(:each) do
+    stub_request(:post, tracker_data[:piwik_url]).to_return(:status => 200, :body => lambda{|req| req.body})
+  end
+
+  it "tracks requests asynchronously" do
+    # Trigger a request to our inner app that should be tracked
+    get '/'
+
+    # wait a little while to let EventMachine send the request
+    sleep 0.01
+
+    # What now?
+    WebMock.should have_requested(:post, tracker_data[:piwik_url]).with{|req|
+      posted_data = URI::decode_www_form(req.body).inject(Hash.new){|h, raw| h[raw[0]] = raw[1]; h}
+      posted_data.should include("token_auth"=>"foobar", "idsite"=>"1", "rec"=>"1", "url" => "http://example.org/", "apiv"=>"1")
+      true
+    }
+  end
 end

data/spec/spec_helper.rb

@@ -1,7 +1,15 @@
 require 'bundler/setup'
 require 'rspec'
-require 'rack'
+require 'rack/test'
+require 'webmock/rspec'
 require 'rakwik'
 
+if RUBY_VERSION.match /^1\.8/
+  require 'spec/lib/compat'
+end
+
+WebMock.disable_net_connect!
+
 RSpec.configure do |config|
+  config.include Rack::Test::Methods
 end

metadata

@@ -1,78 +1,80 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rakwik
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 0.3.0
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Christian Aust
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-21 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-06-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rack
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: em-http-request
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: em-http-request
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-description: |-
-  Rakwik is a server-side tracker integration for the Piwik opensource
-  web statistics software. It's easy to integrate into rack-based applications and does not require
-  frontend Javascript inclusion.
-email: 
-- github@kontakt.software-consultant.net
-executables: []
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! 'Rakwik is a server-side tracker integration for the Piwik opensource
 
-extensions: []
+  web statistics software. It''s easy to integrate into rack-based applications and
+  does not require
 
+  frontend Javascript inclusion.'
+email:
+- git@kontakt.software-consultant.net
+executables: []
+extensions: []
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .ruby-gemset
+- .ruby-version
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -82,41 +84,41 @@ files:
 - lib/rakwik/tracker.rb
 - lib/rakwik/version.rb
 - rakwik.gemspec
+- spec/lib/compat.rb
 - spec/lib/rakwik/tracker_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/datenimperator/rakwik
-licenses: 
+licenses:
 - MIT
 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: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1989987192526098628
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 1989987192526098628
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Rack-based server-side asynchronous Piwik tracker integration.
-test_files: 
+test_files:
+- spec/lib/compat.rb
 - spec/lib/rakwik/tracker_spec.rb
 - spec/spec_helper.rb