lknovel 0.0.1 → 0.0.2

data/CHANGELOG

@@ -1 +1,3 @@
 0.0.1: Initial release.
+0.0.2: Move block all out of Chapter/Volume class, use more helper function and
+       mixin to generalize code.

data/README.md

@@ -16,9 +16,37 @@ And then execute:
 
     $ bundle
 
+## Dependencies
+
+* Ruby 1.9
+* [nokogiri](http://nokogiri.org/)
+* [gepub](https://github.com/skoji/gepub)
+* [parallel](https://github.com/grosser/parallel)
+
+Rubygems will solve it for you.
+
+If you encounter compiling/installing problem about nokogiri, install it
+manually using the package manager. For Debian/Ubuntu:
+
+    # apt-get install ruby-nokogiri
+
 ## Usage
 
-    $ lknovel http://lknovel.lightnovel.cn/main/book/2136.html
+    $ lknovel -h
+    Usage: lknovel [options] url
+
+    Specific options:
+        -k, --[no-]keep                  Keep temporary files
+        -q, --[no-]quiet                 Run quietly
+
+    Common options:
+        -h, --help                       Show this message
+        -V, --version                    Show version
+
+    $ lknovel http://lknovel.lightnovel.cn/main/book/2123.html
+    Chapters: 5/5 第3章 魔王和勇者，在笹塚相会。
+    Images: 13/13 20120817193746_95414.jpg
+    Finish: 打工吧！魔王大人 - 第01卷 - 第1卷.epub
 
 ## Contributing
 

data/lib/lknovel/app.rb

@@ -22,8 +22,8 @@ module Lknovel
           options.keep = k
         end
 
-        opts.on('-v', '--[no-]verbose', 'Run verbosely') do |v|
-          options.verbose = v
+        opts.on('-q', '--[no-]quiet', 'Run quietly') do |q|
+          options.verbose = !q
         end
 
         opts.separator "\nCommon options:"
@@ -51,11 +51,6 @@ module Lknovel
 
     def initialize(args)
       @options = self.class.parse(args)
-      begin
-        @console_width = `tput cols`.to_i
-      rescue Exception
-        @console_width = 80
-      end
     end
 
     def run
@@ -65,60 +60,49 @@ module Lknovel
     end
 
     def process_volume(url)
-      if @options.verbose
-        STDERR.write "Parsing chapters: ..."
-      end
-      volume = Volume.new(url) do |chapter|
-        if @options.verbose
-          STDERR.write "\r#{' ' * @console_width}"
-          STDERR.write "\rParsing chapters: #{chapter.title}"
-        end
-      end
-      if @options.verbose
-        puts
+      volume = Volume.new(url)
+
+      parallel_verbose(volume.chapters, title: 'Chapters',
+                        verbose: @options.verbose) do |chapter|
+        chapter.parse
+        chapter.title
       end
 
       FileUtils.mkdir_p(volume.path)
       Dir.chdir(volume.path) do
+        # generate html
+        FileUtils.mkdir_p(HTML_DIR)
+        Dir.chdir(HTML_DIR) do
+          volume.render(File.join(TEMPLATE_PATH, 'front.html.erb'), 'front.html')
+          erb = File.read(File.join(TEMPLATE_PATH, 'chapter.html.erb'))
+          template = ERB.new(erb, nil, '-')
+          volume.chapters.each_with_index do |chapter, index|
+            chapter.render(template, HTML_FILE_FORMAT % index)
+          end
+        end
+
+        # download images
         FileUtils.mkdir_p(IMAGE_DIR)
         Dir.chdir(IMAGE_DIR) do
           images = []
           volume.chapters.each do |chapter|
             chapter.content.each do |content|
-              images.push content if content.is_a?(Image)
+              images << content if content.is_a?(Image)
             end
           end
 
-          if @options.verbose
-            progress = 1
-          end
-          STDERR.write "\rDownload images: 0/#{images.length}\t..."
-          Parallel.each(images, :in_threads => 5) do |image|
+          parallel_verbose(images, title: 'Images',
+                            verbose: @options.verbose) do |image|
             image.download
-            if @options.verbose
-              STDERR.write "\r#{' ' * @console_width}"
-              STDERR.write \
-                "\rDownload images: #{progress}/#{images.length}\t#{image.file}"
-              progress = progress + 1
-            end
-          end
-          if @options.verbose
-            puts
+            image.file
           end
 
-          # crop cover image if width > height * 1.5
-          cropped = volume.cover_image.crop('cover.jpg',
-                      '52%x100%+0+0') { |w, h| w > h * 1.5 }
-          volume.cover_image_cropped = 'cover.jpg' if cropped
-        end
-
-        FileUtils.mkdir_p(HTML_DIR)
-        Dir.chdir(HTML_DIR) do
-          volume.html(File.join(TEMPLATE_PATH, 'front.html.erb'), 'front.html')
-          erb = File.read(File.join(TEMPLATE_PATH, 'chapter.html.erb'))
-          template = ERB.new(erb, nil, '-')
-          volume.chapters.each_with_index do |chapter, index|
-            chapter.html(template, HTML_FILE_FORMAT % index)
+          if images.size > 0
+            cover_image = images[0]
+            # crop cover image if width > height * 1.4
+            cropped = cover_image.crop('cover.jpg',
+                                       '52%x100%+0+0') { |w, h| w > h * 1.4 }
+            volume.cover_image = cropped ? 'cover.jpg' : cover_image.file
           end
         end
       end
@@ -136,7 +120,7 @@ module Lknovel
         contributor volume.illustrator, 'ill'
 
         resources(:workdir => volume.path) {
-          cover_image File.join(IMAGE_DIR, volume.cover_image_cropped)
+          cover_image File.join(IMAGE_DIR, volume.cover_image)
           file \
             "#{STYLESHEET_DIR}/default.css" => "#{STYLESHEET_PATH}/default.css"
           glob "#{IMAGE_DIR}/*"

data/lib/lknovel/chapter.rb

@@ -9,12 +9,14 @@ require 'open-uri'
 
 module Lknovel
   class Chapter
+    include ERBRender
 
     attr_reader :url, :title, :content
 
-    def initialize(url)
+    def initialize(url, options = {})
+      @options = {:title => nil}.merge(options)
       @url = url
-      parse
+      @title = @options[:title]
     end
 
     def parse
@@ -39,19 +41,5 @@ module Lknovel
       end
     end
 
-    def html(erb, path = nil)
-      template = erb.is_a?(ERB) ? erb : ERB.new(File.read(erb), nil, '-')
-      html_content = template.result(binding)
-      if path.nil?
-        html_content
-      else
-        if !File.exists?(path)
-          File.open(path, 'w') do |file|
-            file.puts html_content
-          end
-        end
-      end
-    end
-
   end
 end

data/lib/lknovel/meta.rb

@@ -1,5 +1,5 @@
 module Lknovel
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
   MODULE_PATH = File.expand_path('..', __FILE__)
   TEMPLATE_PATH = File.join(MODULE_PATH, 'templates')
   STYLESHEET_PATH = File.join(MODULE_PATH, 'assets', 'stylesheets')

data/lib/lknovel/templates/chapter.html.erb

@@ -3,14 +3,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="zh">
   <head>
     <meta http-equiv="content-type" content="text/html;charset=UTF-8">
-    <link href="<%= "../#{STYLESHEET_DIR}/default.css" %>" rel="stylesheet" type="text/css"/>
+    <link href="<%= "../#{Lknovel::STYLESHEET_DIR}/default.css" %>" rel="stylesheet" type="text/css"/>
     <title><%= @title %></title>
   </head>
   <body>
     <h1><%= @title %></h1>
 <% @content.each do |item| -%>
-<% if item.is_a?(Image) -%>
-      <img src="<%= "../#{IMAGE_DIR}/#{item.file}" %>">
+<% if item.is_a?(Lknovel::Image) -%>
+      <img src="<%= "../#{Lknovel::IMAGE_DIR}/#{item.file}" %>">
 <% else -%>
       <p><%= item %></p>
 <% end -%>

data/lib/lknovel/templates/front.html.erb

@@ -2,16 +2,16 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops">
   <head>
     <meta http-equiv="content-type" content="text/html;charset=UTF-8">
-    <link href="<%= "../#{STYLESHEET_DIR}/default.css" %>" rel="stylesheet" type="text/css"/>
+    <link href="<%= "../#{Lknovel::STYLESHEET_DIR}/default.css" %>" rel="stylesheet" type="text/css"/>
   </head>
   <body>
-    <img class="page-break" src="<%= "../#{IMAGE_DIR}/#{@cover_image_cropped}" %>">
+    <img class="page-break" src="<%= "../#{Lknovel::IMAGE_DIR}/#{@cover_image}" %>">
     <h1>简介</h1>
     <p><%= @intro %></p>
     <nav epub:type="toc" id="toc">
       <ul class="nav">
 <% @chapters.each_with_index do |chapter, index| -%>
-        <li><a href="<%= HTML_FILE_FORMAT % index %>"><%= chapter.title %></a></li>
+        <li><a href="<%= Lknovel::HTML_FILE_FORMAT % index %>"><%= chapter.title %></a></li>
 <% end -%>
       </ul>
     </nav>

data/lib/lknovel/utils.rb

@@ -1,3 +1,6 @@
+# encoding: utf-8
+require 'parallel'
+
 # http://blog.codefront.net/2008/01/14/retrying-code-blocks-in-ruby-on-exceptions-whatever/
 # Options:
 # * :tries - Number of retries to perform. Defaults to 3.
@@ -22,3 +25,43 @@ def retryable(options = {}, &block)
 
   yield
 end
+
+def parallel_verbose(items, options = {}, &block)
+  opts = {:title => 'Working', :verbose => true, :threads => 5}.merge(options)
+  if opts[:verbose]
+    progress = 1
+    msg = "\r#{opts[:title]}: 0/#{items.size} ..."
+    STDERR.write msg
+  end
+  Parallel.each_with_index(items, :in_threads => 5) do |item, index|
+    extra_msg = block.call(item, index)
+    if opts[:verbose]
+      # get previous console output length, aware of wide chars
+      size =
+        msg.gsub(/\p{Han}|\p{Katakana}|\p{Hiragana}|\p{Hangul}/, '  ').size - 1
+      STDERR.write "\r#{' ' * size}"
+      msg =  "\r#{opts[:title]}: #{progress}/#{items.size} #{extra_msg}"
+      STDERR.write msg
+      progress = progress + 1
+    end
+  end
+  if opts[:verbose]
+    puts
+  end
+end
+
+module ERBRender
+    def render(erb, path = nil)
+      template = erb.is_a?(ERB) ? erb : ERB.new(File.read(erb), nil, '-')
+      html_content = template.result(binding)
+      if path.nil?
+        html_content
+      else
+        if !File.exists?(path)
+          File.open(path, 'w') do |file|
+            file.puts html_content
+          end
+        end
+      end
+    end
+end

data/lib/lknovel/volume.rb

@@ -4,23 +4,22 @@ require 'lknovel/meta'
 require 'lknovel/utils'
 require 'nokogiri'
 require 'open-uri'
-require 'parallel'
 
 module Lknovel
   class Volume
+    include ERBRender
 
     attr_reader :url, :series, :author, :title, :number_s, :number, :date,
-      :illustrator, :publisher, :intro, :chapters, :path, :cover_image
+      :illustrator, :publisher, :intro, :chapters, :path
 
-    attr_accessor :cover_image_cropped
+    attr_accessor :cover_image
 
-    def initialize(url, options = {}, &block)
+    def initialize(url)
       @url = url
-      @options = {:threads => 4}.merge(options)
-      parse(&block)
+      parse
     end
 
-    def parse(&block)
+    def parse
       page = retryable do
         Nokogiri::HTML(open(@url))
       end
@@ -51,31 +50,10 @@ module Lknovel
 
       @path = "#{@series} - #{@number_s} - #{@title}"
 
-      @chapters = Parallel.map(
-        page.css('ul.lk-chapter-list li.span3'),
-        :in_threads => @threads) do |x|
+      @chapters = page.css('ul.lk-chapter-list li.span3').map do |x|
         chapter_title = x.text.strip.sub(/\s+/, ' ')
         chapter_url = URI.join(url, x.css('a')[0]['href']).to_s
-        chapter = Chapter.new(chapter_url)
-        block.call(chapter)
-        chapter
-      end
-
-      @cover_image = @chapters[0].content.find { |x| x.is_a?(Lknovel::Image) }
-      @cover_image_cropped = @cover_image.file
-    end
-
-    def html(erb, path = nil)
-      template = erb.is_a?(ERB) ? erb : ERB.new(File.read(erb), nil, '-')
-      html_content = template.result(binding)
-      if path.nil?
-        html_content
-      else
-        if !File.exists?(path)
-          File.open(path, 'w') do |file|
-            file.puts html_content
-          end
-        end
+        Chapter.new(chapter_url, title: chapter_title)
       end
     end
 

data/test/test_lknovel_chapter.rb

@@ -5,6 +5,7 @@ require 'lknovel/chapter'
 describe Lknovel::Chapter do
 
   chapter = Lknovel::Chapter.new('http://lknovel.lightnovel.cn/main/view/1486.html')
+  chapter.parse
 
   it 'get chapter title' do
     chapter.title.must_equal '第0章 序章'
@@ -19,7 +20,7 @@ describe Lknovel::Chapter do
   end
 
   it 'generate html' do
-    html = chapter.html(File.join(Lknovel::TEMPLATE_PATH, 'chapter.html.erb'))
+    html = chapter.render(File.join(Lknovel::TEMPLATE_PATH, 'chapter.html.erb'))
     html.must_match '"../stylesheets/default.css"'
     html.must_match '"../images/20120808202639_66681.jpg"'
   end

data/test/test_lknovel_volume.rb

@@ -5,6 +5,10 @@ require 'lknovel/volume'
 describe Lknovel::Volume do
 
   volume = Lknovel::Volume.new('http://lknovel.lightnovel.cn/main/book/2136.html')
+  volume.parse
+  volume.chapters[0].parse
+  cover_image = volume.chapters[0].content.find { |x| x.is_a?(Lknovel::Image) }
+  volume.cover_image = cover_image
 
   it 'get path' do
     volume.path.must_equal '打工吧！魔王大人 - 短篇01 - 短篇01'
@@ -35,7 +39,7 @@ describe Lknovel::Volume do
   end
 
   it 'generate front html' do
-    html = volume.html(File.join(Lknovel::TEMPLATE_PATH, 'front.html.erb'))
+    html = volume.render(File.join(Lknovel::TEMPLATE_PATH, 'front.html.erb'))
     html.must_match '<li><a href="000.html">第0章 序章</a></li>'
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lknovel
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler