Rubocop: simplify regexp literals with slashes in them

Laust Rud Jacobsen
1 parent 92035d31
Showing 4 changed files with 3 additions and 12 deletions Show diff stats
.rubocop_todo.yml
app/models/app.rb
config/initializers/ssl_enforcer.rb
config/load.rb
@@ -220,15 +220,6 @@ Style/Proc:
     - 'app/models/notice.rb'
     - 'app/models/problem.rb'
  
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
-Style/RegexpLiteral:
-  Exclude:
-    - 'app/models/app.rb'
-    - 'config/initializers/ssl_enforcer.rb'
-    - 'config/load.rb'
-
 # Offense count: 1
 # Configuration parameters: Methods.
 Style/SingleLineBlockParams:
@@ -214,7 +214,7 @@ protected
     github_host = URI.parse(Errbit::Config.github_url).host
     github_host = Regexp.escape(github_host)
     github_repo.strip!
-    github_repo.sub!(/(git@|https?:\/\/)#{github_host}(\/|:)/, '')
+    github_repo.sub!(%r{(git@|https?://)#{github_host}(/|:)}, '')
     github_repo.sub!(/\.git$/, '')
   end
 end
@@ -3,6 +3,6 @@ if Errbit::Config.enforce_ssl
   require 'rack/ssl-enforcer'
   ActionMailer::Base.default_url_options.merge!(:protocol => 'https://')
   Rails.application.configure do
-    config.middleware.use Rack::SslEnforcer, :except => /^\/deploys/
+    config.middleware.use Rack::SslEnforcer, :except => %r{^/deploys}
   end
 end
@@ -30,7 +30,7 @@ Errbit::Config = Configurator.run({
  
   # github
   github_url:                ['GITHUB_URL', ->(values) {
-    values[:github_url].gsub(/\/*\z/, '')
+    values[:github_url].gsub(%r{/*\z}, '')
   }],
   github_authentication:     ['GITHUB_AUTHENTICATION'],
   github_client_id:          ['GITHUB_CLIENT_ID'],
...	...	@@ -220,15 +220,6 @@ Style/Proc:
220	220	- 'app/models/notice.rb'
221	221	- 'app/models/problem.rb'
222	222
223		-# Offense count: 3
224		-# Cop supports --auto-correct.
225		-# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
226		-Style/RegexpLiteral:
227		- Exclude:
228		- - 'app/models/app.rb'
229		- - 'config/initializers/ssl_enforcer.rb'
230		- - 'config/load.rb'
231		-
232	223	# Offense count: 1
233	224	# Configuration parameters: Methods.
234	225	Style/SingleLineBlockParams:
...	...
...	...	@@ -214,7 +214,7 @@ protected
214	214	github_host = URI.parse(Errbit::Config.github_url).host
215	215	github_host = Regexp.escape(github_host)
216	216	github_repo.strip!
217		- github_repo.sub!(/(git@\|https?:\/\/)#{github_host}(\/\|:)/, '')
	217	+ github_repo.sub!(%r{(git@\|https?://)#{github_host}(/\|:)}, '')
218	218	github_repo.sub!(/\.git$/, '')
219	219	end
220	220	end
...	...
...	...	@@ -3,6 +3,6 @@ if Errbit::Config.enforce_ssl
3	3	require 'rack/ssl-enforcer'
4	4	ActionMailer::Base.default_url_options.merge!(:protocol => 'https://')
5	5	Rails.application.configure do
6		- config.middleware.use Rack::SslEnforcer, :except => /^\/deploys/
	6	+ config.middleware.use Rack::SslEnforcer, :except => %r{^/deploys}
7	7	end
8	8	end
...	...
...	...	@@ -30,7 +30,7 @@ Errbit::Config = Configurator.run({
30	30
31	31	# github
32	32	github_url: ['GITHUB_URL', ->(values) {
33		- values[:github_url].gsub(/\/*\z/, '')
	33	+ values[:github_url].gsub(%r{/*\z}, '')
34	34	}],
35	35	github_authentication: ['GITHUB_AUTHENTICATION'],
36	36	github_client_id: ['GITHUB_CLIENT_ID'],
...	...