pandoc-ruby 0.2.0 → 0.3.0

data/README.markdown

@@ -40,14 +40,19 @@ is equivalent to
 
     pandoc -s -f markdown --to=rst --no-wrap --table-of-contents /some/file.html
 
-Also provided are `#to_[writer]` instance methods for each of the writers:
+Also provided are `#to_[writer]` instance methods for each of the writers, and these can also accept options:
 
-    PandocRuby.new("# Some title").to_html
-    => "<div id=\"some-title\"\n><h1\n  >Some title</h1\n  ></div\n>"
+    PandocRuby.new("# Some title").to_html(:no_wrap)
+    => "<div id=\"some-title\"><h1>Some title</h1></div>"
     # or
     PandocRuby.new("# Some title").to_rtf
     => "{\\pard \\ql \\f0 \\sa180 \\li0 \\fi0 \\b \\fs36 Some title\\par}"
 
+Similarly, there are class methods for each of the readers, so readers and writers can be specified like this:
+
+    PandocRuby.html("<h1>hello</h1>").to_latex
+    => "\\section{hello}"
+
 PandocRuby assumes the pandoc executables are in the path.  If not, set their location
 with `PandocRuby.bin_path = '/path/to/bin'`
 

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/pandoc-ruby.rb

@@ -46,16 +46,25 @@ class PandocRuby
     @options = args
   end
 
-  def convert
+  def convert(*args)
     executable = @@bin_path ? File.join(@@bin_path, @executable) : @executable
-    execute executable + convert_options
+    execute executable + convert_options(args)
   end
   alias_method :to_s, :convert
   
+  class << self
+    READERS.each_key do |r|
+      define_method(r) do |*args|
+        args += [{:from => r}]
+        new(*args)
+      end
+    end
+  end
+  
   WRITERS.each_key do |w|
-    define_method(:"to_#{w}") do
-      @options << {:to => w.to_sym}
-      convert
+    define_method(:"to_#{w}") do |*args|
+      args += [{:to => w.to_sym}]
+      convert(*args)
     end
   end
   
@@ -71,8 +80,8 @@ private
     output
   end
 
-  def convert_options
-    @options.inject('') do |string, opt|
+  def convert_options(opts = [])
+    (@options + opts).flatten.inject('') do |string, opt|
       string + if opt.respond_to?(:each_pair)
         convert_opts_with_args(opt)
       else

data/pandoc-ruby.gemspec

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

data/test/test_pandoc-ruby.rb

@@ -36,12 +36,18 @@ class TestPandocRuby < Test::Unit::TestCase
     assert converter.convert
   end
   
-  should "accept a variety of options" do
+  should "accept a variety of options in initializer" do
     converter = PandocRuby.new(@file, :s, {:f => :markdown, :to => :rst}, 'no-wrap')
     converter.expects(:execute).with('pandoc -s -f markdown --to=rst --no-wrap').returns(true)
     assert converter.convert
   end
   
+  should "accept a variety of options in convert" do
+    converter = PandocRuby.new(@file)
+    converter.expects(:execute).with('pandoc -s -f markdown --to=rst --no-wrap').returns(true)
+    assert converter.convert(:s, {:f => :markdown, :to => :rst}, 'no-wrap')
+  end
+  
   should "convert underscore symbol ares to hyphenated long options" do
     converter = PandocRuby.new(@file, {:email_obfuscation => :javascript}, :table_of_contents)
     converter.expects(:execute).with('pandoc --email-obfuscation=javascript --table-of-contents').returns(true)
@@ -60,11 +66,19 @@ class TestPandocRuby < Test::Unit::TestCase
     assert converter.convert
   end
   
+  PandocRuby::READERS.each_key do |r|
+    should "convert from #{r} with PandocRuby.#{r}" do
+      converter = PandocRuby.send(r, @file)
+      converter.expects(:execute).with("pandoc --from=#{r}").returns(true)
+      assert converter.convert
+    end
+  end
+  
   PandocRuby::WRITERS.each_key do |w|
     should "convert to #{w} with to_#{w}" do
       converter = PandocRuby.new(@file)
-      converter.expects(:execute).with("pandoc --to=#{w}").returns(true)
-      assert converter.send("to_#{w}")
+      converter.expects(:execute).with("pandoc --no-wrap --to=#{w}").returns(true)
+      assert converter.send("to_#{w}", :no_wrap)
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pandoc-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - William Melody
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-18 00:00:00 -06:00
+date: 2009-11-20 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency