fnando-kitabu 0.3.1 → 0.3.2

data/README.markdown

@@ -120,8 +120,8 @@ Textile.
 To generate the TOC, you need to print a variable called `toc`, using the eRb
 tag `<%= toc %>`.
 
-Syntax Highlighting (Mac OS X)
-==============================
+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
@@ -176,9 +176,7 @@ or, if you have problem
 	gem build kitabu.gemspec
 	sudo gem install kitabu
 
-If you're a Mac user and have Textmate installed, you can
-generate HTML from your source code with syntax highlight,
-the same way you see in Textmate. First, you need to install
+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/)
 
@@ -186,6 +184,24 @@ 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:
 -----------
 

data/Rakefile

@@ -4,7 +4,7 @@ PKG_FILES = %w(Rakefile kitabu.gemspec README.markdown) + Dir["{bin,lib,template
 
 spec = Gem::Specification.new do |s|
   s.name = "kitabu"
-  s.version = "0.3.1"
+  s.version = "0.3.2"
   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"]
@@ -20,9 +20,10 @@ spec = Gem::Specification.new do |s|
   s.add_dependency "hpricot"
   s.add_dependency "unicode"
   s.add_dependency "main"
+  s.add_dependency "ultraviolet"
   
   # Requirements
-  s.requirements << "Install the Oniguruma RE library and ultraviolet gem to get Syntax Highlighting (only for TextMate users)"
+  s.requirements << "Install the Oniguruma RE library"
 end
 
 namespace :gem do

data/kitabu.gemspec

@@ -10,13 +10,14 @@ Gem::Specification.new do |s|
   s.bindir = "bin"
   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 and ultraviolet gem to get Syntax Highlighting (only for TextMate users)"]
+  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.version = "0.3.1"
+  s.add_dependency "ultraviolet", ">= 0"
+  s.version = "0.3.2"
   s.require_paths = ["lib"]
   s.files = ["Rakefile",
  "kitabu.gemspec",
@@ -25,9 +26,11 @@ Gem::Specification.new do |s|
  "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",

data/lib/kitabu.rb

@@ -1,15 +1,17 @@
-require 'rubygems'
-require 'yaml'
-require 'erb'
-require 'ostruct'
-require 'rexml/streamlistener'
-require 'rexml/document'
-require 'hpricot'
+require "rubygems"
+require "yaml"
+require "erb"
+require "ostruct"
+require "rexml/streamlistener"
+require "rexml/document"
+require "hpricot"
 
-require 'kitabu/base'
+require "kitabu/base"
+require "kitabu/toc"
+require "kitabu/markup"
 
 begin
-  require 'ruby-debug'
+  require "ruby-debug"
 rescue LoadError => e
   nil
 end

data/lib/kitabu/base.rb

@@ -1,66 +1,5 @@
 module Kitabu
-  VERSION = "0.3.1"
-  
-  module Markup
-    def self.content_for(options)
-      source_file = File.join(KITABU_ROOT, 'code', options[:source_file].to_s)
-      code = options[:code]
-      
-      if options[:source_file] && File.exists?(source_file)
-        file = File.new(source_file)
-        
-        if options[:from_line] && options[:to_line]
-          from_line = options[:from_line].to_i - 1
-          to_line = options[:to_line].to_i
-          offset = to_line - from_line
-          code = file.readlines.slice(from_line, offset).join
-        elsif block_name = options[:block_name]
-          re = %r(# ?begin: ?\b#{block_name}\b ?(?:[^\r\n]+)?\r?\n(.*?)\r?\n([^\r\n]+)?# ?end: \b#{block_name}\b)sim
-          file.read.gsub(re) { |block| code = $1 }
-        else
-          code = file.read
-          code = code.gsub(/&lt;/, '<').gsub(/&gt;/, '>').gsub(/&amp;/, '&')
-        end
-      end
-      
-      # no code? set to default
-      code ||= options[:code]
-      
-      # normalize indentation
-      line = StringIO.new(code).readlines[0]
-
-      if line =~ /^(\t+)/
-        char = "\t"
-        size = $1.length
-      elsif line =~ /^( +)/
-        char = " "
-        size = $1.length
-      end
-
-      code.gsub! %r(^#{char}{#{size}}), "" if size.to_i > 0
-      
-      # remove all line stubs
-      code.gsub! %r(^[\t ]*__$), ""
-      
-      # return
-      code
-    end
-    
-    def self.syntax(code, syntax='plain_text')
-      # get chosen theme
-      theme = Kitabu::Base.config['theme']
-      theme = Kitabu::Base.default_theme unless Kitabu::Base.theme?(theme)
-      
-      # get syntax
-      syntax = Kitabu::Base.default_syntax unless Kitabu::Base.syntax?(syntax)
-      
-      code = Uv.parse(code, "xhtml", syntax, false, theme)
-      code.gsub!(/<pre class="(.*?)"/sim, %(<pre class="\\1 #{syntax}"))
-      code.gsub!(/<pre>/sim, %(<pre class="#{syntax} #{theme}"))
-      
-      code
-    end
-  end
+  VERSION = "0.3.2"
   
   module Base
     DEFAULT_LAYOUT = 'boom'
@@ -98,7 +37,7 @@ module Kitabu
       cfg = config.merge(:contents => contents, :toc => toc)
       env = OpenStruct.new(cfg)
 
-      ERB.new(template).result env.instance_eval{binding}
+      ERB.new(template).result env.instance_eval{ binding }
     end
     
     def self.table_of_contents(contents)
@@ -297,60 +236,4 @@ module Kitabu
       str
     end
   end
-  
-  class Toc
-    include REXML::StreamListener
-
-    def initialize
-      @toc = ""
-      @previous_level = 0
-      @tag = nil
-      @stack = []
-    end
-
-    def header?(tag=nil)
-      tag ||= @tag_name
-      return false unless tag.to_s =~ /h[2-6]/
-      @tag_name = tag
-      return true
-    end
-
-    def in_header?
-      @in_header
-    end
-
-    def tag_start(name, attrs)
-      @tag_name = name
-      return unless header?(name)
-      @in_header = true
-      @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)
-      return unless header?(name)
-      @in_header = false
-      @previous_level = @current_level
-    end
-
-    def text(str)
-      return unless in_header?
-      @toc << %(<a href="##{@id}"><span>#{str}</span></a>)
-    end
-
-    def method_missing(*args)
-    end
-
-    def to_s
-      @toc + (%(</li></ul>) * (@stack.last - 1))
-    rescue
-      ""
-    end
-  end
-end
+end

data/lib/kitabu/markup.rb

@@ -0,0 +1,62 @@
+module Kitabu
+  module Markup
+    def self.content_for(options)
+      source_file = File.join(KITABU_ROOT, 'code', options[:source_file].to_s)
+      code = options[:code]
+      
+      if options[:source_file] && File.exists?(source_file)
+        file = File.new(source_file)
+        
+        if options[:from_line] && options[:to_line]
+          from_line = options[:from_line].to_i - 1
+          to_line = options[:to_line].to_i
+          offset = to_line - from_line
+          code = file.readlines.slice(from_line, offset).join
+        elsif block_name = options[:block_name]
+          re = %r(# ?begin: ?\b#{block_name}\b ?(?:[^\r\n]+)?\r?\n(.*?)\r?\n([^\r\n]+)?# ?end: \b#{block_name}\b)sim
+          file.read.gsub(re) { |block| code = $1 }
+        else
+          code = file.read
+          code = code.gsub(/&lt;/, '<').gsub(/&gt;/, '>').gsub(/&amp;/, '&')
+        end
+      end
+      
+      # no code? set to default
+      code ||= options[:code]
+      
+      # normalize indentation
+      line = StringIO.new(code).readlines[0]
+
+      if line =~ /^(\t+)/
+        char = "\t"
+        size = $1.length
+      elsif line =~ /^( +)/
+        char = " "
+        size = $1.length
+      end
+
+      code.gsub! %r(^#{char}{#{size}}), "" if size.to_i > 0
+      
+      # remove all line stubs
+      code.gsub! %r(^[\t ]*__$), ""
+      
+      # return
+      code
+    end
+    
+    def self.syntax(code, syntax='plain_text')
+      # get chosen theme
+      theme = Kitabu::Base.config['theme']
+      theme = Kitabu::Base.default_theme unless Kitabu::Base.theme?(theme)
+      
+      # get syntax
+      syntax = Kitabu::Base.default_syntax unless Kitabu::Base.syntax?(syntax)
+      
+      code = Uv.parse(code, "xhtml", syntax, false, theme)
+      code.gsub!(/<pre class="(.*?)"/sim, %(<pre class="\\1 #{syntax}"))
+      code.gsub!(/<pre>/sim, %(<pre class="#{syntax} #{theme}"))
+      
+      code
+    end
+  end
+end

data/lib/kitabu/tasks.rb

@@ -11,7 +11,7 @@ require File.dirname(__FILE__) + "/redcloth"
 require File.dirname(__FILE__) + "/blackcloth"
 
 begin
-  require "uv" if RUBY_PLATFORM =~ /darwin/
+  require "uv"
 rescue LoadError => e
   puts  "\nUltraviolet gem not found. NO SYNTAX HIGHLIGHT for you.\n" +
         "Install using `sudo gem install ultraviolet`.\n\n"

data/lib/kitabu/toc.rb

@@ -0,0 +1,57 @@
+module Kitabu
+  class Toc
+    include REXML::StreamListener
+
+    def initialize
+      @toc = ""
+      @previous_level = 0
+      @tag = nil
+      @stack = []
+    end
+
+    def header?(tag=nil)
+      tag ||= @tag_name
+      return false unless tag.to_s =~ /h[2-6]/
+      @tag_name = tag
+      return true
+    end
+
+    def in_header?
+      @in_header
+    end
+
+    def tag_start(name, attrs)
+      @tag_name = name
+      return unless header?(name)
+      @in_header = true
+      @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)
+      return unless header?(name)
+      @in_header = false
+      @previous_level = @current_level
+    end
+
+    def text(str)
+      return unless in_header?
+      @toc << %(<a href="##{@id}"><span>#{str}</span></a>)
+    end
+
+    def method_missing(*args)
+    end
+
+    def to_s
+      @toc + (%(</li></ul>) * (@stack.last - 1))
+    rescue
+      ""
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fnando-kitabu
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Nando Vieira
@@ -52,6 +52,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: ultraviolet
+  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. Mac users that have Textmate installed can have source code highlighted with his favorite theme.
 email: 
 - fnando.vieira@gmail.com
@@ -69,9 +79,11 @@ files:
 - 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
@@ -112,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
   version: 
 requirements: 
-- Install the Oniguruma RE library and ultraviolet gem to get Syntax Highlighting (only for TextMate users)
+- Install the Oniguruma RE library
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: