maliq 0.0.8 → 0.0.9

data/bin/maliq

@@ -36,7 +36,7 @@ class OptionParser
         EOS
 
       opt :liquid, "Liquid plugin path", :type => :string
-      opt :seq, "Build consecutive filenames", :default => false
+      opt :seq, "Build consecutive filenames", :default => true
       opt :nav, "Create nav.xhtml(TOC)", :default => true
       opt :toc, "Set title for TOC", :default => ''
     end

data/bin/maliq_gepub

@@ -2,127 +2,36 @@
 # encoding: UTF-8
 require "maliq"
 require "trollop"
-require "gepub"
 
 class OptionParser
-  class << self
-    def parse!
-      opts = build_opts
+  def self.parse!
+    Trollop::options do
+      version "Maliq #{Maliq::VERSION} (c) 2012 kyoendo"
+      banner ~<<-EOS
+        Maliq is a markdown, liquid converter for EPUB's xhtml.
 
-      files = read_files
-      markdowns = files.values_atx(:md, :markdown)
-      metadata = read_metadata(markdowns.first)
-      generate(metadata, files, opts)
-    end
-
-    def build_opts
-      Trollop::options do
-        version "Maliq #{Maliq::VERSION} (c) 2012 kyoendo"
-        banner ~<<-EOS
-          Maliq is a markdown, liquid converter for EPUB's xhtml.
-
-          'maliq_gepub' command is a tool for generating a EPUB package
-          using Gepub gem.
-
-          Usage:
-
-              1. Install gepub gem(gem install gepub)
-
-              2. Set meta data required for Epub generation in Yaml Front
-                 Matter(YFM) of your markdown file.
-
-              3. Create xhtml files with 'maliq' command(see maliq -h). 
+        'maliq_gepub' command is a tool for generating a EPUB package
+        using Gepub gem.
 
-              4. fire up 'maliq_gepub' on the direcroty.
+        Usage:
 
-          where [options] are:
-          EOS
-
-          opt :output, "Output Epub filename", :default => 'out.epub'
-          opt :toc, "Add Table of Contents page", :default => true
-      end
-    end
-
-    # Returns a Hash, in which filenames are grouped by extname.
-    def read_files
-      Dir['*', '*/*'].group_by { |f| f.ext || :_dir }.to_symkey
-    end
-
-    # Returns a Hash of metadata.
-    def read_metadata(path)
-      unless path
-        abort "Must exist a markdown filename which have Yaml Front Matter."
-      end
-      yml, _ = Maliq::FileUtils.retrieveYFM(File.read path)
-      return nil if yml.empty?
-      YAML.load(yml).to_symkey
-    end
+            1. Install gepub gem(gem install gepub)
 
-    def generate(metadata, files, opts)
-      meta_nodes = GEPUB::Metadata::CONTENT_NODE_LIST + ["unique_identifier"]
-      metadata.select! { |k, _| meta_nodes.include? k.to_s }
-      csses  = files.values_atx(:css)
-      images = files.values_atx(:png, :jpg, :jpeg, :gif, :bmp, :tiff)
-      cover_images, images = images.partition { |f| File.basename(f, '.*').match /^cover/ }
-      xhtmls = files.values_atx(:xhtml, :html)
-      cover_xhtml = xhtmls.delete('cover.xhtml')
+            2. Set meta data required for Epub generation in Yaml Front
+               Matter(YFM) of your markdown file.
 
-      # Create cover page if page not provided for a cover image.
-      if (cover = cover_images.first) && !cover_xhtml
-        cover_xhtml = create_cover_page(cover)
-      end
+            3. Create xhtml files with 'maliq' command(see maliq -h). 
 
-      navfile, xhtmls = pick_nav_file(xhtmls)
+            4. fire up 'maliq_gepub' on the direcroty.
 
-      heading_files = get_heading_files(navfile)
-
-      xhtmls.map! { |f| xhtml_with_heading f }
-
-      GEPUB::Builder.new do
-        metadata.each { |k, v| send k, *Array(v) }
-
-        resources(:workdir => '.') {
-          csses.each { |f| file f }
-          cover_image cover if cover
-          images.each { |f| file(f) }
-          ordered {
-            if cover_xhtml
-              file 'cover.xhtml' => cover_xhtml
-              heading 'Cover'
-            end
-
-            nav navfile if navfile
-
-            xhtmls.each do |fname, head|
-              file fname
-              heading head if !navfile || heading_files.include?(fname)
-            end
-          }
-        }
-      end.generate_epub(opts[:output])
-    end
-
-    def create_cover_page(cover)
-      out = Maliq::Converter.new("![cover](#{cover})", title:'Cover').run
-      StringIO.new(out)
-    end
-
-    def pick_nav_file(xhtmls)
-      navs, xhtmls = xhtmls.partition { |fname| fname.match /^(nav|toc)\.x*html$/ }
-      nav = navs.empty? ? nil : navs.first
-      return nav, xhtmls
-    end
-
-    def get_heading_files(navfile)
-      File.read(navfile).scan(/\w+\.xhtml(?=.*?<\/li>)/) if navfile
-    end
+        where [options] are:
+        EOS
 
-    def xhtml_with_heading(xhtml)
-      heading = File.basename(xhtml, '.*').capitalize
-      File.read(xhtml).match(/<h(?:1|2|3)>(.*?)<\/h(?:1|2|3)>/) { heading = $1 }
-      [xhtml, heading]
+        opt :output, "Output Epub filename", :default => 'out.epub'
+        opt :toc, "Add Table of Contents page", :default => true
     end
   end
 end
 
-OptionParser.parse!
+opts = OptionParser.parse!
+Maliq::Epub.new(opts).create!

data/lib/maliq.rb

@@ -1,5 +1,5 @@
-require "maliq/version"
-
 module Maliq
-  %w(system_extensions file_utils converter create).each { |lib| require_relative 'maliq/' + lib }
+  %w(version system_extensions file_utils converter create epub).each do |lib|
+    require_relative 'maliq/' + lib
+  end
 end

data/lib/maliq/epub.rb

@@ -0,0 +1,109 @@
+# encoding: UTF-8
+require "gepub"
+
+class Maliq::Epub
+  def initialize(opts)
+    @opts = opts
+    @output = @opts.delete(:output) || 'out.epub'
+    @path = opts[:path] || '.'
+    set_files_by_type(@path)
+    @metadata = read_metadata
+  end
+  
+  def create!
+    # Instance variables need to be locals, because a block of,
+    # GEPUB::Builder.new changes its context with instance_eval.
+    metadata = @metadata
+    csses  = @csses
+    cover_img = @cover_image
+    images = @images
+    cover_xhtml = @cover_xhtml
+    navfile = @navfile
+    heading_files = @heading_files
+    xhtmls = @xhtmls
+    path = @path
+
+    GEPUB::Builder.new do
+      metadata.each { |k, *v| send k, *v }
+
+      resources(:workdir => path) {
+        csses.each { |f| file f }
+        cover_image cover_img if cover_img
+        images.each { |f| file(f) }
+        ordered {
+          if cover_xhtml
+            file 'cover.xhtml' => cover_xhtml
+            heading 'Cover'
+          end
+
+          nav navfile if navfile
+
+          xhtmls.each do |fname, head|
+            file fname
+            heading head if !navfile || heading_files.include?(fname)
+          end
+        }
+      }
+    end.generate_epub(@output)
+  end
+
+  private
+  # Returns a Hash, in which filenames are grouped by extname.
+  def set_files_by_type(path)
+    files = Dir.chdir(path) { Dir["*", "*/*"].group_by { |f| f.ext || :_dir }.to_symkey }
+    @mds = files.values_atx(:md, :markdown)
+    xhtmls = files.values_atx(:xhtml, :html)
+    @csses = files.values_atx(:css)
+    images = files.values_atx(:png, :jpg, :jpeg, :gif, :bmp, :tiff)
+    (@cover_image, *_), @images =
+                images.partition { |f| File.basename(f, '.*').match /^cover/ }
+
+    @cover_xhtml =
+      if cover = xhtmls.delete('cover.xhtml')
+        cover
+      elsif @cover_image
+        # Create cover page if page not provided for a cover image.
+        create_cover_page(@cover_image)
+      end
+
+    @navfile, xhtmls = pick_nav_file(xhtmls)
+
+    @heading_files = get_heading_files(@navfile)
+
+    @xhtmls = xhtmls.map { |f| xhtml_with_heading f }
+  end
+
+  # Returns a Hash of metadata.
+  def read_metadata
+    path = @mds.first
+    unless path
+      abort "Must exist a markdown filename which have Yaml Front Matter."
+    end
+    yml, _ = Maliq::FileUtils.retrieveYFM(File.read path)
+    return nil if yml.empty?
+    metadata = YAML.load(yml).to_symkey
+
+    meta_nodes = GEPUB::Metadata::CONTENT_NODE_LIST + ["unique_identifier"]
+    metadata.select { |k, _| meta_nodes.include? k.to_s }
+  end
+
+  def create_cover_page(cover)
+    out = Maliq::Converter.new("![cover](#{cover})", title:'Cover').run
+    StringIO.new(out)
+  end
+
+  def pick_nav_file(xhtmls)
+    (nav, *_), xhtmls = xhtmls.partition { |fname| fname.match /^(nav|toc)\.x*html$/ }
+    return nav, xhtmls
+  end
+
+  def get_heading_files(navfile)
+    File.read(navfile).scan(/\w+\.xhtml(?=.*?<\/li>)/) if navfile
+  end
+
+  def xhtml_with_heading(xhtml)
+    heading = File.basename(xhtml, '.*').capitalize
+    File.read(xhtml).match(/<h(?:1|2|3)>(.*?)<\/h(?:1|2|3)>/) { heading = $1 }
+    [xhtml, heading]
+  end
+end

data/lib/maliq/version.rb

@@ -1,3 +1,3 @@
 module Maliq
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maliq
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-23 00:00:00.000000000 Z
+date: 2012-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -110,6 +110,7 @@ files:
 - lib/maliq.rb
 - lib/maliq/converter.rb
 - lib/maliq/create.rb
+- lib/maliq/epub.rb
 - lib/maliq/file_utils.rb
 - lib/maliq/system_extensions.rb
 - lib/maliq/version.rb