Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EPUBMaker: verify_target_imagesが有効なときに、coverimageを暗黙に取り込む #1923

Merged
merged 13 commits into from
Aug 19, 2024
Merged

EPUBMaker: verify_target_imagesが有効なときに、coverimageを暗黙に取り込む #1923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4a497eb
include coverimage file implicitly when verify_target_images is enabl…
kmuto Aug 16, 2024
4da6e4c
remove quotation from CSS url string
kmuto Aug 18, 2024
57d5ebc
add test for verify_target_images
kmuto Aug 18, 2024
738b81e
rubocop
kmuto Aug 18, 2024
cb1429f
unlink before closing block
kmuto Aug 18, 2024
6ee0389
write files in epubmaker_instance
kmuto Aug 18, 2024
46f184b
write files at outside of chdir
kmuto Aug 18, 2024
923f5b0
remove test
kmuto Aug 18, 2024
d412007
skip run verify_target_images
kmuto Aug 18, 2024
0be9b0d
enable verify_target_images
kmuto Aug 18, 2024
81ad7f7
enable verify_target_images
kmuto Aug 18, 2024
8404888
try to ignore Errno::EACCES
kmuto Aug 18, 2024
78a561e
ignore Errno::ENOTEMPTY also
kmuto Aug 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion lib/review/epubmaker.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,12 +214,17 @@ def verify_target_images(basetmpdir)
File.open(File.join(basetmpdir, content.file)) do |f|
f.each_line do |l|
l.scan(/url\((.+?)\)/) do |_m|
@config['epubmaker']['force_include_images'].push($1.strip)
@config['epubmaker']['force_include_images'].push($1.strip.gsub(/\A(['"])(.*)\1\Z/, '\2'))
end
end
end
end
end

if @config['coverimage']
@config['epubmaker']['force_include_images'].push(File.join(@config['imagedir'], @config['coverimage']))
end

@config['epubmaker']['force_include_images'] = @config['epubmaker']['force_include_images'].compact.sort.uniq
end

Expand Down
70 changes: 48 additions & 22 deletions test/test_epubmaker.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,34 +854,45 @@ def test_epub_unsafe_id
end

def epubmaker_instance
Dir.mktmpdir do |tmpdir|
epubmaker = ReVIEW::EPUBMaker.new
epubmaker.instance_eval do
@config = ReVIEW::Configure.create(maker: 'epubmaker')
@config['titlepage'] = nil
@producer = ReVIEW::EPUBMaker::Producer.new(@config)

@htmltoc = ReVIEW::HTMLToc.new(tmpdir)

def config
@config
begin
Dir.mktmpdir do |tmpdir|
epubmaker = ReVIEW::EPUBMaker.new
epubmaker.instance_eval do
@config = ReVIEW::Configure.create(maker: 'epubmaker')
@config['titlepage'] = nil
@producer = ReVIEW::EPUBMaker::Producer.new(@config)

@htmltoc = ReVIEW::HTMLToc.new(tmpdir)

def config
@config
end

def producer
@producer
end

def error(s)
raise ApplicationError, s
end
end

def error(s)
raise ApplicationError, s
end
end
File.write(File.join(tmpdir, 'exist.css'), 'body {}')
File.write(File.join(tmpdir, 'exist.html'), '<html></html>')

File.write(File.join(tmpdir, 'exist.css'), 'body {}')
File.write(File.join(tmpdir, 'exist.html'), '<html></html>')
Dir.mkdir(File.join(tmpdir, 'subdir'))
File.write(File.join(tmpdir, 'subdir', 'exist.html'), '<html></html>')

Dir.mkdir(File.join(tmpdir, 'subdir'))
File.write(File.join(tmpdir, 'subdir', 'exist.html'), '<html></html>')
Dir.mkdir(File.join(tmpdir, 'test'))
File.write(File.join(tmpdir, 'test', 'ch01.html'), '<html><img src="images/ch01.png" /></html>')
File.write(File.join(tmpdir, 'test', 'style.css'), 'div { background-image: url("images/bg.jpg")}')

Dir.chdir(tmpdir) do
Dir.mkdir('test')
yield(epubmaker, File.join(tmpdir, 'test'))
Dir.chdir(tmpdir) do
yield(epubmaker, File.join(tmpdir, 'test'))
end
end
rescue Errno::EACCES, Errno::ENOTEMPTY
# Windows fails unlink when file is opened
end
end

Expand Down Expand Up @@ -940,4 +951,19 @@ def test_copy_static_file
end
end
end

def test_verify_target_images
epubmaker_instance do |epubmaker, tmpdir|
epubmaker.config['epubmaker']['verify_target_images'] = true
epubmaker.config['coverimage'] = 'cover.png'

epubmaker.producer.contents << ReVIEW::EPUBMaker::Content.new(file: 'ch01.html', title: 'CH01', level: 1)
epubmaker.producer.contents << ReVIEW::EPUBMaker::Content.new(file: 'style.css')
epubmaker.verify_target_images(tmpdir)

expect = %w[images/bg.jpg images/ch01.png images/cover.png]
assert_equal expect, epubmaker.config['epubmaker']['force_include_images']
assert_equal true, true
end
end
end
Loading