ydocx 1.1.0 → 1.1.1

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.1.1 / 07.05.2012
+
+* Added "a", "pic" namespace for image parse
+
 === 1.1.0 / 04.05.2012
 
 * Fixed bug for HTML ref of subscript

data/lib/ydocx/parser.rb

@@ -145,27 +145,37 @@ module YDocx
       nil # default no block element
     end
     def parse_image(r)
-      if pict = r.xpath('w:pict') and
-         shape = pict.xpath('v:shape') and
-         image = shape.xpath('v:imagedata').first
-        if image and id = image['id'] # r:id
-          @rel.xpath('/').children.each do |element|
-            element.children.each do |rel|
-              if rel['Id'] == id and rel['Target']
-                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}
+      id = nil
+      additional_namespaces = {
+        'xmlns:a'   => 'http://schemas.openxmlformats.org/drawingml/2006/main',
+        '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]
+        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']
+              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
@@ -194,7 +204,7 @@ module YDocx
               content << optional_replace(code)
               pos += 1
             end
-            unless r.xpath('w:pict').empty?
+            if !r.xpath('w:pict').empty? or !r.xpath('w:drawing').empty?
               content << parse_image(r)
             end
           end

data/lib/ydocx.rb

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

metadata

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