rakwik 0.4.2 → 0.4.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Njg1ZmM2YzIxZGE4OGNjMTRlYTVjZDMwYzIyMmU2MjdkZDUzNGUyYg==
-  data.tar.gz: !binary |-
-    YmYyNTg4MjNiMjAzMTY5YmJmZGE0ZDQ3YjgyY2JiYTRiYmJiYzY4YQ==
+SHA1:
+  metadata.gz: d3dc338c75380f85f8377f331ff32bf5f73cdff2
+  data.tar.gz: d0f6720f84bb6e77320ef4dfe2e477b1bd435a91
 SHA512:
-  metadata.gz: !binary |-
-    ZDA0OWM0NDI3YmMwOTZiODI2NjliNTQzYmE4NjU5NjJhY2Y4ZTgxNzY2N2E5
-    YzRiNzIxOTU0Njk4NzI0OGMwMGU0MWZlOGQ3MGVlYTZlMTY1NjA1YWJmYTk5
-    NzFlYjMxYjMxYzIzYzkzZGIxMjEyZDFmYzhjYmE0YWI5ODBiY2Q=
-  data.tar.gz: !binary |-
-    MWYwMjU2ZmJmMGM2M2JmYTI2Y2E3ZWI1MTAxZDkyMDM0YzUyNTE5NTE1M2Jj
-    ZjE1NjkzNTg4MmEzNGY4ZDMxZTdkZWU2NzNmYjEwZDNiNDE2NWVhMDY5MmM5
-    MWNlYjZmMWFmYzM0NDlhNGFiNzQxYjk2ZGM4MGFhMTMzMmI5MjE=
+  metadata.gz: 887054f2d0344d49b1b9014b1c289d9a818bce0878e85ccf0f497a53fd397e0b5a81ee031674c5f24337a13c9e8b4803570e47acfadf2fa77ff38f8461a5c5da
+  data.tar.gz: 4413db51d9e531f3f5fd14affa430515fd7e2e1d8c636ebcfb7aa17ab379c2934efeebc05e2c33f12cf49a2f2a81d9d54f0807fe0b52a7450383961124686e2f

data/.ruby-version

@@ -1 +1 @@
-ruby-1.9.3-p484
+ruby-2.1.2

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
   - "1.8.7"
-  - "1.9.3"
   - "2.0.0"
+  - "2.1.2"
 # uncomment this line if your project needs to run something other than `rake`:
 # script: bundle exec rspec spec

data/lib/rakwik/tracker.rb

@@ -48,6 +48,16 @@ module Rakwik
       @options[:token_auth]
     end
 
+    def path
+      @options[:path] || ""
+    end
+
+    def match_path?(url)
+      return path.call(url) if path.is_a? Proc
+      return url =~ path    if path.is_a? Regexp
+      return url.start_with?(path.to_s)
+    end
+
     def extract(request)
       header = {
         'User-Agent' => (request.user_agent || self.class.user_agent)
@@ -93,6 +103,8 @@ module Rakwik
     end
 
     def track(request)
+      return unless match_path?(request.path)
+
       h, d = extract(request)
       EventMachine.schedule do
         http = connection(piwik_url).post :head => h, :body => d

data/lib/rakwik/version.rb

@@ -1,3 +1,3 @@
 module Rakwik
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/spec/lib/rakwik/tracker_spec.rb

@@ -37,11 +37,11 @@ describe Rakwik::Tracker do
 
       # What now?
       posted_data = nil
-      WebMock.should have_requested(:post, tracker_data[:piwik_url]).with{|req|
+      expect(WebMock).to 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(
+      expect(posted_data).to include(
         "token_auth"=>"foobar",
         "idsite"=>"1",
         "rec"=>"1",
@@ -52,8 +52,8 @@ describe Rakwik::Tracker do
         "lang"=>"en",
         "urlref"=>"http://example.org/referring_page"
       )
-      posted_data["rand"].should_not be_nil
-      posted_data["gt_ms"].should_not be_nil
+      expect(posted_data["rand"]).not_to be_nil
+      expect(posted_data["gt_ms"]).not_to be_nil
     end
 
     it "accepts requests without user agent" do
@@ -61,15 +61,15 @@ describe Rakwik::Tracker do
         get '/'
 
         # wait a little while to let EventMachine send the request
-        sleep 0.01
+        sleep 0.1
 
         # What now?
         headers = nil
-        WebMock.should have_requested(:post, tracker_data[:piwik_url]).with{|req|
+        expect(WebMock).to have_requested(:post, tracker_data[:piwik_url]).with{|req|
           headers = req.headers
         }
 
-        headers.should include(
+        expect(headers).to include(
           "User-Agent"=>Rakwik::Tracker.user_agent
         )
     end
@@ -89,18 +89,122 @@ describe Rakwik::Tracker do
       get '/'
 
       # wait a little while to let EventMachine send the request
-      sleep 0.01
+      sleep 0.1
 
       # What now?
       posted_data = nil
-      WebMock.should have_requested(:post, tracker_data[:piwik_url]).with{|req|
+      expect(WebMock).to 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}/)
+      expect(posted_data["_id"]).not_to be_nil
+      expect(posted_data["_id"]).to match(/[0-9a-f]{16}/)
     end
   end
 
+  context 'with path option' do
+    let(:app) {
+      Rakwik::Tracker.new(
+        lambda { |env| [200, {"Content-Type"=>"text/plain"}, ["Hello."]] },
+        tracker_data
+      )
+    }
+
+    let(:tracker_data) {
+      {
+        :piwik_url => 'http://example.com/piwik.php',
+        :site_id => 1,
+        :token_auth => 'foobar',
+        :path => path
+      }
+    }
+
+    context 'as regexp' do
+      let(:path) { /^\/foo.*$/ }
+
+      it 'should track foo* pathes' do
+        get '/foo'
+        sleep 0.01
+
+        get '/foo/bar'
+        sleep 0.01
+
+        get '/foobar'
+        sleep 0.01
+
+        expect(WebMock).to have_requested(:post, tracker_data[:piwik_url]).times(3)
+      end
+
+      it 'should not track other pathes' do
+        get '/fo'
+        sleep 0.01
+
+        get '/index'
+        sleep 0.01
+
+        get '/bar/foo'
+        sleep 0.01
+
+        expect(WebMock).to have_requested(:post, tracker_data[:piwik_url]).times(0)
+      end
+    end
+
+    context 'as proc' do
+      let(:path) { Proc.new { |path| path.length == 5 }}
+
+      it 'should track pathes of length 5' do
+        get '/foos'
+        sleep 0.01
+
+        get '/a/bc'
+        sleep 0.01
+
+        expect(WebMock).to have_requested(:post, tracker_data[:piwik_url]).times(2)
+      end
+
+      it 'should not track other pathes' do
+        get '/fo'
+        sleep 0.01
+
+        get '/index'
+        sleep 0.01
+
+        get '/bar/foo'
+        sleep 0.01
+
+        expect(WebMock).to have_requested(:post, tracker_data[:piwik_url]).times(0)
+      end
+    end
+
+    context 'as string' do
+      let(:path) { "/api" }
+
+      it 'should track pathes that start with given string' do
+        get '/api/v2/users'
+        sleep 0.01
+
+        get '/api'
+        sleep 0.01
+
+        get '/api/v2/users.json'
+        sleep 0.01
+
+        expect(WebMock).to have_requested(:post, tracker_data[:piwik_url]).times(3)
+      end
+
+      it 'should not track other pathes' do
+        get '/'
+        sleep 0.01
+
+        get '/users.html'
+        sleep 0.01
+
+        get '/downloads/session.json'
+        sleep 0.01
+
+        expect(WebMock).to have_requested(:post, tracker_data[:piwik_url]).times(0)
+      end
+    end
+  end
 end

metadata

@@ -1,73 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: rakwik
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Christian Aust
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-18 00:00:00.000000000 Z
+date: 2014-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: em-http-request
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-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.'
+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:
 - git@kontakt.software-consultant.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -90,17 +88,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: Rack-based server-side asynchronous Piwik tracker integration.