epub-maker 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb15b719ce1526ed7cc33d12ca8da5fbd58664a3baedfd72b8f8363795584825
-  data.tar.gz: 3c493a4f38d30554736e8d752bdbd43414d261081bfe99717004664b50b94d1e
+  metadata.gz: 1b26628c4a7d89e94b8e25bc92d7013aae3f6425a93b2b8af0797e47d4a658a7
+  data.tar.gz: bc67628100b42657aa0bfe5fa380051a46e17e2a20474c8bd0534afd11eeaf81
 SHA512:
-  metadata.gz: d9386a7a043b34f1dcd91e1bffeef3463b7c0bbb106b133619b18a51fbf053c65285817fb5deb3c0f07e25c5074fbff401fbcb51458b9531c8a6f0b6e65b43cd
-  data.tar.gz: bc385ddb0e1a3115c1a5e3039d6638fee5924345a0a3d13e34ae8935ba62c39d4f5b77528816f9c9be7690e47fd2582194019f6f4b9f1e8f43b434375b834a11
+  metadata.gz: d74593cad469b3d3acd0be9542536cbca6ca4e31376bf4536ec87737d44c924dce582b71091d6a9b5ad3e2743a48869f65a38fced547bbf0bc1a2a6d96acfcc6
+  data.tar.gz: e0d2cdcac5d58ea1bac5f495434dfe35b1bb78720e084823de14e0814c4739961a20b2a45765fdc29e6ca2304d7762d4edb5a42a54b9c3a7661a68521a9fd308

data/.gitlab-ci.yml

@@ -7,62 +7,52 @@ before_script:
   - bundle install --jobs=$(nproc) --path=deps --quiet
   - bundle clean
 
-test:2.3:
-  image: ruby:2.3
-  script: bundle exec rake test
-  except:
-    - tags
-  cache:
-    key: ruby:2.3
-    paths:
-      - deps
-
-test:2.4:
-  image: ruby:2.4
+test:2.6:
+  image: ruby:2.6
   script: bundle exec rake test
   except:
     - tags
   cache:
-    key: ruby:2.4
+    key: ruby:2.6
     paths:
       - deps
 
-test:2.5:
-  image: ruby:2.5
+test:2.7:
+  image: ruby:2.7
   script: bundle exec rake test
   except:
     - tags
   cache:
-    key: ruby:2.5
+    key: ruby:2.7
     paths:
       - deps
 
-test:2.6:
-  image: ruby:2.6
+test:3.0:
+  image: ruby:3.0
   script: bundle exec rake test
   except:
     - tags
   cache:
-    key: ruby:2.6
+    key: ruby:3.0
     paths:
       - deps
 
-test:2.7:
-  image: ruby:2.7
+test:3.1:
+  image: ruby:3.1
   script: bundle exec rake test
   except:
     - tags
   cache:
-    key: ruby:2.7
+    key: ruby:3.1
     paths:
       - deps
 
-test:3.0:
-  image: ruby:3.0-rc
+test:3.2:
+  image: ruby:3.2
   script: bundle exec rake test
   except:
     - tags
   cache:
-    key: ruby:3.0
+    key: ruby:3.2
     paths:
       - deps

data/CHANGELOG.markdown

@@ -1,3 +1,13 @@
+0.1.8
+-----
+
+* Add adapter for Rubyzip
+
+0.1.7
+-----
+
+* Remove version specification from Nokogiri to migrate to Ruby 3.1
+
 0.1.6
 -----
 

data/README.markdown

@@ -177,20 +177,17 @@ Todo
 
 Recent Changes
 --------------
+### 0.1.8
 
-### 0.1.6
-
-* [BUG FIX]Add `mtime` keyword argument to `OCF::PhysicalContainer::Zipruby#write`
+* Add adapter for Rubyzip
 
-### 0.1.5
+### 0.1.7
 
-* [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
+* Remove version specification from Nokogiri to migrate to Ruby 3.1
 
-### 0.1.4
+### 0.1.6
 
-* Add `Publication::Package::Metadata#modified=` method
-* Rescue Errno::EXDEV on renaming temporary EPUB file
+* [BUG FIX]Add `mtime` keyword argument to `OCF::PhysicalContainer::Zipruby#write`
 
 Contributing
 ------------

data/epub-maker.gemspec

@@ -20,15 +20,16 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.required_ruby_version = '>= 2.2.0'
 
-  gem.add_runtime_dependency 'epub-parser', '>= 0.2.6'
+  gem.add_runtime_dependency 'epub-parser', '>= 0.4.8'
   gem.add_runtime_dependency 'mimemagic'
   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_runtime_dependency "nokogiri"
 
-  gem.add_development_dependency 'zipruby'
+  gem.add_development_dependency 'zipruby' unless RUBY_PLATFORM.match /mingw|arm64-darwin/
+  gem.add_development_dependency 'rubyzip'
   gem.add_development_dependency 'test-unit'
   gem.add_development_dependency 'test-unit-notify'
   gem.add_development_dependency 'epubcheck-ruby'

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

@@ -0,0 +1,19 @@
+require "epub/ocf/physical_container/rubyzip"
+
+module EPUB
+  class OCF
+    class PhysicalContainer
+      class Rubyzip < self
+        def write(path_name, content, mtime: nil)
+          if @archive
+            @archive.remove path_name
+            @archive.get_output_stream(path_name, nil, nil, nil, nil, nil, nil, nil, mtime) {|f| f.write content}
+            @archive.commit
+          else
+            open {|container| container.write(path_name, content, mtime: mtime)}
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,7 +8,7 @@ module EPUB
           if @archive
             @archive.add_or_replace_buffer path_name, content
           else
-            open {|container| container.save(path_name, content)}
+            open {|container| container.write(path_name, content)}
           end
         end
       end

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

@@ -2,7 +2,8 @@ require 'tmpdir'
 require 'epub/ocf/physical_container'
 [
   [:ArchiveZip, 'archive_zip'],
-  [:Zipruby, 'zipruby']
+  [:Zipruby, 'zipruby'],
+  [:Rubyzip, 'rubyzip']
 ].each do |(class_name, feature_name)|
   if EPUB::OCF::PhysicalContainer.const_defined? class_name
     require "epub/maker/ocf/physical_container/#{feature_name}"

data/lib/epub/maker/version.rb

@@ -1,5 +1,5 @@
 module EPUB
   module Maker
-    VERSION = "0.1.6"
+    VERSION = "0.1.8"
   end
 end

data/test/fixtures/book/OPS/nav.xhtml

@@ -7,7 +7,6 @@
     <div>
       <nav epub:type="toc" id="idid">
         <hgroup>
-          <h2>Sub Navigation</h2>
           <h1>Table of Contents</h1>
         </hgroup>
         <ol>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epub-maker
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - KITAITI Makoto
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-30 00:00:00.000000000 Z
+date: 2023-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: epub-parser
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.4.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.4.8
 - !ruby/object:Gem::Dependency
   name: mimemagic
   requirement: !ruby/object:Gem::Requirement
@@ -100,22 +100,16 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: zipruby
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -263,6 +257,7 @@ files:
 - lib/epub/maker/ocf.rb
 - lib/epub/maker/ocf/physical_container.rb
 - lib/epub/maker/ocf/physical_container/archive_zip.rb
+- lib/epub/maker/ocf/physical_container/rubyzip.rb
 - lib/epub/maker/ocf/physical_container/zipruby.rb
 - lib/epub/maker/publication.rb
 - lib/epub/maker/task.rb
@@ -288,7 +283,7 @@ files:
 homepage: http://www.rubydoc.info/gems/epub-maker
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -303,8 +298,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
-signing_key: 
+rubygems_version: 3.4.22
+signing_key:
 specification_version: 4
 summary: EPUB Maker
 test_files: