RbST 0.0.2 → 0.1.0

data/README.markdown

@@ -22,23 +22,23 @@ RbST is available on [gemcutter](http://gemcutter.org/gems/RbST).
 
 This takes the reStructuredText formatted file and converts it to either HTML or LaTeX. The first argument can be either a file or a string.
 
-You can also use the `#convert` class method:
+You can also use the `convert` class method to output HTML:
 
     puts RbST.convert('/some/file.rst')
 
-When no options are passed, the default behavior converts reStructuredText to html using the default settings. 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.
+Arguments can be passed to `#to_html`, `#to_latex`, `new` or `convert`, accepting symbols or strings for options without arguments and hashes of strings or symbols for options with arguments.
 
-    puts RbST.convert(".. a comment", 'strip-comments')
+    puts RbST.new(".. a comment").to_html('strip-comments')
     # => '<div class="document">\n</div>'
 
 Options passed as string use hyphens while symbols use underscores. For instance, the above could also be written as:
 
-    puts RbST.convert(".. a comment", :strip_comments)
+    puts RbST.new(".. a comment").to_html(:strip_comments)
     # => '<div class="document">\n</div>'
 
 Document parts can also be specified with the `:parts` option.
 
-    puts RbST.convert("hello world", :part => :fragment)
+    puts RbST.new("hello world").to_html(:part => :fragment)
     # => '<p>hello world</p>'
 
 By default, RbST uses the `html_body` part for HTML and the `whole` part for LaTeX.

data/RbST.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{RbST}
-  s.version = "0.0.2"
+  s.version = "0.1.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-04}
+  s.date = %q{2009-11-20}
   s.description = %q{A simple Ruby wrapper for processing reStructuredText via Python's Docutils}
   s.email = %q{wmelody@gmail.com}
   s.extra_rdoc_files = [

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.1.0

data/lib/rbst.rb

@@ -24,19 +24,24 @@ class RbST
     @options = args
   end
 
-  def convert(writer = :html) # :nodoc:
-    execute "python #{RbST.executable(writer)}" + convert_options
+  def convert # :nodoc:
+    @output_format ||= :html
+    execute "python #{RbST.executable(@output_format)}" + convert_options
   end
   alias_method :to_s, :convert
   
   # Converts the object's input to HTML.
-  def to_html
-    convert(:html)
+  def to_html(*args)
+    @output_format = :html
+    @options += args
+    convert
   end
   
   # Converts the object's input to LaTeX.
-  def to_latex
-    convert(:latex)
+  def to_latex(*args)
+    @output_format = :latex
+    @options += args
+    convert
   end
   
   # Formats and prints the options from the docutils help in the way they'd be specified in RbST: strings, symbols and hashes.

data/test/test_rbst.rb

@@ -27,6 +27,14 @@ class TestRbST < Test::Unit::TestCase
     assert_equal latex, File.read(@latex_file)
   end
   
+  [:html, :latex].each do |f|
+    should "accept options on #to_#{f}" do
+      converter = RbST.new(@rst_file)
+      converter.expects(:execute).with("python ./test/../lib/rst2parts/rst2#{f}.py --raw-enabled").returns(true)
+      assert converter.send("to_#{f}", :raw_enabled)
+    end
+  end
+  
   should "recognize strip_comments option" do
     html_with_comment = RbST.convert(".. comment")
     assert_equal html_with_comment, %Q{<div class="document">\n<!-- comment -->\n</div>}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: RbST
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - William Melody
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-07 00:00:00 -06:00
+date: 2009-11-21 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency