ydocx 1.2.0 → 1.2.1

data/History.txt

@@ -1,4 +1,8 @@
-=== 1.2.0 / 07..2012
+=== 1.2.1 / 11.07.2012
+
+* Updated template, option handling for extension
+
+=== 1.2.0 / 07.07.2012
 
 * Added support for stand alone image parsing
 * Improved swissmedic number handling of fi format

data/lib/ydocx.rb

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

data/lib/ydocx/builder.rb

@@ -16,6 +16,7 @@ module YDocx
       @indecies = []
       @references = []
       @block = :div
+      @block_class = nil
       @files = Pathname.new('.')
       @style = false
       @title = ''
@@ -63,18 +64,20 @@ module YDocx
     def compile(contents, mode)
       result = ''
       headings = 0
+      block_start = (@block_class ? "<#{@block} class='#{@block_class}'>" : "<#{@block}>")
+      block_close = "</#{@block}>"
       contents.each do |element|
         if element[:tag].to_s =~ /^h[1-9]$/ # block
           if headings == 0
-            result << "<#{@block}>"
+            result << block_start
           else
-            result << "</#{@block}><#{@block}>"
+            result << "#{block_close}#{block_start}"
           end
           headings += 1
         end
         result << build_tag(element[:tag], element[:content], element[:attributes], mode)
       end
-      result << "</#{@block}>"
+      result << block_close
     end
     def build_after_content
       nil

data/lib/ydocx/document.rb

@@ -40,7 +40,7 @@ module YDocx
     def output_file(ext)
       @path.sub_ext(".#{ext.to_s}")
     end
-    def to_html(file='', options={})
+    def to_html(output=false, options={})
       html = ''
       options = @options.merge(options)
       files = output_directory
@@ -54,32 +54,30 @@ module YDocx
 
         html = builder.build_html
       end
-      unless file.empty?
+      if output
         create_files if has_image?
         html_file = output_file(:html)
         File.open(html_file, 'w:utf-8') do |f|
           f.puts html
         end
-      else
-        html
       end
+      html
     end
-    def to_xml(file='', options={})
+    def to_xml(output=false, options={})
       xml = ''
       options = @options.merge(options)
       Builder.new(@contents) do |builder|
         builder.block = options.has_key?(:block) ? options[:block] : :chapter
         xml = builder.build_xml
       end
-      unless file.empty?
+      if output
         xml_file = output_file(:xml)
         mkdir xml_file.parent
         File.open(xml_file, 'w:utf-8') do |f|
           f.puts xml
         end
-      else
-        xml
       end
+      xml
     end
     private
     def create_files

data/lib/ydocx/parser.rb

@@ -188,13 +188,7 @@ module YDocx
           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]
-                source << File.basename(target, ext) + '.png'
-              else
-                source << File.basename(target)
-              end
+              source = source_path(target)
               @images << {
                 :origin => target,
                 :source => source
@@ -208,6 +202,15 @@ module YDocx
       end
       nil
     end
+    def source_path(target)
+      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
+    end
     def parse_paragraph(node)
       content = []
       if block = parse_block(node)

data/lib/ydocx/templates/fachinfo.rb

@@ -5,10 +5,11 @@ require 'cgi'
 
 module YDocx
   class Parser
-    attr_reader :code
+    attr_accessor :code, :lang
     def init
       @image_path = 'image'
       @code = nil
+      @lang = 'DE'
     end
     private
     def chapters
@@ -31,7 +32,7 @@ module YDocx
         'Pharm.kinetik'       => /^Pharmakokinetik($|\s*\((Absorption,\s*Distribution,\s*Metabolisms,\s*Elimination\s|Kinetik\s+spezieller\s+Patientengruppen)*\)$)|^Pharmacocin.tique?/iu, # 14
         'Präklin.'       => /^Präklinische\s+Daten$/u, # 15
         'Sonstige H.'         => /^Sonstige\s*Hinweise($|\s*\(\s*(Inkompatibilitäten|Beeinflussung\s*diagnostischer\s*Methoden|Haltbarkeit|Besondere\s*Lagerungshinweise|Hinweise\s+für\s+die\s+Handhabung)\s*\)$)|^Remarques/u, # 16
-        'Swissmedic-Nr.'      => /^Zulassungsnummer(:|$|\s*\(\s*Swissmedic\s*\)$)/u, # 17
+        'Swissmedic-Nr.'      => /^Zulassungsnummer(n|:|$|\s*\(\s*Swissmedic\s*\)$)/u, # 17
         '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
@@ -49,6 +50,19 @@ module YDocx
         nil
       end
     end
+    def parse_heading(text, id)
+      return markup(:h2, text, {:id => id})
+    end
+    def parse_title(node, text)
+      if @indecies.empty? and !text.empty? and
+         (node.previous.inner_text.strip.empty? or node.parent.previous.nil?)
+        # The first line as package name
+        @indecies << {:text => 'Titel', :id => 'titel'}
+        return markup(:h1, text, {:id => 'titel'})
+      else
+        return nil
+      end
+    end
     def parse_block(node)
       text = node.inner_text.strip
       text = optional_escape text
@@ -58,15 +72,13 @@ module YDocx
           # 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})
+          return parse_heading(text, id)
         elsif parse_code(text)
           return nil
         end
       end
-      if @indecies.empty? and !text.empty? and node.parent.previous.nil?
-        # The first line as package name
-        @indecies << {:text => 'Titel', :id => 'titel'}
-        return markup(:h2, text, {:id => 'titel'})
+      if title = parse_title(node, text)
+        return title
       end
       return nil
     end
@@ -205,6 +217,8 @@ div#container {
       # now returns just true
       true
     end
+    def optional_copy(source_path)
+    end
     # NOTE
     # Image reference option
     # Currently, this supports only all images or first one reference.
@@ -220,6 +234,7 @@ div#container {
       else
         copy_or_convert(origin_path, source_path)
       end
+      optional_copy(source_path)
     end
     def prepare_reference
       ARGV.reverse.each do |arg|

metadata

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