Skip to content

Commit 476597b

Browse files
andrewandrew
committed
Styleguide changes
1 parent a1a8650 commit 476597b

3 files changed

Lines changed: 21 additions & 21 deletions

File tree

‎lib/split/analytics.rb‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
require "split/helper"
1+
require 'split/helper'
22

33
module Split
44
module Analytics
5-
def tracking_code(options={})
5+
def tracking_code(options = {})
66
# needs more options: http://code.google.com/apis/analytics/docs/gaJS/gaJSApi.html
77
account = options.delete(:account)
88
tracker_url = options.delete(:tracker_url)
@@ -26,15 +26,15 @@ def tracking_code(options={})
2626
})();
2727
</script>
2828
EOF
29-
code = raw(code)if defined?(raw)
29+
code = raw(code) if defined?(raw)
3030
code
3131
end
3232

3333
def custom_variables
3434
return nil if ab_user.nil?
3535
arr = []
36-
ab_user.each_with_index do |h,i|
37-
arr << "_gaq.push(['_setCustomVar', #{i+1}, '#{h[0]}', '#{h[1]}', 1]);"
36+
ab_user.each_with_index do |h, i|
37+
arr << "_gaq.push(['_setCustomVar', #{i + 1}, '#{h[0]}', '#{h[1]}', 1]);"
3838
end
3939
arr.reverse[0..4].reverse.join("\n")
4040
end
@@ -44,25 +44,25 @@ def custom_variables
4444
def insert_tracker_methods(tracker_methods)
4545
return nil if tracker_methods.nil?
4646
arr = []
47-
tracker_methods.each do |k,v|
47+
tracker_methods.each do |k, v|
4848
if v.class == String && v.empty?
4949
# No argument tracker method
5050
arr << "_gaq.push(['" + "_" + "#{k}']);"
5151
else
5252
case v
5353
when String
5454
# String argument tracker method
55-
arr << "_gaq.push(['" + "_" + "#{k}', '#{v}']);"
55+
arr << "_gaq.push(['" + '_' + "#{k}', '#{v}']);"
5656
when TrueClass
5757
# Boolean argument tracker method
58-
arr << "_gaq.push(['" + "_" + "#{k}', #{v}]);"
58+
arr << "_gaq.push(['" + '_' + "#{k}', #{v}]);"
5959
when FalseClass
6060
# Boolean argument tracker method
61-
arr << "_gaq.push(['" + "_" + "#{k}', #{v}]);"
61+
arr << "_gaq.push(['" + '_' + "#{k}', #{v}]);"
6262
when Array
6363
# Array argument tracker method
6464
values = v.map { |value| "'#{value}'" }.join(', ')
65-
arr << "_gaq.push(['" + "_" + "#{k}', #{values}]);"
65+
arr << "_gaq.push(['" + '_' + "#{k}', #{values}]);"
6666
end
6767
end
6868
end

‎lib/split/analytics/version.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module Split
22
module Analytics
3-
VERSION = "0.4.0"
3+
VERSION = '0.4.0'
44
end
55
end

‎spec/analytics_spec.rb‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,30 @@
22

33
describe Split::Analytics do
44
include Split::Helper
5-
it "should generate valid analytics javascript" do
6-
tracking_code = tracking_code(:account => 'UA-12345-6')
5+
it 'should generate valid analytics javascript' do
6+
tracking_code = tracking_code(account: 'UA-12345-6')
77
tracking_code.should 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")
88
end
99

10-
it "should generate valid analytics javascript with arbitrary tracker object methods" do
10+
it 'should generate valid analytics javascript with arbitrary tracker object methods' do
1111
tracker_methods = {
12-
:setDomainName => "example.com", # String argument
13-
:setAllowLinker => true, # Boolean argument
14-
:clearOrganic => "" # No argument
12+
setDomainName: 'example.com', # String argument
13+
setAllowLinker: true, # Boolean argument
14+
clearOrganic: '' # No argument
1515
}
1616
tracking_code = tracking_code(:account => 'UA-12345-6', :tracker_methods => tracker_methods)
1717
tracking_code.should 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")
1818
end
1919

20-
it "should add custom variables for every test the user is involved in" do
20+
it 'should add custom variables for every test the user is involved in' do
2121
first_alt = ab_test('link_colour', 'red', 'blue')
2222

23-
tracking_code = tracking_code(:account => 'UA-12345-6')
23+
tracking_code = tracking_code(account: 'UA-12345-6')
2424
tracking_code.should 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")
2525
end
2626

27-
it "uses doubleclick as tracker url" do
28-
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')
27+
it 'uses doubleclick as tracker url' do
28+
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')
2929
tracking_code.should 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")
3030
end
3131
end

0 commit comments

Comments
 (0)