ydocx 1.1.9 → 1.2.0

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.2.0 / 07..2012
+
+* Added support for stand alone image parsing
+* Improved swissmedic number handling of fi format
+
 === 1.1.9 / 10.05.2012
 
 * Updating image file should not be prevented if image file already exists.

data/lib/ydocx/parser.rb

@@ -154,24 +154,30 @@ module YDocx
       }
       ns = r.namespaces.merge additional_namespaces
       [
-        {
+        { # old type shape
           :attr => 'id',
           :path => 'w:pict//v:shape//v:imagedata',
           :wrap => 'w:pict//v:shape//w10:wrap',
-          :type => 'type',
+          :type => '',
         },
-        {
+        { # in anchor
           :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',
         },
+        { # stand alone
+          :attr => 'embed',
+          :path => 'w:drawing//a:graphic//a:graphicData//pic:pic//pic:blipFill//a:blip',
+          :wrap => 'w:drawing//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"
+            # wrap[element[:type]] has "bothSides", "topAndBottom" and "wrapText"
             @image_style = 'display:block;'
           end
           (id = image.first[element[:attr].to_s]) && break

data/lib/ydocx/templates/fachinfo.rb

@@ -40,9 +40,11 @@ module YDocx
     def escape_id(text)
       CGI.escape(text.gsub(/&(.)uml;/, '\1e').gsub(/\s*\/\s*|\s+|\/|\-/, '_').gsub(/\./, '').downcase)
     end
-    def parse_code(text)
-      if text =~ /^\s*(\d\d)(‘|’|'|.|\s*)(\d\d\d)\s*\(\s*Swiss\s*medic\s*\)(\s*|.)$/iu
+    def parse_code(text) # swissmedic nummer
+      if text =~ /^\s*(\d{2})(‘|’|'|.|\s*)(\d{3})\s*\(\s*Swiss\s*medic\s*\)(\s*|.)$/iu
         @code = "%5d" % ($1 + $3)
+      elsif text =~ /^\s*(\d{5})(.*|\s*)\s*\(\s*Swiss\s*medic\s*\)(\s*|.)$/iu
+        @code = "%5d" % $1
       else
         nil
       end
@@ -180,10 +182,11 @@ div#container {
     def output_directory
       unless @files
         if @parser.code
-          @files = Pathname.new(@directory + '/' + @parser.code)
+          files = @directory + '/' + @parser.code
         else
-          @files = @path.dirname.join(@path.basename('.docx').to_s + '_files')
+          files = @path.basename('.docx').to_s + '_files'
         end
+        @files = @path.dirname.join files
       end
       @files
     end

data/lib/ydocx.rb

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

metadata

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