compat with jruby

Author: hansonw

Diff for: Gemfile

@@ -4,6 +4,6 @@ gem 'nokogiri'
 gem 'rubyzip'
 gem 'htmlentities'
 gem 'roman-numerals'
-gem 'rmagick'
-gem 'ruby-prof'
-gem 'diff-lcs'
+# gem 'rmagick'
+# gem 'ruby-prof'
+gem 'diff-lcs'

Diff for: bin/docx2html

@@ -8,7 +8,7 @@ if $0 == __FILE__
 end
 
 require 'ydocx/command'
-require 'ruby-prof'
+# require 'ruby-prof'
 
 #RubyProf.start
 YDocx::Command.run(:to_html)

Diff for: lib/ydocx/document.rb

@@ -3,7 +3,7 @@
 
 require 'pathname'
 require 'zip/zip'
-require 'RMagick'
+# require 'RMagick'
 require 'ydocx/parser'
 require 'ydocx/builder'
 
@@ -102,7 +102,7 @@ def read(file)
       @zip = Zip::ZipFile.open(@path.realpath)
       doc = @zip.find_entry('word/document.xml').get_input_stream
       rel = @zip.find_entry('word/_rels/document.xml.rels').get_input_stream
-      rel_xml = Nokogiri::XML.parse(rel)
+      rel_xml = Nokogiri::XML.parse(rel.read)
       rel_files = []
       rel_xml.xpath('/').children.each do |relat|
         relat.children.each do |r|

Diff for: lib/ydocx/parser.rb

@@ -5,7 +5,7 @@
 require 'htmlentities'
 require 'ydocx/markup_method'
 require 'roman-numerals'
-require 'RMagick'
+# require 'RMagick'
 
 module YDocx
   Style = Struct.new(:b, :u, :i, :strike, :caps, :smallCaps, :font, :sz, :color, :valign, :ilvl, :numid)
@@ -294,8 +294,8 @@ def to_markup
   class Parser
     attr_accessor :images, :result, :space
     def initialize(doc, rel, rel_files, output_dir)
-      @doc = Nokogiri::XML.parse(doc)
-      @rel = Nokogiri::XML.parse(rel)
+      @doc = Nokogiri::XML.parse(doc.read)
+      @rel = Nokogiri::XML.parse(rel.read)
       @rel_files = rel_files
       @style_nodes = {}
       @styles = {}
@@ -430,7 +430,7 @@ def compute_style(id)
 
     def parse
       if settings_file = @rel_files.select { |file| file[:type] =~ /relationships\/settings$/ }.first
-        settings_xml = Nokogiri::XML.parse(settings_file[:stream])
+        settings_xml = Nokogiri::XML.parse(settings_file[:stream].read)
         if fpr = settings_xml.at_xpath('//w:settings//w:footnotePr')
           if start = fpr.at_xpath('w:numStart')
             @cur_footnote = start['w:val'].to_i
@@ -450,7 +450,7 @@ def parse
       end
 
       if theme_file = @rel_files.select { |file| file[:type] =~ /relationships\/theme$/ }.first
-        theme_xml = Nokogiri::XML.parse(theme_file[:stream])
+        theme_xml = Nokogiri::XML.parse(theme_file[:stream].read)
         ['major', 'minor'].each do |type|
           if font = theme_xml.at_xpath(".//a:#{type}Font//a:latin")
             @theme_fonts[type] = font['typeface']
@@ -459,7 +459,7 @@ def parse
       end
 
       if style_file = @rel_files.select { |file| file[:type] =~ /relationships\/styles$/ }.first
-        style_xml = Nokogiri::XML.parse(style_file[:stream])
+        style_xml = Nokogiri::XML.parse(style_file[:stream].read)
         style_xml.xpath('//w:styles//w:style').each do |style|
           @style_nodes[style['w:styleId']] = style
         end
@@ -474,7 +474,7 @@ def parse
       end
 
       if num_file = @rel_files.select { |file| file[:type] =~ /relationships\/numbering$/ }.first
-        num_xml = Nokogiri::XML.parse(num_file[:stream])
+        num_xml = Nokogiri::XML.parse(num_file[:stream].read)
         abstract_nums = {}
         num_xml.xpath('//w:numbering//w:abstractNum').each do |abstr|
           abstract_nums[abstr['w:abstractNumId']] = abstr