Skip to content

Commit f08588d

Browse files
authored
Merge pull request #38 from splitrb/update-hash-syntax
Fix Rubocop Style/HashSyntax: Use the new Ruby 1.9 hash syntax
2 parents 46976fb + 1617b8b commit f08588d

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ require 'rspec/core/rake_task'
44

55
RSpec::Core::RakeTask.new('spec')
66

7-
task :default => :spec
7+
task default: :spec

Readme.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ The split gem and its dependencies.
1717
If you are using bundler add split to your Gemfile:
1818

1919
```ruby
20-
gem 'split-analytics', :require => 'split/analytics'
20+
gem 'split-analytics', require: 'split/analytics'
2121
```
2222

2323
Then run:
@@ -45,13 +45,13 @@ Use in your application layout template
4545
erb example:
4646

4747
```erb
48-
<%= tracking_code(:account => 'UA-12345-6') %>
48+
<%= tracking_code(account: 'UA-12345-6') %>
4949
```
5050

5151
haml example:
5252

5353
```haml
54-
= tracking_code(:account => 'UA-12345-6')
54+
= tracking_code(account: 'UA-12345-6')
5555
```
5656

5757
### With Tracking Methods
@@ -60,23 +60,23 @@ See [Google Analytics Tracking Methods](https://developers.google.com/analytics/
6060

6161
```ruby
6262
tracker_methods = {
63-
:setDomainName => "example.com", # String argument
64-
:setAllowLinker => true, # Boolean argument
65-
:require => ['inpage_linkid', '//www.google-analytics.com/plugins/ga/inpage_linkid.js'] # Array argument (will be splattered)
66-
:clearOrganic => "" # No argument
63+
setDomainName: "example.com", # String argument
64+
setAllowLinker: true, # Boolean argument
65+
require: ['inpage_linkid', '//www.google-analytics.com/plugins/ga/inpage_linkid.js'] # Array argument (will be splattered)
66+
clearOrganic: "" # No argument
6767
}
6868
```
6969

7070
erb example:
7171

7272
```erb
73-
<%= tracking_code(:account => 'UA-12345-6', :tracker_methods => tracker_methods) %>
73+
<%= tracking_code(account: 'UA-12345-6', tracker_methods: tracker_methods) %>
7474
```
7575

7676
haml example:
7777

7878
```haml
79-
= tracking_code(:account => 'UA-12345-6', :tracker_methods => tracker_methods)
79+
= tracking_code(account: 'UA-12345-6', tracker_methods: tracker_methods)
8080
```
8181
### Other Tracking URLs
8282

@@ -85,13 +85,13 @@ You can use other Tracking URLs with the option tracker_url and ssl_tracker_url.
8585
erb example:
8686

8787
```erb
88-
<%= tracking_code(:account => 'UA-12345-6', :tracker_url => 'stats.g.doubleclick.net/dc.js', :ssl_tracker_url => 'stats.g.doubleclick.net/dc.js') %>
88+
<%= tracking_code(account: 'UA-12345-6', tracker_url: 'stats.g.doubleclick.net/dc.js', ssl_tracker_url: 'stats.g.doubleclick.net/dc.js') %>
8989
```
9090

9191
haml example:
9292

9393
```haml
94-
= tracking_code(:account => 'UA-12345-6', :tracker_url => 'stats.g.doubleclick.net/dc.js', :ssl_tracker_url => 'stats.g.doubleclick.net/dc.js')
94+
= tracking_code(account: 'UA-12345-6', tracker_url: 'stats.g.doubleclick.net/dc.js', ssl_tracker_url: 'stats.g.doubleclick.net/dc.js')
9595
```
9696

9797
## Contributing

spec/analytics_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
setAllowLinker: true, # Boolean argument
1414
clearOrganic: '' # No argument
1515
}
16-
tracking_code = tracking_code(:account => 'UA-12345-6', :tracker_methods => tracker_methods)
16+
tracking_code = tracking_code(account: 'UA-12345-6', tracker_methods: tracker_methods)
1717
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})
1818
end
1919

@@ -26,7 +26,7 @@
2626
end
2727

2828
it 'uses doubleclick as tracker url' do
29-
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')
29+
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')
3030
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})
3131
end
3232
end

0 commit comments

Comments
 (0)