Fix Ruby 2.7 warnings #38
Conversation
![hound[bot]](https://avatars.githubusercontent.com/in/3598?s=60&v=4){kind=small}
| mock_attachment = MockAttachment.new(options) | ||
| url_generator = Paperclip::UrlGenerator.new(mock_attachment) | ||
|
|
||
| expect { url_generator.for(:style_name, escape: true) }.to_not(output(/URI\.(un)?escape is obsolete/).to_stderr) |
There was a problem hiding this comment.
Metrics/LineLength: Line is too long. [116/80]
| @@ -194,6 +194,16 @@ def escape | |||
| "expected the interpolator to be passed #{expected.inspect} but it wasn't" | |||
| end | |||
|
|
|||
| it "doesn't emit deprecation warnings" do | |||
| expected = "the expected result" | |||
There was a problem hiding this comment.
Style/StringLiterals: Prefer single-quoted strings when you don't need string interpolation or special symbols.
| end | ||
|
|
||
| it "doesn't emit deprecation warnings" do | ||
| expect { subject }.to_not(output(/URI\.(un)?escape is obsolete/).to_stderr) |
There was a problem hiding this comment.
Metrics/LineLength: Line is too long. [81/80]
| @subject.original_filename = "image.png" | ||
| assert_equal "image.png", @subject.original_filename | ||
| subject.original_filename = "image.png" | ||
| expect(subject.original_filename).to(eq("image.png")) |
There was a problem hiding this comment.
Style/StringLiterals: Prefer single-quoted strings when you don't need string interpolation or special symbols.
| end | ||
|
|
||
| it "accepts an original_filename" do | ||
| @subject.original_filename = "image.png" | ||
| assert_equal "image.png", @subject.original_filename | ||
| subject.original_filename = "image.png" |
There was a problem hiding this comment.
Style/StringLiterals: Prefer single-quoted strings when you don't need string interpolation or special symbols.
| end | ||
|
|
||
| it "returns a content type" do | ||
| assert_equal "image/png", @subject.content_type | ||
| expect(subject.content_type).to(eq("image/png")) |
There was a problem hiding this comment.
Style/StringLiterals: Prefer single-quoted strings when you don't need string interpolation or special symbols.
| end | ||
|
|
||
| it "closes open handle after reading" do | ||
| assert_equal true, @open_return.closed? | ||
| expect { subject }.to(change { @open_return.closed? }.from(false).to(true)) |
There was a problem hiding this comment.
Metrics/LineLength: Line is too long. [81/80]
| end | ||
|
|
||
| it "returns a file name" do | ||
| assert_equal "thoughtbot-logo.png", @subject.original_filename | ||
| expect(subject.original_filename).to(eq("thoughtbot-logo.png")) |
There was a problem hiding this comment.
Style/StringLiterals: Prefer single-quoted strings when you don't need string interpolation or special symbols.
| @@ -55,7 +55,7 @@ def attachment(*attachment_names) | |||
| attachment_names.each do |attachment_name| | |||
| COLUMNS.each_pair do |column_name, column_type| | |||
| column_options = options.merge(options[column_name.to_sym] || {}) | |||
| column("#{attachment_name}_#{column_name}", column_type, column_options) | |||
| column("#{attachment_name}_#{column_name}", column_type, **column_options) | |||
There was a problem hiding this comment.
Metrics/LineLength: Line is too long. [86/80]
| @@ -26,7 +26,7 @@ def add_attachment(table_name, *attachment_names) | |||
| attachment_names.each do |attachment_name| | |||
| COLUMNS.each_pair do |column_name, column_type| | |||
| column_options = options.merge(options[column_name.to_sym] || {}) | |||
| add_column(table_name, "#{attachment_name}_#{column_name}", column_type, column_options) | |||
| add_column(table_name, "#{attachment_name}_#{column_name}", column_type, **column_options) | |||
There was a problem hiding this comment.
Metrics/LineLength: Line is too long. [102/80]
kikihakiem
force-pushed
the
fix-ruby271-warnings
branch
from
426425d
to
5a5d9e1
Compare
| @@ -28,7 +28,7 @@ def reset_class(class_name) | |||
|
|
|||
| def reset_table(_table_name, &block) | |||
| block ||= lambda { |_table| true } | |||
| ActiveRecord::Base.connection.create_table :dummies, { force: true }, &block | |||
| ActiveRecord::Base.connection.create_table :dummies, **{ force: true }, &block | |||
There was a problem hiding this comment.
Metrics/LineLength: Line is too long. [82/80]
kikihakiem
force-pushed
the
fix-ruby271-warnings
branch
2 times, most recently
from
2852113
to
03b1097
Compare
| @@ -53,7 +53,7 @@ def default_filename | |||
| def download_content | |||
| options = { read_timeout: Paperclip.options[:read_timeout] }.compact | |||
|
|
|||
| open(@target, **options) | |||
| self.open(@target, options) | |||
There was a problem hiding this comment.
Style/RedundantSelf: Redundant self detected.
kikihakiem
force-pushed
the
fix-ruby271-warnings
branch
from
03b1097
to
ba689c6
Compare
| @@ -65,7 +72,7 @@ def escape_url(url) | |||
| if url.respond_to?(:escape) | |||
| url.escape | |||
| else | |||
| URI.escape(url).gsub(escape_regex) { |m| "%#{m.ord.to_s(16).upcase}" } | |||
| self.class.escape(url).gsub(escape_regex) { |m| "%#{m.ord.to_s(16).upcase}" } | |||
There was a problem hiding this comment.
Metrics/LineLength: Line is too long. [85/80]
| escaped = URI.escape(target) | ||
| super(URI(target == URI.unescape(target) ? escaped : target), options) | ||
| escaped = Paperclip::UrlGenerator.escape(target) | ||
| super(URI(target == Paperclip::UrlGenerator.unescape(target) ? escaped : target), options) |
There was a problem hiding this comment.
Metrics/LineLength: Line is too long. [96/80]
|
@ssinghi |
|
Thank you @kikihakiem for this PR, appreciate it. |
|
Thank you guys for your hard work! Is it possible to do a release with a new tag with the fix please @ssinghi :) ? |
|
Definitely a plus one on the above, I'd love to see a new version released to fix all warnings, without having to fetch the code through git. Also considering that Xmas and 3.0 are near 🎅 |
|
for those who missed it, https://github.com/kreeti/kt-paperclip/releases/tag/v6.4.0 is live now |
|
I still have
|
This commit is part of the backport of kreeti#38 to Paperclip 4.x.
This commit is the second and last part of the backport of kreeti#38 to Paperclip 4.x.
This commit is part of the backport of kreeti#38 to Paperclip 4.x.
This commit is the second and last part of the backport of kreeti#38 to Paperclip 4.x.
This commit is part of the backport of #38 to Paperclip 4.x.
This commit is the second and last part of the backport of #38 to Paperclip 4.x.
This commit is part of the backport of #38 to Paperclip 4.x.
This commit is the second and last part of the backport of #38 to Paperclip 4.x.
Cherry picked: kreeti#38 Original Issue: kreeti#35 URI.escape is obsolete The URI.escape documentation (https://ruby-doc.org/stdlib-2.7.1/libdoc/uri/rdoc/URI/Escape.html#method-i-escape-label-Description) has this statement:
Cherry picked: kreeti#38 Original Issue: kreeti#35 URI.escape is obsolete The URI.escape documentation (https://ruby-doc.org/stdlib-2.7.1/libdoc/uri/rdoc/URI/Escape.html#method-i-escape-label-Description) has this statement: "This method is obsolete and should not be used. Instead, use CGI.escape, URI.encode_www_form or URI.encode_www_form_component depending on your specific use case."
Cherry picked: kreeti#38 Original Issue: kreeti#35 URI.escape is obsolete The URI.escape documentation (https://ruby-doc.org/stdlib-2.7.1/libdoc/uri/rdoc/URI/Escape.html#method-i-escape-label-Description) has this statement: "This method is obsolete and should not be used. Instead, use CGI.escape, URI.encode_www_form or URI.encode_www_form_component depending on your specific use case."
Cherry picked: kreeti#38 Original Issue: kreeti#35 URI.escape is obsolete The URI.escape documentation (https://ruby-doc.org/stdlib-2.7.1/libdoc/uri/rdoc/URI/Escape.html#method-i-escape-label-Description) has this statement: "This method is obsolete and should not be used. Instead, use CGI.escape, URI.encode_www_form or URI.encode_www_form_component depending on your specific use case."
This PR fixes #35