rack-ga-track 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a00ae792fc16422781a7c668a09218ef5d6ad5b
-  data.tar.gz: e64ab768ee4ff175ac7daf41e3f46af312361b29
+  metadata.gz: 2488735974ca3424b3539254fec3b519e24a0d08
+  data.tar.gz: 4477f298dacc26bc2473f4576cc930f35a7f8191
 SHA512:
-  metadata.gz: a8de9721f2e5e6dc70b0ba3d30e7f9a1200f95d616abc2c371bdc62cf2a5fca39e4427aa7943231599b7de394f62c3dc94c8722f60b8e6d0147926c57882bcdf
-  data.tar.gz: 1adf57f727aeabae19a92a29cc41e613be5f8713b2503e34d226121f80fc5c81cf85b6682a8a2bdf50baad19197d8bda238ee2ec108b0c6da85d403f4c8296cc
+  metadata.gz: 073a66941beec9d8339481b0a208f69636249a38af0b106cb532a4a2d536b5fd0a6d0b918afd04ab320fcf4482eaf139d78d56bb2c8576ee5e1e3428413c3a70
+  data.tar.gz: f8ee3d175f2864b957f7efeaadedb0190a7d16d2a74fe3f2b2134f8cb40cf32fa3e3d5bdbd0b115df5ac6144f8176b8b7abde507903fbcbb0313df2653795ff6

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/lib/rack-ga-track.rb

@@ -26,20 +26,22 @@ module Rack
 
     def set_params(req)
       if req.params['utm_source']
-        return params_hash(req.params)
+        return params_hash(req)
       elsif req.cookies['ga_track'] && !req.cookies['ga_track'].empty?
        return JSON.parse(req.cookies['ga_track'])
       end
       false
     end
 
-    def params_hash(params)
+    def params_hash(req)
       {
-        source: params['utm_source'],
-        medium: params['utm_medium'],
-        term: params['utm_term'],
-        content: params['utm_content'],
-        campaign: params['utm_campaign'],
+        source: req.params['utm_source'],
+        medium: req.params['utm_medium'],
+        term: req.params['utm_term'],
+        content: req.params['utm_content'],
+        campaign: req.params['utm_campaign'],
+        referer: req.referer,
+        landing_page: req.path,
         time: Time.now.to_i
       }
     end

data/rack-ga-track.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: rack-ga-track 0.5.0 ruby lib
+# stub: rack-ga-track 0.6.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rack-ga-track"
-  s.version = "0.5.0"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Daniel Nolan"]
-  s.date = "2014-07-23"
+  s.date = "2014-08-21"
   s.description = "If the user visits via a Google Analytics Campaign link,\n  this middleware will track utm_source, utm_content, utm_term, utm_medium, utm_campaign, and time."
   s.email = "dnolan@t1dexchange.org"
   s.extra_rdoc_files = [

data/spec/rack_ga_track_spec.rb

@@ -15,6 +15,8 @@ describe "RackGaTrack" do
     last_request.env['ga_track.content'].must_equal nil
     last_request.env['ga_track.medium'].must_equal nil
     last_request.env['ga_track.time'].must_equal nil
+    last_request.env['ga_track.referer'].must_equal nil
+    last_request.env['ga_track.landing_page'].must_equal nil
   end
 
   it "should set ga_track env vars from params" do
@@ -24,13 +26,15 @@ describe "RackGaTrack" do
                  utm_campaign: 'email',
                  utm_medium: 'test_medium' }
 
-      get '/', params
+      get '/testing', params, 'HTTP_REFERER' => "http://www.foo.com"
     end
 
     last_request.env['ga_track.source'].must_equal "testing"
     last_request.env['ga_track.campaign'].must_equal "email"
     last_request.env['ga_track.medium'].must_equal "test_medium"
     last_request.env['ga_track.time'].must_equal @time.to_i
+    last_request.env['ga_track.referer'].must_equal 'http://www.foo.com'
+    last_request.env['ga_track.landing_page'].must_equal '/testing'
   end
 
   it "should save GA Campaign params in a cookie" do
@@ -40,7 +44,7 @@ describe "RackGaTrack" do
                  utm_campaign: 'email',
                  utm_medium: 'test_medium' }
 
-      get '/', params
+      get '/testing', params, 'HTTP_REFERER' => "http://www.foo.com"
     end
 
     cookie_params = JSON.parse(rack_mock_session.cookie_jar["ga_track"])
@@ -49,16 +53,22 @@ describe "RackGaTrack" do
     cookie_params["campaign"].must_equal "email"
     cookie_params["medium"].must_equal "test_medium"
     cookie_params["time"].must_equal @time.to_i
+    cookie_params["referer"].must_equal 'http://www.foo.com'
+    cookie_params["landing_page"].must_equal '/testing'
   end
 
   describe "when cookie exists" do
     before :each do
       @time = Time.now
       clear_cookies
-      @params = { source: 'testing',
-                  campaign: 'email',
-                  medium: 'test_medium',
-                  time: @time.to_i }
+      @params = {
+        source: 'testing',
+        campaign: 'email',
+        medium: 'test_medium',
+        time: @time.to_i,
+        referer: 'http://www.foo.com',
+        landing_page: '/testing'
+      }
       rack_mock_session.cookie_jar["ga_track"] = @params.to_json
     end
 
@@ -71,6 +81,8 @@ describe "RackGaTrack" do
       last_request.env['ga_track.campaign'].must_equal "email"
       last_request.env['ga_track.medium'].must_equal "test_medium"
       last_request.env['ga_track.time'].must_equal @time.to_i
+      last_request.env['ga_track.referer'].must_equal 'http://www.foo.com'
+      last_request.env['ga_track.landing_page'].must_equal '/testing'
     end
 
     it 'should not update existing cookie' do
@@ -82,6 +94,8 @@ describe "RackGaTrack" do
       last_request.env['ga_track.campaign'].must_equal "email"
       last_request.env['ga_track.medium'].must_equal "test_medium"
       last_request.env['ga_track.time'].must_equal @time.to_i
+      last_request.env['ga_track.referer'].must_equal 'http://www.foo.com'
+      last_request.env['ga_track.landing_page'].must_equal '/testing'
 
       rack_mock_session.cookie_jar["ga_track"].must_equal JSON.generate(@params)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-ga-track
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Daniel Nolan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack