slimmer 3.8.0 → 3.9.0

data/lib/slimmer/headers.rb

@@ -9,6 +9,7 @@ module Slimmer
       format:               "Format",
       need_id:              "Need-ID",
       proposition:          "Proposition",
+      organisations:        "Organisations",
       remove_meta_viewport: "Remove-Meta-Viewport",
       result_count:         "Result-Count",
       section:              "Section",

data/lib/slimmer/processors/google_analytics_configurator.rb

@@ -12,12 +12,13 @@ module Slimmer::Processors
     def filter(src, dest)
       custom_vars = []
       if @artefact
-        custom_vars << set_custom_var(1, "Section", @artefact.primary_root_section["title"]) if @artefact.primary_root_section
-        custom_vars << set_custom_var(3, "NeedID", @artefact.need_id)
+        custom_vars << set_custom_var(1, "Section", @artefact.primary_root_section["title"].downcase) if @artefact.primary_root_section
+        custom_vars << set_custom_var(3, "NeedID", @artefact.need_id.downcase)
         custom_vars << set_custom_var(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(2, "Format", @headers[Slimmer::Headers::FORMAT_HEADER])
-      custom_vars << set_custom_var(5, "ResultCount", @headers[Slimmer::Headers::RESULT_COUNT_HEADER])
+      custom_vars << set_custom_var(2, "Format", @headers[Slimmer::Headers::FORMAT_HEADER].downcase)
+      custom_vars << set_custom_var(5, "ResultCount", @headers[Slimmer::Headers::RESULT_COUNT_HEADER].downcase)
 
       if dest.at_css("#ga-params")
         dest.at_css("#ga-params").content += custom_vars.compact.join("\n")
@@ -27,8 +28,8 @@ module Slimmer::Processors
   private
     def set_custom_var(slot, name, value)
       return nil unless value
-      response = "_gaq.push(#{JSON.dump([ "_setCustomVar", slot, name, value.downcase, PAGE_LEVEL_EVENT])});\n"
-      response + "GOVUK.Analytics.#{name} = \"#{value.downcase}\";"
+      response = "_gaq.push(#{JSON.dump([ "_setCustomVar", slot, name, value, PAGE_LEVEL_EVENT])});\n"
+      response + "GOVUK.Analytics.#{name} = \"#{value}\";"
     end
   end
 end

data/lib/slimmer/version.rb

@@ -1,3 +1,3 @@
 module Slimmer
-  VERSION = '3.8.0'
+  VERSION = '3.9.0'
 end

data/test/headers_test.rb

@@ -29,6 +29,11 @@ class HeadersTest < MiniTest::Unit::TestCase
     assert_equal "rhubarb", headers["X-Slimmer-Proposition"]
   end
 
+  def test_should_set_organisations_header
+    set_slimmer_headers organisations: "<D123><P1>"
+    assert_equal "<D123><P1>", headers["X-Slimmer-Organisations"]
+  end
+
   def test_should_set_result_count_header
     set_slimmer_headers result_count: 3
     assert_equal "3", headers["X-Slimmer-Result-Count"]

data/test/processors/google_analytics_test.rb

@@ -57,7 +57,8 @@ module GoogleAnalyticsTest
       artefact = artefact_for_slug_in_a_subsection("something", "rhubarb/in-puddings")
       artefact["details"].merge!(
         "need_id" => "42",
-        "business_proposition" => true
+        "business_proposition" => true,
+        "organisations" => "<P1><D422>"
       )
       headers = {
         Slimmer::Headers::FORMAT_HEADER => "custard",
@@ -96,6 +97,10 @@ module GoogleAnalyticsTest
       assert_custom_var 4, "Proposition", "business", PAGE_LEVEL_EVENT
     end
 
+    def test_should_pass_proposition_to_GA
+      assert_custom_var 9, "Organisations", "<P1><D422>", PAGE_LEVEL_EVENT
+    end
+
     def test_should_set_section_in_GOVUK_object
       assert_set_var "Proposition", "trifle", govuk
     end
@@ -130,6 +135,10 @@ module GoogleAnalyticsTest
       refute_custom_var "Proposition"
     end
 
+    def test_should_omit_organisations
+      refute_custom_var "Organisations"
+    end
+
     def test_should_omit_result_count
       refute_custom_var "ResultCount"
     end

metadata

@@ -2,7 +2,7 @@
 name: slimmer
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.8.0
+  version: 3.9.0
 platform: ruby
 authors: 
 - Ben Griffiths
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-15 00:00:00 Z
+date: 2012-11-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -246,7 +246,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4023505413084510363
+      hash: -2824424653822310108
       segments: 
       - 0
       version: "0"
@@ -255,7 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4023505413084510363
+      hash: -2824424653822310108
       segments: 
       - 0
       version: "0"