analytics_goo 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/analytics_goo.gemspec

@@ -1,49 +1,46 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{analytics_goo}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rob Christie"]
-  s.date = %q{2011-05-31}
+  s.date = %q{2011-06-01}
   s.email = %q{robchristie@gmail.com}
   s.extra_rdoc_files = [
-    "README.markdown"
+    "README.markdown",
+    "TODO"
   ]
   s.files = [
-    ".gitignore",
-     "CHANGELOG",
-     "MIT-LICENSE",
-     "README.markdown",
-     "Rakefile",
-     "TODO",
-     "VERSION",
-     "analytics_goo.gemspec",
-     "autotest/CHANGELOG",
-     "autotest/LICENSE",
-     "autotest/README.rdoc",
-     "autotest/discover.rb",
-     "autotest/railsplugin.rb",
-     "autotest/railsplugin_rspec.rb",
-     "init.rb",
-     "lib/analytics_goo.rb",
-     "lib/analytics_goo/google_analytics_adapter.rb",
-     "rails/init.rb",
-     "rails/init.rb",
-     "tasks/analytics_goo.rake",
-     "test/analytics_goo_test.rb",
-     "test/test_helper.rb"
+    "CHANGELOG",
+    "MIT-LICENSE",
+    "README.markdown",
+    "Rakefile",
+    "TODO",
+    "VERSION",
+    "analytics_goo.gemspec",
+    "autotest/CHANGELOG",
+    "autotest/LICENSE",
+    "autotest/README.rdoc",
+    "autotest/discover.rb",
+    "autotest/railsplugin.rb",
+    "autotest/railsplugin_rspec.rb",
+    "init.rb",
+    "lib/analytics_goo.rb",
+    "lib/analytics_goo/google_analytics_adapter.rb",
+    "rails/init.rb",
+    "tasks/analytics_goo.rake",
+    "test/analytics_goo_test.rb",
+    "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/eyestreet/analytics_goo}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{AnalyticsGoo provides server side non-javascript tracking using google analytics.}
-  s.test_files = [
-    "test/analytics_goo_test.rb",
-     "test/test_helper.rb"
-  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
@@ -55,3 +52,4 @@ Gem::Specification.new do |s|
   else
   end
 end
+

data/lib/analytics_goo/google_analytics_adapter.rb

@@ -40,9 +40,10 @@
 
 module AnalyticsGoo
   class GoogleAnalyticsAdapter
-    attr_accessor :domain, :analytics_id, :env, :noop, :page_title, :remote_address, :referrer, :user_agent, :http_accept_language
-    # utmdt
-    #   Page title, which is a URL-encoded string.  utmdt=analytics%20page%20test
+    attr_accessor :domain, :analytics_id, :env, :noop, :page_title, :remote_address,
+                  :referrer, :user_agent, :http_accept_language, :campaign, :source,
+                  :medium, :term, :content
+
 
     def initialize(ac)
       # sets the environment that this should be run in
@@ -55,6 +56,11 @@ module AnalyticsGoo
       @remote_address = ac[:remote_address]
       @user_agent = ac[:user_agent] || ""
       @http_accept_language = ac[:http_accept_language] || ""
+      @campaign =  ac[:campaign] || ""
+      @source = ac[:source] || ""
+      @medium = ac[:medium] || ""
+      @term = ac[:term] || ""
+      @content = ac[:content] || ""
     end
 
     GA_DOMAIN = "www.google-analytics.com"
@@ -134,11 +140,7 @@ module AnalyticsGoo
     # utmip
     # Remote IP address
     def utmip
-      return '' if self.remote_address.blank?
-      # Capture the first three octects of the IP address and replace the forth
-      # with 0, e.g. 124.455.3.123 becomes 124.455.3.0
-      ip = self.remote_address.to_s.gsub!(/([^.]+\.[^.]+\.[^.]+\.)[^.]+/,"\\1") + "0"
-      ip
+      self.remote_address
     end
 
 
@@ -168,6 +170,27 @@ module AnalyticsGoo
       self.page_title
     end
 
+    def utm_campaign
+      self.campaign
+    end
+
+    def utm_source
+      self.source
+    end
+
+
+    def utm_medium
+      self.medium
+    end
+
+    def utm_term
+      self.term
+    end
+
+    def utm_content
+      self.content
+    end
+
     # send a request to get the image from google
     def track_page_view(path)
       res = ""
@@ -179,7 +202,7 @@ module AnalyticsGoo
 
     protected
     def track_it(path)
-#       puts "/__utm.gif?utmwv=#{self.utmwv}&utmn=#{self.utmn}&utmhn=#{self.utmhn}&utmcs=#{self.utmcs}&utmsr=#{self.utmsr}&utmsc=#{self.utmsc}&utmul=#{self.utmul}&utmje=#{self.utmje}&utmfl=#{URI::escape(self.utmfl)}&utmdt=#{URI::escape(self.utmdt)}&utmhid=#{utmhid}&utmr=#{self.utmr}&utmp=#{path}&utmac=#{self.utmac}&utmcc=#{self.utmcc} \n"
+      #TODO - cleanup
       utm_uri = "/__utm.gif?" +
                 "utmwv="  + self.utmwv +
                 "&utmn="  + self.utmn +
@@ -189,8 +212,12 @@ module AnalyticsGoo
                 "&utmac=" + self.utmac +
                 "&utmcc=" + self.utmcc +
                 "&utmvid="+ self.utmvid +
-                "&utmip=" + self.utmip +
-                "&utmdt=" + CGI.escape(self.utmdt)
+                "&utmip=" + self.utmip
+      utm_uri << "&utmdt=#{CGI.escape(self.utmdt)}"               unless self.utmdt.blank?
+      utm_uri << "&utm_campaign=#{CGI.escape(self.utm_campaign)}" unless self.utm_campaign.blank?
+      utm_uri << "&utm_source=#{CGI.escape(self.utm_source)}"     unless self.utm_source.blank?
+      utm_uri << "&utm_medium=#{CGI.escape(self.utm_medium)}"     unless self.utm_medium.blank?
+      utm_uri << "&utm_term=#{CGI.escape(self.utm_term)}"         unless self.utm_term.blank?
       Net::HTTP.start(GA_DOMAIN) {|http|
         http.request_get(utm_uri, {"User-Agent" => self.user_agent, "Accept-Language" => self.http_accept_language})
       }

data/test/analytics_goo_test.rb

@@ -34,7 +34,7 @@ class AnalyticsGooTest < ActiveSupport::TestCase
 
   context "AnalyticsGoo " do
     setup do
-      @analytics_config = { :analytics_id => "MO-11685745-3",:domain => "test.local", :page_title => "This is the page title"}
+      @analytics_config = { :analytics_id => "MO-11685745-3",:domain => "test.local", :page_title => "This is the page title",  :remote_address => "127.0.0.1"}
       @ga = AnalyticsGoo::GoogleAnalyticsAdapter.new(@analytics_config)
     end
     context "when initialized with an analytics id" do
@@ -47,6 +47,12 @@ class AnalyticsGooTest < ActiveSupport::TestCase
         assert_equal "test.local", @ga.domain
       end
     end
+    context "when initialized with a remote ip address" do
+      should "return that IP" do
+        assert_equal "127.0.0.1", @ga.utmip
+      end
+    end
+
     context "that has been initialized" do
       should "have an urchin url" do
         assert_equal "http://www.google-analytics.com/__utm.gif", @ga.urchin_url
@@ -137,7 +143,7 @@ class AnalyticsGooTest < ActiveSupport::TestCase
     end
     context "makes a request for an image on the google analytics server" do
       setup do
-        path = "/__utm.gif?utmwv=4.4sj&utmn=1277734430&utmhn=shor.tswit.ch&utmr=-&utmp=%2Fadmin%2F1&utmac=MO-11685745-3&utmcc=__utma%3D999.999.999.999.999.1%3B&utmvid=0x5719fb3b1e05e909&utmip=127.0.0.0"
+        path = "/__utm.gif?utmwv=4.4sj&utmn=1277734430&utmhn=shor.tswit.ch&utmr=-&utmp=%2Fadmin%2F1&utmac=MO-11685745-3&utmcc=__utma%3D999.999.999.999.999.1%3B&utmvid=0x5719fb3b1e05e909&utmip=127.0.0.1"
         header_hash =  {'User-Agent' => 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.2) Gecko/20100115 Firefox/3.6', 'Accept-Language' => 'en-us,en;q=0.5'}
         @test_ad.expects(:utmn).returns("1277734430")
         @test_ad.expects(:utmvid).returns("0x5719fb3b1e05e909")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: analytics_goo
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Rob Christie
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-31 00:00:00 -04:00
+date: 2011-06-01 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -27,8 +27,8 @@ extensions: []
 
 extra_rdoc_files: 
 - README.markdown
+- TODO
 files: 
-- .gitignore
 - CHANGELOG
 - MIT-LICENSE
 - README.markdown
@@ -54,8 +54,8 @@ homepage: http://github.com/eyestreet/analytics_goo
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -83,6 +83,5 @@ rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: AnalyticsGoo provides server side non-javascript tracking using google analytics.
-test_files: 
-- test/analytics_goo_test.rb
-- test/test_helper.rb
+test_files: []
+

data/.gitignore

@@ -1,7 +0,0 @@
-coverage
-pkg
-rdoc
-tags
-test/tmp
-test/version_tmp
-tmp