rack-ga-track 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b0ed4ea180cfa25dd248781cc7459bcae7c345f
-  data.tar.gz: 1d889d05d11b45f55423cc3960fab27b1e11710a
+  metadata.gz: 96ea26a2ffcda7b08aaaee34af1ea8c7e53b592a
+  data.tar.gz: 7264ed4ca578d4bda270c3adcb36c34699f33c7e
 SHA512:
-  metadata.gz: 187b3ecd7893659001e2e300c32faf75e275a890adb6742dcb905c3e5763da09b1e1d30c6a7c727b1107bce0602e3d80a9cbac990a817016b8922bacd828e0f0
-  data.tar.gz: b522ab8d2657afd04126800ea4307508904dccf948bc5da7c2e9f0e7facd1866b4a86fc74d50d1c545aedef88f0181a877ce5d2be2886f513810431dbc1032d0
+  metadata.gz: 89141a73848288473d97d2dbe3ab1290f44532fc5657ba74e892206fbc0ee053f3741f21fda3dc97b1852e974a51145c4bb042cba9da7b79c07e3d73e18b77f9
+  data.tar.gz: c2b9a32cad0360b9afc5a16485f3af1523dc639cb62aa2a0df1177da2a1b33fe24137108ee08b02b442aa2e8fd45d42ef5747f0f88e2de05ac4fffb4119d9e99

data/Gemfile

@@ -3,7 +3,7 @@ gem "rack", "~> 1.5", ">= 1.5.2"
 
 group :development do
   gem "bundler", "~> 1.6", ">= 1.6.2"
-  gem "jeweler", "~> 1.6", ">= 1.6.4"
+  gem "jeweler", "~> 2.0", ">= 2.0.1"
   gem 'simplecov', '~> 0.8', ">= 0.8.2"
   gem "rack-test", "~> 0.6", ">= 0.6.2"
   gem "minitest", "~> 5.4", ">= 5.4.0"

data/Gemfile.lock

@@ -1,23 +1,60 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.3.6)
+    builder (3.2.2)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
     docile (1.1.5)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
     git (1.2.7)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
+    github_api (0.11.3)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.1)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 1.2)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.0)
+      oauth2
+    hashie (3.2.0)
+    highline (1.6.21)
+    jeweler (2.0.1)
+      builder
+      bundler (>= 1.0)
       git (>= 1.2.5)
+      github_api
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
       rake
+      rdoc
+    json (1.8.1)
+    jwt (1.0.0)
+    mini_portile (0.6.0)
     minitest (5.4.0)
     multi_json (1.10.1)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    nokogiri (1.6.3)
+      mini_portile (= 0.6.0)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
     rake (10.3.2)
+    rdoc (4.1.1)
+      json (~> 1.4)
     simplecov (0.8.2)
       docile (~> 1.1.0)
       multi_json
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
+    thread_safe (0.3.4)
     timecop (0.7.1)
 
 PLATFORMS
@@ -25,7 +62,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.6, >= 1.6.2)
-  jeweler (~> 1.6, >= 1.6.4)
+  jeweler (~> 2.0, >= 2.0.1)
   minitest (~> 5.4, >= 5.4.0)
   rack (~> 1.5, >= 1.5.2)
   rack-test (~> 0.6, >= 0.6.2)

data/README.md

@@ -4,7 +4,8 @@ Rack::GaTrack
 Rack::GaTrack is a rack middleware that extracts Google Analytics Campaign
 params from the request. Specifically, it looks for a param utm\_source in the request.
 If found, it creates a cookie with utm\_source, utm\_content, utm\_term,
-utm\_campaign, and time.
+utm\_campaign, and time. Anytime utm_source is found in the request the cookie
+will be updated with the new Google Analytics Campaign params.
 
 Use Case
 ---------------
@@ -33,11 +34,12 @@ Add the Rack::GaTrack to your application stack:
     end
 
 You can now access your Google Analytics Campaign params in
-<code>request.env['ga\_track.source']</code>
-<code>request.env['ga\_track.term']</code>
-<code>request.env['ga\_track.content']</code>
-<code>request.env['ga\_track.campaign']</code>
-<code>request.env['ga\_track.medium']</code>
+<code>env['ga\_track.source']</code>
+<code>env['ga\_track.term']</code>
+<code>env['ga\_track.content']</code>
+<code>env['ga\_track.campaign']</code>
+<code>env['ga\_track.medium']</code>
+<code>env['ga\_track.time']</code>
 
 Customization
 -------------
@@ -46,14 +48,14 @@ By default cookie is set for 30 days, you can extend time to live with <code>:tt
 
     #Rails 4 in config/application.rb
     class Application < Rails::Application
-      config.middleware.use Rack::Affiliates, :ttl => 3.months
+      config.middleware.use Rack::GaTrack, :ttl => 3.months
     end
 
 The <code>:domain</code> option allows to customize cookie domain.
 
     #Rails 4 in config/application.rb
     class Application < Rails::Application
-      config.middleware.use Rack::Affiliates, :domain => '.example.org'
+      config.middleware.use Rack::GaTrack, :domain => '.example.org'
     end
 
 Rack::GaTrack will set cookie on <code>.example.org</code> so it's accessible on <code>www.example.org</code>, <code>app.example.org</code> etc.

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/rack-ga-track.rb

@@ -17,7 +17,7 @@ module Rack
 
       response = @app.call(env)
       if params && req.params['utm_source']
-        create_cookies(response[1], params)
+        create_cookie(response[1], params)
       end
       response
     end
@@ -27,33 +27,28 @@ module Rack
     def set_params(req)
       if req.params['utm_source']
         return params_hash(req.params)
-      elsif req.cookies['utm_source']
-       return params_hash(req.cookies)
+      elsif req.cookies['ga_track']
+       return JSON.parse(req.cookies['ga_track'])
       end
       false
     end
 
     def params_hash(params)
-      params['utm_time'] ||= Time.now
-
       {
         source: params['utm_source'],
         medium: params['utm_medium'],
         term: params['utm_term'],
         content: params['utm_content'],
         campaign: params['utm_campaign'],
-        time: params['utm_time'].to_i
+        time: Time.now.to_i
       }
     end
 
-    def create_cookies(headers, params)
+    def create_cookie(headers, params)
       expires = Time.now + @cookie_ttl
-        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
-          Rack::Utils.set_cookie_header!(headers, cookie_key, cookie_hash)
-      end
+      cookie_hash = { value: JSON.generate(params), expires: expires, path: '/' }
+      cookie_hash[:domain] = @cookie_domain if @cookie_domain
+      Rack::Utils.set_cookie_header!(headers, 'ga_track', cookie_hash)
     end
 
     def create_env_vars(env, params)

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.2.0 ruby lib
+# stub: rack-ga-track 0.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rack-ga-track"
-  s.version = "0.2.0"
+  s.version = "0.3.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-17"
+  s.date = "2014-07-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 = [
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rack>, [">= 1.5.2", "~> 1.5"])
       s.add_development_dependency(%q<bundler>, [">= 1.6.2", "~> 1.6"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.6.4", "~> 1.6"])
+      s.add_development_dependency(%q<jeweler>, [">= 2.0.1", "~> 2.0"])
       s.add_development_dependency(%q<simplecov>, [">= 0.8.2", "~> 0.8"])
       s.add_development_dependency(%q<rack-test>, [">= 0.6.2", "~> 0.6"])
       s.add_development_dependency(%q<minitest>, [">= 5.4.0", "~> 5.4"])
@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<rack>, [">= 1.5.2", "~> 1.5"])
       s.add_dependency(%q<bundler>, [">= 1.6.2", "~> 1.6"])
-      s.add_dependency(%q<jeweler>, [">= 1.6.4", "~> 1.6"])
+      s.add_dependency(%q<jeweler>, [">= 2.0.1", "~> 2.0"])
       s.add_dependency(%q<simplecov>, [">= 0.8.2", "~> 0.8"])
       s.add_dependency(%q<rack-test>, [">= 0.6.2", "~> 0.6"])
       s.add_dependency(%q<minitest>, [">= 5.4.0", "~> 5.4"])
@@ -58,7 +58,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<rack>, [">= 1.5.2", "~> 1.5"])
     s.add_dependency(%q<bundler>, [">= 1.6.2", "~> 1.6"])
-    s.add_dependency(%q<jeweler>, [">= 1.6.4", "~> 1.6"])
+    s.add_dependency(%q<jeweler>, [">= 2.0.1", "~> 2.0"])
     s.add_dependency(%q<simplecov>, [">= 0.8.2", "~> 0.8"])
     s.add_dependency(%q<rack-test>, [">= 0.6.2", "~> 0.6"])
     s.add_dependency(%q<minitest>, [">= 5.4.0", "~> 5.4"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-ga-track
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Daniel Nolan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -56,20 +56,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: 2.0.1
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: 2.0.1
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement