epub-parser 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5267c2c665a4fd1fe119e59ed905fdafee49e4f68f063750d80260424ef26ccc
-  data.tar.gz: 3d79ee849a6a7da2e0ac424e6aa5ef272beda4544af29e909f432fabb0f7d402
+  metadata.gz: 33ec17f68d55ead850d39f0df0ec73f0d9cda4901cdc4ee83612ebd95c0b1927
+  data.tar.gz: 580741918f923319e665203b8334725e48afb1c69bdb2fe7ca412cefed3477d6
 SHA512:
-  metadata.gz: eda5efdf8d48603ffe69b135011bbd8156d1dff9c78794971d2250162069d5e1b18f0ff579d7324511656df26e0202302c1ce991421eee0c286ad8c6104b6f92
-  data.tar.gz: 7f73b72cb0b7b7fc77c783ce643bd58fc99cf2644497c8eced82f002c412825025a1515a923f6b8a7bd7b7a4d76bc6335c5d520fa0176313cef9daa61529d400
+  metadata.gz: 7683c526bc654bf55556db4d2be9efeccebc25ad29524ab14f264c85513649c0741b6b281eaa100e0cdbf93706ab1115ffca4522408299964cf1ef36136bc3be
+  data.tar.gz: 7522670e7f7126a33a1ea19a89577382b5f25d0555974cf1b014184d30a44be5a475467b95772f2d5386ac76f2ab4fc6720cea91f68c7ae07e562a1c3229e186

data/.gitlab-ci.yml

@@ -5,66 +5,53 @@ before_script:
   - bundle install --jobs=$(nproc) --path=deps "${FLAGS[@]}"
   - bundle clean
 
-test:2.3:
-  image: ruby:2.3
+test:2.6:
+  image: ruby:2.6
   script: bundle exec rake test XML_BACKEND=REXML 2>/dev/null && bundle exec rake test XML_BACKEND=Oga 2>/dev/null && bundle exec rake test XML_BACKEND=Nokogiri 2>/dev/null
   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 XML_BACKEND=REXML 2>/dev/null && bundle exec rake test XML_BACKEND=Oga 2>/dev/null && bundle exec rake test XML_BACKEND=Nokogiri 2>/dev/null
   except:
     - tags
   cache:
-    key: ruby:2.4
-    paths:
-      - deps
-
-test:2.5:
-  image: ruby:2.5
-  script: bundle exec rake test XML_BACKEND=REXML 2>/dev/null && bundle exec rake test XML_BACKEND=Oga 2>/dev/null && bundle exec rake test XML_BACKEND=Nokogiri 2>/dev/null
-  except:
-    - tags
-  artifacts:
-    paths:
-      - coverage
-  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 XML_BACKEND=REXML 2>/dev/null && bundle exec rake test XML_BACKEND=Oga 2>/dev/null && bundle exec rake test XML_BACKEND=Nokogiri 2>/dev/null
   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 XML_BACKEND=REXML 2>/dev/null && bundle exec rake test XML_BACKEND=Oga 2>/dev/null && bundle exec rake test XML_BACKEND=Nokogiri 2>/dev/null
   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 XML_BACKEND=REXML 2>/dev/null && bundle exec rake test XML_BACKEND=Oga 2>/dev/null && bundle exec rake test XML_BACKEND=Nokogiri 2>/dev/null
   except:
     - tags
   cache:
-    key: ruby:3.0
+    key: ruby:3.2
     paths:
       - deps
 

data/CHANGELOG.adoc

@@ -1,5 +1,9 @@
 = CHANGELOG
 
+== 0.4.8
+
+* Add Rubyzip adapter
+
 == 0.4.7
 
 * [BUG FIX]Fix a bug that epubinfo doesn't handle navigation properly

data/README.adoc

@@ -176,6 +176,10 @@ If you find other gems, please tell me or request a pull request.
 
 == RECENT CHANGES
 
+=== 0.4.8
+
+* Add Rubyzip adapter
+
 === 0.4.7
 
 * [BUG FIX]Fix a bug that epubinfo doesn't handle navigation properly
@@ -186,26 +190,6 @@ If you find other gems, please tell me or request a pull request.
 * Tiny modifcation on Zip archive manipulation
 * Remove version specification from Nokogiri to migrate to Ruby 3.1
 
-=== 0.4.5
-
-* [BUG FIX]Handle the case EPUB path is a Pathname
-
-=== 0.4.4
-
-* [BUG FIX]Fix navigation type check bug
-* Add feature to show navigations to `epubinfo` command-line tool
-
-=== 0.4.3
-
-* Encode file name passed from file system on Unix
-
-=== 0.4.2
-
-* [BUG FIX]Fix a bug that epub-cover refers out of scope variable
-
-* [BUG FIX]Fix a bug that `epubinfo` command with `--words` or `--chars` option causes load error if there is not Nokogiri in environment
-* [BUG FIX]Fix a bug that REXML::Element#content ignores descendant nodes
-
 See {file:CHANGELOG.adoc} for older changelogs and details.
 
 == TODOS

data/epub-parser.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rubygems-tasks'
   s.add_development_dependency 'zipruby' unless RUBY_PLATFORM.match /mingw|arm64-darwin/
+  s.add_development_dependency 'rubyzip', '>= 3.0.0.alpha'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'pry-doc'
   s.add_development_dependency 'test-unit'

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

@@ -0,0 +1,38 @@
+require "zip"
+
+module EPUB
+  class OCF
+    class PhysicalContainer
+      class Rubyzip < self
+        def open
+          orig_encoding = Zip.force_entry_names_encoding
+          begin
+            Zip.force_entry_names_encoding = "UTF-8"
+            Zip::File.open @container_path do |archive|
+              @monitor.synchronize do
+                @archive = archive
+                begin
+                  yield self
+                ensure
+                  @archive = nil
+                end
+              end
+            end
+          ensure
+            Zip.force_entry_names_encoding = orig_encoding
+          end
+        end
+
+        def read(path_name)
+          if @archive
+            @archive.read(path_name)
+          else
+            open {|container| container.read(path_name)}
+          end
+        rescue Errno::ENOENT => error
+          raise NoEntry.from_error(error)
+        end
+      end
+    end
+  end
+end

data/lib/epub/parser/version.rb

@@ -1,5 +1,5 @@
 module EPUB
   class Parser
-    VERSION = "0.4.7"
+    VERSION = "0.4.8"
   end
 end

data/test/test_ocf_physical_container.rb

@@ -86,6 +86,17 @@ class TestOCFPhysicalContainer < Test::Unit::TestCase
     end
   end
 
+  require "epub/ocf/physical_container/rubyzip"
+  class TestRubyzip < self
+    include ConcreteContainer
+
+    def setup
+      super
+      @class = EPUB::OCF::PhysicalContainer::Rubyzip
+      @container = @class.new(@container_path)
+    end
+  end
+
   class TestUnpackedURI < self
     def setup
       super

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epub-parser
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - KITAITI Makoto
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-19 00:00:00.000000000 Z
+date: 2023-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -38,6 +38,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: 3.0.0.alpha
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0.alpha
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -378,6 +392,7 @@ files:
 - lib/epub/ocf/metadata.rb
 - lib/epub/ocf/physical_container.rb
 - lib/epub/ocf/physical_container/archive_zip.rb
+- lib/epub/ocf/physical_container/rubyzip.rb
 - lib/epub/ocf/physical_container/unpacked_directory.rb
 - lib/epub/ocf/physical_container/unpacked_uri.rb
 - lib/epub/ocf/physical_container/zipruby.rb
@@ -460,7 +475,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.21
+rubygems_version: 3.4.22
 signing_key:
 specification_version: 4
 summary: EPUB 3 Parser