ydocx 1.0.5 → 1.0.6

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.0.6 / 03.05.2012
+
+* Removed RMagick dependency (as optional feature)
+- use RMagick only for wmf conversion
+
 === 1.0.5 / 03.05.2012
 
 * Added img support

data/README.txt

@@ -14,13 +14,15 @@
 == Usage
 
 * Usage: /usr/local/bin/docx2html file [options]
-    -f, --format    Format of style and chapter {(fi|fachinfo)|(pl|plain)}, default none.
+    -f, --format    Format of style and chapter {(fi|fachinfo)|(pl|plain)}, default is FI.
     -h, --help      Display this help message.
 
 == Using the great libraries
 
+* rubyzip
 * nokogiri
 * htmlentities
+* RMagick
 
 == License GPLv3.0
 

data/lib/version.rb

@@ -2,5 +2,5 @@
 # encoding: utf-8
 
 module Docx2html
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

data/lib/ydocx/document.rb

@@ -3,6 +3,11 @@
 
 require 'pathname'
 require 'zip/zip'
+begin
+  require 'RMagick'
+rescue LoadError
+  warn "Couldn't load RMagick: .wmf conversion off"
+end
 require 'ydocx/parser'
 require 'ydocx/builder'
 
@@ -65,12 +70,27 @@ module YDocx
       FileUtils.mkdir @files unless @files.exist?
       @zip = Zip::ZipFile.open(@path.realpath)
       @pictures.each do |pic|
-        pic_path = Pathname.new pic # id/filename.ext
-        pic_dir = @files.join pic_path.dirname
-        FileUtils.mkdir pic_dir unless pic_dir.exist?
-        binary = @zip.find_entry("word/media/#{pic_path.basename}").get_input_stream
-        @files.join(pic_path).open('w') do |f|
-          f.puts binary.read
+        origin_path = Pathname.new pic[:origin] # media/filename.ext
+        source_path = Pathname.new pic[:source] # id/filename.ext
+        dir = @files.join source_path.dirname
+        FileUtils.mkdir dir unless dir.exist?
+        binary = @zip.find_entry("word/#{origin_path}").get_input_stream
+        if source_path.extname != origin_path.extname # convert
+          if defined? Magick::Image
+            image = Magick::Image.from_blob(binary.read).first
+            image.format = source_path.extname[1..-1].upcase
+            @files.join(source_path).open('w') do |f|
+              f.puts image.to_blob
+            end
+          else # copy original image
+            @files.join(dir, origin_path.basename).open('w') do |f|
+              f.puts binary.read
+            end
+          end
+       else
+          @files.join(source_path).open('w') do |f|
+            f.puts binary.read
+          end
         end
       end
       @zip.close

data/lib/ydocx/parser.rb

@@ -158,9 +158,19 @@ module YDocx
           @rel.xpath('/').children.each do |element|
             element.children.each do |rel|
               if rel['Id'] == id and rel['Target']
-                src = id.downcase + '/' + File.basename(rel['Target'])
-                @pictures << src
-                return markup :img, [], {:src => src}
+                target = rel['Target']
+                source = id.downcase + '/'
+                if defined? Magick::Image and
+                   ext = File.extname(target).match(/\.wmf$/).to_a[0]
+                  source << File.basename(target, ext) + '.png'
+                else
+                  source << File.basename(target)
+                end
+                @pictures << {
+                  :origin => target,
+                  :source => source
+                }
+                return markup :img, [], {:src => source}
               end
             end
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ydocx
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &9555940 !ruby/object:Gem::Requirement
+  requirement: &16602400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *9555940
+  version_requirements: *16602400
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &9555520 !ruby/object:Gem::Requirement
+  requirement: &16601980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *9555520
+  version_requirements: *16601980
 description: ''
 email:
 - yasaka@ywesee.com,  zdavatz@ywesee.com