ydocx 1.1.4 → 1.1.5

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.1.5 / 08.05.2012
+
+* Updated output files directory for fi/pi format
+
 === 1.1.4 / 08.05.2012
 
 * Updated img src as relative path

data/lib/ydocx/builder.rb

@@ -108,8 +108,7 @@ module YDocx
         attributes.each_pair do |key, value|
           next if mode == :xml and key.to_s =~ /(id|style|colspan)/u
           if tag == :img and key == :src
-            src = @files.join value.to_s
-            _attributes << " src=\"#{src}\""
+            _attributes << " src=\"#{resolve_path(value.to_s)}\""
           else
             _attributes << " #{key.to_s}=\"#{value.to_s}\""
           end
@@ -147,5 +146,8 @@ td {
       CSS
       style.gsub(/\s\s+|\n/, ' ')
     end
+    def resolve_path(path)
+      @files.join path
+    end
   end
 end

data/lib/ydocx/command.rb

@@ -14,6 +14,9 @@ module YDocx
         puts "see `#{self.command} --help`"
         exit
       end
+      def extname(action)
+        action == :to_html ? '.html': '.xml'
+      end
       def command
         File.basename $0
       end
@@ -28,10 +31,7 @@ Usage: #{self.command} file [options]
         exit
       end
       def report(action, path)
-        dir = File.dirname path
-        base = File.basename path, '.docx'
-        ext = (action == :to_xml) ? '.xml' : '.html'
-        puts "#{self.command}: generated #{dir}/#{base}#{ext}"
+        puts "#{self.command}: generated #{File.expand_path(path)}"
         exit
       end
       def run(action=:to_html)
@@ -82,8 +82,9 @@ Usage: #{self.command} file [options]
               require 'ydocx/templates/fachinfo'
               options.merge!({:style => :frame}) if action == :to_html
             end
-            YDocx::Document.open(path).send(action, path, options)
-            self.report action, path
+            doc = YDocx::Document.open(path)
+            doc.send(action, path, options)
+            self.report action, doc.output_file(self.extname(action))
           end
         end
       end

data/lib/ydocx/document.rb

@@ -13,16 +13,19 @@ require 'ydocx/builder'
 
 module YDocx
   class Document
-    attr_reader :contents, :indecies, :images
+    attr_reader :builder,:contents, :images, :indecies,
+                :parser, :path
     def self.open(file, options={})
       self.new(file, options)
     end
     def initialize(file, options={})
+      @parser = nil
+      @builder = nil
       @contents = nil
       @indecies = nil
       @images = []
       @options = options
-      @path = nil
+      @path = Pathname.new('.')
       @files = nil
       @zip = nil
       init
@@ -30,13 +33,19 @@ module YDocx
     end
     def init
     end
+    def output_directory
+      @files ||= @path.dirname.join(@path.basename('.docx').to_s + '_files')
+    end
+    def output_file(ext)
+      @path.sub_ext(".#{ext.to_s}")
+    end
     def to_html(file='', options={})
       html = ''
       options = @options.merge(options)
-      @files = @path.dirname.join(@path.basename('.docx').to_s + '_files')
-      Builder.new(@contents) do |builder|
+      files = output_directory
+      @builder = Builder.new(@contents) do |builder|
         builder.title = @path.basename
-        builder.files = @files.relative_path_from(@files.dirname)
+        builder.files = files.relative_path_from(files.dirname)
         builder.style = options[:style] if options.has_key?(:style)
         if @indecies
           builder.indecies = @indecies
@@ -45,7 +54,7 @@ module YDocx
       end
       unless file.empty?
         create_files if has_image?
-        html_file = @path.sub_ext('.html')
+        html_file = output_file(:html)
         File.open(html_file, 'w:utf-8') do |f|
           f.puts html
         end
@@ -61,7 +70,8 @@ module YDocx
         xml = builder.build_xml
       end
       unless file.empty?
-        xml_file = @path.sub_ext('.xml')
+        xml_file = output_file(:xml)
+        mkdir xml_file.parent
         File.open(xml_file, 'w:utf-8') do |f|
           f.puts xml
         end
@@ -71,13 +81,14 @@ module YDocx
     end
     private
     def create_files
-      FileUtils.mkdir @files unless @files.exist?
+      files_dir = output_directory
+      mkdir Pathname.new(files_dir) unless files_dir.exist?
       @zip = Zip::ZipFile.open(@path.realpath)
       @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?
+        image_dir = files_dir.join source_path.dirname
+        FileUtils.mkdir image_dir unless image_dir.exist?
         organize_image(origin_path, source_path)
       end
       @zip.close
@@ -88,16 +99,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('wb') do |f|
+          output_directory.join(source_path).open('wb') do |f|
             f.puts image.to_blob
           end
         else # copy original image
-          @files.join(dir, origin_path.basename).open('wb') do |f|
+          output_directory.join(dir, origin_path.basename).open('wb') do |f|
             f.puts binary.read
           end
         end
       else
-        @files.join(source_path).open('wb') do |f|
+        output_directory.join(source_path).open('wb') do |f|
           f.puts binary.read
         end
       end
@@ -110,12 +121,18 @@ module YDocx
       @zip = Zip::ZipFile.open(@path.realpath)
       doc = @zip.find_entry('word/document.xml').get_input_stream
       rel = @zip.find_entry('word/_rels/document.xml.rels').get_input_stream
-      Parser.new(doc, rel) do |parser|
+      @parser = Parser.new(doc, rel) do |parser|
         @contents = parser.parse
         @indecies = parser.indecies
         @images = parser.images
       end
       @zip.close
     end
+    def mkdir(path)
+      return if path.exist?
+      parent = path.parent
+      mkdir(parent)
+      FileUtils.mkdir(path)
+    end
   end
 end

data/lib/ydocx/templates/fachinfo.rb

@@ -5,16 +5,13 @@ require 'cgi'
 
 module YDocx
   class Parser
+    attr_reader :code
     def init
-      @image_path = 'fi_images'
+      @image_path = 'image'
+      @code = nil
     end
     private
-    def escape_id(text)
-      CGI.escape(text.gsub(/&(.)uml;/, '\1e').gsub(/\s*\/\s*|\s+|\/|\-/, '_').gsub(/\./, '').downcase)
-    end
-    def parse_block(node)
-      text = node.inner_text.strip
-      text = optional_escape text
+    def chapters
       # TODO
       # Franzoesisch
       chapters = {
@@ -38,13 +35,30 @@ module YDocx
         'Packungen'           => /^Packungen($|\s*\(\s*mit\s+Angabe\s+der\s+Abgabekategorie\s*\)$)/u, # 18
         'Reg.Inhaber'         => /^Zulassungsinhaberin($|\s*\(\s*Firma\s+und\s+Sitz\s+gemäss\s*Handelsregisterauszug\s*\))/u, # 19
         'Stand d. Info.'      => /^Stand\s+der\s+Information$|^Mise\s+.\s+jour$/iu, # 20
-      }.each_pair do |chapter, regexp|
+      }
+    end
+    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)(‘|’|`|')(\d\d\d)\s*\(\s*[Ss]wiss\s*medic\s*\)\s*$/
+        @code = "%5d" % ($1 + $3)
+      else
+        nil
+      end
+    end
+    def parse_block(node)
+      text = node.inner_text.strip
+      text = optional_escape text
+      chapters.each_pair do |chapter, regexp|
         if text =~ regexp
           # allow without line break
           # next if !node.previous.inner_text.empty? and !node.next.inner_text.empty?
           id = escape_id(chapter)
           @indecies << {:text => chapter, :id => id}
           return markup(:h3, text, {:id => id})
+        elsif parse_code(text)
+          return nil
         end
       end
       if node.parent.previous.nil? and @indecies.empty?
@@ -149,6 +163,9 @@ div#container {
       end
       style.gsub(/\s\s+|\n/, ' ')
     end
+    def resolve_path(path)
+      path
+    end
   end
   # == Document
   # Image reference option
@@ -157,14 +174,27 @@ div#container {
   # $ docx2html example.docx --format fachinfo refence1.png refenece2.png
   class Document
     def init
+      @directory = 'fi'
       @references = []
-      ARGV.reverse.each do |arg|
-        if arg.downcase =~ /\.(jpeg|jpg|png|gif)$/
-          path = Pathname.new(arg).realpath
-          @references << path if path.exist?
+      prepare_reference
+    end
+    def output_directory
+      unless @files
+        if @parser.code
+          @files = Pathname.new(@directory + '/' + @parser.code)
+        else
+          @files = @path.dirname.join(@path.basename('.docx').to_s + '_files')
         end
       end
-      @references.reverse unless @references.empty?
+      @files
+    end
+    def output_file(ext)
+      if @parser.code
+        filename = @parser.code
+        output_directory.join "#{filename}.#{ext.to_s}"
+      else # default
+        @path.sub_ext(".#{ext.to_s}")
+      end
     end
     private
     alias :copy_or_convert :organize_image
@@ -176,5 +206,14 @@ div#container {
         copy_or_convert(origin_path, source_path)
       end
     end
+    def prepare_reference
+      ARGV.reverse.each do |arg|
+        if arg.downcase =~ /\.(jpeg|jpg|png|gif)$/
+          path = Pathname.new(arg).realpath
+          @references << path if path.exist?
+        end
+      end
+      @references.reverse unless @references.empty?
+    end
   end
 end

data/lib/ydocx/templates/patinfo.rb

@@ -5,13 +5,8 @@ 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
-      text = optional_escape text
+    def chapters
       # TODO
       # Franzoesisch
       chapters = {
@@ -31,21 +26,14 @@ module YDocx
         'Verteiler'           => /^Zulassungsinhaberin$/u, # 14
         'Hersteller'          => /^Herstellerin$/u, # 15
         'Stand d. Info.'      => /^Diese\sPackungsbeilage\s+wurde\s+im\s+[\.A-z\s0-9]+(\s+|\s*\/\s*\w+\s+\(Monat\s*\/\s*Jahr\)\s*)letztmals\s+durch\s+die\s+Arzneimittelbehörde\s*\(\s*Swissmedic\s*\)\s*geprüft.?$/u, # 16
-      }.each_pair do |chapter, regexp|
-        if text =~ regexp
-          # allow without line break
-          #next if !node.previous.inner_text.empty? and !node.next.inner_text.empty?
-          id = escape_id(chapter)
-          @indecies << {:text => chapter, :id => id}
-          return markup(:h3, text, {:id => id})
-        end
-      end
-      if node.parent.previous.nil? and @indecies.empty?
-        # The first line as package name
-        @indecies << {:text => 'Titel', :id => 'titel'}
-        return markup(:h2, text, {:id => 'titel'})
-      end
-      return nil
+      }
+    end
+  end
+  class Document
+    def init
+      @directory = 'pi'
+      @references = []
+      prepare_reference
     end
   end
 end

data/lib/ydocx.rb

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

metadata

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