epub_book 0.1.19 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3133e96a495f48615e516915174884e95f30298bb03323126e89f9547786f194
-  data.tar.gz: f8ddee829c2cbb6339ce27d9cd6e8661976c3c05323a3a8ad264c445b726e0ef
+  metadata.gz: b9ac65a058cdf7b53e8b45e94a46a96fd60d41a554565c085adbb8b97a86f12d
+  data.tar.gz: 660f5dbc39901304ab576d6a0dd2fcfd1071c1bcd648531ca1d4da38ce18ef34
 SHA512:
-  metadata.gz: 78b3ee21ec5c21169925ab31f225f0f5da862d84b5dc756f536464e08a05e2f822abc3678f102fb28462b7249827c4a8c3026f7fdb3046858534a5d11e2adbad
-  data.tar.gz: 59dbd929d5f2c1d2e1d2f2622d20dcba661efeace5cd7422812f791d731207ae8bb627ee1aaca26c3cd27cd954154fbb41c9aa9b0ca1eaa4bafb4022a33e52c6
+  metadata.gz: 3d4f021a6326c17c1ca3a1e6df6c9ce146486142b12217b687bd67c67d3bb10e3cdadc9740d4073e559ca35817b7078622ee6cd634b2c5ece6cb5f3c90b31e49
+  data.tar.gz: 708a9cd652f79ee677914573f45a8f52f308141164c2c818df13b896949ae95e83de6dc2123e56ff118f144449cd5af6a59f6bf89b69ac61b8fcee2e689aa0be

data/Gemfile

@@ -1,4 +1,5 @@
-source 'https://ruby.taobao.org'
+#source 'https://ruby.taobao.org'
+source 'https://gems.ruby-china.com/'
 
 # Specify your gem's dependencies in epub_book.gemspec
 gemspec

data/epub_book.gemspec

@@ -27,18 +27,17 @@ 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 'nokogiri','1.6.8.1'
-  spec.add_dependency "nokogiri", ">= 1.11.4"
+  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'
   spec.add_dependency 'mail', '~>2.7.0'
 
 
-  spec.add_development_dependency "bundler",  ">= 2.2.10"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency 'bundler', '~> 2.2', '>= 2.2.27'
+  spec.add_development_dependency "rake",  '~> 13.0','>= 13.0.6'
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "pry", "~> 0.14.1"
-  spec.add_development_dependency "pry-byebug", "~> 3.9"
-  spec.add_development_dependency "pry-doc", "~>1.1.0"
+  spec.add_development_dependency "pry", '~> 0.14', '>= 0.14.1'
+  spec.add_development_dependency "pry-byebug", '~> 3.8', '>= 3.8.0'
+  spec.add_development_dependency "pry-doc", '~> 1.2', '>= 1.2.0'
 end

data/lib/epub_book/book.rb

@@ -17,12 +17,12 @@ 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"
     Referer = "http://www.baidu.com/"
-    attr_accessor :title_css, :index_item_css, :body_css, :limit, :item_attr, :page_css, :page_attr,:cover,:cover_css, :description_css,:path,:user_agent,:referer,:creator,:mail_to, :folder_name,:des_url,:ext_name
+    attr_accessor :title_css, :index_item_css, :body_css, :limit, :item_attr, :page_css, :page_attr,:cover,:cover_css, :description_css,:path,:user_agent,:referer,:creator,:mail_to, :folder_name,:des_url,:ext_name,:ignore_txt
 
 
     Reg = /<script.*?>.*?<\/script>/m
@@ -76,7 +76,7 @@ module EpubBook
       if ext_name == 'epub'
         if  !@cover_css && @cover
           generate_cover = <<-eof
-        convert #{File.expand_path("../../../#{@cover}",__FILE__)} -font tsxc.ttf -gravity center -fill red -pointsize 16 -draw "text 0,0 '#{book[:title]}'"  #{File.join(book_path,@cover)}
+            convert #{File.expand_path("../../../#{@cover}",__FILE__)} -font tsxc.ttf -gravity center -fill red -pointsize 16 -draw "text 0,0 '#{book[:title]}'"  #{File.join(book_path,@cover)}
           eof
           system(generate_cover)
         end
@@ -126,7 +126,7 @@ 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(URI.encode(url)).to_s))
+      doc = Nokogiri::HTML(judge_encoding(HTTP.headers("User-Agent" => @user_agent ,'Referer'=> @referer).get(url).to_s))
       #generate index.yml
       EpubBook.logger.info "------Fetch index--#{url}---------------"
 
@@ -134,14 +134,14 @@ module EpubBook
         doc1 = if @des_url.nil?
                  doc
                else
-                 Nokogiri::HTML(judge_encoding(HTTP.headers("User-Agent" => @user_agent ,'Referer'=> @referer).get(URI.encode(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))
                end
         get_des(doc1)
       end
 
       #binding.pry
       doc.css(@index_item_css).each do |item|
-        _href = URI.encode(item.attr(@item_attr).to_s)
+        _href = item.attr(@item_attr).to_s
         next if _href.start_with?('javascript') || _href.start_with?('#')
 
         _href = generate_abs_url(_href)
@@ -171,7 +171,11 @@ module EpubBook
       #open a txt file to write
       if ext_name == 'txt'
         txt_file = File.open(book[:file_abs_name], 'a')
+        txt_file.write("简介\n\n")
+        txt_file.write('  ')
+        txt_file.write(book[:description] || " ")
       end
+
       book[:files].each_with_index do |item,index|
         break if limit && index >= limit
 
@@ -203,8 +207,15 @@ module EpubBook
           next
         end
       end
+      if ext_name == 'txt'
+        txt_file.close
+        EpubBook.logger.info "=============去除包含指定忽略字符的行======="
+        EpubBook.logger.info ignore_txt
+        if ignore_txt
+          system("sed -i -r '/#{ignore_txt}/d' #{book[:file_abs_name]}")
+        end
 
-      txt_file.close if ext_name == 'txt'
+      end
 
     end
 

data/lib/epub_book/version.rb

@@ -1,3 +1,3 @@
 module EpubBook
-  VERSION = "0.1.19"
+  VERSION = "0.1.24"
 end

data/lib/epub_book.rb

@@ -1,6 +1,6 @@
-require "epub_book/version"
-require 'epub_book/book'
-require 'epub_book/loggable'
+require_relative "epub_book/version"
+require_relative 'epub_book/book'
+require_relative 'epub_book/loggable'
 require 'mail'
 
 module EpubBook

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epub_book
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.24
 platform: ruby
 authors:
 - qmliu
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-24 00:00:00.000000000 Z
+date: 2022-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -16,18 +16,27 @@ 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
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.11.4
@@ -35,6 +44,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.11'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.11.4
@@ -84,30 +96,42 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.10
+        version: 2.2.27
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.10
+        version: 2.2.27
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -127,6 +151,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.1
   type: :development
@@ -134,6 +161,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.14.1
 - !ruby/object:Gem::Dependency
@@ -142,28 +172,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.8.0
 - !ruby/object:Gem::Dependency
   name: pry-doc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 description: 'create epub from a book index url and mail to you. by setting a default_setting.yml
   you can use it in shell. '
 email: