rack-ga-track 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b92bcb3b371ada83ad23980f38d88415c8110f81
-  data.tar.gz: a265c689ac2191bbfc423976eb55978b96bcb3ae
+  metadata.gz: 3b0ed4ea180cfa25dd248781cc7459bcae7c345f
+  data.tar.gz: 1d889d05d11b45f55423cc3960fab27b1e11710a
 SHA512:
-  metadata.gz: 2336943aab1d42f717bf7407ce461eb9e9696b11708ab387da76656ab112edff9fec3d9b421dcd43488ed79fc1c7a015dd57ee7ac8eef740867773e0f3faf490
-  data.tar.gz: c2cbb3e4dfe72c65fbabe72524ba927653ddd54e5d9d0b05827e5652bc9c58d730e52178c63d07c9068512c7b80e3413c05c0e56a170e6778a73f669e18b7b66
+  metadata.gz: 187b3ecd7893659001e2e300c32faf75e275a890adb6742dcb905c3e5763da09b1e1d30c6a7c727b1107bce0602e3d80a9cbac990a817016b8922bacd828e0f0
+  data.tar.gz: b522ab8d2657afd04126800ea4307508904dccf948bc5da7c2e9f0e7facd1866b4a86fc74d50d1c545aedef88f0181a877ce5d2be2886f513810431dbc1032d0

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/rack-ga-track.rb

@@ -9,26 +9,30 @@ module Rack
 
     def call(env)
       req = Rack::Request.new(env)
-      status, headers, body = @app.call(env)
 
-      args = {}
-
-      if req.cookies['utm_source']
-        args = params_hash(req.cookies)
-      elsif req.params['utm_source']
-        args = params_hash(req.params)
-        create_cookies(headers, args)
+      params = set_params(req)
+      if params
+        create_env_vars(env, params)
       end
 
-      unless args.empty?
-        create_env_vars(env, args)
+      response = @app.call(env)
+      if params && req.params['utm_source']
+        create_cookies(response[1], params)
       end
-
-      [status, headers, body]
+      response
     end
 
     private
 
+    def set_params(req)
+      if req.params['utm_source']
+        return params_hash(req.params)
+      elsif req.cookies['utm_source']
+       return params_hash(req.cookies)
+      end
+      false
+    end
+
     def params_hash(params)
       params['utm_time'] ||= Time.now
 
@@ -42,9 +46,9 @@ module Rack
       }
     end
 
-    def create_cookies(headers, args)
+    def create_cookies(headers, params)
       expires = Time.now + @cookie_ttl
-        args.each do |key, value|
+        params.each do |key, value|
           cookie_hash = {:value => value, :expires => expires}
           cookie_hash[:domain] = @cookie_domain if @cookie_domain
           cookie_key = 'utm_' + key.to_s
@@ -52,8 +56,8 @@ module Rack
       end
     end
 
-    def create_env_vars(env, args)
-      args.each do |key, value|
+    def create_env_vars(env, params)
+      params.each do |key, value|
         env["ga_track.#{key.to_s}"] = value
       end
     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.1.0 ruby lib
+# stub: rack-ga-track 0.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rack-ga-track"
-  s.version = "0.1.0"
+  s.version = "0.2.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-15"
+  s.date = "2014-07-17"
   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

@@ -19,7 +19,11 @@ describe "RackGaTrack" do
   it "should set ga_track env vars from params" do
     Timecop.freeze do
       @time = Time.now
-      get '/', {utm_source: 'testing', utm_campaign: 'email', utm_content: 'test_content'}
+      params = { utm_source: 'testing',
+                 utm_campaign: 'email',
+                 utm_content: 'test_content' }
+
+      get '/', params
     end
 
     last_request.env['ga_track.source'].must_equal "testing"
@@ -31,7 +35,11 @@ describe "RackGaTrack" do
   it "should save GA Campaign params in a cookie" do
     Timecop.freeze do
       @time = Time.now
-      get '/', {utm_source: 'testing', utm_campaign: 'email', utm_content: 'test_content'}
+      params = { utm_source: 'testing',
+                 utm_campaign: 'email',
+                 utm_content: 'test_content' }
+
+      get '/', params
     end
 
     rack_mock_session.cookie_jar["utm_source"].must_equal "testing"
@@ -76,5 +84,17 @@ describe "RackGaTrack" do
       rack_mock_session.cookie_jar["utm_content"].must_equal "test_content"
       rack_mock_session.cookie_jar["utm_time"].must_equal "#{@time.to_i}"
     end
+
+    it 'should update existing cookie if utm_source is present in url params' do
+      Timecop.freeze(60*60*24) do
+        params = { utm_source: 'cool_source',
+                   utm_campaign: 'email',
+                   utm_content: 'test_content' }
+
+        get '/', params
+      end
+
+      rack_mock_session.cookie_jar["utm_source"].must_equal "cool_source"
+    end
   end
  end

metadata

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