ydocx 1.1.1 → 1.1.2

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.1.2 / 07.05.2012
+
+* Fixed bug in xpath for multi images
+* Updated directory name for extracted images
+
 === 1.1.1 / 07.05.2012
 
 * Added "a", "pic" namespace for image parse

data/lib/ydocx/document.rb

@@ -13,14 +13,14 @@ require 'ydocx/builder'
 
 module YDocx
   class Document
-    attr_reader :contents, :indecies, :pictures
+    attr_reader :contents, :indecies, :images
     def self.open(file, options={})
       self.new(file, options)
     end
     def initialize(file, options={})
       @contents = nil
       @indecies = nil
-      @pictures = []
+      @images = []
       @options = options
       @path = nil
       @files = nil
@@ -44,7 +44,7 @@ module YDocx
         html = builder.build_html
       end
       unless file.empty?
-        create_files if has_picture?
+        create_files if has_image?
         html_file = @path.sub_ext('.html')
         File.open(html_file, 'w:utf-8') do |f|
           f.puts html
@@ -73,9 +73,9 @@ module YDocx
     def create_files
       FileUtils.mkdir @files unless @files.exist?
       @zip = Zip::ZipFile.open(@path.realpath)
-      @pictures.each do |pic|
-        origin_path = Pathname.new pic[:origin] # media/filename.ext
-        source_path = Pathname.new pic[:source] # id/filename.ext
+      @images.each do |image|
+        origin_path = Pathname.new image[:origin] # media/filename.ext
+        source_path = Pathname.new image[:source] # images/filename.ext
         dir = @files.join source_path.dirname
         FileUtils.mkdir dir unless dir.exist?
         organize_image(origin_path, source_path)
@@ -102,8 +102,8 @@ module YDocx
         end
       end
     end
-    def has_picture?
-      !@pictures.empty?
+    def has_image?
+      !@images.empty?
     end
     def read(file)
       @path = Pathname.new file
@@ -113,7 +113,7 @@ module YDocx
       Parser.new(doc, ref) do |parser|
         @contents = parser.parse
         @indecies = parser.indecies
-        @pictures = parser.pictures
+        @images = parser.images
       end
       @zip.close
     end

data/lib/ydocx/parser.rb

@@ -8,15 +8,16 @@ require 'ydocx/markup_method'
 module YDocx
   class Parser
     include MarkupMethod
-    attr_accessor :indecies, :pictures, :result, :space
+    attr_accessor :indecies, :images, :result, :space
     def initialize(doc, rel)
       @doc = Nokogiri::XML.parse(doc)
       @rel = Nokogiri::XML.parse(rel)
       @coder = HTMLEntities.new
       @indecies = []
-      @pictures = []
+      @images = []
       @result = []
       @space = ' '
+      @image_path = 'images'
       init
       if block_given?
         yield self
@@ -152,11 +153,11 @@ module YDocx
       }
       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'
+        :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]
+          (id = image.first[attr.to_s]) && break
         end
       end
       if id
@@ -164,14 +165,14 @@ module YDocx
           element.children.each do |rel|
             if rel['Id'] == id and rel['Target']
               target = rel['Target']
-              source = id.downcase + '/'
+              source = @image_path + '/'
               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 << {
+              @images << {
                 :origin => target,
                 :source => source
               }

data/lib/ydocx/templates/fachinfo.rb

@@ -5,6 +5,9 @@ require 'cgi'
 
 module YDocx
   class Parser
+    def init
+      @image_path = 'fi_images'
+    end
     private
     def escape_id(text)
       CGI.escape(text.gsub(/&(.)uml;/, '\1e').gsub(/\s*\/\s*|\s+|\/|\-/, '_').gsub(/\./, '').downcase)

data/lib/ydocx/templates/patinfo.rb

@@ -5,6 +5,9 @@ require 'ydocx/templates/fachinfo'
 
 module YDocx
   class Parser
+    def init
+      @image_path = 'pi_images'
+    end
     private
     def parse_block(node)
       text = node.inner_text.strip

data/lib/ydocx.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ydocx
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   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: &13563740 !ruby/object:Gem::Requirement
+  requirement: &17798620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *13563740
+  version_requirements: *17798620
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &13563320 !ruby/object:Gem::Requirement
+  requirement: &17798200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *13563320
+  version_requirements: *17798200
 description: ''
 email:
 - yasaka@ywesee.com,  zdavatz@ywesee.com