epub_book 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcf2e6b52c434a9c609291c5815c524227caa0b9
-  data.tar.gz: 06059a204f8a130809c19fd9bc386fe79681267b
+  metadata.gz: 8a69bb745d60d25bdb4eeb2b6a6dcc2b0d115b4e
+  data.tar.gz: 86a99f95e8a35e0fa12163c784eb2cfe56aad574
 SHA512:
-  metadata.gz: d53320d61f9f247fecd630b8ca5540677ec4a8a9263d7803216f8ee5373f8ad87eff281cc1eda2aba22006c83b6ddcd31b0d7692aada7ee77d3ff0571730f782
-  data.tar.gz: cbec566608c5d506ccb5d74d901b9a3f9bd8f5fe84fff38e9a67b2fb2ed18746a19825dd396c84dec87494eaafd60f9b0fdd026abdca8e5351ed8483efede3ad
+  metadata.gz: e1d24a611b214d0f4a37d8f0c67bf0285095a1c8f51f87b6c747b019ae70345eba11189962b1e42300e0570fe96aa22c59fde873a8e10563fa7a23102c422518
+  data.tar.gz: 6a2f053ca97e68a5db5e83278d171a82bab14e2fb51a2399ae2889c1e45e95ac62f539858a4430640c9c9d04ccbe74fd105b6b559fcdb8efb83b695e37b5937d

data/epub_book.gemspec

@@ -27,15 +27,16 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'nokogiri','~> 1.6.8'
-  spec.add_dependency 'eeepub'
-  spec.add_dependency 'zip-zip'
-  spec.add_dependency 'mail'
+  spec.add_dependency 'http','~> 0'
+  spec.add_dependency 'nokogiri','~> 0'
+  spec.add_dependency 'eeepub','~> 0'
+  spec.add_dependency 'zip-zip','~> 0'
+  spec.add_dependency 'mail','~> 0'
 
 
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "pry-doc"
+  spec.add_development_dependency "pry",'~> 0'
+  spec.add_development_dependency "pry-doc",'~> 0'
 end

data/lib/epub_book/book.rb

@@ -1,4 +1,4 @@
-require 'open-uri'
+require 'http'
 require 'nokogiri'
 require 'eeepub'
 require 'base64'
@@ -21,8 +21,7 @@ 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
-    attr_accessor :cover_css, :description_css,:path,:user_agent,:referer,:creator,:mail_to
+    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
 
 
     Reg = /<script.*?>.*?<\/script>/m
@@ -40,21 +39,24 @@ module EpubBook
       @body_css = '.articlebody'
       @item_attr = "href"
       yield self if block_given?
-      @book_path = File.join((@path || `pwd`.strip), @folder_name)
     end
 
+    def book_path
+      @book_path ||= File.join((@path || `pwd`.strip), @folder_name)
+    end
 
     def link_host
       @link_host ||= @index_url[/\A(http:\/\/.*?)\/\w+/,1]
     end
 
     def book
-      Dir.mkdir(@book_path) unless test(?d,@book_path)
-      @book ||= test(?s,File.join(@book_path,'index.yml')) ? YAML.load(File.open(File.join(@book_path,'index.yml'))) : ({files: []})
+      return @book if @book
+      Dir.mkdir(book_path) unless test(?d,book_path)
+      @book = test(?s,File.join(book_path,'index.yml')) ? YAML.load(File.open(File.join(book_path,'index.yml'))) : {files: []}
     end
 
     def save_book
-      File.open(File.join(@book_path,'index.yml' ),'w') do |f|
+      File.open(File.join(book_path,'index.yml' ),'w') do |f|
         f.write(@book.to_yaml)
       end
     end
@@ -66,7 +68,7 @@ module EpubBook
       fetch_book
       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
@@ -84,47 +86,53 @@ module EpubBook
       epub.description book[:description] if book[:description]
 
       book[:files] = book[:files][0...limit] if limit
+      _files = []
+      book[:files].collect! do |item|
+        _file = File.join(book_path,item[:content])
+        if test(?f, _file)
+          _files.push(_file)
+          item
+        end
+      end
+      book[:files].compact!
 
-      epub.files book[:files].map{|item| File.join(@book_path,item[:content])}.push(File.join(@book_path,@cover))
+      epub.files _files.push(File.join(book_path,@cover))
       epub.nav book[:files]
 
+      book[:epub_file] = File.join(book_path,"#{book_name || @folder_name}.epub")
 
-      epub_file = File.join(@book_path,"#{book_name || @folder_name}.epub")
+      yield self if block_given?
 
-      epub.save(epub_file)
+      epub.save(book[:epub_file])
 
       #send mail
-      puts mail_to
+
       if mail_to
         mailer = Mailer.new
         mailer.to = mail_to
-        mailer.add_file epub_file
+        mailer.add_file book[:epub_file]
         mailer.body = "您创建的电子书[#{book[:title]}]见附件\n"
-
         mailer.send_mail
       end
 
     end
 
-
-
-
     #得到书目索引
     def fetch_index(url=nil)
+      book[:files] = []
       url ||= @index_url
-      doc = Nokogiri::HTML(judge_encoding(open(URI.encode(url),"User-Agent" => @user_agent ,'Referer'=> @referer).read))
+      doc = Nokogiri::HTML(judge_encoding(HTTP.headers("User-Agent" => @user_agent ,'Referer'=> @referer).get(URI.encode(url)).to_s))
       #generate index.yml
 
       if !book[:title]
         doc1 = if @des_url.nil?
                  doc
                else
-                 Nokogiri::HTML(judge_encoding(open(URI.encode(@des_url),"User-Agent" => @user_agent ,'Referer'=> @referer).read))
+                 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))
                end
         get_des(doc1)
       end
 
-
       doc.css(@index_item_css).each do |item|
         _href = URI.encode(item.attr(@item_attr).to_s)
         next if _href.start_with?('javascript') || _href.start_with?('#')
@@ -151,28 +159,26 @@ module EpubBook
 
     def fetch_book
       #重新得到书目，如果不存在或重新索引的话
-      fetch_index  if !test(?s,File.join(@book_path,'index.yml'))
+      fetch_index  if !test(?s,File.join(book_path,'index.yml'))
+      EpubBook.logger.info "------Fetch book----------"
       book[:files].each_with_index do |item,index|
         break if limit && index >= limit
 
-        content_path = File.join(@book_path,item[:content])
+        content_path = File.join(book_path,item[:content])
 
         #如果文件存在且长度不为0则获取下一个
         next if test(?s,content_path)
 
         begin
-          doc_file = Nokogiri::HTML(judge_encoding(open(item[:url],"User-Agent" => @user_agent,'Referer'=> @referer).read))
+          doc_file = Nokogiri::HTML(judge_encoding(HTTP.headers("User-Agent" => @user_agent,'Referer'=> @referer).get(item[:url]).to_s))
 
           File.open(content_path,'w') do |f|
             f.write("<h3>#{item[:label]}</h3>")
             f.write(doc_file.css(@body_css).to_s.gsub(Reg,''))
           end
-
-          puts item[:label]
-
         rescue  Exception => e
-          puts "Error:#{e.message}"
-          puts e.backtrace.inspect
+          EpubBook.logger.info "Error:#{e.message},#{item.inspect}"
+          #EpubBook.logger.info e.backtrace
           next
         end
       end
@@ -183,8 +189,9 @@ 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',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')
+      str
     end
 
     #得到书名，介绍，及封面
@@ -193,7 +200,7 @@ module EpubBook
       if @cover_css && !book[:cover]
         cover_url = doc.css(@cover_css).attr("src").to_s
         cover_url = generate_abs_url(cover_url) #link_host + cover_url unless cover_url.start_with?("http")
-        cover_path = File.join(@book_path,@cover)
+        cover_path = File.join(book_path,@cover)
         system("curl #{cover_url} -o #{cover_path} ")
         book[:cover] = cover_path
       end

data/lib/epub_book/loggable.rb

@@ -0,0 +1,68 @@
+module EpubBook
+
+  # Contains logging behaviour.
+  module Loggable
+
+    # Get the logger.
+    #
+    # @note Will try to grab Rails' logger first before creating a new logger
+    #   with stdout.
+    #
+    # @example Get the logger.
+    #   Loggable.logger
+    #
+    # @return [ Logger ] The logger.
+    #
+    # @since 3.0.0
+    def logger
+      return @logger if defined?(@logger)
+      @logger = rails_logger || default_logger
+    end
+
+    # Set the logger.
+    #
+    # @example Set the logger.
+    #   Loggable.logger = Logger.new($stdout)
+    #
+    # @param [ Logger ] The logger to set.
+    #
+    # @return [ Logger ] The new logger.
+    #
+    # @since 3.0.0
+    def logger=(logger)
+      @logger = logger
+    end
+
+    private
+
+    # Gets the default EpubBook logger - stdout.
+    #
+    # @api private
+    #
+    # @example Get the default logger.
+    #   Loggable.default_logger
+    #
+    # @return [ Logger ] The default logger.
+    #
+    # @since 3.0.0
+    def default_logger
+      logger = Logger.new($stdout)
+      logger.level = EpubBook.config.log_level
+      logger
+    end
+
+    # Get the Rails logger if it's defined.
+    #
+    # @api private
+    #
+    # @example Get Rails' logger.
+    #   Loggable.rails_logger
+    #
+    # @return [ Logger ] The Rails logger.
+    #
+    # @since 3.0.0
+    def rails_logger
+      defined?(::Rails) && ::Rails.respond_to?(:logger) && ::Rails.logger
+    end
+  end
+end

data/lib/epub_book/version.rb

@@ -1,3 +1,3 @@
 module EpubBook
-  VERSION = "0.1.15"
+  VERSION = "0.1.16"
 end

data/lib/epub_book.rb

@@ -1,5 +1,6 @@
 require "epub_book/version"
 require 'epub_book/book'
+require 'epub_book/loggable'
 require 'mail'
 
 module EpubBook
@@ -7,15 +8,18 @@ module EpubBook
   autoload :Book, "epub_book/book"
   autoload :Mailer, "epub_book/mailer"
 
-  Config = Struct.new(:setting_file,:mail_from,:mail_subject,:mail_body,:mail_address,:mail_port,:mail_user_name,:mail_password) do
+  Config = Struct.new(:setting_file,:mail_from,:mail_subject,:mail_body,:mail_address,:mail_port,:mail_user_name,:mail_password,:log_level) do
     include Singleton
     def initialize
       self.mail_subject =  'epub 电子书'
       #self.mail_body =  "您创建的电子书见附件\n"
       self.mail_port = 25
+      self.log_level = "info"
     end
   end
 
+  extend Loggable
+
   #book initialize, and the block will prior the yml setting
   def self.create_book(url,bookname=nil,des_url=nil)
 

metadata

@@ -1,69 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: epub_book
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - qmliu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2016-12-27 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.8
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.8
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: eeepub
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: zip-zip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -112,28 +126,28 @@ dependencies:
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-doc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: 'create epub from a book index url and mail to you. by setting a default_setting.yml
@@ -160,6 +174,7 @@ files:
 - exe/create_book
 - lib/epub_book.rb
 - lib/epub_book/book.rb
+- lib/epub_book/loggable.rb
 - lib/epub_book/mailer.rb
 - lib/epub_book/version.rb
 - tsxc.ttf