docify 1.0.1 → 1.0.2

data/Rakefile

@@ -2,4 +2,6 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:test) do |spec|
   spec.pattern = 'spec/*_spec.rb'
-end
+end
+
+task :default => :test

data/bin/docify

@@ -49,6 +49,8 @@ begin
   optparse.parse!
   file = ARGV.shift.to_s.strip
   unless file.empty?
+    file = File.expand_path(file)
+    
     begin
       options[:format] = Docify.detect_format(file)
       doc = Docify::Document.new(file)
@@ -61,6 +63,9 @@ begin
     rescue ArgumentError => e
       puts "Error: #{e.message}"
       exit
+    rescue Exception => e
+      puts "Error: #{e.message}"
+      exit
     end
   else
     puts optparse.to_s

data/docify.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   
   s.add_runtime_dependency 'rdiscount', '~> 1.6.8'
   s.add_runtime_dependency 'RedCloth', '~> 4.2.3'
+  s.add_runtime_dependency 'rdoc', '~> 3.5'
   
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/docify.rb

@@ -1,4 +1,9 @@
 require 'docify/format'
 require 'docify/style'
 require 'docify/markup'
-require 'docify/document'
+require 'docify/document'
+
+module Docify
+  def self.render(filename, format='md')
+  end
+end

data/lib/docify/markup.rb

@@ -1,10 +1,13 @@
-if RUBY_VERSION.include?('1.9')
+if RUBY_VERSION >= '1.9'
   require 'rdoc/markup/to_html'
 else
   require 'rdoc/generators/html_generator'
   require 'ostruct'
 end
 
+require 'RedCloth'
+require 'rdiscount'
+
 module Docify
   module Markup
     extend self
@@ -17,15 +20,11 @@ module Docify
       format == :text ? content : self.send(format, content)
     end
     
-    # Render content for Markdown
-    def markdown(content)
-      Markdown.new(content).to_html
-    end
-    
-    if RUBY_VERSION.include?('1.9')
-      # Render content for RDoc
+    if RUBY_VERSION >= '1.9'
+      # Render content for RDoc on Ruby 1.9
       def rdoc(content)
-        RDoc::Markup::ToHtml.new.convert(content)
+        markup = RDoc::Markup::ToHtml.new
+        markup.convert(content)
       end
     else
       # Render content for RDoc
@@ -38,6 +37,11 @@ module Docify
       end
     end
     
+    # Render content for Markdown
+    def markdown(content)
+      Markdown.new(content).to_html
+    end
+    
     # Render content for Textile
     def textile(content)
       RedCloth.new(content).to_html

data/lib/docify/version.rb

@@ -1,3 +1,3 @@
 module Docify
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.0.2'.freeze
 end

data/spec/fixtures/README.markdown

@@ -0,0 +1,2 @@
+* One
+* Two

data/spec/fixtures/README.markdown.html

@@ -0,0 +1,5 @@
+<ul>
+<li>One</li>
+<li>Two</li>
+</ul>
+

data/spec/fixtures/README.rdoc

@@ -0,0 +1,9 @@
+link:RDoc.html
+
+http://rdoc.rubyforge.org
+
+mailto:user@example.com
+
+{RDoc Documentation}[http://rdoc.rubyforge.org]
+
+{RDoc Markup}[link:RDoc/Markup.html]

data/spec/fixtures/README.rdoc.html

@@ -0,0 +1,15 @@
+<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>

data/spec/fixtures/README.textile

@@ -0,0 +1,2 @@
+* One
+* Two

data/spec/fixtures/README.textile.html

@@ -0,0 +1,4 @@
+<ul>
+	<li>One</li>
+	<li>Two</li>
+</ul>

data/spec/markup_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe Docify::Markup do
+  it 'should render RDoc' do
+    Docify::Markup.render('README.rdoc', fixture('README.rdoc')).should == fixture('README.rdoc.html')
+  end
+  
+  it 'should render Markdown' do
+    Docify::Markup.render('README.markdown', fixture('README.markdown')).should == fixture('README.markdown.html')
+  end
+  
+  it 'should render Textile' do
+    Docify::Markup.render('README.textile', fixture('README.textile')).should == fixture('README.textile.html')
+  end
+end

data/spec/spec_helper.rb

@@ -15,4 +15,12 @@ README_FILES  = {
   'README.textile'  => 'textile',
   'README.txt'      => 'rdoc',
   'README.foo'      => 'rdoc'
-}
+}
+
+def fixture_path
+  File.expand_path("../fixtures", __FILE__)
+end
+
+def fixture(file)
+  File.read(File.join(fixture_path, file))
+end

metadata

@@ -2,7 +2,7 @@
 name: docify
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Dan Sosedoff
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-13 00:00:00 -05:00
+date: 2011-06-23 00:00:00 -05:00
 default_executable: docify
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -90,6 +90,17 @@ dependencies:
         version: 4.2.3
   type: :runtime
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "3.5"
+  type: :runtime
+  version_requirements: *id008
 description: Docify provides a command line tool to render documentation files (RDoc, Markdown, Textile) into nice-looking html.
 email: 
 - dan.sosedoff@gmail.com
@@ -115,6 +126,13 @@ files:
 - lib/docify/version.rb
 - spec/docify_spec.rb
 - spec/document_spec.rb
+- spec/fixtures/README.markdown
+- spec/fixtures/README.markdown.html
+- spec/fixtures/README.rdoc
+- spec/fixtures/README.rdoc.html
+- spec/fixtures/README.textile
+- spec/fixtures/README.textile.html
+- spec/markup_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/sosedoff/docify
@@ -147,4 +165,11 @@ summary: Terminal tool to render markups into html
 test_files: 
 - spec/docify_spec.rb
 - spec/document_spec.rb
+- spec/fixtures/README.markdown
+- spec/fixtures/README.markdown.html
+- spec/fixtures/README.rdoc
+- spec/fixtures/README.rdoc.html
+- spec/fixtures/README.textile
+- spec/fixtures/README.textile.html
+- spec/markup_spec.rb
 - spec/spec_helper.rb