ffnpdf 0.0.3 → 0.0.4

data/README.md

@@ -52,7 +52,7 @@ This command
 * combines all `.md` files to a single file, `combined.md`, in alphabetical order
 * converts `combined.md` to `combined.pdf` while using both the template and variables file
 
-### Build
+### Convert
 
     ffnpdf convert [STORY_ID]
 
@@ -60,8 +60,14 @@ This command does only the second step of the Build i.e. converts `combined.md`
 
 ## Known Issues
 
-**Line following a horizontal line (<hr>) is missing**
+**Line following a horizontal line (\<hr\>) is missing**
 
 This is a problem with FF.net's rendering of stories, especially in older ones.
 
 At the moment, the only fix is to manually edit the `.md` files to add the missing lines.
+
+**Page numbering in bookmark is incorrect for stories with long Table of Contents**
+
+It's a tradeoff between wrong numbering in the Table of Contents or in the bookmarks. I chose the latter.
+
+I still don't know the root cause, though.

data/lib/ffnpdf.rb

@@ -1,6 +1,7 @@
 require "ffnpdf/version"
 require "ffnpdf/exec"
 require "ffnpdf/story"
+require "ffnpdf/chapter"
 require "ffnpdf/converter"
 
 module Ffnpdf

data/lib/ffnpdf/chapter.rb

@@ -0,0 +1,71 @@
+require 'httparty'
+require 'nokogiri'
+require 'fileutils'
+
+module Ffnpdf
+  class Chapter
+
+    attr_accessor :story_url, :chapter, :doc
+
+    def initialize(story_url, chapter)
+      self.story_url = story_url
+      self.chapter = chapter
+    end
+
+    def pull_and_convert
+      pull_chapter
+      convert_to_md
+    end
+
+    def pull_chapter
+      puts "pulling chapter #{chapter}"
+      pull = HTTParty.get(story_url)
+      self.doc = Nokogiri::HTML(pull.body)
+      content = doc.css(".storytext")[0].inner_html
+      content = content.gsub(/<div class.*?\/div>/m, "")
+      content = content.gsub(/<hr.*>/, "<hr/><p>")
+      puts "saving as #{padded_ch}.html"
+      tempfile = File.new("#{padded_ch}.html", "w")
+      tempfile.puts(content)
+      tempfile.close
+    end
+
+    def convert_to_md
+      puts "converting #{padded_ch}.html to #{padded_ch}.md"
+      Converter.exec("pandoc #{padded_ch}.html -o #{padded_ch}.md")
+      
+      if chapter ==1 or chapter_title
+        tempfile = File.new("#{padded_ch}.temp", "w")
+        if chapter == 1
+          tempfile.puts "\\pagenumbering{arabic}"
+          tempfile.puts "\\setcounter{page}{1}"
+          tempfile.puts
+        end
+
+        if (chapter_title)
+          tempfile.puts "\#\# #{chapter_title}"
+          tempfile.puts
+        end
+        IO.foreach("#{padded_ch}.md") do |line|
+          tempfile.puts line
+        end
+        tempfile.close
+        FileUtils.rm("#{padded_ch}.md")
+        File.rename("#{padded_ch}.temp", "#{padded_ch}.md")
+      end
+    end
+
+    def padded_ch
+      "%04d" % chapter
+    end
+
+    def chapter_title
+      if doc.xpath('//form//select[@name="chapter"]/option').count > 1
+        doc.xpath('//form//select[@name="chapter"]/option')[chapter - 1].text.gsub(/^[\d]*?\. /, "")
+      else
+        nil
+      end
+    end
+
+  end
+end

data/lib/ffnpdf/story.rb

@@ -1,7 +1,6 @@
 require 'httparty'
 require 'nokogiri'
 require 'fileutils'
-require 'open3'
 
 module Ffnpdf
   class Story
@@ -67,43 +66,23 @@ module Ffnpdf
       FileUtils.mkdir_p @story_id
       Dir.chdir @story_id
       
-      tempfile = File.new("temp.html", "w")
-      puts "pulling first chapter"
-      pull = HTTParty.get(story_url)
-      doc = Nokogiri::HTML(pull.body)
-      doc.css(".storytext")[0].children.each do |paragraph|
-        if /^<(p|hr|i|b)/.match paragraph.to_s
-          tempfile.puts paragraph
-        end
-      end
-      tempfile.close
+      chapter1 = Chapter.new(story_url, 1)
+      chapter1.pull_and_convert
 
-      Converter.exec 'pandoc temp.html -o 0001.md'
+      doc = chapter1.doc
 
       title = doc.xpath("//div/div/b")[0].text
       author = doc.xpath("//div/table//a[not(@title or @onclick)]")[0].text
 
       generate_template(title, author, get_doc_date(doc))
       generate_variables_file
-      generate_title_page
+      generate_title_page(chapter1.chapter_title)
 
       chapters = doc.xpath('//form//select[@name="chapter"]/option').count
-      if chapters > 1
-        append_header_to_ch1
 
+      if chapters > 1
         (2..chapters).each do |chapter| 
-          puts "pulling chapter #{chapter}"
-          tempfile = File.new("temp.html", "w")
-          tempfile.puts "<h2>Chapter #{chapter}</h2>"
-          pull = HTTParty.get("#{story_url}#{chapter}/")
-          doc = Nokogiri::HTML(pull.body)
-          doc.css(".storytext")[0].children.each do |paragraph|
-            if /^<(p|hr|i|b)/.match paragraph.to_s
-              tempfile.puts paragraph
-            end
-          end
-          tempfile.close
-          Converter.exec("pandoc temp.html -o #{"%04d" % chapter}.md")
+          Chapter.new("#{story_url}#{chapter}/", chapter).pull_and_convert
         end
       end
       Dir.chdir "../" 
@@ -126,7 +105,6 @@ module Ffnpdf
 % Shamelessly ripped off from https://github.com/karlseguin/the-little-mongodb-book
 \\documentclass[$fontsize$,$columns$]{book}
 \\usepackage{fullpage}
-\\usepackage{changepage}
 \\usepackage{fontspec,xltxtra,xunicode}
 \\defaultfontfeatures{Mapping=tex-text,Scale=MatchLowercase}
 \\setmainfont{$mainfont$}
@@ -138,7 +116,7 @@ module Ffnpdf
 \\linespread{1.2}
 
 \\usepackage{listings}
-\\usepackage[dvipsnames,usenames]{color}
+\\usepackage[dvipsnames,usenames]{xcolor}
 
 $if(fancy-enums)$
 \\usepackage{enumerate}
@@ -171,31 +149,18 @@ $body$
       variables.close
     end
 
-    def generate_title_page
+    def generate_title_page(has_toc = true)
       title_page = File.new("0000.md", "w")
-      contents = <<-CONTENTS
-\\maketitle
+      title = "\\maketitle\n"
+      if has_toc
+        title += <<-CONTENTS
 \\pagenumbering{roman}
 \\tableofcontents
 
-      CONTENTS
-      title_page.puts(contents)
-      title_page.close
-    end
-
-    def append_header_to_ch1
-      chapter1 = File.new("0001.temp", "w")
-      chapter1.puts "\\pagenumbering{arabic}"
-      chapter1.puts "\\setcounter{page}{1}"
-      chapter1.puts
-      chapter1.puts "\#\# Chapter 1"
-      chapter1.puts
-      IO.foreach("0001.md") do |line|
-        chapter1.puts line
+        CONTENTS
       end
-      chapter1.close
-      FileUtils.rm("0001.md")
-      File.rename("0001.temp", "0001.md")
+      title_page.puts(title)
+      title_page.close
     end
 
     def build_story

data/lib/ffnpdf/version.rb

@@ -1,3 +1,3 @@
 module Ffnpdf
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/release_notes.md

@@ -0,0 +1,5 @@
+### 0.0.4
+
+* now creates a `html` file for each chapter
+* fixed `hr` parsing
+* chapter titles are now based on the value in the dropdown

data/spec/ffnpdf/chapter_spec.rb

@@ -0,0 +1,4 @@
+require 'spec_helper'
+
+describe Ffnpdf::Chapter do
+end

data/spec/ffnpdf_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Ffnpdf do
   it "has the correct version" do
-    Ffnpdf::VERSION.should == "0.0.3"
+    Ffnpdf::VERSION.should == "0.0.4"
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffnpdf
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-14 00:00:00.000000000 Z
+date: 2012-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &69865690 !ruby/object:Gem::Requirement
+  requirement: &69050000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69865690
+  version_requirements: *69050000
 - !ruby/object:Gem::Dependency
   name: test_notifier
-  requirement: &69865320 !ruby/object:Gem::Requirement
+  requirement: &69049700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69865320
+  version_requirements: *69049700
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &69864940 !ruby/object:Gem::Requirement
+  requirement: &69049490 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69864940
+  version_requirements: *69049490
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &69864590 !ruby/object:Gem::Requirement
+  requirement: &69049040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69864590
+  version_requirements: *69049040
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &69864260 !ruby/object:Gem::Requirement
+  requirement: &69048540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *69864260
+  version_requirements: *69048540
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &69863850 !ruby/object:Gem::Requirement
+  requirement: &69048190 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *69863850
+  version_requirements: *69048190
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &69863410 !ruby/object:Gem::Requirement
+  requirement: &69047890 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *69863410
+  version_requirements: *69047890
 description: Scrapes a story off FF.net, converts it to Markdown, and turns it to
   PDF with LaTeX
 email:
@@ -106,10 +106,13 @@ files:
 - bin/ffnpdf
 - ffnpdf.gemspec
 - lib/ffnpdf.rb
+- lib/ffnpdf/chapter.rb
 - lib/ffnpdf/converter.rb
 - lib/ffnpdf/exec.rb
 - lib/ffnpdf/story.rb
 - lib/ffnpdf/version.rb
+- release_notes.md
+- spec/ffnpdf/chapter_spec.rb
 - spec/ffnpdf/converter_spec.rb
 - spec/ffnpdf/exec_spec.rb
 - spec/ffnpdf/story_spec.rb