pdftohtmlr 0.3.1 → 0.4

data/README.textile

@@ -15,7 +15,7 @@ h1. install
 <pre><code>gem install pdftohtmlr</code></pre>
     
 h1. using
-"gist examples":http://gist.github.com/254556.js?file=pdftohtmlr_example.rb"
+"gist examples":http://gist.github.com/254556
 
 <pre><code lang="ruby">require 'pdftohtmlr'
 require 'nokogiri'

data/lib/pdftohtmlr.rb

@@ -10,7 +10,6 @@
 # License:: MIT
 
 require 'rubygems'
-require 'open3'
 require 'nokogiri'
 require 'uri'
 require 'open-uri'
@@ -21,7 +20,7 @@ module PDFToHTMLR
   # Simple local error abstraction
   class PDFToHTMLRError < RuntimeError; end
   
-  VERSION = '0.3.1'
+  VERSION = '0.4'
 
   # Provides facilities for converting PDFs to HTML from Ruby code.
   class PdfFile
@@ -42,22 +41,19 @@ module PDFToHTMLR
       errors = ""
       output = ""
       if @user_pwd 
-        cmd = "pdftohtml -stdout -upw #{@user_pwd} #{@path}"    
+        cmd = "pdftohtml -stdout -upw #{@user_pwd}" + ' "' + @path + '"'    
       elsif @owner_pwd 
-        cmd = "pdftohtml -stdout -opw #{@owner_pwd} #{@path}"
+        cmd = "pdftohtml -stdout -opw #{@owner_pwd}" + ' "' + @path + '"'
       else
-        cmd = "pdftohtml -stdout #{@path}"
+        cmd = "pdftohtml -stdout" + ' "' + @path + '"'
       end
       
-      Open3.popen3 cmd do | stdin, stdout, stderr|
-        stdin.write cmd
-        stdin.close
-        output = stdout.read
-        errors = stderr.read
-      end
+      output = `#{cmd} 2>&1`
 
-      if (errors != "")
-        raise PDFToHTMLRError, errors.first.to_s.chomp
+      if (output.include?("Error: May not be a PDF file"))
+        raise PDFToHTMLRError, "Error: May not be a PDF file (continuing anyway)"
+      elsif (output.include?("Error:"))
+        raise PDFToHTMLRError, output.split("\n").first.to_s.chomp
       else
         return output
       end
@@ -67,7 +63,6 @@ module PDFToHTMLR
     def convert_to_document() 
       Nokogiri::HTML.parse(convert())
     end
-    
   end
   
   # Handle a string-based local path as input, extends PdfFile
@@ -92,7 +87,7 @@ module PDFToHTMLR
           raise PDFToHTMLRError, "invalid file url"
         end
         tempfile = Tempfile.new('pdftohtmlr')
-        File.open(tempfile.path, 'w') {|f| f.write(open(input_url).read) }
+        File.open(tempfile.path, 'wb') {|f| f.write(open(input_url).read) }
         super(tempfile.path, target_path, user_pwd, owner_pwd)
       rescue => bang
         raise PDFToHTMLRError, bang.to_s

data/test/pdftohtmlr_test.rb

@@ -36,7 +36,7 @@ class PdfFileTest < Test::Unit::TestCase
   def test_string_from_pdffile
     file = PdfFilePath.new(TEST_PDF_PATH, ".", nil, nil)
     assert_equal "String", file.convert().class.to_s
-    assert_equal `pdftohtml -stdout #{TEST_PDF_PATH}`, file.convert() 
+    assert_equal `pdftohtml -stdout "#{TEST_PDF_PATH}"`, file.convert() 
   end 
 
   def test_invalid_pwd_pdffile
@@ -50,7 +50,7 @@ class PdfFileTest < Test::Unit::TestCase
   def test_valid_pwd_pdffile
     file = PdfFilePath.new(TEST_PWD_PDF_PATH, ".", "user", nil)
     assert_equal "String", file.convert().class.to_s
-    assert_equal `pdftohtml -stdout -upw user #{TEST_PWD_PDF_PATH}`,
+    assert_equal `pdftohtml -stdout -upw user "#{TEST_PWD_PDF_PATH}"`,
     file.convert()
   end
   
@@ -59,7 +59,7 @@ class PdfFileTest < Test::Unit::TestCase
     assert_equal "Nokogiri::HTML::Document",
      file.convert_to_document().class.to_s
     assert_equal Nokogiri::HTML.parse(
-        `pdftohtml -stdout #{TEST_PDF_PATH}`
+        `pdftohtml -stdout "#{TEST_PDF_PATH}"`
       ).css('body').first.to_s,
        file.convert_to_document().css('body').first.to_s
   end
@@ -90,7 +90,7 @@ class PdfFileTest < Test::Unit::TestCase
     # http://github.com/kitplummer/pdftohtmlr/raw/master/test/test.pdf
     file = PdfFileUrl.new(TEST_URL_PDF, ".", nil, nil)
     assert_equal "String", file.convert().class.to_s
-    assert_equal `pdftohtml -stdout #{TEST_PDF_PATH}`, file.convert()
+    assert_equal `pdftohtml -stdout "#{TEST_PDF_PATH}"`, file.convert()
   end
   
   def test_args

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pdftohtmlr
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: "0.4"
 platform: ruby
 authors: 
 - Kit Plummer
@@ -9,7 +9,7 @@ autorequire: pdftohtml
 bindir: bin
 cert_chain: []
 
-date: 2009-12-14 00:00:00 -07:00
+date: 2009-12-18 00:00:00 -07:00
 default_executable: 
 dependencies: []