slimmer 3.27.0 → 3.28.0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 3.28.0
+
+* Report multiple need ids to Google analytics and Performance tracking
+* Removed unused need_id header
+
 # 3.27.0
 
 * Added BETA_LABEL header and deprecated BETA_NOTICE header.

data/lib/slimmer/headers.rb

@@ -9,7 +9,6 @@ module Slimmer
       beta:                 "Beta",
       beta_label:           "Beta-Label",
       format:               "Format",
-      need_id:              "Need-ID",
       page_owner:           "Page-Owner",
       proposition:          "Proposition",
       organisations:        "Organisations",

data/lib/slimmer/processors/google_analytics_configurator.rb

@@ -13,7 +13,7 @@ module Slimmer::Processors
       custom_vars = []
       if @artefact
         custom_vars << set_custom_var_downcase(1, "Section", @artefact.primary_root_section["title"]) if @artefact.primary_root_section
-        custom_vars << set_custom_var_downcase(3, "NeedID", @artefact.need_id)
+        custom_vars << set_multivalue_custom_var(3, "NeedID", @artefact.need_ids)
         custom_vars << set_custom_var_downcase(4, "Proposition", (@artefact.business_proposition ? 'business' : 'citizen')) unless @artefact.business_proposition.nil?
       end
       custom_vars << set_custom_var(9, "Organisations", @headers[Slimmer::Headers::ORGANISATIONS_HEADER])
@@ -32,6 +32,11 @@ module Slimmer::Processors
       set_custom_var(slot, name, value.downcase)
     end
 
+    def set_multivalue_custom_var(slot, name, values)
+      return nil if values.empty?
+      set_custom_var(slot, name, values.join(',').downcase)
+    end
+
     def set_custom_var(slot, name, value)
       return nil unless value
       response = "_gaq.push(#{JSON.dump([ "_setCustomVar", slot, name, value, PAGE_LEVEL_EVENT])});\n"

data/lib/slimmer/version.rb

@@ -1,3 +1,3 @@
 module Slimmer
-  VERSION = '3.27.0'
+  VERSION = '3.28.0'
 end

data/test/headers_test.rb

@@ -14,11 +14,6 @@ class HeadersTest < MiniTest::Unit::TestCase
     assert_equal "rhubarb", headers["X-Slimmer-Section"]
   end
 
-  def test_should_set_need_id_header
-    set_slimmer_headers need_id: "rhubarb"
-    assert_equal "rhubarb", headers["X-Slimmer-Need-ID"]
-  end
-
   def test_should_set_format_header
     set_slimmer_headers format: "rhubarb"
     assert_equal "rhubarb", headers["X-Slimmer-Format"]

data/test/processors/google_analytics_test.rb

@@ -56,7 +56,7 @@ module GoogleAnalyticsTest
 
       artefact = artefact_for_slug_in_a_subsection("something", "rhubarb/in-puddings")
       artefact["details"].merge!(
-        "need_id" => "42",
+        "need_ids" => [100001,100002],
         "business_proposition" => true,
       )
       headers = {
@@ -82,16 +82,16 @@ module GoogleAnalyticsTest
       assert_custom_var 2, "Format", "custard", PAGE_LEVEL_EVENT
     end
 
-    def test_should_set_section_in_GOVUK_object
+    def test_should_set_internal_format_name_in_GOVUK_object
       assert_set_var "Format", "custard", govuk
     end
 
-    def test_should_pass_need_ID_to_GA
-      assert_custom_var 3, "NeedID", "42", PAGE_LEVEL_EVENT
+    def test_should_pass_need_ids_to_GA
+      assert_custom_var 3, "NeedID", "100001,100002", PAGE_LEVEL_EVENT
     end
 
-    def test_should_set_section_in_GOVUK_object
-      assert_set_var "NeedID", "42", govuk
+    def test_should_set_need_ids_in_GOVUK_object
+      assert_set_var "NeedID", "100001,100002", govuk
     end
 
     def test_should_pass_proposition_to_GA
@@ -106,15 +106,15 @@ module GoogleAnalyticsTest
       assert_custom_var 10, "WorldLocations", "<WL3>", PAGE_LEVEL_EVENT
     end
 
-    def test_should_set_section_in_GOVUK_object
-      assert_set_var "Proposition", "trifle", govuk
+    def test_should_set_proposition_in_GOVUK_object
+      assert_set_var "Proposition", "business", govuk
     end
 
     def test_should_pass_result_count_to_GA
       assert_custom_var 5, "ResultCount", "3", PAGE_LEVEL_EVENT
     end
 
-    def test_should_set_section_in_GOVUK_object
+    def test_should_set_result_count_in_GOVUK_object
       assert_set_var "ResultCount", "3", govuk
     end
   end
@@ -157,7 +157,7 @@ module GoogleAnalyticsTest
 
       artefact = artefact_for_slug_in_a_subsection("something", "rhubarb/in-puddings")
       artefact["details"].merge!(
-        "need_id" => "42",
+        "need_ids" => [100001, 100002],
         "business_proposition" => true
       )
       headers = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slimmer
 version: !ruby/object:Gem::Version
-  version: 3.27.0
+  version: 3.28.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -341,7 +341,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 553986080410227119
+      hash: -4353529555828351700
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -350,7 +350,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 553986080410227119
+      hash: -4353529555828351700
 requirements: []
 rubyforge_project: slimmer
 rubygems_version: 1.8.23