epub-maker 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e50c70b73d483a46da5bb6110e0159c311a3ac2a9c1d30a02f9cb28bde5b512
-  data.tar.gz: be7576c82dda592b0e0296b14b648594c510f122ad125a7b3302bce5d6448d25
+  metadata.gz: fcad7a4dc57d3cc9b39f9f591d602b9c4fa8e6f381d4e862b90ebe677f10b66e
+  data.tar.gz: da11245d3ced514dc3bb70db1a6735ecf7fcf061a94ff23bafdb095bc92baee6
 SHA512:
-  metadata.gz: 0a37e50046f9fc4dd1054b0d21e4a422548d1847a43f89bd6b49133864fa40852909f1f2555a3519cf77807eb169856fa6fe1a2b8705009bd5748b38dfd0431b
-  data.tar.gz: 6cbb1058962c23db192085603a4cf47865271a4d8ab3ef79cd543de90a67948b0b98c39512392bae3f4e492df05945cd823018795615c371c133e983fb88793d
+  metadata.gz: 714e40d064f8207b25f26bc822c856746890f61022622837052008d370cab5d60134af41f9eac8deea1365906994b8089df31e491f1502a3ac2c6eb72b657cf5
+  data.tar.gz: 9807fbf0009d259e909dd967651921626a888b8f04fa0df22db07efa85eee436e60a6a571443245c216df35ffe49631de09f9373c514e0090db2fa9a81ea754f

data/.gitlab-ci.yml

@@ -3,66 +3,75 @@ before_script:
   - which ruby
   - apt -qq update -y
   - apt -qq install -y default-jre
-  - gem install bundler --no-document
   - bundle install --jobs=$(nproc) --path=deps --quiet
   - bundle clean
 
-test:2.3:
-  image: ruby:2.3
+test:2.6:
+  image: ruby:2.6
   script: bundle exec rake test
   except:
     - tags
   cache:
-    key: ruby:2.3
+    key: ruby:2.6
     paths:
       - deps
 
-test:2.4:
-  image: ruby:2.4
+test:2.7:
+  image: ruby:2.7
   script: bundle exec rake test
   except:
     - tags
   cache:
-    key: ruby:2.4
+    key: ruby:2.7
     paths:
       - deps
 
-test:2.5:
-  image: ruby:2.5
+test:3.0:
+  image: ruby:3.0
   script: bundle exec rake test
   except:
     - tags
   cache:
-    key: ruby:2.5
+    key: ruby:3.0
     paths:
       - deps
 
-test:2.6:
-  image: ruby:2.6
+test:3.1:
+  image: ruby:3.1
   script: bundle exec rake test
   except:
     - tags
   cache:
-    key: ruby:2.6
+    key: ruby:3.1
     paths:
       - deps
 
-test:2.7:
-  image: ruby:2.7
+test:3.2:
+  image: ruby:3.2
   script: bundle exec rake test
   except:
     - tags
   cache:
-    key: ruby:2.7
+    key: ruby:3.2
     paths:
       - deps
 
-test:3.0:
-  image: ruby:3.0-rc
+test:3.3:
+  image: ruby:3.3
   script: bundle exec rake test
   except:
     - tags
   cache:
-    key: ruby:3.0
+    key: ruby:3.3
+    paths:
+      - deps
+
+test:3.4:
+  image: ruby:3.4
+  script: bundle exec rake test
+  except:
+    - tags
+  cache:
+    key: ruby:3.4
     paths:
       - deps

data/CHANGELOG.markdown

@@ -1,3 +1,13 @@
+0.1.9
+-----
+
+* Fix output of package@prefix
+
+0.1.8
+-----
+
+* Add adapter for Rubyzip
+
 0.1.7
 -----
 

data/Gemfile

@@ -1,8 +1,8 @@
 source 'https://rubygems.org'
 
-if ENV['EDGE_PARSER'] == '1'
+if ENV["EPUB_PARSER_PATH"]
   group :development do
-    gem 'epub-parser', path: '../epub-parser'
+    gem 'epub-parser', path: ENV["EPUB_PARSER_PATH"]
   end
 end
 

data/README.markdown

@@ -177,6 +177,13 @@ Todo
 
 Recent Changes
 --------------
+### 0.1.9
+
+* Fix output of package@prefix
+
+### 0.1.8
+
+* Add adapter for Rubyzip
 
 ### 0.1.7
 
@@ -186,16 +193,6 @@ Recent Changes
 
 * [BUG FIX]Add `mtime` keyword argument to `OCF::PhysicalContainer::Zipruby#write`
 
-### 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 `Publication::Package::Metadata#modified=` method
-* Rescue Errno::EXDEV on renaming temporary EPUB file
-
 Contributing
 ------------
 

data/epub-maker.gemspec

@@ -20,7 +20,7 @@ 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'
@@ -29,6 +29,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "nokogiri"
 
   gem.add_development_dependency 'zipruby'
+  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, mtime: mtime)}
           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/publication.rb

@@ -14,10 +14,10 @@ module EPUB
             'unique-identifier' => unique_identifier.id
           }
           [
-           ['dir', dir],
-           ['id', id],
-           ['xml:lang', xml_lang],
-           ['prefix', prefix.reduce('') {|attr, (pfx, iri)| [attr, [pfx, iri].join(':')].join(' ')}]
+            ['dir', dir],
+            ['id', id],
+            ['xml:lang', xml_lang],
+            ['prefix', prefix.collect {|pfx, iri| [pfx, iri].join(": ")}.join("\n")]
           ].each do |(name, value)|
             next if value.nil? or value.empty?
             attrs[name] = value

data/lib/epub/maker/version.rb

@@ -1,5 +1,5 @@
 module EPUB
   module Maker
-    VERSION = "0.1.7"
+    VERSION = "0.1.9"
   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,13 @@
 --- !ruby/object:Gem::Specification
 name: epub-maker
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - KITAITI Makoto
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-26 00:00:00.000000000 Z
+date: 2025-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: epub-parser
@@ -16,14 +15,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
@@ -122,6 +121,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -257,6 +270,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
@@ -282,7 +296,6 @@ files:
 homepage: http://www.rubydoc.info/gems/epub-maker
 licenses: []
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -297,8 +310,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
-signing_key: 
+rubygems_version: 3.6.5
 specification_version: 4
 summary: EPUB Maker
 test_files: