rack-ga-track 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96ea26a2ffcda7b08aaaee34af1ea8c7e53b592a
-  data.tar.gz: 7264ed4ca578d4bda270c3adcb36c34699f33c7e
+  metadata.gz: 93ddc3baec8a82c8c825ca814f3f200616fa832a
+  data.tar.gz: 4edbd555eab633ea6c745c7bc76c6ca721158dfa
 SHA512:
-  metadata.gz: 89141a73848288473d97d2dbe3ab1290f44532fc5657ba74e892206fbc0ee053f3741f21fda3dc97b1852e974a51145c4bb042cba9da7b79c07e3d73e18b77f9
-  data.tar.gz: c2b9a32cad0360b9afc5a16485f3af1523dc639cb62aa2a0df1177da2a1b33fe24137108ee08b02b442aa2e8fd45d42ef5747f0f88e2de05ac4fffb4119d9e99
+  metadata.gz: 85c93d08f15abd364558dba7aa121bb616c88d123a84740f135ef5291b22df256d820824a10c4b6e78b07139c4cd727aa5785d0587ebd379dcb155928b1b7973
+  data.tar.gz: 3bf5fcf603a4df08c8c3a6efc5a4633937e5f73f75f85a3130cfc4172b3140fb781811818488318abd402104208014cb6bd2b5471aab5aaf960589211a3951dc

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/rack-ga-track.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: rack-ga-track 0.3.0 ruby lib
+# stub: rack-ga-track 0.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rack-ga-track"
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

data/spec/rack_ga_track_spec.rb

@@ -1,4 +1,5 @@
 require 'helper'
+require 'json'
 
 describe "RackGaTrack" do
   before :each do
@@ -21,14 +22,14 @@ describe "RackGaTrack" do
       @time = Time.now
       params = { utm_source: 'testing',
                  utm_campaign: 'email',
-                 utm_content: 'test_content' }
+                 utm_medium: 'test_medium' }
 
       get '/', params
     end
 
     last_request.env['ga_track.source'].must_equal "testing"
     last_request.env['ga_track.campaign'].must_equal "email"
-    last_request.env['ga_track.content'].must_equal "test_content"
+    last_request.env['ga_track.medium'].must_equal "test_medium"
     last_request.env['ga_track.time'].must_equal @time.to_i
   end
 
@@ -37,25 +38,28 @@ describe "RackGaTrack" do
       @time = Time.now
       params = { utm_source: 'testing',
                  utm_campaign: 'email',
-                 utm_content: 'test_content' }
+                 utm_medium: 'test_medium' }
 
       get '/', params
     end
 
-    rack_mock_session.cookie_jar["utm_source"].must_equal "testing"
-    rack_mock_session.cookie_jar["utm_campaign"].must_equal "email"
-    rack_mock_session.cookie_jar["utm_content"].must_equal "test_content"
-    rack_mock_session.cookie_jar["utm_time"].must_equal "#{@time.to_i}"
+    cookie_params = JSON.parse(rack_mock_session.cookie_jar["ga_track"])
+
+    cookie_params["source"].must_equal "testing"
+    cookie_params["campaign"].must_equal "email"
+    cookie_params["medium"].must_equal "test_medium"
+    cookie_params["time"].must_equal @time.to_i
   end
 
   describe "when cookie exists" do
     before :each do
       @time = Time.now
       clear_cookies
-      set_cookie("utm_source=testing")
-      set_cookie("utm_campaign=email")
-      set_cookie("utm_content=test_content")
-      set_cookie("utm_time=#{@time.to_i}")
+      @params = { source: 'testing',
+                  campaign: 'email',
+                  medium: 'test_medium',
+                  time: @time.to_i }
+      rack_mock_session.cookie_jar["ga_track"] = @params.to_json
     end
 
     it "should restore GA Campaign params from cookie" do
@@ -65,7 +69,7 @@ describe "RackGaTrack" do
 
       last_request.env['ga_track.source'].must_equal "testing"
       last_request.env['ga_track.campaign'].must_equal "email"
-      last_request.env['ga_track.content'].must_equal "test_content"
+      last_request.env['ga_track.medium'].must_equal "test_medium"
       last_request.env['ga_track.time'].must_equal @time.to_i
     end
 
@@ -76,25 +80,23 @@ describe "RackGaTrack" do
 
       last_request.env['ga_track.source'].must_equal "testing"
       last_request.env['ga_track.campaign'].must_equal "email"
-      last_request.env['ga_track.content'].must_equal "test_content"
+      last_request.env['ga_track.medium'].must_equal "test_medium"
       last_request.env['ga_track.time'].must_equal @time.to_i
 
-      rack_mock_session.cookie_jar["utm_source"].must_equal "testing"
-      rack_mock_session.cookie_jar["utm_campaign"].must_equal "email"
-      rack_mock_session.cookie_jar["utm_content"].must_equal "test_content"
-      rack_mock_session.cookie_jar["utm_time"].must_equal "#{@time.to_i}"
+      rack_mock_session.cookie_jar["ga_track"].must_equal JSON.generate(@params)
     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' }
+                   utm_medium: 'test_medium' }
 
         get '/', params
       end
+      cookie_params = JSON.parse(rack_mock_session.cookie_jar["ga_track"])
 
-      rack_mock_session.cookie_jar["utm_source"].must_equal "cool_source"
+      cookie_params["source"].must_equal "cool_source"
     end
   end
  end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-ga-track
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Daniel Nolan