Merge pull request #12 from Bodacious/escapedStrings

Escaped strings in HTML/Javascript code

Author: andrew

lib/split/analytics.rb

@@ -15,10 +15,10 @@ def tracking_code(options = {})
       code = <<-EOF
         <script type="text/javascript">
           var _gaq = _gaq || [];
-          _gaq.push(['_setAccount', '#{account}']);
+          _gaq.push(["_setAccount", "#{account}"]);
           #{insert_tracker_methods(tracker_methods)}
           #{custom_variables}
-          _gaq.push(['_trackPageview']);
+          _gaq.push(["_trackPageview"]);
           (function() {
             var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
             ga.src = ('https:' == document.location.protocol ? '#{ssl_tracker_url}' : '#{tracker_url}');
@@ -34,7 +34,7 @@ def custom_variables
       return nil if session[:split].nil?
       arr = []
       session[:split].each_with_index do |h, i|
-        arr << "_gaq.push(['_setCustomVar', #{i + 1}, '#{h[0]}', '#{h[1]}', 1]);"
+        arr << "_gaq.push([\"_setCustomVar\", #{i + 1}, \"#{h[0]}\", \"#{h[1]}\", 1]);"
       end
       arr.reverse[0..4].reverse.join("\n")
     end
@@ -47,22 +47,22 @@ def insert_tracker_methods(tracker_methods)
         tracker_methods.each do |k, v|
           if v.class == String && v.empty?
             # No argument tracker method
-            arr << "_gaq.push(['" + "_" + "#{k}']);"
+            arr << "_gaq.push([\"" + "_" + "#{k}\"]);"
           else
             case v
             when String
               # String argument tracker method
-              arr << "_gaq.push(['" + '_' + "#{k}', '#{v}']);"
+              arr << "_gaq.push([\"" + '_' + "#{k}\", \"#{v}\"]);"
             when TrueClass
               # Boolean argument tracker method
-              arr << "_gaq.push(['" + '_' + "#{k}', #{v}]);"
+              arr << "_gaq.push([\"" + '_' + "#{k}\", #{v}]);"
             when FalseClass
               # Boolean argument tracker method
-              arr << "_gaq.push(['" + '_' + "#{k}', #{v}]);"
+              arr << "_gaq.push([\"" + '_' + "#{k}\", #{v}]);"
             when Array
               # Array argument tracker method
-              values = v.map { |value| "'#{value}'" }.join(', ')
-              arr << "_gaq.push(['" + '_' + "#{k}', #{values}]);"
+              values = v.map { |value| "\"#{value}\"" }.join(', ')
+              arr << "_gaq.push([\"" + '_' + "#{k}\", #{values}]);"
             end
           end
         end

spec/analytics_spec.rb

@@ -4,7 +4,7 @@
   include Split::Helper
   it 'should generate valid analytics javascript' do
     tracking_code = tracking_code(account: 'UA-12345-6')
-    expect(tracking_code).to eql("        <script type=\"text/javascript\">\n          var _gaq = _gaq || [];\n          _gaq.push(['_setAccount', 'UA-12345-6']);\n          \n          \n          _gaq.push(['_trackPageview']);\n          (function() {\n            var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;\n            ga.src = ('https:' == document.location.protocol ? 'https://ssl.google-analytics.com/ga.js' : 'http://www.google-analytics.com/ga.js');\n            var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);\n          })();\n        </script>\n")
+    expect(tracking_code).to eql(%Q{        <script type=\"text/javascript\">\n          var _gaq = _gaq || [];\n          _gaq.push(["_setAccount", "UA-12345-6"]);\n          \n          \n          _gaq.push(["_trackPageview"]);\n          (function() {\n            var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;\n            ga.src = ('https:' == document.location.protocol ? 'https://ssl.google-analytics.com/ga.js' : 'http://www.google-analytics.com/ga.js');\n            var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);\n          })();\n        </script>\n})
   end
 
   it 'should generate valid analytics javascript with arbitrary tracker object methods' do
@@ -14,7 +14,7 @@
       clearOrganic: '' # No argument
     }
     tracking_code = tracking_code(:account => 'UA-12345-6', :tracker_methods => tracker_methods)
-    expect(tracking_code).to eql("        <script type=\"text/javascript\">\n          var _gaq = _gaq || [];\n          _gaq.push(['_setAccount', 'UA-12345-6']);\n          _gaq.push(['_setDomainName', 'example.com']);\n_gaq.push(['_setAllowLinker', true]);\n_gaq.push(['_clearOrganic']);\n          \n          _gaq.push(['_trackPageview']);\n          (function() {\n            var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;\n            ga.src = ('https:' == document.location.protocol ? 'https://ssl.google-analytics.com/ga.js' : 'http://www.google-analytics.com/ga.js');\n            var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);\n          })();\n        </script>\n")
+    expect(tracking_code).to eql(%Q{        <script type=\"text/javascript\">\n          var _gaq = _gaq || [];\n          _gaq.push(["_setAccount", "UA-12345-6"]);\n          _gaq.push(["_setDomainName", "example.com"]);\n_gaq.push(["_setAllowLinker", true]);\n_gaq.push(["_clearOrganic"]);\n          \n          _gaq.push(["_trackPageview"]);\n          (function() {\n            var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;\n            ga.src = ('https:' == document.location.protocol ? 'https://ssl.google-analytics.com/ga.js' : 'http://www.google-analytics.com/ga.js');\n            var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);\n          })();\n        </script>\n})
   end
 
   it 'should add custom variables for every test the user is involved in' do
@@ -23,11 +23,11 @@
     session[:split].should eql({'link_colour' => first_alt})
 
     tracking_code = tracking_code(account: 'UA-12345-6')
-    expect(tracking_code).to eql("        <script type=\"text/javascript\">\n          var _gaq = _gaq || [];\n          _gaq.push(['_setAccount', 'UA-12345-6']);\n          \n          _gaq.push(['_setCustomVar', 1, 'link_colour', '#{first_alt}', 1]);\n          _gaq.push(['_trackPageview']);\n          (function() {\n            var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;\n            ga.src = ('https:' == document.location.protocol ? 'https://ssl.google-analytics.com/ga.js' : 'http://www.google-analytics.com/ga.js');\n            var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);\n          })();\n        </script>\n")
+    expect(tracking_code).to eql(%Q{        <script type=\"text/javascript\">\n          var _gaq = _gaq || [];\n          _gaq.push(["_setAccount", 'UA-12345-6']);\n          \n          _gaq.push(['_setCustomVar', 1, 'link_colour', '#{first_alt}', 1]);\n          _gaq.push(["_trackPageview"]);\n          (function() {\n            var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;\n            ga.src = ('https:' == document.location.protocol ? 'https://ssl.google-analytics.com/ga.js' : 'http://www.google-analytics.com/ga.js');\n            var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);\n          })();\n        </script>\n})
   end
 
   it 'uses doubleclick as tracker url' do
-    tracking_code = tracking_code(account: 'UA-12345-6', tracker_url: 'stats.g.doubleclick.net/dc.js', :ssl_tracker_url => 'stats.g.doubleclick.net/dc.js')
-    expect(tracking_code).to eql("        <script type=\"text/javascript\">\n          var _gaq = _gaq || [];\n          _gaq.push(['_setAccount', 'UA-12345-6']);\n          \n          \n          _gaq.push(['_trackPageview']);\n          (function() {\n            var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;\n            ga.src = ('https:' == document.location.protocol ? 'https://stats.g.doubleclick.net/dc.js' : 'http://stats.g.doubleclick.net/dc.js');\n            var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);\n          })();\n        </script>\n")
+    tracking_code = tracking_code(account: "UA-12345-6", tracker_url: 'stats.g.doubleclick.net/dc.js', :ssl_tracker_url => 'stats.g.doubleclick.net/dc.js')
+    expect(tracking_code).to eql(%Q{        <script type=\"text/javascript\">\n          var _gaq = _gaq || [];\n          _gaq.push(["_setAccount", "UA-12345-6"]);\n          \n          \n          _gaq.push(["_trackPageview"]);\n          (function() {\n            var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;\n            ga.src = ('https:' == document.location.protocol ? 'https://stats.g.doubleclick.net/dc.js' : 'http://stats.g.doubleclick.net/dc.js');\n            var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);\n          })();\n        </script>\n})
   end
 end