epub_book 0.1.27 → 0.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a433512f6b0c69b388fd5071ef442edf6e07aa0755872a61f9a03896f7dd354b
-  data.tar.gz: 6ffb8b8863f2670bc07718f98bacba13be44faab8c775737777403944f7fae5c
+  metadata.gz: b033ca4e17804742f14f6e1acfe56a76af3bc90525bfc19a521e31c86bbbf3b4
+  data.tar.gz: 0ed53b49843e6ac92122f26d9362fe55ca141a39e6b190e378ae14363de7a9b1
 SHA512:
-  metadata.gz: 13097be5e90b59a7c3d02cdb1a8eb12bf05afa01739523a279893e7c34ed44935f930064f518010fa80223db982ace912aacfbfe1c786a0ddbbf36843d0565e1
-  data.tar.gz: 0b158bd9956551cccea116ff4fa60a0455de9d2ebd2753446af102228e4693cb5e5ad5903aab9bdd157274a7bb4ad3ad631814dc885396268c3b5ebc3654d06e
+  metadata.gz: 76c1d96de6b8df5af9dee5181bd8bd4bcea4ea8a69d96ad0cce16ea3ff525f25ee37b44722c8bbd3dbfd79fb01bce521bbc9ddb2065b0aad5a4a5b1d1f350b8b
+  data.tar.gz: 5f0818cd97cfbc3971a46adcc50f871a033a4d008f38a3bbef3ef4f7b5a11c7c5d0098e91c46f7e9b29ff5e81c65309d6040d973c2df246e33126f6b0be62458

data/epub_book.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'http','~> 5.0', '>= 5.0.4'
-  spec.add_runtime_dependency 'nokogiri', '~> 1.11', '>= 1.11.4'
+  spec.add_runtime_dependency 'nokogiri', '~> 1.12', '>= 1.12.4'
   spec.add_dependency 'eeepub', '~> 0.8.1'
   spec.add_dependency 'zip-zip', '~> 0.3'
   spec.add_dependency 'mail', '~>2.7.0'

data/lib/epub_book/book.rb

@@ -126,7 +126,8 @@ module EpubBook
     def fetch_index(url=nil)
       book[:files] = []
       url ||= @index_url
-      doc = Nokogiri::HTML(judge_encoding(HTTP.headers("User-Agent" => @user_agent ,'Referer'=> @referer).get(url).to_s))
+      #doc = Nokogiri::HTML(judge_encoding(HTTP.headers("User-Agent" => @user_agent ,'Referer'=> @referer).get(url).to_s))
+      doc = Nokogiri::HTML(HTTP.headers("User-Agent" => @user_agent ,'Referer'=> @referer).get(url).to_s)
       #generate index.yml
       EpubBook.logger.info "------Fetch index--#{url}---------------"
 
@@ -134,18 +135,24 @@ module EpubBook
         doc1 = if @des_url.nil?
                  doc
                else
-                 Nokogiri::HTML(judge_encoding(HTTP.headers("User-Agent" => @user_agent ,'Referer'=> @referer).get(generate_abs_url(doc.css(@des_url).attr("href").to_s)).to_s))
+                 #Nokogiri::HTML(judge_encoding(HTTP.headers("User-Agent" => @user_agent ,'Referer'=> @referer).get(generate_abs_url(doc.css(@des_url).attr("href").to_s)).to_s))
+                 Nokogiri::HTML(HTTP.headers("User-Agent" => @user_agent ,'Referer'=> @referer).get(generate_abs_url(doc.css(@des_url).attr("href").to_s)).to_s)
                end
         get_des(doc1)
       end
 
-      #binding.pry
+      binding.pry
+      EpubBook.logger.info @index_item_css
+
       doc.css(@index_item_css).each do |item|
         _href = item.attr(@item_attr).to_s
         next if _href.start_with?('javascript') || _href.start_with?('#')
 
         _href = generate_abs_url(_href)
 
+        EpubBook.logger.info item.inspect
+        EpubBook.logger.info item.text
+
         book[:files] << {label: item.text, url: _href}
       end
 
@@ -186,7 +193,7 @@ module EpubBook
         next if test(?s,content_path)
 
         begin
-          doc_file = Nokogiri::HTML(judge_encoding(HTTP.headers("User-Agent" => @user_agent,'Referer'=> @referer).get(item[:url]).to_s))
+          doc_file = Nokogiri::HTML(HTTP.headers("User-Agent" => @user_agent,'Referer'=> @referer).get(item[:url]).to_s)
 
           EpubBook.logger.info item[:label]
           #binding.pry
@@ -198,8 +205,14 @@ module EpubBook
           else
             txt_file.write("\n\n")
             txt_file.write(item[:label])
-            txt_file.write("\n  ")
-            txt_file.write(doc_file.css(@body_css).text)
+            txt_file.write("\n")
+            doc_file.css(@body_css).children.each do |it|
+              if it.name == 'text'
+                txt_file.write(it.text)
+                txt_file.write("\n")
+              end
+            end
+            #txt_file.write(doc_file.css(@body_css).text)
           end
         rescue  Exception => e
           EpubBook.logger.info "Error:#{e.message},#{item.inspect}"

data/lib/epub_book/version.rb

@@ -1,3 +1,3 @@
 module EpubBook
-  VERSION = "0.1.27"
+  VERSION = "0.1.30"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epub_book
 version: !ruby/object:Gem::Version
-  version: 0.1.27
+  version: 0.1.30
 platform: ruby
 authors:
 - qmliu
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-09 00:00:00.000000000 Z
+date: 2022-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -36,20 +36,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.12'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.4
+        version: 1.12.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.12'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.4
+        version: 1.12.4
 - !ruby/object:Gem::Dependency
   name: eeepub
   requirement: !ruby/object:Gem::Requirement