epub_book 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0735c9b7e26babca4b2f7fa802ecdfe0b7d4a28a
-  data.tar.gz: 10a55f1dd0faf6eb2c40496170f615eb4ab85604
+  metadata.gz: 3fb57f569d6a4f72770cd99441352ec380dcdb20
+  data.tar.gz: 8bc1961447a9490bc36ee3e055f24da6d9a8a24a
 SHA512:
-  metadata.gz: 9c460cc949d519dfd0cf44e366ad724710cc0da94e84dcff8350d6b72c9a5bd3659a17f72891e4fd605cabfce44d7a75758169889076d7881758bb6bd68feabe
-  data.tar.gz: ebf8039702739dd2d45ec763179d856c982ce67f89efa4cbe24ab68d3d9c2d82132d884c24ecfec5340e5bef5530a92e04fc69bf1bf3027352d26fd43b5a870f
+  metadata.gz: 0794e58ce0add4601e4bb639177a215e88c99622988f538739fe46df3fd1e0d6c989034d27350ecc5403ffbe09f5a364592dcf03504f42327261f83fe830c948
+  data.tar.gz: d5d3c1fcbfc6831c3d007a47b9b5c9a68c6c00cfca3c9996002ed451a7775c8733f343752553a0c4dc8a18f199dbaef110ce453b0210352ee56ca57a9965274c

data/lib/epub_book/book.rb

@@ -32,7 +32,7 @@ module EpubBook
       @des_url = des_url
       @user_agent = UserAgent
       @referer = Referer
-      @folder_name = Base64.urlsafe_encode64(Digest::MD5.digest(@index_url))[0..-2]
+      @folder_name = Base64.urlsafe_encode64(Digest::MD5.digest(@index_url))[0..-3]
       @creator = 'javy_liu'
       @title_css = '.wrapper h1.title1'
       @index_item_css = 'ul.list3>li>a'
@@ -110,16 +110,14 @@ module EpubBook
     #得到书目索引
     def fetch_index(url=nil)
       url ||= @index_url
-      _tmp_string = open(URI.encode(url),"User-Agent" => @user_agent ,'Referer'=> @referer).read
-      doc = Nokogiri::HTML(Encoding::UTF_8 === _tmp_string.encoding ? _tmp_string : _tmp_string.force_encoding('gbk').encode('utf-8'))
+      doc = Nokogiri::HTML(judge_encoding(open(URI.encode(url),"User-Agent" => @user_agent ,'Referer'=> @referer).read))
       #generate index.yml
 
       if !book[:title]
         doc1 = if @des_url.nil?
                  doc
                else
-                 _tmp_string = open(URI.encode(@des_url),"User-Agent" => @user_agent ,'Referer'=> @referer).read
-                 Nokogiri::HTML(Encoding::UTF_8 === _tmp_string.encoding ? _tmp_string : _tmp_string.force_encoding('gbk').encode('utf-8'))
+                 Nokogiri::HTML(judge_encoding(open(URI.encode(@des_url),"User-Agent" => @user_agent ,'Referer'=> @referer).read))
                end
         get_des(doc1)
       end
@@ -127,8 +125,17 @@ module EpubBook
 
       doc.css(@index_item_css).each do |item|
         _href = URI.encode(item.attr(@item_attr).to_s)
-        next if _href.start_with?('javascript')
-        _href = link_host + _href unless _href.start_with?("http")
+        next if _href.start_with?('javascript') || _href.start_with?('#')
+
+        if _href.start_with?("http")
+          _href
+        elsif _href.start_with?("/")
+          _href = "#{link_host}#{_href}"
+        else
+          @path_name ||= File.dirname(@index_url)
+          _href = "#{@path_name}/#{_href}"
+        end
+
         book[:files] << {label: item.text, url: _href}
       end
 
@@ -159,8 +166,7 @@ module EpubBook
         next if test(?s,content_path)
 
         begin
-          _tmp_string = open(item[:url],"User-Agent" => @user_agent,'Referer'=> @referer).read
-          doc_file = Nokogiri::HTML(Encoding::UTF_8 === _tmp_string.encoding ? _tmp_string : _tmp_string.force_encoding('gbk').encode('utf-8'))
+          doc_file = Nokogiri::HTML(judge_encoding(open(item[:url],"User-Agent" => @user_agent,'Referer'=> @referer).read))
 
           File.open(content_path,'w') do |f|
             f.write("<h3>#{item[:label]}</h3>")
@@ -180,6 +186,11 @@ module EpubBook
 
 
     private
+    #is valid encoding
+    def judge_encoding(str)
+      /<meta.*?charset\s*=[\s\"\']?utf-8/i =~ str ? str : str.force_encoding('gbk').encode('utf-8')
+    end
+
     #得到书名，介绍，及封面
     def get_des(doc)
       book[:title] = doc.css(@title_css).text.strip

data/lib/epub_book/version.rb

@@ -1,3 +1,3 @@
 module EpubBook
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: epub_book
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - qmliu