gabba-gmp 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9f61c6e8d4d5f9bd7e8f6211c1200cfb75d5152
-  data.tar.gz: a44c3224b4450e70cc85ff483c82154a9e1b14e4
+  metadata.gz: 00bdea145d8fff89dfdeae456a77fa9d63126ad5
+  data.tar.gz: 034188d7f5a36758720eee9b33f5e5ead77a137b
 SHA512:
-  metadata.gz: 1eefcc83c887f569e369c1d1095269664487da3d77c7cfaad8f8422e8fb6f4ebb8f2ba56cbff2fbc1e6daceec5f7091d3bdc469883a8f31662931708702811ef
-  data.tar.gz: 4aa0a0dba797a05932e817b9949e87cfb6c6451da7baf2a809a956ca849162008b6bdc0534f7ee4a90a38fec92442cf26695749ff57fcd858debd5b60bb6f696
+  metadata.gz: 7f0d2df6f233cb9a377d5d335fba9d93350740504d1e157bda3b0d78e7df18a9acd7145c1e1e854b043116cf039eb2a09d7725c0ff7c1ca6ec4192808a830037
+  data.tar.gz: fba6cfb6133dc3c7ea42669228a8b6a8dbe850c49de8464b92baade2b767f69864ae28c1b50e3a180a4ec82ba7b3297cfc067cfb818970666a36bf3644cd8ea0

data/lib/gabba-gmp/event.rb

@@ -27,8 +27,8 @@ module GabbaGMP
           event_category: category,
           event_action: action
         }
-        options[:event_label] = label if label
-        options[:event_value] = value if value
+        options[:event_label] = label unless label.to_s.empty?
+        options[:event_value] = value unless value.to_s.empty?
         @sessionopts.merge(options).merge!(event_options)
       end
     end

data/lib/gabba-gmp/gabba_gmp.rb

@@ -4,6 +4,7 @@ require 'net/http'
 require 'ipaddr'
 require 'cgi'
 require 'net/http/persistent'
+require 'pry'
 
 require "#{File.dirname(__FILE__)}/parameter_map"
 require "#{File.dirname(__FILE__)}/campaign"
@@ -93,26 +94,30 @@ module GabbaGMP
       campaign ||= Campaign.new
       {}.tap do |campaign_params|
         if campaign.present?
-          @sessionopts[:campaign_name] = campaign.name
+          @sessionopts[:campaign_name] = parse_string(campaign.name)
           @sessionopts[:campaign_name] ||= "(direct)"
             
-          @sessionopts[:campaign_source] = campaign.source
+          @sessionopts[:campaign_source] = parse_string(campaign.source)
           @sessionopts[:campaign_source] ||= "(direct)"
             
-          @sessionopts[:campaign_medium] = campaign.medium
+          @sessionopts[:campaign_medium] = parse_string(campaign.medium)
           @sessionopts[:campaign_medium] ||= "(none)"
           
           @sessionopts.delete(:campaign_keyword)
-          @sessionopts[:campaign_keyword] = campaign.keyword if campaign.keyword
+          @sessionopts[:campaign_keyword] = campaign.keyword unless campaign.keyword.to_s.empty?
             
           @sessionopts.delete(:campaign_content)
-          @sessionopts[:campaign_content] = campaign.content if campaign.content
+          @sessionopts[:campaign_content] = campaign.content unless campaign.content.to_s.empty?
         end
       end
     end
     
     
     private
+    def parse_string(value)
+      (value.to_s.empty? ? nil : value)
+    end
+    
     # Sanity check that we have needed params to even call GA
     def validate_session_parameters(params)
       raise GoogleAnalyticsRequiredParameterMissingError, "Protocol version is required" unless params[:protocol_version]
@@ -128,7 +133,9 @@ module GabbaGMP
     # makes the tracking call to Google Analytics
     def hey(params)
       validate_session_parameters(params)
-      query = params.map {|k,v| "#{GA_PARAMS[k]}=#{URI.escape("#{v}", Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))}" }.join('&')
+      params_formatted = params.each_pair {|k,v| params[k] = "#{v}"}.keep_if {|k,v| !v.nil? and !v.empty?}
+      params_formatted = params_formatted.map {|k,v| "#{GA_PARAMS[k]}=#{URI.escape(v, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))}" }
+      query = params_formatted.join('&')
 
       @http ||= Net::HTTP::Persistent.new 'GabbaGMP'
 

data/lib/gabba-gmp/version.rb

@@ -1,5 +1,5 @@
 module GabbaGMP
   unless const_defined?('VERSION')
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

data/spec/lib/campaign_spec.rb

@@ -56,6 +56,26 @@ describe GabbaGMP::GabbaGMP::Campaign do
     it "is not present?" do
       campaign = GabbaGMP::GabbaGMP::Campaign.new
       expect(campaign.present?).to be(false)
+
+      campaign = GabbaGMP::GabbaGMP::Campaign.new
+      campaign.name = ''
+      expect(campaign.present?).to be(false)
+
+      campaign = GabbaGMP::GabbaGMP::Campaign.new
+      campaign.source = ''
+      expect(campaign.present?).to be(false)
+      
+      campaign = GabbaGMP::GabbaGMP::Campaign.new
+      campaign.medium = ''
+      expect(campaign.present?).to be(false)
+
+      campaign = GabbaGMP::GabbaGMP::Campaign.new
+      campaign.keyword = ''
+      expect(campaign.present?).to be(false)
+
+      campaign = GabbaGMP::GabbaGMP::Campaign.new
+      campaign.content = ''
+      expect(campaign.present?).to be(false)
     end
   end
 end

data/spec/lib/custom_vars_spec.rb

@@ -14,20 +14,20 @@ describe GabbaGMP::GabbaGMP::CustomVars do
     it "#set_custom_var(index, name, value) using pageview" do
       gabbaGmp.set_custom_var(1, "Dogs", "Black")
       gabbaGmp.page_view(request)
-      expect_query(MockRequest::DEFAULT_PARAMS.merge({v: "1", dt: "", tid: "tracker", cid: "1234", t: "pageview", dp: "", cd1: "Black"}))
+      expect_query(MockRequest::DEFAULT_PARAMS.merge({v: "1", tid: "tracker", cid: "1234", t: "pageview", cd1: "Black"}))
         
       gabbaGmp.set_custom_var(1, "Dog", "Spotty")
       gabbaGmp.set_custom_var(2, "Lemming", "Fall")
       gabbaGmp.set_custom_var(3, "Kite", "Surf")
       gabbaGmp.set_custom_var(200, "Cabbage", "Patch")
       gabbaGmp.page_view(request)
-      expect_query(MockRequest::DEFAULT_PARAMS.merge({v: "1", dt: "", tid: "tracker", cid: "1234", t: "pageview", dp: "", 
+      expect_query(MockRequest::DEFAULT_PARAMS.merge({v: "1", tid: "tracker", cid: "1234", t: "pageview", 
         cd1: "Spotty", cd2: "Fall", cd3: "Surf", cd200: "Patch"}))
         
       expect {gabbaGmp.set_custom_var(201, "Cabbage", "Patch")}.to raise_error(GabbaGMP::GoogleAnalyticsInvalidParameterError)
       
       gabbaGmp.page_view(request, nil, dimension_4: "Ni!!")
-      expect_query(MockRequest::DEFAULT_PARAMS.merge({v: "1", dt: "", tid: "tracker", cid: "1234", t: "pageview", dp: "", 
+      expect_query(MockRequest::DEFAULT_PARAMS.merge({v: "1", tid: "tracker", cid: "1234", t: "pageview", 
         cd1: "Spotty", cd2: "Fall", cd3: "Surf", cd200: "Patch", cd4: "Ni!!"}))
     end
 

data/spec/lib/event_spec.rb

@@ -15,12 +15,20 @@ describe GabbaGMP::GabbaGMP::Event do
       gabbaGmp.event("Cats", "Action")
       expect_query(MockRequest::DEFAULT_PARAMS.merge({v: "1", tid: "tracker", cid: "1234", t: "event", 
         ec: "Cats", ea: "Action"}))
+        
+      gabbaGmp.event("Cats", "Action","")
+      expect_query(MockRequest::DEFAULT_PARAMS.merge({v: "1", tid: "tracker", cid: "1234", t: "event", 
+        ec: "Cats", ea: "Action"}), 2)
     end
     
     it "#event(category, action, label)" do
       gabbaGmp.event("Cats", "Action", "Label")
       expect_query(MockRequest::DEFAULT_PARAMS.merge({v: "1", tid: "tracker", cid: "1234", t: "event", 
         ec: "Cats", ea: "Action", el: "Label"}))
+        
+      gabbaGmp.event("Cats", "Action", "Label", "")
+      expect_query(MockRequest::DEFAULT_PARAMS.merge({v: "1", tid: "tracker", cid: "1234", t: "event", 
+        ec: "Cats", ea: "Action", el: "Label"}), 2)
     end
 
     it "#event(category, action, label, value)" do

data/spec/lib/gabba_gmp_spec.rb

@@ -112,6 +112,18 @@ describe GabbaGMP::GabbaGMP do
       gabbaGmp.event("Cats", "Action")
       expect_query(MockRequest::DEFAULT_PARAMS.merge({v: "1", tid: "tracker", cid: "1234", t: "event", 
         ec: "Cats", ea: "Action", cn: "(direct)", cs: "Confidential", cm: "(none)", cc: "Contents"}))
+
+      campaign = GabbaGMP::GabbaGMP::Campaign.new()
+      campaign.name = "First Campaign"
+      campaign.source = ""
+      campaign.medium = ""
+      campaign.keyword = ""
+      campaign.content = ""
+      
+      gabbaGmp.campaign = campaign
+      gabbaGmp.event("Cats", "Action")
+      expect_query(MockRequest::DEFAULT_PARAMS.merge({v: "1", tid: "tracker", cid: "1234", t: "event", 
+        ec: "Cats", ea: "Action", cn: "First Campaign", cs: "(direct)", cm: "(none)"}))
     end
   end
   describe "#campaign=" do

data/spec/lib/page_view_spec.rb

@@ -13,16 +13,16 @@ describe GabbaGMP::GabbaGMP::PageView do
     
     it "#page_view(request)" do
       gabbaGmp.page_view(request)
-      expect_query(MockRequest::DEFAULT_PARAMS.merge({v: "1", dt: "", tid: "tracker", cid: "1234", t: "pageview", dp: ""}))
+      expect_query(MockRequest::DEFAULT_PARAMS.merge({v: "1", tid: "tracker", cid: "1234", t: "pageview"}))
 
       request.fullpath = "/amazing/things"
       gabbaGmp.page_view(request)
-      expect_query(MockRequest::DEFAULT_PARAMS.merge({v: "1", dt: "", tid: "tracker", cid: "1234", t: "pageview", dp: "/amazing/things"}))
+      expect_query(MockRequest::DEFAULT_PARAMS.merge({v: "1", tid: "tracker", cid: "1234", t: "pageview", dp: "/amazing/things"}))
     end
     
     it "#page_view(request, title)" do
       gabbaGmp.page_view(request, "Title")
-      expect_query(MockRequest::DEFAULT_PARAMS.merge({v: "1", dt: "Title", tid: "tracker", cid: "1234", t: "pageview", dp: ""}))
+      expect_query(MockRequest::DEFAULT_PARAMS.merge({v: "1", dt: "Title", tid: "tracker", cid: "1234", t: "pageview"}))
     end
     
     it "#page_view(request, title, options)" do
@@ -35,10 +35,10 @@ describe GabbaGMP::GabbaGMP::PageView do
       expect_query(MockRequest::DEFAULT_PARAMS.merge({v: "1", dt: "Title", tid: "tracker", cid: "1234", t: "pageview", dp: "/Nowhere"}))
 
       gabbaGmp.page_view(request)
-      expect_query(MockRequest::DEFAULT_PARAMS.merge({v: "1", dt: "", tid: "tracker", cid: "1234", t: "pageview", dp: ""}))
+      expect_query(MockRequest::DEFAULT_PARAMS.merge({v: "1", tid: "tracker", cid: "1234", t: "pageview"}))
 
       gabbaGmp.page_view(request, "Title", {user_language: "en-au"})
-      expect_query(MockRequest::DEFAULT_PARAMS.merge({v: "1", dt: "Title", tid: "tracker", cid: "1234", t: "pageview", ul: "en-au", dp: ""}))
+      expect_query(MockRequest::DEFAULT_PARAMS.merge({v: "1", dt: "Title", tid: "tracker", cid: "1234", t: "pageview", ul: "en-au"}))
     end
   end
 end

data/spec/spec_helper.rb

@@ -11,8 +11,8 @@ def stub_analytics(expected_params)
   ).to_return(:status => 200, :body => '', :headers => {})
 end
 
-def expect_query(query_params)
-  expect(WebMock).to have_requested(:get, "www.google-analytics.com\/collect").with(:query => query_params)
+def expect_query(query_params, times = 1)
+  expect(WebMock).to have_requested(:get, "www.google-analytics.com\/collect").with(:query => query_params).times(times)
 end
 
 class MockCookies

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gabba-gmp
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Julian West
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2015-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http-persistent