kitabu 0.4.6 → 0.4.7

data/Rakefile

@@ -4,22 +4,22 @@ require File.dirname(__FILE__) + "/lib/kitabu"
 
 JEWEL = Jeweler::Tasks.new do |gem|
   gem.name = "kitabu"
-  gem.version = Kitabu::VERSION
+  gem.version = ENV["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. 
+A framework for creating e-books from Markdown/Textile text markup using Ruby.
 With 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/public/kitabu.html"
-  
+
   gem.has_rdoc = false
   gem.files = %w(Rakefile kitabu.gemspec VERSION README.markdown) + Dir["{bin,templates,lib}/**/*"]
 	gem.bindir = "bin"
 	gem.executables = "kitabu"
-	
+
 	gem.add_dependency "activesupport", ">=2.3"
 end
 
@@ -30,8 +30,8 @@ end
 
 desc "Generate gemspec and build gem"
 task :build_gem do
-  File.open("VERSION", "w+") {|f| f << Kitabu::VERSION.to_s }
-  
+  File.open("VERSION", "w+") {|f| f << (ENV["VERSION"] || Kitabu::VERSION.to_s) }
+
   Rake::Task["gemspec"].invoke
   Rake::Task["build"].invoke
 end

data/kitabu.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{kitabu}
-  s.version = "0.4.6"
+  s.version = "0.4.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nando Vieira"]
-  s.date = %q{2010-01-07}
+  s.date = %q{2010-03-12}
   s.default_executable = %q{kitabu}
-  s.description = %q{A framework for creating e-books from Markdown/Textile text markup using Ruby. 
+  s.description = %q{A framework for creating e-books from Markdown/Textile text markup using Ruby.
 With Prince PDF generator, you'll be able to get high quality PDFs.
 }
   s.email = %q{fnando.vieira@gmail.com}
@@ -465,10 +465,11 @@ With Prince PDF generator, you'll be able to get high quality PDFs.
      "templates/themes/sunburst.css",
      "templates/user.css"
   ]
+  s.has_rdoc = false
   s.homepage = %q{http://fnando.github.com/public/kitabu.html}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{A framework for creating e-books from Markdown/Textile text markup using Ruby.}
   s.test_files = [
     "spec/exit_matcher.rb",

data/lib/kitabu.rb

@@ -1,11 +1,15 @@
 # encoding: utf-8
-require "rubygems"
 require "yaml"
 require "erb"
 require "ostruct"
 require "rexml/streamlistener"
 require "rexml/document"
-require "active_support"
+
+begin
+  require "active_support/all"
+rescue LoadError
+  require "active_support"
+end
 
 $:.unshift File.dirname(__FILE__)
 
@@ -46,5 +50,5 @@ rescue LoadError => e
 end
 
 module Kitabu
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 end

data/lib/kitabu/blackcloth.rb

@@ -1,53 +1,53 @@
 # encoding: utf-8
 class BlackCloth < RedCloth
   @@syntax_blocks = []
-  
+
   FN_RE = /
     (\s+)?    # getting spaces
     %\{       # opening
     (.*?)     # footnote
     \}#       # closing
   /xm
-  
+
   # Usage: Writing some text with a footnote %{this is a footnote}
   def inline_textile_fn(text)
     text.gsub!( FN_RE )  do |m|
       %(<span class="footnote">#{$2}</span>)
     end
-    
+
     text
   end
-  
+
   FN_URL_LINK = /
     <
     ((?:https?|ftp):\/\/.*?)
     >
   /x
-  
+
   # Usage: <http://google.com>
   def inline_textile_url_link(text)
     text.gsub!( FN_URL_LINK ) do |m|
       %(<a href="#{$1}">#{$1}</a>)
     end
   end
-  
+
   # Usage:
   # file. app/models/users.rb
   #
   # Remember to set `base_url` in your Kitabu configuration file
   def textile_file(tag, attrs, cite, content)
     base_url = Kitabu::Base.config["base_url"]
-    
+
     if base_url
       url = File.join(base_url, content)
     else
       url = content
       $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>)
   end
-  
+
   # Usage:
   # syntax(ruby). Some code
   #
@@ -68,13 +68,13 @@ class BlackCloth < RedCloth
 
     # set source
     source_file = content
-    
+
     # get block name
     m, block_name = *attrs.match(/id="(.*?)"/ms)
-    
+
     # get line interval
     m, from_line, to_line = *attrs.match(/class=".*? ([0-9]+),([0-9]+)"/)
-    
+
     content = Kitabu::Syntax.content_for({
       :code => content,
       :syntax => syntax,
@@ -83,62 +83,67 @@ class BlackCloth < RedCloth
       :from_line => from_line,
       :to_line => to_line
     })
-    
+
     @@syntax_blocks << [syntax, content]
     position = @@syntax_blocks.size - 1
     %(@syntax:#{position})
   end
-  
+
   def syntax_blocks
     @@syntax_blocks
   end
-  
+
   # Usage: pre. Some code
   def textile_pre(*args)
     # Should I add the default theme as a class?
     send(:textile_syntax, *args)
   end
-  
+
   # Usage: note. Some text
   def textile_note(tag, attrs, cite, content)
     %(<p class="note">#{content}</p>)
   end
-  
+
+  # Usage: attention. Some text
+  def textile_attention(tag, attrs, cite, content)
+    %(<p class="attention">#{content}</p>)
+  end
+
   # Usage: figure(This is the caption). some_image.jpg
   def textile_figure(tag, attrs, cite, content)
     m, title = *attrs.match(/class="(.*?)"/)
-    
+
     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)
     IO.popen("file #{Kitabu::Base.root_path}/images/#{img}") do |io|
       m, width, height = *io.read.match(/([0-9]+) x ([0-9]+)/)
       return [width.to_i, height.to_i]
     end
   end
-  
+
   # overriding inline method
-  def inline( text ) 
+  def inline( text )
     @rules += [:inline_textile_fn, :inline_textile_url_link]
     super
   end
-  
+
   # overriding to_html method
   def to_html( *rules )
       rules = DEFAULT_RULES if rules.empty?
       # make our working copy
       text = self.dup
-      
+
       @urlrefs = {}
       @shelf = []
       textile_rules = [:refs_textile, :block_textile_table, :block_textile_lists,
                        :block_textile_prefix, :inline_textile_image, :inline_textile_link,
                        :inline_textile_code, :inline_textile_span, :glyphs_textile]
       markdown_rules = [:refs_markdown, :block_markdown_setext, :block_markdown_atx, :block_markdown_rule,
-                        :block_markdown_bq, :block_markdown_lists, 
+                        :block_markdown_bq, :block_markdown_lists,
                         :inline_markdown_reflink, :inline_markdown_link]
       @rules = rules.collect do |rule|
           case rule
@@ -152,14 +157,14 @@ class BlackCloth < RedCloth
       end.flatten
 
       # standard clean up
-      incoming_entities text 
-      clean_white_space text 
+      incoming_entities text
+      clean_white_space text
 
       # start processor
       @pre_list = []
       rip_offtags text
       no_textile text
-      hard_break text 
+      hard_break text
       unless @lite_mode
           refs text
           blocks text

data/spec/kitabu/blackcloth_spec.rb

@@ -9,26 +9,31 @@ describe "BlackCloth" do
       p.should have_tag("span.caption", "The Rails logo")
     end
   end
-  
+
   it "should parse note tag" do
     @html = BlackCloth.new("note. Some important note!").to_html
     @html.should have_tag("p.note", "Some important note!")
   end
-  
+
+  it "should parse attention tag" do
+    @html = BlackCloth.new("attention. Some warning note!").to_html
+    @html.should have_tag("p.attention", "Some warning note!")
+  end
+
   it "should link to file" do
     Kitabu::Base.should_receive(:config).and_return("base_url" => "http://example.com")
     @html = BlackCloth.new("file. app/models/users.rb").to_html
-    
+
     @html.should have_tag("p.file") do |p|
       p.should have_tag("a[@href=http://example.com/app/models/users.rb]", "app/models/users.rb")
     end
   end
-  
+
   it "should create footnote" do
     @html = BlackCloth.new("Writing some text with a footnote %{this is a footnote}").to_html
     @html.should == %(<p>Writing some text with a footnote<span class="footnote">this is a footnote</span></p>)
   end
-  
+
   it "should link url" do
     @html = BlackCloth.new("<http://example.com>").to_html
     @html.should == %(<a href="http://example.com">http://example.com</a>)

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: kitabu
 version: !ruby/object:Gem::Version 
-  version: 0.4.6
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 7
+  version: 0.4.7
 platform: ruby
 authors: 
 - Nando Vieira
@@ -9,21 +14,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-07 00:00:00 -02:00
+date: 2010-03-12 00:00:00 -03:00
 default_executable: kitabu
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
         version: "2.3"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: |
-  A framework for creating e-books from Markdown/Textile text markup using Ruby. 
+  A framework for creating e-books from Markdown/Textile text markup using Ruby.
   With Prince PDF generator, you'll be able to get high quality PDFs.
 
 email: fnando.vieira@gmail.com
@@ -478,7 +486,7 @@ files:
 - templates/themes/slush_poppies.css
 - templates/themes/sunburst.css
 - templates/user.css
-has_rdoc: true
+has_rdoc: false
 homepage: http://fnando.github.com/public/kitabu.html
 licenses: []
 
@@ -491,18 +499,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A framework for creating e-books from Markdown/Textile text markup using Ruby.