fnando-kitabu 0.3.3 → 0.3.4

data/README.markdown

@@ -1,15 +1,13 @@
 Kitabu
 ======
 
-* [http://github.com/fnando/kitabu](http://github.com/fnando/kitabu)
+* <http://fnando.github.com/kitabu.html>
 
 DESCRIPTION:
 ------------
 
 A framework for creating e-books from Markdown/Textile text markup using Ruby. 
 Using the Prince PDF generator, you'll be able to get high quality PDFs.
-Mac users that have [Textmate](http://macromates.com) installed can have source 
-code highlighted with his/her favorite theme.
 
 While Prince is too expensive (495USD for a single user license), the 
 free version available at [http://www.princexml.com/download/](http://www.princexml.com/download/) generates
@@ -25,198 +23,17 @@ FEATURES:
 * Generate a PDF with a single rake task
 * Table of Contents automatically generated from chapter titles
 
-SYNOPSIS:
----------
-
-Create a new book with `kitabu mybook`. Kitabu has support for book
-layout and syntax highlight theme. You can specify other settings:
-
-	kitabu mybook --theme=mac_classic
-	kitabu mybook --layout=boom
-
-You can check available layouts and themes with `kitabu --help`
-
-The `kitabu` command creates a directory "mybook" with the 
-following structure:
-
-- book
-	- config.yml
-	- images
-	- output
-	- Rakefile
-	- templates
-		- layout.css
-		- layout.html
-		- syntax.css
-		- user.css
-	- text
-
-The `config.yml` file holds some information about your book; so you'll always
-change it. This is the default generated file:
-
-	title: [Your Book Title]
-	copyright: Copyright (c) 2008 [Your Name], All Rights Reserved
-	authors:
-	  - [Your Name]
-	  - [Other Name]
-	subject: [Write down what your book is about]
-	keywords: [The keywords related to your book]
-	theme: eiffel
-
-If you're writing on a different language, the `user.css` file can override all
-the messages added by the `layout.css`. Examples on doing this coming soon.
-
-Now it's time to write your book. All your book content will be placed on the
-text directory. Kitabu requires you to separate your book into chapters. 
-A chapter is nothing but a directory that holds lots of Markdown/Textile files.
-The book will be generated using every folder/file alphabetically. So be sure 
-to use a sequential numbering as the name. Here's a sample:
-
-- text
-	- 01_Introduction
-		- 01\_introduction.markdown
-	- 02\_What\_is\_Ruby\_on\_Rails
-		- 01\_MVC.markdown
-		- 02\_DRY.markdown
-		- 03\_Convention\_Over\_Configuration.markdown
-	- 03\_Installing\_Ruby\_on\_Rails
-		- 01\_Installing.textile
-		- 02\_Mac\_OS\_X\_instructions.textile
-		- 03\_Windows\_instructions.markdown
-		- 04\_Ubuntu\_Linux\_instructions.markdown
-
-If you prefer, you can add a chapter per file:
-
-- text
-	- 01\_Introduction.markdown
-	- 02\_What\_is\_Ruby\_on\_Rails.markdown
-	- 03\_Installing\_Ruby\_on\_Rails.markdown
-
-Note that you can use Textile or Markdown at the same time. Just use the 
-`.markdown` or `.textile` file extension.
-
-You'll want to see your progress eventually; it's time for you to generate
-the book PDF. Just run the command `rake kitabu:pdf` and your book will be 
-created on the output directory.
-
-There are other rake tasks you can use:
-
-* `kitabu:html` - generate a html from your content
-* `kitabu:syntaxes` - list all available syntaxes
-* `kitabu:themes` - list all available themes
-* `kitabu:titles` - list all titles and its permalinks
-* `kitabu:watch` - watch `text` for any change and automatically generate html
-
-Kitabu can generate a Table of Contents (TOC) based on your h2-h6 tags. The 
-h1 tag is discarded because it's meant to be the book title. 
-
-If you need to link to a specific chapter, you can use the `kitabu:titles` rake
-task to know what's the permalink that you need. For example, a title 
-`Installing Mac OS X` will have a permalink `installing-mac-os-x` and you can
-link to this chapter by writing
-`"See more on Installing Mac OS X":#installing-mac-os-x` when using 
-Textile.
-
-To generate the TOC, you need to print a variable called `toc`, using the eRb
-tag `<%= toc %>`.
-
-Syntax Highlighting
-===================
-
-If you're using Textile, all you need to do is use the tag `syntax.`. For 
-example, to highlight a code added right into your text, just do something like
-
-	syntax(ruby_on_rails). class User < ActiveRecord::Base
-	  validates_presence_of :login, :password, :email
-	__
-	  validates_uniqueness_of :login, :email
-	end
-
-To keep multiple line breaks into a single code block, add a line `__`;
-Kitabu will replace it when generating the HTML file.
-
-If you want to highlight a file, you need to place it into the `code` 
-directory and call it like this:
-
-	syntax(ruby_on_rails). some_file.rb
-
-You can specify the lines you want to highlight; the example below will 
-highlight lines 10-17 from some_file.rb.
-
-	syntax(ruby_on_rails 10,17). some_file.rb
-
-You can also specify named blocks to highlight. Named blocks are identified
-by `#begin` and `#end` marks. If some_file.rb has the following code
-
-	require "rubygems"
-	require "hpricot"
-	require "open"
-
-	# begin: get_all_h2_tags
-	doc = Hpricot(open('http://simplesideias.com.br'))
-	(doc/"h2").each {|h2| puts h2.inner_text }
-	# end: get_all_h2_tags
-
-you can get the code between `get_all_h2_tags` using
-
-	syntax(ruby#get_all_h2_tags). some_file.rb
-
-*Note:* Makdown uses the same syntax above. You just need to indent your code
-(as usual) and add the `syntax.` thing as the first line.
-
-INSTALL:
---------
-
-	sudo gem install fnando-kitabu --source http://gems.github.com
-
-or, if you have problem
-
-	git clone git://github.com/fnando/kitabu.git
-	cd kitabu
-	gem build kitabu.gemspec
-	sudo gem install kitabu
-
-To have syntax highlighting support, you need to install
-Oniguruma regular expression library that can be found at 
-[http://www.geocities.jp/kosako3/oniguruma/](http://www.geocities.jp/kosako3/oniguruma/)
-
-Then, you need to install the Ultraviolet gem.
-
-	sudo gem install ultraviolet
-
-TROUBLESHOOTING
----------------
-
-You might get this error (specially on Linux):
-
-    require 'uv'
-    LoadError: libonig.so.2: cannot open shared object file: No such file or directory - /usr/lib/ruby/gems/1.8/gems/oniguruma-1.1.0/lib/oregexp.so
-
-It means Ruby can’t find `libonig.so.2`. Add the path to the directory where the file is located to `/etc/ld.so.conf`:
-
-    include /etc/ld.so.conf.d/*.conf
-    include /usr/local/lib
-
-Then run:
-
-    ldconfig
-
-
-REFERENCES:
------------
-
-- Textile: [http://hobix.com/textile/](http://hobix.com/textile/)
-- Markdown: [http://daringfireball.net/projects/markdown/syntax](http://daringfireball.net/projects/markdown/syntax)
+Check it out <http://fnando.github.com/kitabu.html> for details.
 
 MAINTAINER
 ----------
  
-* Nando Vieira ([http://simplesideias.com.br](http://simplesideias.com.br))
+* Nando Vieira (<http://simplesideias.com.br>)
 
 CONTRIBUTORS
 ------------
  
-* Arthur Zapparoli ([http://arthurgeek.net](http://arthurgeek.net))
+* Arthur Zapparoli (<http://arthurgeek.net>)
 
 LICENSE:
 --------

data/Rakefile

@@ -1,89 +1,40 @@
-require 'rake'
+require "rake"
+require "jeweler"
+require File.dirname(__FILE__) + "/lib/kitabu"
 
-PKG_FILES = %w(Rakefile kitabu.gemspec README.markdown) + Dir["{bin,lib,templates}/**/*"]
-
-spec = Gem::Specification.new do |s|
-  s.name = "kitabu"
-  s.version = "0.3.3"
-  s.summary = "A framework for creating e-books from Markdown/Textile text markup using Ruby."
-  s.authors = ["Nando Vieira"]
-  s.email = ["fnando.vieira@gmail.com"]
-  s.homepage = "http://github.com/fnando/kitabu"
-  s.description = "A framework for creating e-books from Markdown/Textile text markup using Ruby. Using the Prince PDF generator, you'll be able to get high quality PDFs. Mac users that have Textmate installed can have source code highlighted with his favorite theme."
-  s.has_rdoc = false
-  s.files = PKG_FILES
-	s.bindir = "bin"
-	s.executables = "kitabu"
+JEWEL = Jeweler::Tasks.new do |gem|
+  gem.name = "kitabu"
+  gem.version = Kitabu::VERSION
+  gem.summary = "A framework for creating e-books from Markdown/Textile text markup using Ruby."
+  gem.description = <<-TXT
+A framework for creating e-books from Markdown/Textile text markup using Ruby. 
+Using the Prince PDF generator, you'll be able to get high quality PDFs.
+TXT
+  
+  gem.authors = ["Nando Vieira"]
+  gem.email = "fnando.vieira@gmail.com"
+  gem.homepage = "http://fnando.github.com/kitabu.html"
+  
+  gem.has_rdoc = false
+  gem.files = %w(Rakefile kitabu.gemspec VERSION README.markdown) + Dir["{bin,lib,templates}/**/*"]
+	gem.bindir = "bin"
+	gem.executables = "kitabu"
 	
-	# Dependencies
-  s.add_dependency "discount"
-  s.add_dependency "hpricot"
-  s.add_dependency "unicode"
-  s.add_dependency "main"
-  s.add_dependency "ultraviolet"
+	gem.add_dependency "discount"
+  gem.add_dependency "hpricot"
+  gem.add_dependency "unicode"
+  gem.add_dependency "main"
+  gem.add_dependency "ultraviolet"
   
-  # Requirements
-  s.requirements << "Install the Oniguruma RE library"
+  gem.requirements << "Install the Oniguruma RE library"
 end
 
-namespace :gem do
-  # Thanks to the Merb project for this code.
-  desc "Update Github Gemspec"
-  task :update_gemspec do
-    skip_fields = %w(new_platform original_platform specification_version loaded required_ruby_version rubygems_version platform )
-    
-    result = "# WARNING : RAKE AUTO-GENERATED FILE. DO NOT MANUALLY EDIT!\n"
-    result << "# RUN : 'rake gem:update_gemspec'\n\n"
-    result << "Gem::Specification.new do |s|\n"
-    
-    spec.instance_variables.each do |ivar|
-      value = spec.instance_variable_get(ivar)
-      name  = ivar.split("@").last
-      next if name == "date"
-      
-      if name == 'version'
-        base_file = File.join(File.dirname(__FILE__), 'lib/kitabu/base.rb')
-        contents = File.read(base_file)
-        contents.gsub!(/VERSION = "[\d\.]+"/sim, %(VERSION = "#{value}"))
-        File.open(base_file, 'w+') do |f|
-          f << contents
-        end
-      end
-      
-      next if skip_fields.include?(name) || value.nil? || value == "" || (value.respond_to?(:empty?) && value.empty?)
-      if name == "dependencies"
-        value.each do |d|
-          dep, *ver = d.to_s.split(" ")
-          result <<  "  s.add_dependency #{dep.inspect}, #{ver.join(" ").inspect.gsub(/[()]/, "").gsub(", runtime", "")}\n"
-        end
-      else
-        case value
-        when Array
-          value =  name != "files" ? value.inspect : value.inspect.split(",").join(",\n")
-        when FalseClass
-        when TrueClass
-        when Fixnum
-        when String
-          value = value.inspect
-        else
-          value = value.to_s.inspect
-        end
-        result << "  s.#{name} = #{value}\n"
-      end
-    end
-    
-    result << "end"
-    File.open(File.join(File.dirname(__FILE__), "#{spec.name}.gemspec"), "w"){|f| f << result}
-  end
+desc "Generate gemspec, build and install the gem"
+task :package do
+  File.open("VERSION", "w+") {|f| f << Kitabu::VERSION.to_s }
+  FileUtils.cp "VERSION", File.expand_path("~/Sites/github/glue-pages/views/version/_#{JEWEL.gemspec.name}.haml")
   
-  desc "Build gem"
-  task :build => :update_gemspec do
-    system "rm *.gem"
-    system "gem build #{spec.instance_variable_get('@name')}.gemspec"
-  end
-  
-  desc "Install gem"
-  task :install => :build do
-    system "sudo gem install #{spec.instance_variable_get('@name')}"
-  end
-end
+  Rake::Task["gemspec"].invoke
+  Rake::Task["build"].invoke
+  Rake::Task["install"].invoke
+end

data/VERSION

@@ -0,0 +1 @@
+0.3.4

data/kitabu.gemspec

@@ -1,55 +1,81 @@
-# WARNING : RAKE AUTO-GENERATED FILE. DO NOT MANUALLY EDIT!
-# RUN : 'rake gem:update_gemspec'
+# -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.required_rubygems_version = ">= 0"
-  s.has_rdoc = true
-  s.email = ["fnando.vieira@gmail.com"]
-  s.name = "kitabu"
-  s.homepage = "http://github.com/fnando/kitabu"
-  s.bindir = "bin"
+  s.name = %q{kitabu}
+  s.version = "0.3.4"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Nando Vieira"]
+  s.date = %q{2009-08-02}
+  s.default_executable = %q{kitabu}
+  s.description = %q{A framework for creating e-books from Markdown/Textile text markup using Ruby. 
+Using the Prince PDF generator, you'll be able to get high quality PDFs.
+}
+  s.email = %q{fnando.vieira@gmail.com}
   s.executables = ["kitabu"]
-  s.summary = "A framework for creating e-books from Markdown/Textile text markup using Ruby."
-  s.requirements = ["Install the Oniguruma RE library"]
-  s.description = "A framework for creating e-books from Markdown/Textile text markup using Ruby. Using the Prince PDF generator, you'll be able to get high quality PDFs. Mac users that have Textmate installed can have source code highlighted with his favorite theme."
-  s.add_dependency "discount", ">= 0"
-  s.add_dependency "hpricot", ">= 0"
-  s.add_dependency "unicode", ">= 0"
-  s.add_dependency "main", ">= 0"
-  s.add_dependency "ultraviolet", ">= 0"
-  s.version = "0.3.3"
+  s.extra_rdoc_files = [
+    "README.markdown"
+  ]
+  s.files = [
+    "README.markdown",
+     "Rakefile",
+     "VERSION",
+     "bin/kitabu",
+     "kitabu.gemspec",
+     "lib/kitabu.rb",
+     "lib/kitabu/base.rb",
+     "lib/kitabu/blackcloth.rb",
+     "lib/kitabu/markup.rb",
+     "lib/kitabu/redcloth.rb",
+     "lib/kitabu/tasks.rb",
+     "lib/kitabu/templates.rb",
+     "lib/kitabu/toc.rb",
+     "templates/Rakefile",
+     "templates/config.yml",
+     "templates/layouts/boom/layout.css",
+     "templates/layouts/boom/layout.html",
+     "templates/syntax.css",
+     "templates/themes/active4d.css",
+     "templates/themes/blackboard.css",
+     "templates/themes/dawn.css",
+     "templates/themes/eiffel.css",
+     "templates/themes/idle.css",
+     "templates/themes/iplastic.css",
+     "templates/themes/lazy.css",
+     "templates/themes/mac_classic.css",
+     "templates/themes/slush_poppies.css",
+     "templates/themes/sunburst.css",
+     "templates/user.css"
+  ]
+  s.homepage = %q{http://fnando.github.com/kitabu.html}
+  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.files = ["Rakefile",
- "kitabu.gemspec",
- "README.markdown",
- "bin/kitabu",
- "lib/kitabu",
- "lib/kitabu/base.rb",
- "lib/kitabu/blackcloth.rb",
- "lib/kitabu/markup.rb",
- "lib/kitabu/redcloth.rb",
- "lib/kitabu/tasks.rb",
- "lib/kitabu/templates.rb",
- "lib/kitabu/toc.rb",
- "lib/kitabu.rb",
- "templates/config.yml",
- "templates/layouts",
- "templates/layouts/boom",
- "templates/layouts/boom/layout.css",
- "templates/layouts/boom/layout.html",
- "templates/Rakefile",
- "templates/syntax.css",
- "templates/themes",
- "templates/themes/active4d.css",
- "templates/themes/blackboard.css",
- "templates/themes/dawn.css",
- "templates/themes/eiffel.css",
- "templates/themes/idle.css",
- "templates/themes/iplastic.css",
- "templates/themes/lazy.css",
- "templates/themes/mac_classic.css",
- "templates/themes/slush_poppies.css",
- "templates/themes/sunburst.css",
- "templates/user.css"]
-  s.authors = ["Nando Vieira"]
-end
+  s.requirements = ["Install the Oniguruma RE library"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{A framework for creating e-books from Markdown/Textile text markup using Ruby.}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<discount>, [">= 0"])
+      s.add_runtime_dependency(%q<hpricot>, [">= 0"])
+      s.add_runtime_dependency(%q<unicode>, [">= 0"])
+      s.add_runtime_dependency(%q<main>, [">= 0"])
+      s.add_runtime_dependency(%q<ultraviolet>, [">= 0"])
+    else
+      s.add_dependency(%q<discount>, [">= 0"])
+      s.add_dependency(%q<hpricot>, [">= 0"])
+      s.add_dependency(%q<unicode>, [">= 0"])
+      s.add_dependency(%q<main>, [">= 0"])
+      s.add_dependency(%q<ultraviolet>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<discount>, [">= 0"])
+    s.add_dependency(%q<hpricot>, [">= 0"])
+    s.add_dependency(%q<unicode>, [">= 0"])
+    s.add_dependency(%q<main>, [">= 0"])
+    s.add_dependency(%q<ultraviolet>, [">= 0"])
+  end
+end

data/lib/kitabu.rb

@@ -6,6 +6,8 @@ require "rexml/streamlistener"
 require "rexml/document"
 require "hpricot"
 
+$LOAD_PATH.unshift File.dirname(__FILE__)
+
 require "kitabu/base"
 require "kitabu/toc"
 require "kitabu/markup"
@@ -15,3 +17,7 @@ begin
 rescue LoadError => e
   nil
 end
+
+module Kitabu
+  VERSION = "0.3.4"
+end

data/lib/kitabu/base.rb

@@ -1,37 +1,37 @@
 module Kitabu
-  VERSION = "0.3.3"
-  
   module Base
     DEFAULT_LAYOUT = 'boom'
     DEFAULT_THEME = 'eiffel'
     DEFAULT_SYNTAX = 'plain_text'
     GEM_ROOT = File.expand_path(File.dirname(__FILE__) + "/../../")
     
-    def self.html_path
+    extend self
+    
+    def html_path
       KITABU_ROOT + "/output/#{app_name}.html"
     end
     
-    def self.pdf_path
+    def pdf_path
       KITABU_ROOT + "/output/#{app_name}.pdf"
     end
     
-    def self.template_path
+    def template_path
       KITABU_ROOT + "/templates/layout.html"
     end
     
-    def self.config_path
+    def config_path
       KITABU_ROOT + "/config.yml"
     end
     
-    def self.text_dir
+    def text_dir
       KITABU_ROOT + "/text"
     end
     
-    def self.config
+    def config
       @config ||= YAML::load_file(config_path)
     end
     
-    def self.parse_layout(contents)
+    def parse_layout(contents)
       template = File.new(template_path).read
       contents, toc = self.table_of_contents(contents)
       cfg = config.merge(:contents => contents, :toc => toc)
@@ -40,8 +40,8 @@ module Kitabu
       ERB.new(template).result env.instance_eval{ binding }
     end
     
-    def self.table_of_contents(contents)
-      return [contents, nil] unless Object.const_defined?('Hpricot') && Object.const_defined?('Unicode')
+    def table_of_contents(contents)
+      return [contents, nil] unless defined?('Hpricot') && defined?('Unicode')
       
       doc = Hpricot(contents)
       counter = {}
@@ -64,16 +64,16 @@ module Kitabu
       contents = doc.to_html
       io = StringIO.new(contents)
       toc = Toc.new
-      REXML::Document.parse_stream(io, toc)
+      REXML::Document.parse_stream(io, toc) rescue nil
 
       [contents, toc.to_s]
     end
     
-    def self.generate_pdf
+    def generate_pdf
       IO.popen('prince %s -o %s' % [html_path, pdf_path])
     end
     
-    def self.generate_html
+    def generate_html
       # parsed file holder
       contents = ""
       
@@ -81,7 +81,7 @@ module Kitabu
         %w(. .. .svn .git).include?(entry) || (File.file?(entry) && entry !~ /\.(markdown|textile)$/)
       end
       
-      raise "No markup files found! Stopping PDF generation" if entries.empty?
+      $stdout << "\nNo markup files found!\n" if entries.empty?
       
       # first, get all chapters; then, get all parsed markdown
       # files from this chapter and group them into a <div class="chapter"> tag
@@ -116,14 +116,14 @@ module Kitabu
               markup = Discount.new(markup_contents)
             end
           rescue Exception => e
-            puts "Skipping #{markup_file} (#{e.message})"
+            $stdout << "\nSkipping #{markup_file} (#{e.message})"
             next
           end
           
           # convert the markup into html
           parsed_contents = markup.to_html
           
-          if Object.const_defined?('Uv')
+          if defined?(Uv)
             if markup.respond_to?(:syntax_blocks)
               # textile
               parsed_contents.gsub!(/@syntax:([0-9]+)/m) do |m|
@@ -136,24 +136,24 @@ module Kitabu
                 code = $1.gsub(/&lt;/, '<').gsub(/&gt;/, '>').gsub(/&amp;/, '&')
                 code_lines = StringIO.new(code).readlines
                 syntax_settings = code_lines.first
-                
+              
                 syntax = 'plain_text'
-                
+              
                 if syntax_settings =~ /syntax\(.*?\)\./
                   code = code_lines.slice(1, code_lines.size).join
-                  
+                
                   # syntax
                   m, syntax = *syntax_settings.match(/syntax\(([^ #]+).*?\)./)
-                  
+                
                   # file name
                   m, source_file = *syntax_settings.match(/syntax\(.*?\)\. +(.*?)$/)
-                  
+                
                   # get line interval
                   m, from_line, to_line = *syntax_settings.match(/syntax\(.*? ([0-9]+),([0-9]+)\)/)
-                  
+                
                   # get block name
                   m, block_name = *syntax_settings.match(/syntax\(.*?#([0-9a-z_]+)\)/)
-                  
+                
                   code = Kitabu::Markup.content_for({
                     :code => code,
                     :from_line => from_line,
@@ -162,7 +162,7 @@ module Kitabu
                     :source_file => source_file
                   })
                 end
-                
+              
                 Kitabu::Markup.syntax(code, syntax)
               end
             end
@@ -183,53 +183,53 @@ module Kitabu
       end
     end
     
-    def self.app_name
+    def app_name
       ENV['KITABU_NAME'] || 'kitabu'
     end
     
-    def self.theme?(theme_name)
+    def theme?(theme_name)
       themes.include?(theme_name)
     end
     
-    def self.syntax?(syntax_name)
+    def syntax?(syntax_name)
       syntaxes.include?(syntax_name)
     end
     
-    def self.layout?(layout_name)
+    def layout?(layout_name)
       layouts.include?(layout_name)
     end
     
-    def self.default_theme
+    def default_theme
       DEFAULT_THEME
     end
     
-    def self.default_syntax
+    def default_syntax
       DEFAULT_SYNTAX
     end
     
-    def self.default_layout
+    def default_layout
       DEFAULT_LAYOUT
     end
     
-    def self.syntaxes
+    def syntaxes
       Uv.syntaxes
     end
     
-    def self.layouts
+    def layouts
       @layouts ||= begin
         dir = File.join(GEM_ROOT, "templates/layouts")
         Dir.entries(dir).reject{|p| p =~ /^\.+$/ }.sort
       end
     end
     
-    def self.themes
+    def themes
       @themes ||= begin
         filter = File.join(GEM_ROOT, "templates/themes/*.css")
         Dir[filter].collect{|path| File.basename(path).gsub(/\.css$/, '') }.sort
       end
     end
     
-    def self.to_permalink(str)
+    def to_permalink(str)
       str = Unicode.normalize_KD(str).gsub(/[^\x00-\x7F]/n,'') 
       str = str.gsub(/[^-_\s\w]/, ' ').downcase.squeeze(' ').tr(' ', '-')
       str = str.gsub(/-+/, '-').gsub(/^-+/, '').gsub(/-+$/, '')

data/lib/kitabu/blackcloth.rb

@@ -41,7 +41,7 @@ class BlackCloth < RedCloth
       url = File.join(base_url, content)
     else
       url = content
-      puts "\nYou're using `file. #{content}` but didn't set base_url in your configuration file.\n"
+      $stdout << "\nYou're using `file. #{content}` but didn't set base_url in your configuration file.\n"
     end
     
     %(<p class="file"><span><strong>Download</strong> <a href="#{url}">#{content}</a></span></p>)
@@ -105,7 +105,18 @@ class BlackCloth < RedCloth
   # Usage: figure(This is the caption). some_image.jpg
   def textile_figure(tag, attrs, cite, content)
     m, title = *attrs.match(/class="(.*?)"/)
-    %(<p class="figure"><img src="../images/#{content}" alt="#{title}" /><br/><span class="caption">#{title}</span></p>)
+    
+    width, height = image_size(content)
+    
+    %(<p class="figure"><img style="width: #{width}px; height: #{height}px" src="../images/#{content}" alt="#{title}" /><br/><span class="caption">#{title}</span></p>)
+  end
+  
+  def image_size(img)
+    puts File.expand_path(img)
+    output = IO.popen("file images/#{img}").read
+    m, width, height = *output.match(/([0-9]+) x ([0-9]+)/)
+    
+    [width.to_i, height.to_i]
   end
   
   # overriding inline method

data/lib/kitabu/markup.rb

@@ -1,6 +1,8 @@
 module Kitabu
   module Markup
-    def self.content_for(options)
+    extend self
+    
+    def content_for(options)
       source_file = File.join(KITABU_ROOT, 'code', options[:source_file].to_s)
       code = options[:code]
       
@@ -44,7 +46,7 @@ module Kitabu
       code
     end
     
-    def self.syntax(code, syntax='plain_text')
+    def syntax(code, syntax='plain_text')
       # get chosen theme
       theme = Kitabu::Base.config['theme']
       theme = Kitabu::Base.default_theme unless Kitabu::Base.theme?(theme)

data/lib/kitabu/tasks.rb

@@ -36,7 +36,7 @@ namespace :kitabu do
   task :pdf => :html do
     Kitabu::Base.generate_pdf
     puts "Your PDF has been generated. Check it out the output directory!"
-    sleep(1) && system("open #{Kitabu::Base.pdf_path}") if RUBY_PLATFORM =~ /darwin/
+    sleep(1) && system("open #{Kitabu::Base.pdf_path}") if RUBY_PLATFORM =~ /darwin/ && ENV["AUTO_OPEN"] == "1"
   end
 
   desc "Generate HTML from markup files"

data/lib/kitabu/templates.rb

@@ -3,14 +3,16 @@ module Kitabu
     TEMPLATES_ROOT = File.join(Kitabu::Base::GEM_ROOT, 'templates')
     DIRECTORIES = %w(text templates output)
     
-    def self.process!(options)
+    extend self
+    
+    def process!(options)
       directories!(options)
       bundle_css!(options)
       files!(options)
       config!(options)
     end
     
-    def self.directories!(options)
+    def directories!(options)
       FileUtils.mkdir(options[:path])
       
       DIRECTORIES.each do |d|
@@ -18,14 +20,14 @@ module Kitabu
       end
     end
     
-    def self.files!(options)
+    def files!(options)
       copy_file "Rakefile", "#{options[:path]}/Rakefile"
       copy_file "layouts/#{options[:layout]}/layout.css", "#{options[:path]}/templates/layout.css"
       copy_file "layouts/#{options[:layout]}/layout.html", "#{options[:path]}/templates/layout.html"
       copy_file "user.css", "#{options[:path]}/templates/user.css"
     end
     
-    def self.config!(options)
+    def config!(options)
       template = File.new(File.join(TEMPLATES_ROOT, 'config.yml')).read
       env = OpenStruct.new(options)
       contents = ERB.new(template).result env.instance_eval{binding}
@@ -33,7 +35,7 @@ module Kitabu
       File.open(File.join(options[:path], 'config.yml'), 'w+') << contents
     end
     
-    def self.bundle_css!(options)
+    def bundle_css!(options)
       contents = Dir["#{TEMPLATES_ROOT}/themes/*.css"].collect do |file|
         File.read(file)
       end
@@ -42,7 +44,7 @@ module Kitabu
     end
     
     private
-      def self.copy_file(from, to)
+      def copy_file(from, to)
         FileUtils.cp File.join(TEMPLATES_ROOT, from), to
       end
   end

data/lib/kitabu/toc.rb

@@ -27,11 +27,6 @@ module Kitabu
       @current_level = name.gsub!(/[^2-6]/, '').to_i
       @stack << @current_level
       @id = attrs["id"]
-
-      @toc << %(<ul class="level#{@current_level}">) if @current_level > @previous_level
-      @toc << %(</li></ul>) * (@previous_level - @current_level) if @current_level < @previous_level
-      @toc << %(</li>) if @current_level <= @previous_level
-      @toc << %(<li>)
     end
 
     def tag_end(name)
@@ -42,16 +37,14 @@ module Kitabu
 
     def text(str)
       return unless in_header?
-      @toc << %(<a href="##{@id}"><span>#{str}</span></a>)
+      @toc << %(<div class="level#{@current_level} #{@id}"><a href="##{@id}"><span>#{str}</span></a></div>)
     end
 
     def method_missing(*args)
     end
 
     def to_s
-      @toc + (%(</li></ul>) * (@stack.last - 1))
-    rescue
-      ""
+      @toc
     end
   end
 end

data/templates/config.yml

@@ -1,8 +1,9 @@
-title: [Your Book Title]
-copyright: Copyright (c) <%= Time.now.year %> [Your Name], All Rights Reserved
+title: "[Your Book Title]"
+year: 2009
 authors:
-  - [Your Name]
-  - [Other Name]
-subject: [Write down what your book is about]
-keywords: [The keywords related to your book]
-theme: <%= theme %>
+  - "[Your Name]"
+subject: "[Your book description]"
+keywords: "[Your book keywords (comma-separated)]"
+theme: idle
+base_url: http://example.com
+copyright: "[Your copyright info]"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fnando-kitabu
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Nando Vieira
@@ -9,8 +9,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-16 00:00:00 -07:00
-default_executable: 
+date: 2009-08-02 00:00:00 -07:00
+default_executable: kitabu
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: discount
@@ -62,21 +62,21 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: A framework for creating e-books from Markdown/Textile text markup using Ruby. Using the Prince PDF generator, you'll be able to get high quality PDFs. Mac users that have Textmate installed can have source code highlighted with his favorite theme.
-email: 
-- fnando.vieira@gmail.com
+description: A framework for creating e-books from Markdown/Textile text markup using Ruby.  Using the Prince PDF generator, you'll be able to get high quality PDFs.
+email: fnando.vieira@gmail.com
 executables: 
 - kitabu
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README.markdown
 files: 
-- Rakefile
-- kitabu.gemspec
 - README.markdown
+- Rakefile
+- VERSION
 - bin/kitabu
-- lib/kitabu
+- kitabu.gemspec
+- lib/kitabu.rb
 - lib/kitabu/base.rb
 - lib/kitabu/blackcloth.rb
 - lib/kitabu/markup.rb
@@ -84,15 +84,11 @@ files:
 - lib/kitabu/tasks.rb
 - lib/kitabu/templates.rb
 - lib/kitabu/toc.rb
-- lib/kitabu.rb
+- templates/Rakefile
 - templates/config.yml
-- templates/layouts
-- templates/layouts/boom
 - templates/layouts/boom/layout.css
 - templates/layouts/boom/layout.html
-- templates/Rakefile
 - templates/syntax.css
-- templates/themes
 - templates/themes/active4d.css
 - templates/themes/blackboard.css
 - templates/themes/dawn.css
@@ -104,11 +100,12 @@ files:
 - templates/themes/slush_poppies.css
 - templates/themes/sunburst.css
 - templates/user.css
-has_rdoc: true
-homepage: http://github.com/fnando/kitabu
+has_rdoc: false
+homepage: http://fnando.github.com/kitabu.html
+licenses: 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -126,9 +123,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - Install the Oniguruma RE library
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A framework for creating e-books from Markdown/Textile text markup using Ruby.
 test_files: []