ydocx 1.1.2 → 1.1.3

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.1.3 / 08.05.2012
+
+* Updated image copy as binary mode
+
 === 1.1.2 / 07.05.2012
 
 * Fixed bug in xpath for multi images

data/lib/ydocx/document.rb

@@ -88,16 +88,16 @@ module YDocx
         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|
+          @files.join(source_path).open('wb') do |f|
             f.puts image.to_blob
           end
         else # copy original image
-          @files.join(dir, origin_path.basename).open('w') do |f|
+          @files.join(dir, origin_path.basename).open('wb') do |f|
             f.puts binary.read
           end
         end
       else
-        @files.join(source_path).open('w') do |f|
+        @files.join(source_path).open('wb') do |f|
           f.puts binary.read
         end
       end
@@ -109,8 +109,8 @@ module YDocx
       @path = Pathname.new file
       @zip = Zip::ZipFile.open(@path.realpath)
       doc = @zip.find_entry('word/document.xml').get_input_stream
-      ref = @zip.find_entry('word/_rels/document.xml.rels').get_input_stream
-      Parser.new(doc, ref) do |parser|
+      rel = @zip.find_entry('word/_rels/document.xml.rels').get_input_stream
+      Parser.new(doc, rel) do |parser|
         @contents = parser.parse
         @indecies = parser.indecies
         @images = parser.images

data/lib/ydocx/parser.rb

@@ -18,6 +18,7 @@ module YDocx
       @result = []
       @space = ' '
       @image_path = 'images'
+      @image_style = ''
       init
       if block_given?
         yield self
@@ -152,19 +153,35 @@ module YDocx
         'xmlns:pic' => 'http://schemas.openxmlformats.org/drawingml/2006/picture'
       }
       ns = r.namespaces.merge additional_namespaces
-      paths = {
-        :id    => 'w:pict//v:shape//v:imagedata',
-        :embed => 'w:drawing//wp:anchor//a:graphic//a:graphicData//pic:pic//pic:blipFill//a:blip'
-      }.each do |attr, path|
-        if image = r.xpath(path, ns) and !image.empty?
-          (id = image.first[attr.to_s]) && break
+      [
+        {
+          :attr => 'id',
+          :path => 'w:pict//v:shape//v:imagedata',
+          :wrap => 'w:pict//v:shape//w10:wrap',
+          :type => 'type',
+        },
+        {
+          :attr => 'embed',
+          :path => 'w:drawing//wp:anchor//a:graphic//a:graphicData//pic:pic//pic:blipFill//a:blip',
+          :wrap => 'w:drawing//wp:anchor//wp:wrapTight',
+          :type => 'wrapText',
+        },
+      ].each do |element|
+        if image = r.xpath(element[:path], ns) and !image.empty?
+          if wrap = r.xpath("#{element[:wrap]}", ns).first
+            # TODO
+            # wrap handling (currently all wrap off)
+            # wrap[element[:type]] has "bothSides", "topAndBottom"
+            @image_style = 'display:block;'
+          end
+          (id = image.first[element[:attr].to_s]) && break
         end
       end
       if id
-        @rel.xpath('/').children.each do |element|
-          element.children.each do |rel|
-            if rel['Id'] == id and rel['Target']
-              target = rel['Target']
+        @rel.xpath('/').children.each do |rel|
+          rel.children.each do |r|
+            if r['Id'] == id and r['Target']
+              target = r['Target']
               source = @image_path + '/'
               if defined? Magick::Image and
                  ext = File.extname(target).match(/\.wmf$/).to_a[0]
@@ -176,7 +193,9 @@ module YDocx
                 :origin => target,
                 :source => source
               }
-              return markup :img, [], {:src => source}
+              attributes = {:src => source}
+              attributes.merge!({:style => @image_style}) unless @image_style.empty?
+              return markup :img, [], attributes
             end
           end
         end

data/lib/ydocx.rb

@@ -4,5 +4,5 @@
 require 'ydocx/document'
 
 module YDocx
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ydocx
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-07 00:00:00.000000000 Z
+date: 2012-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &17798620 !ruby/object:Gem::Requirement
+  requirement: &24016920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *17798620
+  version_requirements: *24016920
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &17798200 !ruby/object:Gem::Requirement
+  requirement: &24016500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *17798200
+  version_requirements: *24016500
 description: ''
 email:
 - yasaka@ywesee.com,  zdavatz@ywesee.com