epub-maker 0.1.8 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b26628c4a7d89e94b8e25bc92d7013aae3f6425a93b2b8af0797e47d4a658a7
-  data.tar.gz: bc67628100b42657aa0bfe5fa380051a46e17e2a20474c8bd0534afd11eeaf81
+  metadata.gz: 8db2f63b56d79949a6fbeb34d4a18d17179d7eafd79b140eecee4ec863811bea
+  data.tar.gz: 3c06d5c127dfe80c35e0e023a6143070d68285df5d41e49c05c72b14c78a6afa
 SHA512:
-  metadata.gz: d74593cad469b3d3acd0be9542536cbca6ca4e31376bf4536ec87737d44c924dce582b71091d6a9b5ad3e2743a48869f65a38fced547bbf0bc1a2a6d96acfcc6
-  data.tar.gz: e0d2cdcac5d58ea1bac5f495434dfe35b1bb78720e084823de14e0814c4739961a20b2a45765fdc29e6ca2304d7762d4edb5a42a54b9c3a7661a68521a9fd308
+  metadata.gz: 8cde226fa77ce56db13f1b43b13e4b804d1bcea44fc98edeaab0f96cefeaccf5af749d37a90bca3ef6cc35fb98fab197a07133a5f62a68cc2f55f97f87fa6dd2
+  data.tar.gz: 376e3f6f5c8df3a28005a5e365930f595bb12a1233a6159519eac32ba7966caff8f99c7510e46ffbb57e24ed52de3f34128faacf5c9ee0066f6bb0c5eeea55f2

data/.gitlab-ci.yml

@@ -3,20 +3,9 @@ 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.6:
-  image: ruby:2.6
-  script: bundle exec rake test
-  except:
-    - tags
-  cache:
-    key: ruby:2.6
-    paths:
-      - deps
-
 test:2.7:
   image: ruby:2.7
   script: bundle exec rake test
@@ -56,3 +45,23 @@ test:3.2:
     key: ruby:3.2
     paths:
       - deps
+
+test:3.3:
+  image: ruby:3.3
+  script: bundle exec rake test
+  except:
+    - tags
+  cache:
+    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.2.0
+-----
+
+* Update dependent Archive::Zip version to 0.13.0
+
+0.1.9
+-----
+
+* Fix output of package@prefix
+
 0.1.8
 -----
 

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,14 @@ Todo
 
 Recent Changes
 --------------
+### 0.2.0
+
+* Update dependent Archive::Zip version to 0.13.0
+
+### 0.1.9
+
+* Fix output of package@prefix
+
 ### 0.1.8
 
 * Add adapter for Rubyzip

data/epub-maker.gemspec

@@ -22,13 +22,13 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'epub-parser', '>= 0.4.8'
   gem.add_runtime_dependency 'mimemagic'
-  gem.add_runtime_dependency 'archive-zip'
+  gem.add_runtime_dependency 'archive-zip', ">= 0.13.0"
   gem.add_runtime_dependency 'rake'
   gem.add_runtime_dependency 'addressable', '>= 2.3.5'
   gem.add_runtime_dependency 'rexml'
   gem.add_runtime_dependency "nokogiri"
 
-  gem.add_development_dependency 'zipruby' unless RUBY_PLATFORM.match /mingw|arm64-darwin/
+  gem.add_development_dependency 'zipruby'
   gem.add_development_dependency 'rubyzip'
   gem.add_development_dependency 'test-unit'
   gem.add_development_dependency 'test-unit-notify'

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

@@ -8,31 +8,27 @@ module EPUB
         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|
-              ::File.open tmp_archive_path, 'w' do |archive_out|
-                archive_out.binmode
-                Archive::Zip.open archive_in, :r do |z_in|
-                  Archive::Zip.open archive_out, :w do |z_out|
-                    updated = false
-                    z_in.each do |entry|
-                      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
+            Archive::Zip.open @container_path, :r do |z_in|
+              Archive::Zip.open tmp_archive_path, :w do |z_out|
+                updated = false
+                z_in.each do |entry|
+                  if entry.zip_path == path_name.force_encoding('ASCII-8BIT')
+                    entry = entry.dup
+                    entry.file_data = IO::LikeHelpers::IOWrapper.new(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 = IO::LikeHelpers::IOWrapper.new(StringIO.new(content))
+                  if mtime
+                    entry.mtime = mtime
+                  end
+                  z_out << entry
                 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.write(path_name, content)}
+            open {|container| container.write(path_name, content, mtime: mtime)}
           end
         end
       end

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.8"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: epub-maker
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors:
 - KITAITI Makoto
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-22 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: epub-parser
@@ -44,14 +43,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +107,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: zipruby
+  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: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -283,7 +296,6 @@ files:
 homepage: http://www.rubydoc.info/gems/epub-maker
 licenses: []
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -298,8 +310,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: EPUB Maker
 test_files: