epub_book 0.1.22 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe0acde1dee44a1b78b5919f5918b9251046dc77d99845b8e7f30b7727bb9bdb
-  data.tar.gz: 10ba271cdac6b7afe9b79dd874c3a373e0e97c115f6e1b9c642d73aa517ee093
+  metadata.gz: 638d65f8185c019abc488c48ce088ef93680cf34725b95ad9be3a28ffae48847
+  data.tar.gz: 919c6c35bf22b80c085bb33655f44aa2ca594ea416d57dd7b9157c622acde718
 SHA512:
-  metadata.gz: f8afdb3e0e9ed70782894c00207afa174b97d4792ad67235f15f0d0a193e1278cdca97fd7081dcefb4db131a0af16c3ce4f7f092bec3fb31e56e0abffecde430
-  data.tar.gz: 80a46d793b3d69e4f19154c07202e77197bf2f08cdd1cdf23c207cd6122d6a6b46c4df850e0676d2b099e32e8d48542da1f5cd4e4d4f475022f540fc81a19940
+  metadata.gz: e58ff84b46ac2830fa900b867ccdf4c68087e770bd9cab61a4604987ad4d7007ba282522eba0a93c0bd40c1d4d5cd9ee8ff3dc90193ae9576924ba480e527384
+  data.tar.gz: e6c23da564154fa17f77d7cc21fe63fd7bddfb3059423b14837a0455acafccc6efc9183dc839a6cccf636366bf3abb832b85f6c73f6d5d87046a490db4ac3914

data/epub_book.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'http','~> 2.1'
+  spec.add_dependency 'http','~> 5.0', '>= 5.0.4'
   spec.add_runtime_dependency 'nokogiri', '~> 1.11', '>= 1.11.4'
   spec.add_dependency 'eeepub', '~> 0.8.1'
   spec.add_dependency 'zip-zip', '~> 0.3'
@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
 
 
   spec.add_development_dependency 'bundler', '~> 2.2', '>= 2.2.27'
-  spec.add_development_dependency "rake",  '~> 12.3','>= 12.3.3'
+  spec.add_development_dependency "rake",  '~> 13.0','>= 13.0.6'
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry", '~> 0.14', '>= 0.14.1'
   spec.add_development_dependency "pry-byebug", '~> 3.8', '>= 3.8.0'

data/lib/epub_book/book.rb

@@ -17,7 +17,7 @@ require 'yaml'
 #referer 访问原地址
 #creator 责任人
 #ext_name 扩展名 epub,txt
-
+#ignore_txt 忽略字符，带有ignore_txt的行将被删除
 module EpubBook
   class Book
     UserAgent = "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.116 Safari/537.36"
@@ -212,7 +212,7 @@ module EpubBook
         EpubBook.logger.info "=============去除包含指定忽略字符的行======="
         EpubBook.logger.info ignore_txt
         if ignore_txt
-          system("sed -i 's/#{ignore_txt}//' #{book[:file_abs_name]}")
+          system("sed -i -r '/#{ignore_txt}/d' #{book[:file_abs_name]}")
         end
 
       end
@@ -224,8 +224,10 @@ module EpubBook
     #is valid encoding
     def judge_encoding(str)
       EpubBook.logger.info str.encoding
-      /<meta.*?charset\s*=[\s\"\']?utf-8/i =~ str ? str : str.force_encoding('gbk').encode!('utf-8',invalid: :replace, undef: :replace)
-      str.scrub! unless str.valid_encoding?
+      #/<meta.*?charset\s*=[\s\"\']?utf-8/i =~ str ? str : str.force_encoding('gbk').encode!('utf-8',invalid: :replace, undef: :replace)
+
+      str.scrub('')! unless str.valid_encoding?
+      str.encode!('utf-8') if str.encoding.name != 'UTF-8'
 
       EpubBook.logger.info "-------encode 后 #{str.encoding}"
       str

data/lib/epub_book/version.rb

@@ -1,3 +1,3 @@
 module EpubBook
-  VERSION = "0.1.22"
+  VERSION = "0.1.25"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epub_book
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.25
 platform: ruby
 authors:
 - qmliu
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-15 00:00:00.000000000 Z
+date: 2022-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '5.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '5.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.4
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -112,20 +118,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement