epub_book 0.1.29 → 0.1.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10adea71e28883b5d5f9b6ca8f552637610583879338cc9258cfcfc087d41c1a
-  data.tar.gz: f241723275f5d139f4e202f025cd4ed37701c0268cf9a2f030368824472585d7
+  metadata.gz: 0b0f6cc5fbf1059d26d9fb9268e23bb13c2d9c1b1ab83147c007c14e4566708d
+  data.tar.gz: f24f55e0f154ba6415f200d6aef97ad661470b878d3df0d78d34865a48ca6e8d
 SHA512:
-  metadata.gz: 1ed9b98961ce16f0db4f0fc9a54ff389e8a31a578dc2988f48f9b793f4109fb219471c793b6a4ca38256f592ffb72e9428fc023b52308cc39346201e7c51d89e
-  data.tar.gz: df711aff69ea22f47c25171eeb49e268dde5ac22a380cd92fdcd9fa8deab4e627bee19f86343015bb16d381ad72149067d2506126de8136cf036bee73abb1ffa
+  metadata.gz: 7d2fe057e0f4883be7606b041b52ade0188d759c87c4bbf43ffafff1d1ca01f9c3bdc44982f0e83861b2c937bb351af12e2ed39a48e70cebbe39ae81ca685b7e
+  data.tar.gz: ddb8bf3aa0ce7314f30a917be50f8b7d38dfdea61d316fa8be9a8f10695726f82d6c04ec42c6a1a60e725a30e47fa7744ac995a15e3f5684ad907bd470c02e99

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
+      #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,11 +205,10 @@ module EpubBook
           else
             txt_file.write("\n\n")
             txt_file.write(item[:label])
-            txt_file.write("\n")
+            txt_file.write("\n\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)

data/lib/epub_book/version.rb

@@ -1,3 +1,3 @@
 module EpubBook
-  VERSION = "0.1.29"
+  VERSION = "0.1.32"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: epub_book
 version: !ruby/object:Gem::Version
-  version: 0.1.29
+  version: 0.1.32
 platform: ruby
 authors:
 - qmliu
@@ -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