maliq 0.0.5 → 0.0.6

data/bin/maliq

@@ -12,14 +12,18 @@ class OptionParser
     end
     csses = Dir['*.css', '*/*.css']
 
-    filenames.each do |fname|
+    lastname = nil
+    filenames.each_with_index do |fname, fno|
+      seq_name = Maliq::FileUtils.create_filename(lastname) if lastname && opts[:seq]
       chapters = Maliq::FileUtils.split(fname)
       chapters.each do |title, text|
+        title = seq_name.tap { |s| seq_name = seq_name.next } if !fno.zero? && opts[:seq]
         dest = title.basename_with(:xhtml)
         conv = Maliq::Converter.new(text, css:csses)
         conv.set_meta(liquid:opts[:liquid]) if opts[:liquid]
         conv.save(dest)
         puts "'#{dest}' created."
+        lastname = title
       end
     end
   end
@@ -57,6 +61,7 @@ class OptionParser
         EOS
 
       opt :liquid, "Liquid plugin path", :type => :string
+      opt :seq, "Build consecutive filenames", :default => false
     end
   end
 end

data/bin/maliq_gepub

@@ -134,10 +134,14 @@ class OptionParser
     end
 
     def create_nav_page(xhtmls, opts={})
-      out = Maliq::Converter.new(~<<-EOS, opts).run
+      out = Maliq::Converter.new(~<<-EOS, opts).run(:epub, 'xhtmls' => xhtmls)
       ## Table of Contents
 
-      #{xhtmls.map { |fname, text| "1. [#{text}](#{fname})"  }.join("\n")}
+      <ol id='toc'>
+        {% for ch in xhtmls %}
+          <li><a href='{{ ch[0] }}'>{{ ch[1] }}</a></li>
+        {% endfor %}
+      </ol>
 
       EOS
       StringIO.new(out)

data/lib/maliq/converter.rb

@@ -15,8 +15,8 @@ class Maliq::Converter
     set_meta(opts)
   end
   
-  def run(template=:epub)
-    text = convert_liquid_tags(@text)
+  def run(template=:epub, context={})
+    text = convert_liquid_tags(@text, context)
     @converted = apply_template(template) { @engine.call(text) }
   end
   alias :to_xhtml :run
@@ -37,12 +37,12 @@ class Maliq::Converter
     set_meta(YAML.load(yfm).to_symkey) unless yfm.empty?
   end
 
-  def convert_liquid_tags(text)
+  def convert_liquid_tags(text, context)
     if dir = meta[:liquid]
       plugins = File.join(Dir.pwd, dir, '*.rb')
       Dir[plugins].each { |lib| require lib }
     end
-    Liquid::Template.parse(text).render
+    Liquid::Template.parse(text).render(context)
   end
 
   def apply_template(template, &blk)

data/lib/maliq/file_utils.rb

@@ -34,7 +34,6 @@ module Maliq
     def create_filename(prev_name)
       prev_name[/\d+$/] ? prev_name.next : prev_name + '02'
     end
-    private :create_filename
 
     module_function :split, :retrieveYFM, :create_filename
   end

data/lib/maliq/version.rb

@@ -1,3 +1,3 @@
 module Maliq
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maliq
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-05 00:00:00.000000000 Z
+date: 2012-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop