epub_book 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 988d7b70bfcc5a8c9f127f3571881dc513556370
-  data.tar.gz: 8e468e991b0fb86bc591713739f01037b78f79b2
+  metadata.gz: 6576163ae0d036a05da85d98b83375314ca8de30
+  data.tar.gz: fbf0608c5fd2db1cb122386b9f76be697a98f4d9
 SHA512:
-  metadata.gz: 91501148b27c75734dab39ca1a4c336a22a17b7a08c2553841b247b7545e6f524aa27a356fee722368369ad7ef7f86f96012f00ea62d6d36b192ec44f80c7d8b
-  data.tar.gz: dbe5c7559a2134bf4be084a319eb444dd0cdf70ed203b04782a5d8a64c9e616c5b4af404da64220e2d617ade474af2ac12696c902e9b467a96eb68374147b9b3
+  metadata.gz: e3d76543d588dfdc76a48b38133127081338ea0adba5fed4c1d630c167da624bb155bf87ac26da9befb598e5c6289eb55d858406f7fb0e3e2e6b6b501b1fd735
+  data.tar.gz: 995f91d7e0138583c4012920c69d6c1e5c3912ab91ba7f6a238410cb4663944ab9c6849485a547f13858cfd8b7a1f97ed9a9dde20ee0d426f774ee5b5def1801

data/README.md

@@ -19,11 +19,27 @@ Or install it yourself as:
     $ gem install epub_book
 
 ## Usage
+### create book
+```ruby
+  EpubBook.create_book(book_url,bookname, des_url) do |book|
+    book.cover_css = '.pic_txt_list .pic img'
+    book.description_css = '.box p.description'
+    book.title_css = '.pic_txt_list h3 span'
+    book.index_item_css = 'ul.list li.c3 a'
+    book.body_css = '.wrapper #content'
+    book.creator = 'javy_liu'
+    book.path  = '/tmp'
+  end
+``` 
+
 
-Setting
+###use Setting
 ```ruby 
-  #smtp setting
+  #default setting, this setting is prior the default_setting.yml
   EpubBook.configure do |config|
+    #if not set,it will use `pwd`/default_setting.yml
+    config.setting_file = "./default_setting.yml"
+    #you can set following setting in default_setting.yml
     config.mail_address = 'smtp.example.com'
     config.mail_user_name = 'ex@example.com'
     config.mail_password = 'password'
@@ -42,6 +58,7 @@ Or use a ./default_setting.yml file have following content
     mail_user_name: smpt_mail@example.com
     mail_password: smpt_pwd
 
+  #default book setting
   book:
     limit: 10
     cover_css: '.pic_txt_list .pic img'
@@ -52,33 +69,33 @@ Or use a ./default_setting.yml file have following content
     creator: 'user name'
     path: '/'
     mail_to: 'yourmail@example.com'
-  book_url: http://www.quanben5.com/n/bubushenglian/xiaoshuo.html
-  bookname: bbsl
+
+  #special host book setting(the key is book_url's host which replacing the dot with underline)
+  www_piaotian_net:
+    cover_css: '.pic_txt_list .pic img'
+    description_css: '.box p.description'
+    title_css: '.pic_txt_list h3 span'
+    index_item_css: 'ul.list li.c3 a'
+    body_css: '.wrapper #content'
+    path: '/'
 ```
-Create book
+
+if you have setting file , you can create book like following 
 ```ruby 
-  EpubBook.create_book(book_url,bookname) do |book|
-    book.cover_css = '.pic_txt_list .pic img'
-    book.description_css = '.box p.description'
-    book.title_css = '.pic_txt_list h3 span'
-    book.index_item_css = 'ul.list li.c3 a'
-    book.body_css = '.wrapper #content'
-    book.creator = 'javy_liu'
-    book.path  = '/home/oswap/ruby_test/epub_book/'
-    book.mail_to = ''
-  end
+  EpubBook.create_book(book_url,bookname, des_url)
 ```
 
 ## Parameter specification
 ```ruby
   book_url(required): internal book index page url (this page may include the description or cover)
   bookname(optional): created book file name, if not set ,it will use the Base64.url_encode(book_url)[-10,-2] 
-```
+  des_url(optional): if the book cover and book description is not in book_url catalog,you can set this for the cover and description
 
+``` 
 
 ## Block parameter specification
 ```ruby 
-    book.cover_css #book cover image css path
+    book.cover_css       #book cover image css path
     book.description_css #book description css path
     book.title_css       #book title css path
     book.index_item_css  #book catalog item  css path
@@ -89,7 +106,7 @@ Create book
 ```
 ## Perform `create_book` in your terminal
 ```bash
-  create_book
+  create_book(book_catalog_link, bookname)
 ```
 ## Development
 

data/exe/create_book

@@ -6,19 +6,12 @@ require 'yaml'
 
 # use like
 # bin/create_book http://www.quanben5.com/n/jinyiyexing/xiaoshuo.html bookname
-url,bookname = ARGV
+url,bookname,des_url = ARGV
 
-default_config = YAML.load(File.open('./default_setting.yml'))
 #smtp setting
 EpubBook.configure do |config|
-  default_config['smtp_config'].each_pair do |key,value|
-    config.send("#{key}=",value)
-  end
+  config.setting_file = './default_setting.yml'
 end
 
-EpubBook.create_book(url || default_config['book_url'],bookname || default_config['bookname']) do |book|
-  default_config['book'].each_pair do |key,value|
-    book.send("#{key}=",value)
-  end
-end
+EpubBook.create_book(url,bookname,des_url)
 

data/lib/epub_book/book.rb

@@ -27,8 +27,9 @@ module EpubBook
 
     Reg = /<script.*?>.*?<\/script>/m
 
-    def initialize(index_url )
+    def initialize(index_url,des_url=nil )
       @index_url = index_url
+      @des_url = des_url
       @user_agent = UserAgent
       @referer = Referer
       @folder_name = Base64.urlsafe_encode64(Array(index_url).pack('P'))
@@ -98,6 +99,7 @@ module EpubBook
         mailer = Mailer.new
         mailer.to = mail_to
         mailer.add_file epub_file
+        mailer.body = "您创建的电子书[#{book[:title]}]见附件\n"
 
         mailer.send_mail
       end
@@ -105,23 +107,17 @@ module EpubBook
     end
 
 
+    #得到书目索引
     def fetch_index(url=nil)
       url ||= @index_url
       doc = Nokogiri::HTML(open(URI.encode(url),"User-Agent" => @user_agent ,'Referer'=> @referer).read)
       #generate index.yml
 
-      book[:title] ||= doc.css(@title_css).text.strip
-
-      if @cover_css && !book[:cover]
-        cover_url = doc.css(@cover_css).attr("src").to_s
-        cover_url = link_host + cover_url unless cover_url.start_with?("http")
-        system("curl #{cover_url} -o #{File.join(@book_path,@cover)} ")
-        book[:cover] = File.join(@book_path,@cover)
+      if !book[:title]
+        doc1 = @des_url.nil? ? doc :  Nokogiri::HTML(open(URI.encode(des_url),"User-Agent" => @user_agent ,'Referer'=> @referer).read)
+        get_des(doc1)
       end
 
-      if @description_css && !book[:description]
-        book[:description] = doc.css(@description_css).text
-      end
 
       doc.css(@index_item_css).each do |item|
         _href = URI.encode(item.attr(@item_attr).to_s)
@@ -142,7 +138,6 @@ module EpubBook
 
       #保存书目
       save_book
-
     end
 
     def fetch_book
@@ -175,6 +170,24 @@ module EpubBook
 
     end
 
+
+    private
+    #得到书名，介绍，及封面
+    def get_des(doc)
+      book[:title] = doc.css(@title_css).text.strip
+      if @cover_css && !book[:cover]
+        cover_url = doc.css(@cover_css).attr("src").to_s
+        cover_url = link_host + cover_url unless cover_url.start_with?("http")
+        cover_path = File.join(@book_path,@cover)
+        system("curl #{cover_url} -o #{cover_path} ")
+        book[:cover] = cover_path
+      end
+
+      if @description_css && !book[:description]
+        book[:description] = doc.css(@description_css).text
+      end
+    end
+
   end
 
 end

data/lib/epub_book/mailer.rb

@@ -1,23 +1,9 @@
-require 'mail'
-
 module EpubBook
   class Mailer
     extend Forwardable
-    ::Mail.defaults do
-      delivery_method :smtp, {
-        :address => EpubBook.config.mail_address,
-        :port => EpubBook.config.mail_port,
-        :user_name => EpubBook.config.mail_user_name,
-        :password => EpubBook.config.mail_password,
-        :authentication => :plain,
-        :enable_starttls_auto => true
-      }
-    end
 
     def_delegators :@mailer, :from,:from=,:to,:to=,:subject,:subject=,:body,:body=,:add_file
 
-
-
     def initialize
       @mailer = Mail.new do
         from    EpubBook.config.mail_from

data/lib/epub_book/version.rb

@@ -1,3 +1,3 @@
 module EpubBook
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/epub_book.rb

@@ -1,44 +1,41 @@
 require "epub_book/version"
 require 'epub_book/book'
+require 'mail'
 
 module EpubBook
   # Your code goes here...
   autoload :Book, "epub_book/book"
   autoload :Mailer, "epub_book/mailer"
 
-  def self.create_book(url,bookname=nil,&block)
-    epub_book = Book.new(url,&block)
-    #do |book|
-    #  book.limit = 5
-    #  book.cover_css = '.pic_txt_list .pic img'
-    #  book.description_css = '.box p.description'
-    #  book.title_css = '.pic_txt_list h3 span'
-    #  book.index_item_css = 'ul.list li.c3 a'
-    #  book.body_css = '.wrapper #content'
-    #  book.creator = 'javy_liu'
-    #  book.path  = '/home/oswap/ruby_test/epub_book/'
-    #  book.user_agent = ''
-    #  book.referer = ''
-    #  book.mail_to = 'javy_liu@163.com'
-    #end
-    #epub_book.fetch_index
-    epub_book.generate_book(bookname)
-  end
-
-  Config = Struct.new(:mail_from,:mail_subject,:mail_body,:mail_address,:mail_port,:mail_user_name,:mail_password)
+  Config = Struct.new(:setting_file,:mail_from,:mail_subject,:mail_body,:mail_address,:mail_port,:mail_user_name,:mail_password)
   class Config
     include Singleton
     def initialize
       self.mail_subject =  'epub 电子书'
       self.mail_body =  "您创建的电子书见附件\n"
       self.mail_port = 25
-      #mail_from
-      #mail_address
-      #mail_user_name
-      #mail_password
     end
   end
 
+  #book initialize, and the block will prior the yml setting
+  def self.create_book(url,bookname=nil,des_url=nil)
+
+    url_host_key = url[/\/\/(.*?)\//,1].tr(?.,'_')
+
+    epub_book = Book.new(url,des_url) do |book|
+      (default_config['book']||{}).merge(default_config[url_host_key]||{}).each_pair do |key,value|
+        book.send("#{key}=",value)
+      end
+    end
+
+    yield epub_book if block_given?
+
+    #epub_book.fetch_index
+    epub_book.generate_book(bookname)
+
+    epub_book
+  end
+
 
   def self.config
     Config.instance
@@ -47,4 +44,27 @@ module EpubBook
   def self.configure
     yield config
   end
+
+  #you can set in configure block or default_setting.yml,and configure block prior the yml setting
+  def self.default_config
+    unless @default_config
+      @default_config= YAML.load(config.setting_file || File.open("#{`pwd`.strip}/default_setting.yml"))
+      configure do |_config|
+        @default_config['smtp_config'].each_pair do |key,value|
+          _config[key] ||= value
+        end
+      end
+      ::Mail.defaults do
+        delivery_method :smtp, {
+          :address => EpubBook.config.mail_address,
+          :port => EpubBook.config.mail_port,
+          :user_name => EpubBook.config.mail_user_name,
+          :password => EpubBook.config.mail_password,
+          :authentication => :plain,
+          :enable_starttls_auto => true
+        }
+      end
+    end
+    @default_config
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epub_book
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - qmliu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-17 00:00:00.000000000 Z
+date: 2016-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri