redcloth-formatters-docbook 0.0.1 → 0.0.2

data/lib/redcloth-formatters-docbook/formatters/docbook.rb

@@ -120,7 +120,7 @@ module RedCloth::Formatters::Docbook
 
     # para
     def p(opts)
-      "#{"\t" * @@stack.size}<para>#{opts[:text]}</para>\n"
+      "#{"\t" * @@stack.size}<para>#{clean_text(opts[:text])}</para>\n"
     end
 
     # lists
@@ -215,7 +215,7 @@ module RedCloth::Formatters::Docbook
     alias :strong :b
     
     def br(opts)
-      ""
+      " "
     end
     
     def cite(opts)
@@ -234,12 +234,14 @@ module RedCloth::Formatters::Docbook
     def image(opts)
       title = opts[:title]
       id = title.split(" ").join(".")
+      options = parse_css(opts[:style])
+      width = options[:width] || "100%"
       
       out = "\n"
       out += "<figure xml:id=\"#{id}\">\n"
       out += "<title>#{title}</title>\n"
       out += "<mediaobject>\n"
-      out += "\t<imageobject><imagedata fileref=\"#{opts[:src]}\" format=\"PNG\" /></imageobject>\n"
+      out += "\t<imageobject><imagedata fileref=\"#{opts[:src]}\" format=\"PNG\" width=\"#{width}\"/></imageobject>\n"
       out += "</mediaobject>\n"
       out += "</figure>\n"
       out
@@ -261,9 +263,8 @@ module RedCloth::Formatters::Docbook
     def bc_open(opts)
       opts[:block] = true
       options = parse_css(opts[:style])
-      id = options[:name].split(" ").join(".")
       out = "<para>\n"
-      out += "\t<example xml:id=\"#{id}\">\n"
+      out += "\t<example xml:id=\"#{parse_id(options[:name])}\">\n"
       out += "\t<title>#{options[:name]}</title>\n"
       out += "\t<programlisting width=\"100%\">\n"
       out
@@ -309,6 +310,10 @@ module RedCloth::Formatters::Docbook
       end
       options
     end
+    
+    def parse_id name
+      name.gsub(",", "").gsub(".", "").squeeze(" ").strip.gsub(" ", "")
+    end
 
     def close_level(type)
       last = @@stack.last
@@ -322,20 +327,24 @@ module RedCloth::Formatters::Docbook
     def open_level(type, tag)
       @@stack << { :type => type, :tag => tag }
     end
+    
+    def clean_text(text)
+      text.gsub("\n", " ").gsub("\t", " ").squeeze(" ").strip
+    end
 
     # escapement for regular HTML (not in PRE tag)
     def escape(text)
-      html_esc(text)
+      text
     end
 
     # escapement for HTML in a PRE tag
     def escape_pre(text)
-      html_esc(text, :html_escape_preformatted)
+      text
     end
 
     # escaping for HTML attributes
     def escape_attribute(text)
-      html_esc(text, :html_escape_attributes)
+      text
     end
 
     def after_transform(text)

data/lib/redcloth-formatters-docbook/version.rb

@@ -1,7 +1,7 @@
 module Redcloth
   module Formatters
     module Docbook
-      VERSION = "0.0.1"
+      VERSION = "0.0.2"
     end
   end
 end

data/spec/docbook_spec.rb

@@ -57,5 +57,11 @@ describe Redcloth::Formatters::Docbook do
     docbook = File.open("spec/fixtures/cover.xml", 'rb') { |f| f.read }
     RedCloth.new(textile).to_docbook.docbook_strip.should eql(docbook.docbook_strip)
   end
+  
+  it "formatting" do
+    textile = File.open("spec/fixtures/formatting.textile", 'rb') { |f| f.read }
+    docbook = File.open("spec/fixtures/formatting.xml", 'rb') { |f| f.read }
+    RedCloth.new(textile).to_docbook.docbook_strip.should eql(docbook.docbook_strip)
+  end
 
 end

data/spec/fixtures/formatting.textile

@@ -0,0 +1,12 @@
+h1. Hello
+
+h2. Basic
+
+They're so cool!
+
+
+This is some text that
+continues in the second line.
+
+This is some text that 
+continues in the second line.

data/spec/fixtures/formatting.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<book xmlns="http://docbook.org/ns/docbook" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xl="http://www.w3.org/1999/xlink" version="5.0">
+    
+    <chapter xmlns='http://docbook.org/ns/docbook' xmlns:xi='http://www.w3.org/2001/XInclude' version='5.0'>
+        <title>Hello</title>
+        <section>
+            <title>Basic</title>
+            <para>They're so cool!</para>
+            <para>This is some text that continues in the second line.</para>
+            <para>This is some text that continues in the second line.</para>
+        </section>
+    </chapter>
+</book>

data/spec/fixtures/phrase.textile

@@ -16,6 +16,6 @@ Simply run @rake db:migrate@ to install everything.
 
 Simply got to "Google":http://www.google.com and search.
 
-!../images/image.png(A great image)!
+!{width: 90%;}../images/image.png(A great image)!
 
 bq{by: Martin Luther King}. I have a dream. The dream is great. It will come true!

data/spec/fixtures/phrase.xml

@@ -24,7 +24,7 @@
                 <figure xml:id="A.great.image">
                 <title>A great image</title>
                 <mediaobject>
-                  <imageobject><imagedata fileref="../images/image.png" format="PNG" /></imageobject>
+                  <imageobject><imagedata fileref="../images/image.png" format="PNG" width="90%"/></imageobject>
                 </mediaobject>
                 </figure>
                 </para>

data/spec/fixtures/source.xml

@@ -9,7 +9,7 @@
     <para>some text</para>
     
     <para>
-        <example xml:id="Ruby.Car.Class">
+        <example xml:id="RubyCarClass">
         <title>Ruby Car Class</title>
         <programlisting width="100%">
 class Car

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redcloth-formatters-docbook
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Thomas Fankhauser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-17 00:00:00 +02:00
+date: 2011-10-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -77,6 +77,8 @@ files:
 - spec/fixtures/cover.xml
 - spec/fixtures/footnotes.textile
 - spec/fixtures/footnotes.xml
+- spec/fixtures/formatting.textile
+- spec/fixtures/formatting.xml
 - spec/fixtures/hello.textile
 - spec/fixtures/hello.xml
 - spec/fixtures/lists.textile
@@ -132,6 +134,8 @@ test_files:
 - spec/fixtures/cover.xml
 - spec/fixtures/footnotes.textile
 - spec/fixtures/footnotes.xml
+- spec/fixtures/formatting.textile
+- spec/fixtures/formatting.xml
 - spec/fixtures/hello.textile
 - spec/fixtures/hello.xml
 - spec/fixtures/lists.textile