bookmaker 0.6.0 → 0.7.0.pre3

data/lib/bookmaker/adapters/markdown.rb

@@ -21,6 +21,15 @@ module Kitabu
       @engine ||= Object.const_get(MARKDOWN_LIBRARIES.find {|lib| Object.const_defined?(lib)})
     end
 
+    def self.to_latex(content)
+      case engine.name
+      when "Redcarpet"
+        # render = Redcarpet::Render::HTML.new(:hard_wrap => true, :xhtml => true)
+        # Redcarpet::Markdown.new(render).render(content)
+      else
+        engine.new(content).to_latex
+      end
+    end
     # Convert Markdown to HTML.
     def self.to_html(content)
       case engine.name

data/lib/bookmaker/cli.rb

@@ -55,15 +55,25 @@ module Bookmaker
       stats = Bookmaker::Stats.new(root_dir)
 
       say [
-        "Chapters: #{stats.chapters}",
-        "Words: #{stats.words}",
-        # "Images: #{stats.images}",
-        # "Links: #{stats.links}",
-        # "Footnotes: #{stats.footnotes}",
-        # "Code blocks: #{stats.code_blocks}"
+        # "Chapters: #{stats.chapters}",
+        "Goal:   #{sprintf("%7d", stats.target)}",
+        "Words:  #{sprintf("%7d", stats.words)}",
+        "        -------",
+        "Left:   #{sprintf("%7d", stats.remaining)}",
+        "\nProgress: #{sprintf("%5d", stats.today)}"
       ].join("\n")
     end
-    
+
+    desc "move old_id new_id", "Move scene to new sequence."
+    def move(oid,nid)
+      s = Structure.new(root_dir)
+      s.move(oid,nid)
+    end
+    desc "trash [OPTIONS]", "Move scene to trash."
+    def trash(scene_id)
+      s = Structure.new(root_dir)
+      s.trash(scene_id)
+    end
     private
       def config
         YAML.load_file(config_path).with_indifferent_access

data/lib/bookmaker/exporter.rb

@@ -21,6 +21,12 @@ module Bookmaker
       helper = root_dir.join("config/helper.rb")
       load(helper) if helper.exist?
 
+      raise "Missing Templates directory (_templates)" unless File.exist?("_templates")
+      raise "Missing Images directory (_images)" unless File.exist?("_images")
+      raise "Missing Output directory (_output)" unless File.exist?("_output")
+
+puts Dependency.xelatex?
+
       export_pdf  = [nil, "pdf"].include?(options[:only])
       export_html = [nil, "html", "mobi", "epub"].include?(options[:only])
       export_epub = [nil, "mobi", "epub"].include?(options[:only])
@@ -50,7 +56,7 @@ module Bookmaker
         end
 
         Notifier.notify(
-          :image   => Bookmaker::ROOT.join("templates/ebook.png"),
+          :image   => Bookmaker::ROOT.join("_templates/ebook.png"),
           :title   => "Bookmaker",
           :message => "Your \"#{config[:title]}\" e-book has been exported!"
         )

data/lib/bookmaker/generator.rb

@@ -12,30 +12,34 @@ module Bookmaker
       template "config.erb", "_bookmaker.yml"
     end
     def copy_templates
-      copy_file "latex.erb",  "templates/pdf/layout.erb"
-      copy_file "dp-logo.png",  "images/dp-logo.png"
+      copy_file "pdf/layout.erb",         "_templates/pdf/layout.erb"
+      copy_file "dp-logo.png",            "_images/dp-logo.png"
+      
+      copy_file "html/layout.erb",        "_templates/html/layout.erb"
+      copy_file "html/thanks.erb",        "_templates/html/thanks.erb"
+      copy_file "html/copyright.erb",        "_templates/html/copyright.erb"
+      copy_file "html/user.css",          "_templates/html/user.css"
+      copy_file "html/layout.css",        "_templates/html/layout.css"
+      copy_file "html/syntax.css",        "_templates/html/syntax.css"
 
-      copy_file "html.erb",   "templates/html/layout.erb"
-      copy_file "user.css",   "templates/html/user.css"
-      copy_file "layout.css", "templates/html/layout.css"
-      copy_file "syntax.css", "templates/html/syntax.css"
+      copy_file "epub/back.erb",          "_templates/epub/back.html"
+      copy_file "epub/copyright.erb",     "_templates/epub/copyright.erb"
+      copy_file "epub/cover.erb",         "_templates/epub/cover.erb"
+      copy_file "epub/cover.html",        "_templates/epub/cover.html"
+      copy_file "epub/page.erb",          "_templates/epub/page.erb"
+      copy_file "epub/user.css",          "_templates/epub/user.css"
 
-      copy_file "back.erb",   "templates/epub/back.erb"
-      copy_file "copyright.erb",   "templates/epub/copyright.erb"
-      copy_file "cover.erb", "templates/epub/cover.erb"
-      copy_file "epub.erb",   "templates/epub/page.erb"
-      copy_file "epub.css",   "templates/epub/user.css"
-      copy_file "cover.jpg",  "images/cover.jpg"
-      copy_file "rakefile.rb",  "Rakefile"
-      copy_file "extras.tex",  "extras/characters.tex"
-      copy_file "extras.tex",  "extras/dedicationls.tex"
+      copy_file "cover.jpg",              "_images/cover.jpg"
+      copy_file "rakefile.rb",            "Rakefile"
+      copy_file "extras.tex",             "_extras/characters.tex"
+      copy_file "extras.tex",             "_extras/dedications.tex"
     end
     def copy_sample_text
-      copy_file "sample.tex"   , "text/01_First-Chapter/01-Welcome.tex"
+      copy_file "sample.tex",             "text/01_First-Chapter/01-Welcome.tex"
     end
     def create_directories
-      empty_directory "output"
-      empty_directory "images"
+      empty_directory "_output"
+      empty_directory "_images"
     end
     private
       # Retrieve user's name using finger.

data/lib/bookmaker/parser/epub.rb

@@ -1,3 +1,4 @@
+require 'fileutils'
 module Bookmaker
   module Parser
     class Epub < Base
@@ -28,11 +29,12 @@ module Bookmaker
           epub.cover      cover_image
         end
         write_coverpage!
+        write_thankspage!
         write_copyright!
         write_sections!
         write_backpage!
         write_toc!
-        epub.files    cover_page  + sections.map(&:filepath) + back_page + copyright_page + assets
+        epub.files    cover_page + thanks_page + sections.map(&:filepath) + back_page + copyright_page + assets
         epub.nav      navigation
 
         epub.save(epub_path)
@@ -51,28 +53,46 @@ module Bookmaker
       def copyright_page
         Dir[copyright_path]
       end
+      def thanks_page
+        Dir[thanks_path]
+      end
       def write_backpage!
-        contents = render_template(root_dir.join("templates/epub/back.html"), config)
+        contents = render_template(root_dir.join("_templates/epub/back.html"), config)
         File.open(back_path,"w") do |file|
           file << contents
         end
       end
       def write_coverpage!
-        contents = render_template(root_dir.join("templates/epub/cover.html"), config)
+        contents = render_template(root_dir.join("_templates/epub/cover.html"), config)
+        puts "Writing cover page. #{cover_path}"
+        # 
+        # raise File.dirname(cover_path).inspect
+        FileUtils.mkdir_p(File.dirname(cover_path))
         File.open(cover_path,"w") do |file|
           file << contents
         end
       end
       def write_copyright!
-        contents = render_template(root_dir.join("templates/html/copyright.erb"), config)
+        contents = render_template(root_dir.join("_templates/html/copyright.erb"), config)
         # File.open('help.html','w').write(contents)
+        FileUtils.mkdir_p(File.dirname(copyright_path))
         File.open(copyright_path,"w") do |file|
           file << contents
           # puts file
         end
       end
+      def write_thankspage!
+        contents = render_template(root_dir.join("_templates/html/thanks.erb"), config)
+        # File.open('help.html','w').write(contents)
+        FileUtils.mkdir_p(File.dirname(thanks_path))
+        File.open(thanks_path,"w") do |file|
+          file << contents
+          # puts file
+        end
+      end
       def write_toc!
         toc = TOC::Epub.new(navigation)
+        FileUtils.mkdir_p(File.dirname(toc_path))
         File.open(toc_path, "w") do |file|
           file << toc.to_html
         end
@@ -121,7 +141,7 @@ module Bookmaker
       end
       def assets
         @assets ||= begin
-          assets = Dir[root_dir.join("templates/epub/*.css")]
+          assets = Dir[root_dir.join("_templates/epub/*.css")]
           assets += Dir[root_dir.join("images/**/*.{jpg,png,gif}")]
           assets
         end
@@ -138,20 +158,23 @@ module Bookmaker
         end
       end
       def template_path
-        root_dir.join("templates/epub/page.erb")
+        root_dir.join("_templates/epub/page.erb")
       end
       def html_path
-        root_dir.join("output/#{name}.html")
+        root_dir.join("_output/#{name}.html")
       end
       def epub_path
-        root_dir.join("output/#{name}.epub")
+        root_dir.join("_output/#{name}.epub")
       end
       def tmp_dir
-        root_dir.join("output/tmp")
+        root_dir.join("_output/tmp")
       end
       def cover_path
         tmp_dir.join("cover.html")
       end
+      def thanks_path
+        tmp_dir.join("thanks.html")
+      end
       def back_path
         tmp_dir.join("back.html")
       end

data/lib/bookmaker/parser/html.rb

@@ -5,7 +5,8 @@ module Bookmaker
       def content
         raw = []
         entries.keys.each do |chapter|
-          text = "<h2>#{chapter.split(/_/)[1].gsub('-',' ').titleize}</h2>"
+          # text = "<h2>#{chapter.split(/_/)[1].gsub('-',' ').titleize}</h2>"
+          text = "<h2>Chapter</h2>"
           sections = []
           entries[chapter].each do |section|
             sections << "<p>#{read_content(section)[0].split(/\n{2,}/).map do |s|
@@ -26,8 +27,8 @@ module Bookmaker
                   :contents  => toc.content,
                   :toc       => toc.to_html,
                  })
-        output = render_template(root_dir.join("templates/html/layout.erb"), locals)
-        f = File.open(root_dir.join("output/#{name}.html"), 'w')
+        output = render_template(root_dir.join("_templates/html/layout.erb"), locals)
+        f = File.open(root_dir.join("_output/#{name}.html"), 'w')
         f.write(output)
         f.close
         true
@@ -44,20 +45,30 @@ module Bookmaker
           text.gsub!(/``(.*?'?)''/) { "&ldquo;#{$1}&rdquo;"}
           text.gsub!(/``(.*?'?)"/) { "&ldquo;#{$1}&rdquo;"}
           text.gsub!(/``/, "&ldquo;")
-          text.gsub!(/\b'\b/) { "&#39;" }
+          text.gsub!(/\b'\b/) { "&rsquo;" }
           text.gsub!(/`(.*?)'/) { "&lsquo;#{$1}&rsquo;"}
           # \{([^\}]+?)\} Within the curly braces.
           text.gsub!(/\\pf?break\{\}/,"<hr />")
+          text.gsub!(/\\pf?break/,"<hr />")
+          text.gsub!(/\\%/,'%')
+          text.gsub!(/\\`e/,'&eacute;')
+          text.gsub!(/\\textgreater\{?\}?/, "&gt;")
+          text.gsub!(/\\Bophendze/,'Bophendze')
           text.gsub!(/\\ldots\{\}/,"&hellip;")
           text.gsub!(/\\Dash\{\}/, "&mdash;")
+          text.gsub!(/\\Dash/, "&mdash;")
           text.gsub!(/\\begin\{quote\}(.*?)\\end\{quote\}/m) { "<blockquote>#{$1.strip}</blockquote>"}
           text.gsub!(/<\/blockquote>\s+?<blockquote>/m, "\n")
           text.gsub!(/\\begin\{([^\}]+?)\}(.*?)\\end\{[^\}]+?\}/m) { "<div class='#{$1.strip}'>#{$2.strip}</div>"}
           text.gsub!(/\\section\{([^\}]+?)\}/m) { "<h3>#{$1.strip}</h3>"}
-          ['Character','Equipment'].each do |s|
-            text.gsub!(/\\#{s}\{[^\}]+?\}\{([^\}]+?)\}/) { "<span class='#{s}'>#{$1.strip}</span>"}
-            text.gsub!(/\\#{s}\{([^\}]+?)\}/) { "<span class='#{s.downcase}'>#{$1.strip}</span>"}
+          ['Character','Equipment','Organization','Index'].each do |s|
+            # puts "Working on #{s}"
+            # text.gsub!(/\\#{s}{Drazen, Joven}{(Drazen)}/) { "<span class='#{s.downcase}'>#{$1.strip}</span>"}
+            text.gsub!(/\\#{s}\{[^\}]+?\}\{([^\}]+?)\}/) { "<span class='#{s.downcase}'>#{$1.strip}</span>"}
+            text.gsub!(/\\#{s}\{([^\}]+?)\}/) { ""}
+            # text.gsub!(/\\#{s}\{([^\}]+?)\}/) { "<span class='#{s.downcase}'>#{$1.strip}</span>"}
           end
+          text.gsub!(/\\footnote\{([^\}]+?)\}/m) { ""}
           text.gsub!(/\\emph\{([^\}]+?)\}/m) { "<em>#{$1.strip}</em>"}
           text.gsub!(/\\thought\{([^\}]+?)\}/m) { "<em>#{$1.strip}</em>"}
           text.gsub!(/\\(.*?)\{([^\}]+?)\}/) { "<span class='#{$1.downcase}'>#{$2.strip}</span>"}
@@ -65,7 +76,6 @@ module Bookmaker
           text.gsub!(/<\/span>\{[^\}]+?}/, "</span>")
           text.gsub!(/<p><h([1-6])>(.*?)<\/h[1-6]><\/p>/) { "<h#{$1}>#{$2.strip}</h#{$1}>"}
           text.gsub!(/(\S+)~(\S+)/) { "#{$1}&nbsp;#{$2}"}
-          # text.gsub!(/> +/, ">")
           output << text
         end
         output.gsub!(/\n\n+/, "\n\n")
@@ -97,7 +107,7 @@ module Bookmaker
      #   def parse
      #     reset_footnote_index!
      #
-     #     # File.open(root_dir.join("output/#{name}.html"), "w") do |file|
+     #     # File.open(root_dir.join("_output/#{name}.html"), "w") do |file|
      #     #   file << parse_layout(content)
      #     # end
      #     true
@@ -211,7 +221,7 @@ module Bookmaker
      #       :toc       => toc.to_html,
      #       :changelog => render_changelog
      #     })
-     #     render_template(root_dir.join("templates/html/layout.erb"), locals)
+     #     render_template(root_dir.join("_templates/html/layout.erb"), locals)
      #   end
      #
      #   # Render changelog file.

data/lib/bookmaker/parser/mobi.rb

@@ -10,7 +10,7 @@ module Bookmaker
         false
       end
       def epub_file
-        root_dir.join("output/#{name}.epub")
+        root_dir.join("_output/#{name}.epub")
       end
     end
   end

data/lib/bookmaker/parser/pdf.rb

@@ -7,6 +7,7 @@ module Bookmaker
         raw = []
         entries.keys.each do |chapter|
           title = (chapter.empty?) ? "Untitled" : chapter.split('_')[1]
+          title = 'Untitled' if title.nil?
           raw << "\\Chapter{#{title.gsub('-',' ')}}\n\n"
           entries[chapter].each do |section|
             s = read_content(section)[0]
@@ -46,7 +47,7 @@ module Bookmaker
         text.gsub!('* * *', "\n\n\\pbreak{}\n\n")
       end
       def tex_file
-        root_dir.join("output/#{name}.tex")
+        root_dir.join("_output/#{name}.tex")
       end
     end
   end

data/lib/bookmaker/stats.rb

@@ -1,45 +1,114 @@
+class Fixnum
+  def day
+    self * (60 * 60 * 24) # seconds * hours * minutes
+  end
+  def ago
+    Time.now - self
+  end
+end
+require 'json'
 module Bookmaker
   class Stats
     attr_reader :root_dir
 
     def initialize(root_dir)
       @root_dir = root_dir
+      @files = Dir["#{root_dir}/text/**/[0-9]*.tex"]
+      @words = 0
+      @progress = (File.exist?(log)) ? JSON.parse(File.open(log,'r').read).clone : {}
     end
 
-    def text
-      @text ||= html.text
+    def log
+      "#{root_dir}/.wordcount"
     end
 
-    def html
-      @html ||= Nokogiri::HTML(content)
+    def target
+      Bookmaker.config(@root_dir)['wordcount']
     end
-
-    def words
-      @words ||= text.split(" ").size
+    def now
+      Date.today.to_s
     end
+    def words
+      if @words == 0
+        most_recent = @files.max_by {|f| File.mtime(f)}
+        if !@progress[now].nil? and File.mtime(log) > File.mtime(most_recent)
+          @progress[now]
+        else
+          detex = "/usr/texbin/detex"
 
-    def chapters
-      @chapters ||= html.css(".chapter").size
+          file = Tempfile.new('foo.tex')
+          file.write(text)
+          file.close
+          @progress[now] = `detex #{file.path}| wc -w`.to_i
+          file.unlink
+          # Do previous day's progress...if nil.
+          @progress[Date.yesterday.to_s] = @progress[now] if @progress.keys.count == 1
+        end
+      end
+      if (lasttime != Date.yesterday.to_s)
+        # Update the record.
+        n = lasttime
+        w = @progress[lasttime]
+        n.upto(Date.yesterday.to_s) do |k|
+          # puts "Upto #{k}: @progress[#{k}] = #{w}"
+          @progress[k] = w
+        end
+      end
+      File.open(log,'w').write( JSON.generate(@progress) )
+      @words = @progress[now]
     end
-
-    def images
-      @images ||= html.css("img").size
+    def lasttime
+      p = nil
+      @progress.keys.sort.each do |k|
+        break if k == now
+        p = k
+      end
+      p
     end
-
-    def footnotes
-      @footnotes ||= html.css("p.footnote").size
+    def yesterday
+      @progress[lasttime]
     end
-
-    def links
-      @links ||= html.css("[href^='http']").size
+    def today
+      @words - @progress[lasttime] 
     end
-
-    def code_blocks
-      @code_blocks ||= html.css("pre").size
+    def text
+      @text = nil
+      @text = @files.map{|f| File.open(f,'r').read}.join("\n\n\n") if @text.nil?
     end
-
-    def content
-      @content ||= Parser::HTML.new(root_dir).content
+    def remaining
+      target - words
     end
+
+    # def html
+    #   @html ||= Nokogiri::HTML(content)
+    # end
+
+    # def words
+    #   @words ||= text.split(" ").size
+    # end
+
+    # def chapters
+    #   @chapters ||= html.css(".chapter").size
+    # end
+
+    # def images
+    #   @images ||= html.css("img").size
+    # end
+
+    # def footnotes
+    #   @footnotes ||= html.css("p.footnote").size
+    # end
+
+    # def links
+    #   @links ||= html.css("[href^='http']").size
+    # end
+
+    # def code_blocks
+    #   @code_blocks ||= html.css("pre").size
+    # end
+
+    # def content
+    #   @content ||= Parser::HTML.new(root_dir).content
+    # end
   end
 end