kitabu 1.0.0.rc2 → 1.0.0.rc3

data/.gitignore

@@ -1,3 +1,4 @@
 .DS_Store
 pkg
 tmp
+spec/support/mybook/output/mybook.*

data/Gemfile.lock

@@ -1,56 +1,65 @@
 PATH
   remote: .
   specs:
-    kitabu (1.0.0.rc2)
-      RedCloth (~> 4.2)
-      activesupport (~> 3.0)
+    kitabu (1.0.0.rc3)
+      RedCloth
+      activesupport
       coderay
-      eeepub-with-cover-support (~> 0.8)
-      i18n (~> 0.5)
-      nokogiri (~> 1.5)
-      notifier (~> 0.1)
-      rdiscount (~> 1.6)
-      thor (~> 0.14)
-      watchr (~> 0.7)
+      eeepub-with-cover-support
+      i18n
+      nokogiri
+      notifier
+      rdiscount
+      thor
+      watchr
 
 GEM
   remote: http://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    activesupport (3.2.3)
+    activesupport (3.2.8)
       i18n (~> 0.6)
       multi_json (~> 1.0)
+    awesome_print (1.0.2)
     builder (3.0.0)
-    coderay (1.0.6)
+    coderay (1.0.7)
     diff-lcs (1.1.3)
     eeepub-with-cover-support (0.8.7)
       builder
       rubyzip
     i18n (0.6.0)
-    multi_json (1.3.5)
-    nokogiri (1.5.2)
+    method_source (0.8)
+    multi_json (1.3.6)
+    nokogiri (1.5.5)
     notifier (0.2.1)
+    pry (0.9.10)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.3.1)
     rake (0.9.2.2)
     rdiscount (1.6.8)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.1)
-    rspec-expectations (2.10.0)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.2)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-    rubyzip (0.9.8)
+    rspec-mocks (2.11.2)
+    rubyzip (0.9.9)
+    slop (3.3.2)
     test_notifier (1.0.0)
       notifier
-    thor (0.15.2)
+    thor (0.16.0)
     watchr (0.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  awesome_print
   kitabu!
+  pry
   rake
   rspec
   test_notifier

data/examples/RailsGuides/config/kitabu.yml

@@ -40,9 +40,5 @@ identifier:
 authors:
   - "Rails Documentation Team"
 
-# The theme that will be used for source
-# code syntax highlighting.
-theme: idle
-
 # The base URL from your source code.
 base_url: http://example.com

data/kitabu.gemspec

@@ -19,18 +19,20 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "activesupport",             "~> 3.0"
-  s.add_dependency "nokogiri",                  "~> 1.5"
-  s.add_dependency "RedCloth",                  "~> 4.2"
-  s.add_dependency "rdiscount",                 "~> 1.6"
-  s.add_dependency "i18n",                      "~> 0.5"
-  s.add_dependency "thor",                      "~> 0.14"
-  s.add_dependency "eeepub-with-cover-support", "~> 0.8"
-  s.add_dependency "watchr",                    "~> 0.7"
-  s.add_dependency "notifier",                  "~> 0.1"
+  s.add_dependency "activesupport"
+  s.add_dependency "nokogiri"
+  s.add_dependency "RedCloth"
+  s.add_dependency "rdiscount"
+  s.add_dependency "i18n"
+  s.add_dependency "thor"
+  s.add_dependency "eeepub-with-cover-support"
+  s.add_dependency "watchr"
+  s.add_dependency "notifier"
   s.add_dependency "coderay"
 
   s.add_development_dependency "rspec"
   s.add_development_dependency "test_notifier"
   s.add_development_dependency "rake"
+  s.add_development_dependency "pry"
+  s.add_development_dependency "awesome_print"
 end

data/lib/kitabu.rb

@@ -47,6 +47,7 @@ module Kitabu
   autoload :Generator,  "kitabu/generator"
   autoload :TOC,        "kitabu/toc"
   autoload :Cli,        "kitabu/cli"
+  autoload :Markdown,   "kitabu/adapters/markdown"
   autoload :Parser,     "kitabu/parser"
   autoload :Exporter,   "kitabu/exporter"
   autoload :Syntax,     "kitabu/syntax"

data/lib/kitabu/adapters/markdown.rb

@@ -0,0 +1,34 @@
+module Kitabu
+  class Markdown
+    # Supported Markdown libraries
+    #
+    MARKDOWN_LIBRARIES = %w[Maruku BlueCloth PEGMarkdown Redcarpet RDiscount]
+
+    # Retrieve preferred Markdown processor.
+    # You'll need one of the following libraries:
+    #
+    # # RDiscount: https://rubygems.org/gems/rdiscount
+    # # Maruku: https://rubygems.org/gems/maruku
+    # # PEGMarkdown: https://rubygems.org/gems/rpeg-markdown
+    # # BlueCloth: https://rubygems.org/gems/bluecloth
+    # # Redcarpet: https://rubygems.org/gems/redcarpet
+    #
+    # Note: RDiscount will always be installed as Kitabu's dependency but only used when no
+    # alternative library is available.
+    #
+    def self.engine
+      @engine ||= Object.const_get(MARKDOWN_LIBRARIES.find {|lib| Object.const_defined?(lib)})
+    end
+
+    # Convert Markdown to HTML.
+    def self.to_html(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_html
+      end
+    end
+  end
+end

data/lib/kitabu/parser/epub.rb

@@ -28,7 +28,7 @@ module Kitabu
         epub.date         config[:published_at]
         epub.uid          config[:uid]
         epub.identifier   config[:identifier][:id], :scheme => config[:identifier][:type]
-        epub.cover_page   cover_image
+        epub.cover_page   cover_image if cover_image && File.exist?(cover_image)
 
         write_sections!
         write_toc!
@@ -80,6 +80,8 @@ module Kitabu
           section.html.css("[src]").each do |element|
             src = File.basename(element["src"]).gsub(/\.svg$/, ".png")
             element.set_attribute("src", src)
+            element.set_attribute("alt", "")
+            element.node_name = "img"
           end
 
           FileUtils.mkdir_p(tmp_dir)
@@ -87,7 +89,8 @@ module Kitabu
           # Save file to disk.
           #
           File.open(section.filepath, "w") do |file|
-            file << render_chapter(section.html.css("body").inner_html)
+            body = section.html.css("body").to_xhtml.gsub(%r[<body>(.*?)</body>]m, "\\1")
+            file << render_chapter(body)
           end
         end
       end
@@ -101,7 +104,6 @@ module Kitabu
         @assets ||= begin
           assets = Dir[root_dir.join("templates/epub/*.css")]
           assets += Dir[root_dir.join("images/**/*.{jpg,png,gif}")]
-          assets << cover_image if cover_image
           assets
         end
       end

data/lib/kitabu/parser/html.rb

@@ -1,10 +1,6 @@
 module Kitabu
   module Parser
     class HTML < Base
-      # Supported Markdown libraries
-      #
-      MARKDOWN_LIBRARIES = %w[Maruku BlueCloth PEGMarkdown Redcarpet RDiscount]
-
       # List of directories that should be skipped.
       #
       IGNORE_DIR = %w[. .. .svn]
@@ -105,7 +101,7 @@ module Kitabu
 
         content = case file_format
         when :markdown
-          markdown.new(content).to_html
+          Markdown.to_html(content)
         when :textile
           RedCloth.convert(content)
         else
@@ -188,22 +184,6 @@ module Kitabu
           end
         end
       end
-
-      # Retrieve preferred Markdown processor.
-      # You'll need one of the following libraries:
-      #
-      # # RDiscount: https://rubygems.org/gems/rdiscount
-      # # Maruku: https://rubygems.org/gems/maruku
-      # # PEGMarkdown: https://rubygems.org/gems/rpeg-markdown
-      # # BlueCloth: https://rubygems.org/gems/bluecloth
-      # # Redcarpet: https://rubygems.org/gems/redcarpet
-      #
-      # Note: RDiscount will always be installed as Kitabu's dependency but only used when no
-      # alternative library is available.
-      #
-      def markdown
-        @markdown ||= Object.const_get(MARKDOWN_LIBRARIES.find {|lib| Object.const_defined?(lib)})
-      end
     end
   end
 end

data/lib/kitabu/parser/pdf.rb

@@ -9,7 +9,7 @@ module Kitabu
       def apply_footnotes!
         html = Nokogiri::HTML(html_file.read)
 
-        # https://github.com/tenderlove/nokogiri/issues/339
+        # https://github.com/sparklemotion/nokogiri/issues/339
         html.css("html").first.tap do |element|
           next unless element
           element.delete("xmlns")

data/lib/kitabu/parser/txt.rb

@@ -2,7 +2,7 @@ module Kitabu
   module Parser
     class Txt < Base
       def parse
-        spawn_command ["html2text", "-style", "pretty", "-o", txt_file.to_s, html_file.to_s]
+        spawn_command ["html2text", "-style", "pretty", "-nobs", "-o", txt_file.to_s, html_file.to_s]
       end
 
       def html_file

data/lib/kitabu/toc/html.rb

@@ -28,7 +28,7 @@ module Kitabu
           tag.set_attribute("id", permalink)
         end
 
-        html.css("body").inner_html
+        html.css("body").to_xhtml.gsub(/<body>(.*?)<\/body>/m, "\\1")
       end
 
       # Traverse every title normalizing its content as a permalink.

data/lib/kitabu/version.rb

@@ -3,6 +3,6 @@ module Kitabu
     MAJOR = 1
     MINOR = 0
     PATCH = 0
-    STRING = "#{MAJOR}.#{MINOR}.#{PATCH}.rc2"
+    STRING = "#{MAJOR}.#{MINOR}.#{PATCH}.rc3"
   end
 end

data/spec/support/mybook/config/kitabu.yml

@@ -41,10 +41,6 @@ authors:
   - "John Doe"
   - "Mary Doe"
 
-# The theme that will be used for source
-# code syntax highlighting.
-theme: idle
-
 # The base URL from your source code.
 base_url: http://example.com
 

data/templates/config.erb

@@ -40,9 +40,5 @@ identifier:
 authors:
   - "<%= @name %>"
 
-# The theme that will be used for source
-# code syntax highlighting.
-theme: mac_classic
-
 # The base URL from your source code.
 base_url: http://example.com

data/templates/layout.css

@@ -118,7 +118,7 @@ div.frontcover * {
 /* =========== */
 #chapters {
     counter-reset: page 1;
-    counter-reset: chapter 1;
+    counter-reset: chapter;
     page-break-before: always;
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitabu
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.0.0.rc3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,152 +9,152 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-23 00:00:00.000000000 Z
+date: 2012-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdiscount
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: eeepub-with-cover-support
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: watchr
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: notifier
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coderay
   requirement: !ruby/object:Gem::Requirement
@@ -219,6 +219,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A framework that generates PDF and e-Pub from Markdown, Textile, and
   HTML files.
 email:
@@ -265,6 +297,7 @@ files:
 - examples/RailsGuides/text/13_Configuration_gotchas.mkdn
 - kitabu.gemspec
 - lib/kitabu.rb
+- lib/kitabu/adapters/markdown.rb
 - lib/kitabu/cli.rb
 - lib/kitabu/dependency.rb
 - lib/kitabu/errors.rb
@@ -310,7 +343,6 @@ files:
 - spec/support/mybook/images/.gitkeep
 - spec/support/mybook/images/logo.gif
 - spec/support/mybook/output/.gitkeep
-- spec/support/mybook/output/mybook.pdf.html
 - spec/support/mybook/templates/epub/cover.erb
 - spec/support/mybook/templates/epub/page.erb
 - spec/support/mybook/templates/epub/style.css
@@ -365,46 +397,4 @@ signing_key:
 specification_version: 3
 summary: A framework that generates PDF and e-Pub from Markdown, Textile, and HTML
   files.
-test_files:
-- spec/kitabu/cli/export_spec.rb
-- spec/kitabu/cli/new_spec.rb
-- spec/kitabu/cli/permalinks_spec.rb
-- spec/kitabu/cli/version_spec.rb
-- spec/kitabu/extensions/redcloth_spec.rb
-- spec/kitabu/extensions/string_spec.rb
-- spec/kitabu/generator_spec.rb
-- spec/kitabu/parser/epub_spec.rb
-- spec/kitabu/parser/html_spec.rb
-- spec/kitabu/parser/pdf_spec.rb
-- spec/kitabu/syntax_spec.rb
-- spec/kitabu/toc/html_spec.rb
-- spec/kitabu_spec.rb
-- spec/spec_helper.rb
-- spec/support/exit_with_code.rb
-- spec/support/have_tag.rb
-- spec/support/helper.rb
-- spec/support/mybook/.gitignore
-- spec/support/mybook/code/.gitkeep
-- spec/support/mybook/code/code.rb
-- spec/support/mybook/config/helper.rb
-- spec/support/mybook/config/kitabu.yml
-- spec/support/mybook/images/.gitkeep
-- spec/support/mybook/images/logo.gif
-- spec/support/mybook/output/.gitkeep
-- spec/support/mybook/output/mybook.pdf.html
-- spec/support/mybook/templates/epub/cover.erb
-- spec/support/mybook/templates/epub/page.erb
-- spec/support/mybook/templates/epub/style.css
-- spec/support/mybook/templates/html/layout.css
-- spec/support/mybook/templates/html/layout.erb
-- spec/support/mybook/templates/html/syntax.css
-- spec/support/mybook/templates/html/user.css
-- spec/support/mybook/text/.gitkeep
-- spec/support/mybook/text/01_Markdown_Chapter.markdown
-- spec/support/mybook/text/02_Textile_Chapter.textile
-- spec/support/mybook/text/03_HTML_Chapter.html
-- spec/support/mybook/text/04_With_Directory/Some_Chapter.mkdn
-- spec/support/mybook/text/CHANGELOG.textile
-- spec/support/mybook/text/TOC.textile
-- spec/support/mybook/text/_00_Introduction.markdown
-- spec/support/shared.rb
+test_files: []

data/spec/support/mybook/output/mybook.pdf.html

@@ -1,83 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>Testing Kitabu</title>
-    <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-    <link rel="stylesheet" type="text/css" href="../templates/html/layout.css" />
-    <link rel="stylesheet" type="text/css" href="../templates/html/syntax.css" />
-    <link rel="stylesheet" type="text/css" href="../templates/html/user.css" />
-    <meta name="author" content="John Doe, Mary Doe" />
-    <meta name="subject" content="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." />
-    <meta name="keywords" content="demo, book, pdf, epub, kitabu, textile, html, markdown" />
-    <meta name="date" content="2010-12-19" />
-  </head>
-  <body>
-    <div class="frontcover container">
-      <div>
-        <h1>Testing Kitabu</h1>
-        <p class="description">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
-        <p class="authors">John Doe and Mary Doe</p>
-      </div>
-    </div>
-
-    <div class="table-of-contents">
-      <h2 class="no-toc">Content</h2>
-      <div id="toc">
-        <div class="level2 markdown"><a href="#markdown"><span>Markdown</span></a></div><div class="level2 textile"><a href="#textile"><span>Textile</span></a></div><div class="level2 html"><a href="#html"><span>HTML</span></a></div><div class="level2 some-chapter"><a href="#some-chapter"><span>Some Chapter</span></a></div>
-      </div>
-    </div>
-
-    <div id="chapters">
-      <div class="chapter">
-<h2 id="markdown">Markdown</h2>
-
-<p>This chapter was written with <a href="http://daringfireball.net/projects/markdown/">Markdown</a>.</p>
-
-<div class="CodeRay">
-  <div class="code"><pre>nice to hear that!</pre></div>
-</div>
-
-
-
-
-
-</div>
-<div class="chapter">
-<h2 id="textile">Textile</h2>
-<p>This chapter was written with <a href="http://www.textism.com/tools/textile/">Textile</a>.</p>
-
-</div>
-<div class="chapter">
-<h2 id="html">HTML</h2>
-
-<p>This chapter was written with HTML.</p>
-
-
-</div>
-<div class="chapter">
-<h2 id="some-chapter">Some Chapter</h2>
-
-<p>Some chapter organized in a directory.</p>
-
-
-</div>
-    </div>
-
-    <div class="imprint container">
-      <div>
-        <h2>Testing Kitabu</h2>
-        <p>John Doe and Mary Doe</p>
-        <p>Copyright (C) 2010 John Doe.</p>
-      </div>
-    </div>
-
-    
-      <div class="container changelog">
-        <h2>Revisions</h2>
-<h3>Version 1</h3>
-<ul><li>Some text fixes</li>
-	<li>Added chapter about something</li>
-</ul></div>
-    
-  </body>
-</html>