rakwik 0.3.0 → 0.4.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NmM3N2Y0ZmVlNzliYjc5NDJiZGI1MzJhMzI5MTU5MDg4N2QyZjQ1Nw==
+  data.tar.gz: !binary |-
+    Nzg1ZjBkZWZhMWVlODVjYjBmNDk5MGEyY2ExMjkxOTBmZDhlOWE1ZQ==
+SHA512:
+  metadata.gz: !binary |-
+    YmI1MDhiYzk4ZjNjYmQ0OGJkZjJiMmRlNjlmY2RiZWVjOGIxZWYwNTZkMzky
+    MGVkMDY0OWU1ZDEwMzhkYTdlYWY2YjRlMTdkMDRmMjMzYzQ0NDY3NTU0MTg5
+    ZDBlM2RhM2E2MzVhODgyM2FlNGI5ODBjOGUzZjljMmZjODExMjE=
+  data.tar.gz: !binary |-
+    OTRjZDllMjIxNjgyODViMDRlNDg1YzYyY2ExOGJiMTE4YjUyOTJhZGM5NzI4
+    MDEwZTlkMmU1NWJlODY1YmY4YTZmOGU1MWFlYzNhZDljMTJmYjdkNzEyYjgw
+    MjgwMjgyMDg0ZGQ5NjcxOTQ0NGYxMTE3ZWNmNTcyOGZhM2U1NTI=

data/.travis.yml

@@ -1,15 +1,7 @@
 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
+  - "2.0.0"
 # 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

@@ -8,4 +8,5 @@ gem 'rake'
 group :test do
   gem 'rack-test'
   gem 'webmock'
+  gem 'warden'
 end

data/lib/rakwik/tracker.rb

@@ -1,4 +1,5 @@
 require 'em-http'
+require 'digest/md5'
 
 module Rakwik
   class Tracker
@@ -67,12 +68,17 @@ module Rakwik
         'rand'       => rand(1000000),
         'apiv'       => 1,
         'gt_ms'      => request.env['rakwik.duration'],
-        'ua'         => request.user_agent
+        'ua'         => request.user_agent,
+        'lang'       => header['Accept-Language']
       }
       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 w = request.env['warden']
+        data['_id'] = Digest::MD5.hexdigest w.user
+      end
+
       if not_found? && @options[:track_404] === true
         data['action_name'] = "404/URL = #{data['url'].gsub(/\//, '%2f')}/From = #{data['urlref'].gsub(/\//, '%2f')}"
       end

data/lib/rakwik/version.rb

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

data/spec/lib/rakwik/tracker_spec.rb

@@ -11,29 +11,77 @@ describe Rakwik::Tracker do
     }
   }
 
-  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})
+    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 '/'
+  context "for anonymous requests" do
+    let(:app) {
+      Rakwik::Tracker.new(
+        lambda { |env| [200, {"Content-Type"=>"text/plain"}, ["Hello."]] },
+        tracker_data
+      )
+    }
+
+    it "tracks requests asynchronously" do
+      header "User-Agent", "SomeAgent"
+      header "Referer", "http://example.org/referring_page"
+      header "Accept-Language", "en"
+
+      # 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
 
-    # wait a little while to let EventMachine send the request
-    sleep 0.01
+      # What now?
+      posted_data = nil
+      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/",
+        "cip" => "127.0.0.1",
+        "apiv"=>"1",
+        "ua"=>"SomeAgent",
+        "lang"=>"en",
+        "urlref"=>"http://example.org/referring_page"
+      )
+      posted_data["rand"].should_not be_nil
+      posted_data["gt_ms"].should_not be_nil
+    end
+  end
 
-    # 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
+  context "for Warden authenticated requests" do
+    let(:app) {
+      Warden::Manager.new Rakwik::Tracker.new(
+          lambda { |env| [200, {"Content-Type"=>"text/plain"}, ["Hello."]] },
+          tracker_data
+        )
     }
+
+    it "recognizes login data" do
+      login_as 'test'
+      get '/'
+
+      # wait a little while to let EventMachine send the request
+      sleep 0.01
+
+      # What now?
+      posted_data = nil
+      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["_id"].should_not be_nil
+      posted_data["_id"].should match(/[0-9a-f]{16}/)
+    end
   end
+
 end

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ require 'bundler/setup'
 require 'rspec'
 require 'rack/test'
 require 'webmock/rspec'
+require 'warden'
 require 'rakwik'
 
 if RUBY_VERSION.match /^1\.8/
@@ -12,4 +13,9 @@ WebMock.disable_net_connect!
 
 RSpec.configure do |config|
   config.include Rack::Test::Methods
+  config.include Warden::Test::Helpers
+
+  config.after do
+    Warden.test_reset!
+  end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: rakwik
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors:
 - Christian Aust
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-01 00:00:00.000000000 Z
+date: 2013-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,33 +83,26 @@ files:
 homepage: https://github.com/datenimperator/rakwik
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1989987192526098628
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1989987192526098628
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rack-based server-side asynchronous Piwik tracker integration.
 test_files:
 - spec/lib/compat.rb