Skip to content

Commit 8f86ce7

Browse files
committed
Fix test and lint errors
1 parent 2fb044a commit 8f86ce7

File tree

6 files changed

+25
-26
lines changed

6 files changed

+25
-26
lines changed

.rubocop.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
require:
22
- standard/cop/block_single_line_braces
3+
4+
plugins:
35
- rubocop-rspec
46

57
inherit_gem:
@@ -33,7 +35,5 @@ Style/TrailingCommaInArrayLiteral:
3335
Enabled: true
3436
EnforcedStyleForMultiline: comma
3537

36-
RSpec/FilePath:
37-
Enabled: false
3838
RSpec/SpecFilePathFormat:
3939
Enabled: false

docs/yard/fix_pictures.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ module YARD
77
# Replaces <picture> tags with <img> and relative src with absolute ones
88
module ReplacePicture
99
def html_markup_markdown(text)
10-
text = text.gsub(%r{<picture>.*(<img [^>]*>).*</picture>}m) do
10+
new_text = text.gsub(%r{<picture>.*(<img [^>]*>).*</picture>}m) do
1111
Regexp.last_match(1)
1212
end
1313

14-
text = text.gsub(/<img [^>]*src="(([^>?]+)(\?[^>]*)?)"[^>]*>/m) do |str|
14+
new_text = new_text.gsub(/<img [^>]*src="(([^>?]+)(\?[^>]*)?)"[^>]*>/m) do |str|
1515
src = Regexp.last_match(1)
1616
next str unless URI.parse(src).relative?
1717
str.gsub(src, url_for_file(Regexp.last_match(2)))
1818
end
1919

20-
super(text)
20+
super(new_text)
2121
end
2222
end
2323

imgproxy.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
3838
spec.add_development_dependency "combustion", "~> 1.3"
3939
spec.add_development_dependency "rspec", "~> 3.12"
4040
spec.add_development_dependency "rspec-rails", "~> 6.0"
41-
spec.add_development_dependency "rubocop-rspec", "~> 2.11"
41+
spec.add_development_dependency "rubocop-rspec", "~> 3.6"
4242
spec.add_development_dependency "standard", "~> 1.0"
4343

4444
spec.add_development_dependency "aws-sdk-s3", "~> 1.64"

lib/imgproxy/service_config.rb

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -73,39 +73,39 @@ class ServiceConfig < Anyway::Config
7373
:set_source_url_encryption_key, :set_raw_source_url_encryption_key
7474

7575
def key=(value)
76-
value = value&.to_s
77-
super(value)
78-
set_raw_key(value && [value].pack("H*"))
76+
str_value = value&.to_s
77+
super(str_value)
78+
set_raw_key(str_value && [str_value].pack("H*"))
7979
end
8080

8181
def raw_key=(value)
82-
value = value&.to_s
83-
super(value)
84-
set_key(value&.unpack!("H*"))
82+
str_value = value&.to_s
83+
super(str_value)
84+
set_key(str_value&.unpack!("H*"))
8585
end
8686

8787
def salt=(value)
88-
value = value&.to_s
89-
super(value)
90-
set_raw_salt(value && [value].pack("H*"))
88+
str_value = value&.to_s
89+
super(str_value)
90+
set_raw_salt(str_value && [str_value].pack("H*"))
9191
end
9292

9393
def raw_salt=(value)
94-
value = value&.to_s
95-
super(value)
96-
set_salt(value&.unpack1("H*"))
94+
str_value = value&.to_s
95+
super(str_value)
96+
set_salt(str_value&.unpack1("H*"))
9797
end
9898

9999
def source_url_encryption_key=(value)
100-
value = value&.to_s
101-
super(value)
102-
set_raw_source_url_encryption_key(value && [value].pack("H*"))
100+
str_value = value&.to_s
101+
super(str_value)
102+
set_raw_source_url_encryption_key(str_value && [str_value].pack("H*"))
103103
end
104104

105105
def raw_source_url_encryption_key=(value)
106-
value = value&.to_s
107-
super(value)
108-
set_source_url_encryption_key(value&.unpack1("H*"))
106+
str_value = value&.to_s
107+
super(str_value)
108+
set_source_url_encryption_key(str_value&.unpack1("H*"))
109109
end
110110
end
111111
end

lib/imgproxy/url_builders/processing.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class Processing < Base
2424
# @param [Hash] options Processing options
2525
# @see Imgproxy.url_for
2626
def initialize(options = {})
27-
super(options)
27+
super
2828

2929
@format = @options.delete(:format)
3030
end

spec/rails_helper.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ class User < ActiveRecord::Base
2626
active_storage_path = Gem::Specification.find_by_name("activestorage").gem_dir
2727
ActiveRecord::MigrationContext.new(
2828
File.join(active_storage_path, "db/migrate"),
29-
ActiveRecord::SchemaMigration,
3029
).migrate
3130

3231
RSpec.configure do |config|

0 commit comments

Comments
 (0)