epub-parser 0.4.9 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 399a60256947a87d2dc3ada4b348cffeb99ac9d3ed9dcbe5159b4d6ca02d1dff
-  data.tar.gz: f9ed100e463cc3a60071b7074ebc4a6dd141fac397762697b39b549bb13025f9
+  metadata.gz: ae67229ef10676e051fcac1f01f8c96bdfba667cc36c53584475795f3b9dbd82
+  data.tar.gz: 798548f2139eb8a807b95cabab3478a1d477b50ee3511d923f3f6a00b343d559
 SHA512:
-  metadata.gz: 3f320d4d2ed30d1d2b65db4bf67f4c66dfb4aea66911bd2de9b1b6b8d93e1caa093f4c4cf9c1d595d81744633c4333f5e126c0ae3f6573d9b7fb9c3702987bf3
-  data.tar.gz: 95cf359e907036d9f4046c4eb7c1bc8eec577c3c78ef31629cae8b9cfd3b8f8c81190ac18b7d639918ccaabc054ca2c5dcddf7f05733c2e05f7b9170463e9bbd
+  metadata.gz: eb2a311ed69638f05b5d6e9e553e284825ee5bf48db54b0cec418042c221298c1e1c15f070aecd334b2ea6ddcdff8f351b8c190ffa59379fc84a4c00874d986d
+  data.tar.gz: 67c0e4e3eaaae19b2bcdb9d7e0f2fb93b0f9f0410ff36ddd47d1f8b2ea56ec509121226217ec46c96cc1ed122eba5eb310e3544cc573e920121c4b45c6bf9c93

data/.gitlab-ci.yml

@@ -1,76 +1,36 @@
 before_script:
+  - apt update -y && apt install -y clang
+  - curl https://sh.rustup.rs -sSf | sh -s -- -y
+  - . "$HOME/.cargo/env"
   - ruby -v
   - which ruby
-  - bundle install --jobs=$(nproc) --path=deps "${FLAGS[@]}"
+  - bundle config --local build.zipruby "--with-zlib-include=/usr/include --with-cflags='-Wno-error=implicit-function-declaration -Wno-error=implicit-int -Wno-error=incompatible-pointer-types'"
+  - bundle install --jobs=$(nproc) --path=deps "${FLAGS[@]}" || (cat deps/ruby/3.4.0/extensions/x86_64-linux/3.4.0/zipruby-*/mkmf.log && exit 1)
   - bundle clean
 
-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.7
-    paths:
-      - deps
-
-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:3.0
-    paths:
-      - deps
-
-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:3.1
-    paths:
-      - deps
-
-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.2
-    paths:
-      - deps
-
-test:3.3:
-  image: ruby:3.3
-  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.3
-    paths:
-      - deps
-
-test:3.4:
-  image: ruby:3.4
-  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
+test:
+  image: ruby:$RUBY_VERSION
+  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.4
+    key: ruby:$RUBY_VERSION
     paths:
       - deps
+  parallel:
+    matrix:
+      - RUBY_VERSION: ["3.1", "3.2", "3.3", "3.4"]
 
 pages:
   stage: deploy
   image: ruby:3.4
   dependencies:
-    - test:3.4
+    - test
   script:
-    - bundle exec rake test doc:yard
+    - bundle exec rake test:test doc:yard
     - mv doc public
     - mv coverage public/
   artifacts:

data/CHANGELOG.adoc

@@ -1,5 +1,9 @@
 = CHANGELOG
 
+== 0.5.0
+
+* Add RuZip adapter
+
 == 0.4.9
 
 * Restructure test

data/README.adoc

@@ -176,6 +176,10 @@ If you find other gems, please tell me or request a pull request.
 
 == RECENT CHANGES
 
+=== 0.5.0
+
+* Add RuZip adapter
+
 === 0.4.9
 
 * Restructure test
@@ -188,10 +192,6 @@ If you find other gems, please tell me or request a pull request.
 
 * Add Rubyzip adapter
 
-=== 0.4.7
-
-* [BUG FIX]Fix a bug that epubinfo doesn't handle navigation properly
-
 See {file:CHANGELOG.adoc} for older changelogs and details.
 
 == TODOS

data/Rakefile

@@ -4,4 +4,3 @@ require 'rubygems/tasks'
 task :default => :test
 
 Gem::Tasks.new
-task :build => :clean

data/epub-parser.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rubygems-tasks'
   s.add_development_dependency 'zipruby'
   s.add_development_dependency 'rubyzip', '>= 2.0.0'
+  s.add_development_dependency "ruzip"
   s.add_development_dependency 'test-unit'
   s.add_development_dependency 'test-unit-rr'
   s.add_development_dependency 'test-unit-notify'
@@ -43,7 +44,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'packnga'
   s.add_development_dependency "steep"
 
-  s.add_runtime_dependency 'archive-zip'
+  s.add_runtime_dependency 'archive-zip', ">= 0.13.0"
   s.add_runtime_dependency 'rexml'
   s.add_runtime_dependency 'addressable', '>= 2.3.5'
   s.add_runtime_dependency 'rchardet', '>= 1.6.1'

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

@@ -0,0 +1,31 @@
+require "ruzip"
+
+module EPUB
+  class OCF
+    class PhysicalContainer
+      class RuZip < self
+        def open
+          @monitor.synchronize do
+            @archive = ::RuZip::Archive.new(@container_path)
+            begin
+              yield self
+            ensure
+              @archive = nil
+            end
+          end
+        end
+
+        def read(path_name)
+          if @archive
+            file = @archive.by_name(path_name)
+            raise NoEntry.new(path_name) unless file
+
+            file.read
+          else
+            open {|container| container.read(path_name)}
+          end
+        end
+      end
+    end
+  end
+end

data/lib/epub/ocf/physical_container.rb

@@ -21,8 +21,8 @@ module EPUB
       class << self
         def find_adapter(adapter)
           return adapter if adapter.instance_of? Class
-          if adapter == :Zipruby && ! const_defined?(adapter)
-            require 'epub/ocf/physical_container/zipruby'
+          if (adapter == :Zipruby || adapter == :RuZip) && ! const_defined?(adapter)
+            require "epub/ocf/physical_container/#{adapter.downcase}"
           end
           const_get adapter
         end

data/lib/epub/parser/version.rb

@@ -1,5 +1,5 @@
 module EPUB
   class Parser
-    VERSION = "0.4.9"
+    VERSION = "0.5.0"
   end
 end

data/test/test_ocf_physical_container.rb

@@ -1,5 +1,6 @@
 # coding: utf-8
 require_relative "test_ocf_physical_container_base"
+require "epub/ocf/physical_container/ruzip"
 
 class TestOCFPhysicalContainer < TestOCFPhysicalContainerBase
   def test_read
@@ -34,6 +35,16 @@ class TestOCFPhysicalContainer < TestOCFPhysicalContainerBase
     end
   end
 
+  class TestRuZip < self
+    include ConcreteContainer
+
+    def setup
+      super
+      @class = EPUB::OCF::PhysicalContainer::RuZip
+      @container = @class.new(@container_path)
+    end
+  end
+
   class TestUnpackedURI < self
     def setup
       super

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: epub-parser
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.5.0
 platform: ruby
 authors:
 - KITAITI Makoto
@@ -65,6 +65,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: ruzip
+  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
@@ -253,14 +267,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: rexml
   requirement: !ruby/object:Gem::Requirement
@@ -378,6 +392,7 @@ files:
 - 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/ruzip.rb
 - lib/epub/ocf/physical_container/unpacked_directory.rb
 - lib/epub/ocf/physical_container/unpacked_uri.rb
 - lib/epub/ocf/physical_container/zipruby.rb
@@ -465,7 +480,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.7.2
 specification_version: 4
 summary: EPUB 3 Parser
 test_files: