pandoc-ruby 0.0.3 → 0.0.4

data/README.markdown

@@ -19,35 +19,38 @@ Next, install PandocRuby from gemcutter.
     @converter = PandocRuby.new('/some/file.md', :from => :markdown, :to => :rst)
     puts @converter.convert
 
-This takes the Markdown formatted file and converts it to reStructuredText.
+This takes the Markdown formatted file and converts it to reStructuredText. The first argument can be either a file or a string.
 
-You can use the `#convert` class method:
+You can also use the `#convert` class method:
 
     puts PandocRuby.convert('/some/file.md', :from => :markdown, :to => :html)
 
-Included is a `#to_s` method for somewhat nicer use in Rails views.
+When no options are passed, pandoc's default behavior converts markdown to html. To specify options, simply pass options as a hash to the initializer. Pandoc's wrapper executables can also be used by passing the executable name as the second argument. For example,
 
-    ... helper file ...
-    def format(text)
-      PandocRuby.convert(text)
-    end
+    PandocRuby.new('/some/file.html', 'html2markdown')
 
-    ... view file ...
-    <%= format text %>
+will use Pandoc's `html2markdown` wrapper.
 
-The default behavior follows the pandoc executable's behavior, converting markdown to html. To specify options, simply pass options as a hash to the initializer. Pandoc's wrapper executables can also be used by passing the executable name as the second argument. For example,
+Other arguments are simply converted into command line options, accepting symbols or strings for options without arguments and hashes of strings or symbols for options with arguments.
 
-    PandocRuby.new('/some/file.html', 'html2markdown')
+    PandocRuby.convert('/some/file.html', :s, {:to => :rst, :f => :markdown}, 'no-wrap')
 
-will use Pandoc's `html2markdown` wrapper.
+becomes
 
-Assumes pandoc executables are in the path.  If not, set their location
+    pandoc -s --to=rst -f markdown --no-wrap /some/file.html
+
+PandocRuby assumes the pandoc executables are in the path.  If not, set their location
 with `PandocRuby.bin_path = '/path/to/bin'`
 
 For more information on Pandoc, see the [Pandoc documentation](http://johnmacfarlane.net/pandoc/) or run `man pandoc`.
 
 Pretty much everything in the gem was derived directly from [Albino](http://github.com/github/albino).
 
+## Caveats
+
+* This has only been tested on *nix systems.
+* Some conversions may still not work and/or require additional dependencies.
+
 ## Note on Patches/Pull Requests
  
 * Fork the project.

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/pandoc-ruby.rb

@@ -17,16 +17,25 @@ class PandocRuby
     new(*args).convert
   end
 
-  def initialize(target, *args)
+  def initialize(*args)
+    target = args.shift
     @target  = File.exists?(target) ? File.read(target) : target rescue target
     if args[0] && !args[0].respond_to?(:merge) && EXECUTABLES.include?(args[0])
-      @executable = args[0]
+      @executable = args.shift
     else
       @executable = 'pandoc'
     end
-    @options = args.last.respond_to?(:merge) ? args.last : {}
+    @options = args.empty? ? [] : args
   end
 
+  def convert
+    executable = @@bin_path ? File.join(@@bin_path, @executable) : @executable
+    execute executable + convert_options
+  end
+  alias_method :to_s, :convert
+
+private
+
   def execute(command)
     pid, stdin, stdout, stderr = Open4.popen4(command)
     stdin.puts @target
@@ -34,19 +43,16 @@ class PandocRuby
     stdout.read.strip
   end
 
-  def convert
-    executable = @@bin_path ? File.join(@@bin_path, @executable) : @executable
-    execute executable + convert_options
-  end
-  alias_method :to_s, :convert
 
   def convert_options
-    @options.inject('') do |string, (flag, value)|
-      string + if flag.to_s.length == 1 
-        " -#{flag} #{value}"
+    @options.inject('') do |string, opt|
+      string + if opt.respond_to?(:each_pair)
+        opt.inject('') do |s, (flag, val)|
+          s + (flag.to_s.length == 1 ? " -#{flag} #{val}" : " --#{flag}=#{val}")
+        end
       else
-        " --#{flag}=#{value}"
+        opt.to_s.length == 1 ? " -#{opt}" : " --#{opt}"
       end
     end
   end
-end
+end

data/pandoc-ruby.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pandoc-ruby}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["William Melody"]
-  s.date = %q{2009-10-12}
+  s.date = %q{2009-10-13}
   s.description = %q{Ruby wrapper for Pandoc}
   s.email = %q{wmelody@gmail.com}
   s.extra_rdoc_files = [

data/test/pandoc-ruby_test.rb

@@ -37,18 +37,24 @@ class PandocRubyTest < Test::Unit::TestCase
     assert converter.convert
   end
   
+  should "accept a variety of options" do
+    converter = PandocRuby.new(@file, :s, {:to => :rst, :f => :markdown}, 'no-wrap')
+    converter.expects(:execute).with('pandoc -s --to=rst -f markdown --no-wrap').returns(true)
+    assert converter.convert
+  end
+
   should "accept optional executable" do
     converter = PandocRuby.new(@file, 'html2markdown')
     converter.expects(:execute).with('html2markdown').returns(true)
     assert converter.convert
   end
   
-  should "not accept non-pandoc optional executable" do
-    converter = PandocRuby.new(@file, 'ls')
-    converter.expects(:execute).with('pandoc').returns(true)
+  should "use non-executable second arg as option" do
+    converter = PandocRuby.new(@file, 'toc')
+    converter.expects(:execute).with('pandoc --toc').returns(true)
     assert converter.convert
   end
-  
+
   should "work with strings" do
     converter = PandocRuby.new('## this is a title')
     assert_match %r(h2), converter.convert

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pandoc-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - William Melody
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-12 00:00:00 -05:00
+date: 2009-10-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency