slimmer 3.9.1 → 3.9.2

data/lib/slimmer/headers.rb

@@ -20,6 +20,7 @@ module Slimmer
     ARTEFACT_HEADER = "#{HEADER_PREFIX}-Artefact"
     CAMPAIGN_NOTIFICATION = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:campaign_notification]}"
     FORMAT_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:format]}"
+    ORGANISATIONS_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:organisations]}"
     REMOVE_META_VIEWPORT = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:remove_meta_viewport]}"
     RESULT_COUNT_HEADER = "#{HEADER_PREFIX}-#{SLIMMER_HEADER_MAPPING[:result_count]}"
     SEARCH_INDEX_HEADER = "#{HEADER_PREFIX}-Search-Index"

data/lib/slimmer/processors/google_analytics_configurator.rb

@@ -15,8 +15,8 @@ module Slimmer::Processors
         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_custom_var_downcase(4, "Proposition", (@artefact.business_proposition ? 'business' : 'citizen')) unless @artefact.business_proposition.nil?
-        custom_vars << set_custom_var(9, "Organisations", @artefact.organisations) unless @artefact.organisations.nil?
       end
+      custom_vars << set_custom_var(9, "Organisations", @headers[Slimmer::Headers::ORGANISATIONS_HEADER])
       custom_vars << set_custom_var_downcase(2, "Format", @headers[Slimmer::Headers::FORMAT_HEADER])
       custom_vars << set_custom_var_downcase(5, "ResultCount", @headers[Slimmer::Headers::RESULT_COUNT_HEADER])
 
@@ -32,6 +32,7 @@ module Slimmer::Processors
     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"
       response + "GOVUK.Analytics.#{name} = \"#{value}\";"
     end

data/lib/slimmer/version.rb

@@ -1,3 +1,3 @@
 module Slimmer
-  VERSION = '3.9.1'
+  VERSION = '3.9.2'
 end

data/test/processors/google_analytics_test.rb

@@ -58,12 +58,12 @@ module GoogleAnalyticsTest
       artefact["details"].merge!(
         "need_id" => "42",
         "business_proposition" => true,
-        "organisations" => "<P1><D422>"
       )
       headers = {
         Slimmer::Headers::FORMAT_HEADER => "custard",
         Slimmer::Headers::RESULT_COUNT_HEADER => "3",
-        Slimmer::Headers::ARTEFACT_HEADER => artefact.to_json
+        Slimmer::Headers::ARTEFACT_HEADER => artefact.to_json,
+        Slimmer::Headers::ORGANISATIONS_HEADER => "<P1><D422>"
       }
 
       given_response 200, GENERIC_DOCUMENT, headers
@@ -153,12 +153,12 @@ module GoogleAnalyticsTest
       artefact = artefact_for_slug_in_a_subsection("something", "rhubarb/in-puddings")
       artefact["details"].merge!(
         "need_id" => "42",
-        "business_proposition" => true,
-        "organisations" => "<P1><D422>"
+        "business_proposition" => true
       )
       headers = {
         Slimmer::Headers::RESULT_COUNT_HEADER => "3",
-        Slimmer::Headers::ARTEFACT_HEADER => artefact.to_json
+        Slimmer::Headers::ARTEFACT_HEADER => artefact.to_json,
+        Slimmer::Headers::ORGANISATIONS_HEADER => "<P1><D422>"
       }
 
       given_response 200, GENERIC_DOCUMENT, headers

metadata

@@ -2,7 +2,7 @@
 name: slimmer
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.9.1
+  version: 3.9.2
 platform: ruby
 authors: 
 - Ben Griffiths
@@ -246,7 +246,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3564071849089416318
+      hash: -1627984955409048265
       segments: 
       - 0
       version: "0"
@@ -255,7 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3564071849089416318
+      hash: -1627984955409048265
       segments: 
       - 0
       version: "0"