epub-maker 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 816986a0e0e3f170275270068e795f5b59dba7b786812bce6596b812f5b9e1ca
-  data.tar.gz: e7338e106f3ede913aa2d53fa031f7638b2c1cefba3fa00f5cd17e264927ead2
+  metadata.gz: 4aeffa7298ad5bb22c54beaa0eaafc0f46cbcd724a950202d917ef9186345a5c
+  data.tar.gz: ea10fe12472421d4585636290c814df4eab87d9d4fc466a480d94d229174d3c4
 SHA512:
-  metadata.gz: 61b29b15aeb9848bfae40ab97644fa84b18b582e50adea2051b417a29b6e5efcc056dd9da457300e5a7c0364279d91e928d9bf6923986935b6225c7e01e7ae28
-  data.tar.gz: eef00806fe74397d78334387b3e81eca6730364630db152c640fbe6a69106476fe99910abd2a7e09a117fde45ec42f88254f74b13540e0600318229c68929c2a
+  metadata.gz: 3ef569b71794f317b6a05136bd94ff9dcee19caa0993d58ab7f1f4d5b03bba2edc9836300892e5b1780ce0afe1b1498b84bfcbd884c9d6fe4ad9e82b1ef191a4
+  data.tar.gz: 39e9011f7bcac33805936f1842959a697bbf8b72d415b7b6cdd82b0dc782548316f369951e7aac68c299f1f50f40058239316868bd55de4841dc92da81775c23

data/.gitlab-ci.yml

@@ -56,3 +56,13 @@ test:2.7:
     key: ruby:2.7
     paths:
       - deps
+
+test:3.0:
+  image: ruby:3.0-rc
+  script: bundle exec rake test
+  except:
+    - tags
+  cache:
+    key: ruby:3.0
+    paths:
+      - deps

data/CHANGELOG.markdown

@@ -1,7 +1,13 @@
+0.1.5
+-----
+
+* [BUG FIX]Compare path name in the same encoding when finding file in ZIP archive
+* Add `PhysicalContaienr.mtime` API to set mtime of files in EPUB archive
+
 0.1.4
 -----
 
-* Add `Pubication::Package::Metadata#modified=` method
+* Add `Publication::Package::Metadata#modified=` method
 * Rescue Errno::EXDEV on renaming temporary EPUB file
 
 0.1.3

data/README.markdown

@@ -178,19 +178,20 @@ Todo
 Recent Changes
 --------------
 
+### 0.1.5
+
+* [BUG FIX]Compare path name in the same encoding when finding file in ZIP archive
+* Add `PhysicalContaienr.mtime` API to set mtime of files in EPUB archive
+
 ### 0.1.4
 
-* Add `Pubication::Package::Metadata#modified=` method
+* Add `Publication::Package::Metadata#modified=` method
 * Rescue Errno::EXDEV on renaming temporary EPUB file
 
 ### 0.1.3
 
 * Add workaround Window file renaming problem
 
-### 0.1.2
-
-* Close temp file when archiving EPUB file
-
 Contributing
 ------------
 

data/Rakefile

@@ -2,11 +2,17 @@ require 'rake/testtask'
 require 'rake/clean'
 require 'yard'
 require "rubygems/tasks"
+  require "open-uri"
 
 task :default => :test
 
 CLEAN.include 'README.html'
 
+VALID_EPUB = "test/fixtures/accessible_epub_3.epub"
+file VALID_EPUB do |t|
+  File.write t.name, URI("https://github.com/IDPF/epub3-samples/releases/download/20170606/accessible_epub_3.epub").read
+end
 Rake::TestTask.new
+task test: VALID_EPUB
 YARD::Rake::YardocTask.new
 Gem::Tasks.new

data/epub-maker.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'archive-zip'
   gem.add_runtime_dependency 'rake'
   gem.add_runtime_dependency 'addressable', '>= 2.3.5'
+  gem.add_runtime_dependency 'rexml'
   gem.add_runtime_dependency "nokogiri", ">= 1.6.0", "< 1.11"
 
   gem.add_development_dependency 'zipruby'

data/lib/epub/maker/ocf/physical_container.rb

@@ -13,15 +13,33 @@ module EPUB
   class OCF
     class PhysicalContainer
       class << self
+        @@mtime = nil
+
+        def mtime
+          @@mtime
+        end
+
+        # Sets +mtime+, which is used when setting mtime of file in EPUB(ZIP) archive.
+        # Currently supported for only {ArchiveZip} adapter
+        #
+        # @example
+        #   EPUB::OCF::PhysicalCotainer.adapter = :ArchiveZip
+        #   EPUB::OCF::PhysicalCotainer.mtime = Time.new(2020, 1, 1)
+        #
+        # @return [Time]
+        def mtime=(time)
+          @@mtime = time
+        end
+
         def write(container_path, path_name, content)
           open(container_path) {|container|
-            container.write(path_name, content)
+            container.write(path_name, content, mtime: mtime)
           }
         end
 
         def save(container_path, path_name, content)
           warn "EPUB::OCF::PhysicalContainer.#{__method__} is deprecated. Use .write instead"
-          write(container_path, path_name, content)
+          write(container_path, path_name, content, mtime: mtime)
         end
       end
     end

data/lib/epub/maker/ocf/physical_container/archive_zip.rb

@@ -5,7 +5,7 @@ module EPUB
     class PhysicalContainer
       class ArchiveZip < self
         # @todo Write multiple files at once
-        def write(path_name, content)
+        def write(path_name, content, mtime: nil)
           ::Dir.mktmpdir do |dir|
             tmp_archive_path = ::File.join(dir, ::File.basename(@container_path) + '.tmp')
             ::File.open @container_path do |archive_in|
@@ -15,15 +15,21 @@ module EPUB
                   Archive::Zip.open archive_out, :w do |z_out|
                     updated = false
                     z_in.each do |entry|
-                      if entry.zip_path == path_name
+                      if entry.zip_path == path_name.force_encoding('ASCII-8BIT')
                         entry.file_data = StringIO.new(content)
                         updated = true
                       end
+                      if mtime
+                        entry.mtime = mtime
+                      end
                       z_out << entry
                     end
                     unless updated
                       entry = Archive::Zip::Entry::File.new(path_name)
                       entry.file_data = StringIO.new(content)
+                      if mtime
+                        entry.mtime = mtime
+                      end
                       z_out << entry
                     end
                   end

data/lib/epub/maker/publication.rb

@@ -288,7 +288,11 @@ module EPUB
               elsif content_file
                 File.read(content_file)
               else
-                raise 'no content nor content_file'
+                begin
+                  read
+                rescue OCF::PhysicalContainer::NoEntry
+                  raise 'no content nor content_file'
+                end
               end
             book = manifest.package.book
             book.container_adapter.write book.epub_file, entry_name, content_to_save

data/lib/epub/maker/version.rb

@@ -1,5 +1,5 @@
 module EPUB
   module Maker
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

data/test/helper.rb

@@ -11,6 +11,12 @@ class Test::Unit::TestCase
   def assert_valid_epub(file)
     assert_true Epubcheck::Ruby::CLI.new.execute(file)
   end
+
+  private
+
+  def valid_epub
+    Pathname.new("test/fixtures/accessible_epub_3.epub")
+  end
 end
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'epub'

data/test/test_inplace_editing.rb

@@ -1,13 +1,15 @@
 require_relative 'helper'
 require 'epub/maker'
 
-class TestImplaceEditing < Test::Unit::TestCase
+class TestInplaceEditing < Test::Unit::TestCase
   def setup
     @assets_dir = Pathname(__dir__)/'fixtures'/'book'
     @dir = Pathname.mktmpdir('epub-maker-test')
     @file = @dir/'book.epub'
     EPUB::Maker.archive @assets_dir, @file
     @book = EPUB::Parser.parse(@file)
+    @valid_epub = @dir/valid_epub.basename
+    FileUtils.cp valid_epub, @valid_epub
   end
 
   def teardown
@@ -57,4 +59,25 @@ class TestImplaceEditing < Test::Unit::TestCase
 
     assert_match '<title>Edited Title</title>', item.read
   end
+
+  def test_edit_without_change
+    epub = EPUB::Parser.parse(@valid_epub)
+    epub.save
+    assert_equal epub.release_identifier, EPUB::Parser.parse(@valid_epub).release_identifier
+  end
+
+  def test_specify_mtime
+    # Currently, only ArchiveZip supports this API
+    EPUB::OCF::PhysicalContainer.adapter = :ArchiveZip
+    mtime = EPUB::OCF::PhysicalContainer.mtime = Time.new(2020, 1, 1)
+    epub = EPUB::Parser.parse(@valid_epub)
+    epub.metadata.unique_identifier.content = "new-unique-identifier"
+    epub.package.save
+
+    Archive::Zip.open @valid_epub.to_path do |z|
+      z.each do |entry|
+        assert_equal mtime, entry.mtime
+      end
+    end
+  end
 end

data/test/test_maker.rb

@@ -73,7 +73,6 @@ class TestMaker < Test::Unit::TestCase
       error_message = error.message
     end
     dirname = error_message.match(/\[EPUB::Maker\].*:\s*(.+)\Z/m).captures.last
-
     assert_path_exist dirname
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epub-maker
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - KITAITI Makoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-17 00:00:00.000000000 Z
+date: 2020-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: epub-parser
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.5
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -288,7 +302,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: EPUB Maker