Skip to content

Commit 4b797ef

Browse files
mshibuyamshibuya
committed
Cope with the change in MiniMagick 5.3
1 parent a51a970 commit 4b797ef

File tree

3 files changed

+23
-23
lines changed

3 files changed

+23
-23
lines changed

‎spec/processing/mini_magick_spec.rb‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
it "respects the page parameter" do
2828
# create a multi-layer image
2929
tiff = Tempfile.new(["file", ".tiff"])
30-
MiniMagick::Tool::Convert.new do |convert|
30+
MiniMagick::Tool.new('convert') do |convert|
3131
convert.merge! [landscape_file_path, landscape_file_path, landscape_file_path]
3232
convert << tiff.path
3333
end
@@ -59,12 +59,12 @@
5959
end
6060

6161
it "scales up the image if it smaller than the given dimensions" do
62-
expect(::MiniMagick::Tool::Identify.new.verbose(instance.current_path).call).to_not include('Quality: 70')
62+
expect(::MiniMagick::Tool.new('identify').verbose(instance.current_path).call).to_not include('Quality: 70')
6363

6464
instance.resize_to_fill(1000, 1000, combine_options: { quality: 70 })
6565

6666
expect(instance).to have_dimensions(1000, 1000)
67-
expect(::MiniMagick::Tool::Identify.new.verbose(instance.current_path).call).to include('Quality: 70')
67+
expect(::MiniMagick::Tool.new('identify').verbose(instance.current_path).call).to include('Quality: 70')
6868
end
6969
end
7070

@@ -117,21 +117,21 @@
117117
end
118118

119119
it 'accepts combine_options and set quality' do
120-
expect(::MiniMagick::Tool::Identify.new.verbose(instance.current_path).call).to_not include('Quality: 70')
120+
expect(::MiniMagick::Tool.new('identify').verbose(instance.current_path).call).to_not include('Quality: 70')
121121

122122
instance.resize_and_pad(1000, 1000, combine_options: {quality: 70})
123123

124124
expect(instance).to have_dimensions(1000, 1000)
125-
expect(::MiniMagick::Tool::Identify.new.verbose(instance.current_path).call).to include('Quality: 70')
125+
expect(::MiniMagick::Tool.new('identify').verbose(instance.current_path).call).to include('Quality: 70')
126126
end
127127

128128
it 'accepts non-argument option as combine_options' do
129-
expect(::MiniMagick::Tool::Identify.new.verbose(instance.current_path).call).to include('exif:ColorSpace: 1')
129+
expect(::MiniMagick::Tool.new('identify').verbose(instance.current_path).call).to include('exif:ColorSpace: 1')
130130

131131
instance.resize_and_pad(1000, 1000, combine_options: {strip: nil})
132132

133133
expect(instance).to have_dimensions(1000, 1000)
134-
expect(::MiniMagick::Tool::Identify.new.verbose(instance.current_path).call).to_not include('exif:ColorSpace: 1')
134+
expect(::MiniMagick::Tool.new('identify').verbose(instance.current_path).call).to_not include('exif:ColorSpace: 1')
135135
end
136136
end
137137

@@ -153,24 +153,24 @@
153153
end
154154

155155
it 'scales up the image if it smaller than the given dimensions and set quality' do
156-
expect(::MiniMagick::Tool::Identify.new.verbose(instance.current_path).call).to_not include('Quality: 70')
156+
expect(::MiniMagick::Tool.new('identify').verbose(instance.current_path).call).to_not include('Quality: 70')
157157

158158
instance.resize_to_fit(1000, 1000, combine_options: {quality: 70})
159159

160160
expect(instance).to have_dimensions(1000, 750)
161-
expect(::MiniMagick::Tool::Identify.new.verbose(instance.current_path).call).to include('Quality: 70')
161+
expect(::MiniMagick::Tool.new('identify').verbose(instance.current_path).call).to include('Quality: 70')
162162
end
163163
end
164164

165165
describe '#resize_to_limit' do
166166
it 'resizes the image to fit within the given dimensions, maintain file type and set quality' do
167-
expect(::MiniMagick::Tool::Identify.new.verbose(instance.current_path).call).to_not include('Quality: 70')
167+
expect(::MiniMagick::Tool.new('identify').verbose(instance.current_path).call).to_not include('Quality: 70')
168168

169169
instance.resize_to_limit(200, 200, combine_options: {quality: 70})
170170

171171
expect(instance).to have_dimensions(200, 150)
172172
expect(::MiniMagick::Image.open(instance.current_path)['format']).to match(/JPEG/)
173-
expect(::MiniMagick::Tool::Identify.new.verbose(instance.current_path).call).to include('Quality: 70')
173+
expect(::MiniMagick::Tool.new('identify').verbose(instance.current_path).call).to include('Quality: 70')
174174
end
175175

176176
it "resizes the image to fit within the given dimensions and maintain updated file type" do

‎spec/processing/vips_spec.rb‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
it "respects the page parameter" do
2727
# create a multi-layer image
2828
tiff = Tempfile.new(["file", ".tiff"])
29-
MiniMagick::Tool::Convert.new do |convert|
29+
MiniMagick::Tool.new('convert') do |convert|
3030
convert.merge! [landscape_file_path, landscape_file_path, landscape_file_path]
3131
convert << tiff.path
3232
end
@@ -58,12 +58,12 @@
5858
end
5959

6060
it "scales up the image if it smaller than the given dimensions" do
61-
expect(::MiniMagick::Tool::Identify.new.verbose(instance.current_path).call).to_not include('Quality: 70')
61+
expect(::MiniMagick::Tool.new('identify').verbose(instance.current_path).call).to_not include('Quality: 70')
6262

6363
instance.resize_to_fill(1000, 1000, combine_options: { saver: { quality: 70 } })
6464

6565
expect(instance).to have_dimensions(1000, 1000)
66-
expect(::MiniMagick::Tool::Identify.new.verbose(instance.current_path).call).to include('Quality: 70')
66+
expect(::MiniMagick::Tool.new('identify').verbose(instance.current_path).call).to include('Quality: 70')
6767
end
6868
end
6969

@@ -116,21 +116,21 @@
116116
end
117117

118118
it 'accepts combine_options and set quality' do
119-
expect(::MiniMagick::Tool::Identify.new.verbose(instance.current_path).call).to_not include('Quality: 70')
119+
expect(::MiniMagick::Tool.new('identify').verbose(instance.current_path).call).to_not include('Quality: 70')
120120

121121
instance.resize_and_pad(1000, 1000, combine_options: { saver: { quality: 70 } })
122122

123123
expect(instance).to have_dimensions(1000, 1000)
124-
expect(::MiniMagick::Tool::Identify.new.verbose(instance.current_path).call).to include('Quality: 70')
124+
expect(::MiniMagick::Tool.new('identify').verbose(instance.current_path).call).to include('Quality: 70')
125125
end
126126

127127
it 'accepts non-argument option as combine_options' do
128-
expect(::MiniMagick::Tool::Identify.new.verbose(instance.current_path).call).to include('exif:ColorSpace: 1')
128+
expect(::MiniMagick::Tool.new('identify').verbose(instance.current_path).call).to include('exif:ColorSpace: 1')
129129

130130
instance.resize_and_pad(1000, 1000, combine_options: { saver: { strip: true } })
131131

132132
expect(instance).to have_dimensions(1000, 1000)
133-
expect(::MiniMagick::Tool::Identify.new.verbose(instance.current_path).call).to_not include('exif:ColorSpace: 1')
133+
expect(::MiniMagick::Tool.new('identify').verbose(instance.current_path).call).to_not include('exif:ColorSpace: 1')
134134
end
135135
end
136136

@@ -152,24 +152,24 @@
152152
end
153153

154154
it 'scales up the image if it smaller than the given dimensions and set quality' do
155-
expect(::MiniMagick::Tool::Identify.new.verbose(instance.current_path).call).to_not include('Quality: 70')
155+
expect(::MiniMagick::Tool.new('identify').verbose(instance.current_path).call).to_not include('Quality: 70')
156156

157157
instance.resize_to_fit(1000, 1000, combine_options: { saver: { quality: 70} })
158158

159159
expect(instance).to have_dimensions(1000, 750)
160-
expect(::MiniMagick::Tool::Identify.new.verbose(instance.current_path).call).to include('Quality: 70')
160+
expect(::MiniMagick::Tool.new('identify').verbose(instance.current_path).call).to include('Quality: 70')
161161
end
162162
end
163163

164164
describe '#resize_to_limit' do
165165
it 'resizes the image to fit within the given dimensions, maintain file type and set quality' do
166-
expect(::MiniMagick::Tool::Identify.new.verbose(instance.current_path).call).to_not include('Quality: 70')
166+
expect(::MiniMagick::Tool.new('identify').verbose(instance.current_path).call).to_not include('Quality: 70')
167167

168168
instance.resize_to_limit(200, 200, combine_options: { saver: { quality: 70} })
169169

170170
expect(instance).to have_dimensions(200, 150)
171171
expect(::Vips::Image.new_from_file(instance.current_path).get("vips-loader")).to match(/jpeg/)
172-
expect(::MiniMagick::Tool::Identify.new.verbose(instance.current_path).call).to include('Quality: 70')
172+
expect(::MiniMagick::Tool.new('identify').verbose(instance.current_path).call).to include('Quality: 70')
173173
end
174174

175175
it "resizes the image to fit within the given dimensions and maintain updated file type" do

‎spec/spec_helper.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ def change_and_enforce_available_locales(locale, available_locales, &block)
113113

114114
module ManipulationHelpers
115115
def color_of_pixel(path, x, y)
116-
convert = ::MiniMagick::Tool::Convert.new
116+
convert = ::MiniMagick::Tool.new('convert')
117117
convert << path
118118
convert.crop("1x1+#{x}+#{y}")
119119
convert.depth(8)

0 commit comments

Comments
 (0)