fnando-kitabu 0.3.8 → 0.3.9

data/Rakefile

@@ -25,7 +25,6 @@ TXT
   gem.add_dependency "unicode"
   gem.add_dependency "main"
   gem.add_dependency "ultraviolet"
-  gem.add_dependency "colorize"
   
   gem.requirements << "Install the Oniguruma RE library"
   gem.requirements << "Install colorize using gem install fnando-colorize -s http://gems.github.com"

data/VERSION

@@ -1 +1 @@
-0.3.8
+0.3.9

data/kitabu.gemspec

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{kitabu}
-  s.version = "0.3.8"
+  s.version = "0.3.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nando Vieira"]
-  s.date = %q{2009-08-14}
+  s.date = %q{2009-08-28}
   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.
@@ -64,14 +67,12 @@ Using the Prince PDF generator, you'll be able to get high quality PDFs.
       s.add_runtime_dependency(%q<unicode>, [">= 0"])
       s.add_runtime_dependency(%q<main>, [">= 0"])
       s.add_runtime_dependency(%q<ultraviolet>, [">= 0"])
-      s.add_runtime_dependency(%q<colorize>, [">= 0"])
     else
       s.add_dependency(%q<rdiscount>, [">= 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"])
-      s.add_dependency(%q<colorize>, [">= 0"])
     end
   else
     s.add_dependency(%q<rdiscount>, [">= 0"])
@@ -79,6 +80,5 @@ Using the Prince PDF generator, you'll be able to get high quality PDFs.
     s.add_dependency(%q<unicode>, [">= 0"])
     s.add_dependency(%q<main>, [">= 0"])
     s.add_dependency(%q<ultraviolet>, [">= 0"])
-    s.add_dependency(%q<colorize>, [">= 0"])
   end
 end

data/lib/kitabu.rb

@@ -5,6 +5,7 @@ require "ostruct"
 require "rexml/streamlistener"
 require "rexml/document"
 require "hpricot"
+require "activesupport"
 
 $LOAD_PATH.unshift File.dirname(__FILE__)
 
@@ -19,5 +20,5 @@ rescue LoadError => e
 end
 
 module Kitabu
-  VERSION = "0.3.8"
+  VERSION = "0.3.9"
 end

data/lib/kitabu/blackcloth.rb

@@ -64,7 +64,7 @@ class BlackCloth < RedCloth
     # get syntax
     m, syntax = *attrs.match(/class="(.*?)([# ].*?)?"/)
     syntax = 'plain_text' if tag == "pre"
-    
+
     # set source
     source_file = content
     

data/lib/kitabu/tasks.rb

@@ -17,13 +17,6 @@ rescue LoadError => e
         "Install using `sudo gem install ultraviolet`.\n\n"
 end
 
-begin
-  require "hpricot"
-rescue LoadError => e
-  puts  "\nHpricot gem not found. NO TOC for you.\n" +
-        "Install using `sudo gem install hpricot`.\n\n"
-end
-
 begin
   require "unicode"
 rescue LoadError => e
@@ -38,6 +31,11 @@ rescue LoadError => e
         "Install using `sudo gem install fnando-colorize -s http://gems.github.com`.\n\n"
 end
 
+# extend BlackCloth if module Helpers is defined
+BlackCloth.__send__(:include, ::Helpers) if defined?(::Helpers)
+
+task :default => "kitabu:auto"
+
 namespace :kitabu do
   desc "Generate PDF from markup files"
   task :pdf => :html do
@@ -64,29 +62,24 @@ namespace :kitabu do
   desc "List all titles and its permalinks"
   task :titles => :html do
     contents = File.new(Kitabu::Base.html_path).read
-    doc = Hpricot(contents)
-    counter = {}
-
-    titles = (doc/"h2, h3, h4, h5, h6").collect do |node|
-      title = node.inner_text
-      permalink = Kitabu::Base.to_permalink(title)
-      
-      # initialize and increment counter
-      counter[permalink] ||= 0
-      counter[permalink] += 1
+    output = ""
+    
+    contents.scan(/<h([1-6])(.*?)>(.*?)<\/h[1-6]>/sim) do
+      level = $1.to_i - 1
+      output << "-" * level
+      output << " " if level > 0
       
-      # set a incremented permalink if more than one occurrence
-      # is found
-      permalink = "#{permalink}-#{counter[permalink]}" if counter[permalink] > 1
+      if level == 0
+        output << Colorize.yellow($3.upcase, :style => :underscore)
+      else
+        output << $3
+      end
       
-      [title, permalink]
+      output << Colorize.green($2.to_s.gsub(/^.*?id=['"](.*?)['"].*?$/, ' #\1'))
+      output << "\n"
     end
     
-    titles.sort_by {|items| items.last }.each do |items|
-      puts items.first
-      puts %(##{items.last})
-      puts
-    end
+    puts output
   end
   
   task :watch => :auto

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fnando-kitabu
 version: !ruby/object:Gem::Version 
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors: 
 - Nando Vieira
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-14 00:00:00 -07:00
+date: 2009-08-28 00:00:00 -07:00
 default_executable: kitabu
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,16 +62,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: colorize
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !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.
 email: fnando.vieira@gmail.com
 executables: