redcloth-formatters-ast 0.0.2 → 0.0.3

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

@@ -99,17 +99,14 @@ module RedCloth::Formatters::AST
   end
 
   def link(opts)
-    @@ast << { :type => :link, :href => opts[:href], :name => opts[:name], :options => parse_css(opts[:style]) }
-    ""
+    "<u><link href='#{opts[:href]}'>#{opts[:name] || opts[:href]}</link></u>"
   end
 
   def image(opts)
-    title = opts[:title]
-    id = title.split(" ").join(".")
     options = parse_css(opts[:style])
     width = options[:width] || "100%"
     
-    @@ast << { :type => :image, :title => title, :src => opts[:src], :width => width, :options => options }
+    @@ast << { :type => :image, :title => opts[:title], :src => opts[:src], :width => width, :options => options }
     ""
   end
   
@@ -131,7 +128,7 @@ module RedCloth::Formatters::AST
     opts[:block] = true
     opts[:append_to_parent] = true
     options = parse_css(opts[:style])
-    @@ast << { :type => :code, :text => "", :title => options[:name], :options => options }
+    @@ast << { :type => :code, :text => "", :title => options[:name], :options => options, :language => (options[:language] rescue nil) }
     ""
   end
   
@@ -139,7 +136,8 @@ module RedCloth::Formatters::AST
     if opts[:append_to_parent]
       @@ast.last[:text] << "#{opts[:text]}\n\n"
     else
-      @@ast << { :type => :code, :text => opts[:text], :options => parse_css(opts[:style]) }
+      options = parse_css(opts[:style])
+      @@ast << { :type => :code, :text => opts[:text], :options => parse_css(opts[:style]), :language => (options[:language] rescue nil) }
     end
     ""
   end

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

@@ -1,7 +1,7 @@
 module Redcloth
   module Formatters
     module AST
-      VERSION = "0.0.2"
+      VERSION = "0.0.3"
     end
   end
 end

data/spec/ast_spec.rb

@@ -78,8 +78,8 @@ describe RedCloth::Formatters::AST do
   it "should compile links and images" do
     textile = File.read "spec/fixtures/link_image.textile"
     RedCloth.new(textile).to_ast.should == [
-      { :type=>:link,   :href=>"http://example.com",  :name=>"Text to display",     :options=>{}}, 
-      { :type=>:link,   :href=>"http://example.com",  :name=>"Text to display",     :options=>{}},
+      { :type=>:p, :text=> "This is a paragraph with a link to <u><link href='http://google.com'>Google</link></u> that continues here.", :options=>{}}, 
+      { :type=>:p, :text=>"<u><link href='http://southdesign.de'>southdesign</link></u>", :options=>{}},
       { :type=>:image,  :title=>"A great image",      :src=>"../images/image.png",  :width=>"100%", :options=>{}},
       { :type=>:image,  :title=>"A great image",      :src=>"../images/image.png",  :width=>"90%",  :options=>{:width=>"90%"}}, 
     ]

data/spec/fixtures/link_image.textile

@@ -1,4 +1,6 @@
-"Text to display":http://example.com
-"Text to display (Title text)":http://example.com
+This is a paragraph with a link to "Google":http://google.com that continues here.
+
+"southdesign":http://southdesign.de
+
 !../images/image.png(A great image)!
 !{width: 90%;}../images/image.png(A great image)!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redcloth-formatters-ast
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-30 00:00:00.000000000 Z
+date: 2012-06-01 00:00:00.000000000 Z
 dependencies: []
 description: A RedCloth formatter that compiles textile to an AST
 email: