docify 1.0.4 → 1.0.5

data/.rspec

@@ -1,3 +1,2 @@
 --color
 --format=nested
---backtrace

data/lib/docify.rb

@@ -7,7 +7,7 @@ require 'docify/document'
 
 module Docify
   # Simply renders content for the markup
-  def self.render(text, format='mardown')
+  def self.render(text, format='markdown')
     if Docify::FORMATS.include?(format.to_s)
       Docify::Markup.send(format.to_sym, text)
     else

data/lib/docify/markup.rb

@@ -1,10 +1,4 @@
-if RUBY_VERSION >= '1.9'
-  require 'rdoc/markup/to_html'
-else
-  require 'rdoc/generators/html_generator'
-  require 'ostruct'
-end
-
+require 'rdoc/markup/to_html'
 require 'RedCloth'
 require 'rdiscount'
 
@@ -20,21 +14,10 @@ module Docify
       format == :text ? content : self.send(format, content)
     end
     
-    if RUBY_VERSION >= '1.9'
-      # Render content for RDoc on Ruby 1.9
-      def rdoc(content)
-        markup = RDoc::Markup::ToHtml.new
-        markup.convert(content)
-      end
-    else
-      # Render content for RDoc
-      def rdoc(content)
-        simple_markup = SM::SimpleMarkup.new
-        generator = Generators::HyperlinkHtml.new('', OpenStruct.new)
-        simple_markup.add_special(/((link:|https?:|mailto:|ftp:|www\.)\S+\w)/, :HYPERLINK)
-        simple_markup.add_special(/(((\{.*?\})|\b\S+?)\[\S+?\.\S+?\])/, :TIDYLINK)
-        simple_markup.convert(content, generator)     
-      end
+    # Render content for RDoc
+    def rdoc(content)
+      markup = RDoc::Markup::ToHtml.new
+      markup.convert(content)
     end
     
     # Render content for Markdown

data/lib/docify/version.rb

@@ -1,3 +1,3 @@
 module Docify
-  VERSION = '1.0.4'.freeze
+  VERSION = '1.0.5'.freeze
 end

data/spec/docify_spec.rb

@@ -11,4 +11,14 @@ describe 'Docify' do
       Docify.detect_format(k).should == v
     end
   end
+  
+  it 'should render markup directly' do
+    {
+      'README.markdown' => 'markdown',
+      'README.rdoc'     => 'rdoc',
+      'README.textile'  => 'textile'
+    }.each_pair do |k,v|
+      Docify.render(fixture(k), v).should == fixture(k + ".html")
+    end
+  end
 end

data/spec/fixtures/README.rdoc.html

@@ -1,15 +1,10 @@
-<p>
-<a href="RDoc.html">RDoc.html</a>
-</p>
-<p>
-<a href="http://rdoc.rubyforge.org">rdoc.rubyforge.org</a>
-</p>
-<p>
-<a href="mailto:user@example.com">user@example.com</a>
-</p>
-<p>
-<a href="http://rdoc.rubyforge.org">RDoc Documentation</a>
-</p>
-<p>
-<a href="../RDoc/Markup.html">RDoc Markup</a>
-</p>
+
+<p><a href="RDoc.html">RDoc.html</a></p>
+
+<p><a href="http://rdoc.rubyforge.org">rdoc.rubyforge.org</a></p>
+
+<p><a href="mailto:user@example.com">user@example.com</a></p>
+
+<p><a href="http://rdoc.rubyforge.org">RDoc Documentation</a></p>
+
+<p><a href="RDoc/Markup.html">RDoc Markup</a></p>

metadata

@@ -2,7 +2,7 @@
 name: docify
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors: 
 - Dan Sosedoff
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-29 00:00:00 -05:00
+date: 2011-07-11 00:00:00 -05:00
 default_executable: docify
 dependencies: 
 - !ruby/object:Gem::Dependency