pandoc-ruby 0.0.2 → 0.0.3

data/README.markdown

@@ -19,13 +19,13 @@ Next, install PandocRuby from gemcutter.
     @converter = PandocRuby.new('/some/file.md', :from => :markdown, :to => :rst)
     puts @converter.convert
 
-This takes the the Markdown formatted file and converts it to reStructuredText.
+This takes the Markdown formatted file and converts it to reStructuredText.
 
-You can also use the `#convert` class method:
+You can use the `#convert` class method:
 
     puts PandocRuby.convert('/some/file.md', :from => :markdown, :to => :html)
 
-Another also: you get a `#to_s`, for somewhat nicer use in Rails views.
+Included is a `#to_s` method for somewhat nicer use in Rails views.
 
     ... helper file ...
     def format(text)

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/pandoc-ruby.rb

@@ -10,7 +10,7 @@ class PandocRuby
   ]
   
   def self.bin_path=(path)
-    @@bin_path = bin_path
+    @@bin_path = path
   end
 
   def self.convert(*args)
@@ -35,20 +35,17 @@ class PandocRuby
   end
 
   def convert
-    if @@bin_path
-      execute File.join(@@bin_path, @executable) + convert_options
-    else
-      execute @executable + convert_options
-    end
+    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)|
-      if flag.to_s.length == 1
-        string + " -#{flag} #{value}"
+      string + if flag.to_s.length == 1 
+        " -#{flag} #{value}"
       else
-        string + " --#{flag}=#{value}"
+        " --#{flag}=#{value}"
       end
     end
   end

data/pandoc-ruby.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pandoc-ruby}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["William Melody"]

data/test/pandoc-ruby_test.rb

@@ -8,33 +8,45 @@ class PandocRubyTest < Test::Unit::TestCase
     @converter = PandocRuby.new(@file, :t => :rst)
   end
   
-  should "convert mimic default behavior" do
+  def teardown
+    PandocRuby.bin_path = nil
+  end
+  
+  should "call bare pandoc when passed no options" do
+    converter = PandocRuby.new(@file)
+    converter.expects(:execute).with('pandoc').returns(true)
+    assert converter.convert
+  end
+  
+  should "convert with altered bin_path" do
+    path = %x[which pandoc].strip
+    PandocRuby.bin_path = path
     converter = PandocRuby.new(@file)
-    assert converter.expects(:execute).with('pandoc').returns(true)
-    converter.convert
+    converter.expects(:execute).with("#{path}/pandoc").returns(true)
+    assert converter.convert
   end
   
   should "accept short options" do
-    assert @converter.expects(:execute).with('pandoc -t rst').returns(true)
-    @converter.convert
+    @converter.expects(:execute).with('pandoc -t rst').returns(true)
+    assert @converter.convert
   end
   
   should "accept long options" do
     converter = PandocRuby.new(@file, :to => :rst)
-    assert converter.expects(:execute).with('pandoc --to=rst').returns(true)
-    converter.convert
+    converter.expects(:execute).with('pandoc --to=rst').returns(true)
+    assert converter.convert
   end
   
   should "accept optional executable" do
     converter = PandocRuby.new(@file, 'html2markdown')
-    assert converter.expects(:execute).with('html2markdown').returns(true)
-    converter.convert
+    converter.expects(:execute).with('html2markdown').returns(true)
+    assert converter.convert
   end
   
   should "not accept non-pandoc optional executable" do
     converter = PandocRuby.new(@file, 'ls')
-    assert converter.expects(:execute).with('pandoc').returns(true)
-    converter.convert
+    converter.expects(:execute).with('pandoc').returns(true)
+    assert converter.convert
   end
   
   should "work with strings" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pandoc-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - William Melody