oddb2xml 2.7.1 → 2.7.2

data/lib/oddb2xml/compare.rb

@@ -1,22 +1,22 @@
-# encoding: utf-8
-require 'xmlsimple'
+require "xmlsimple"
 
 module Oddb2xml
   def self.log_timestamp(msg)
     full_msg = "#{Time.now.strftime("%H:%M:%S")}: #{msg}"
     puts full_msg
-    STDOUT.flush
+    $stdout.flush
     full_msg
   end
+
   class StammXML
     V3_NAME_REG = /_([N,P])_/
     attr_accessor :components
     attr_reader :keys, :sub_key_names, :filename, :basename, :version, :hash
-    def initialize(filename, components =  ['ITEMS'])
+    def initialize(filename, components = ["ITEMS"])
       raise "File #{filename} must exist" unless File.exist?(filename)
       @filename = filename
       @basename = File.basename(filename)
-      @version =  V3_NAME_REG.match(filename) ? 3 : 5
+      @version = V3_NAME_REG.match(filename) ? 3 : 5
       @components = components
       if @version == 5
         @hash = load_file(@filename)
@@ -24,41 +24,47 @@ module Oddb2xml
         raise "Unsupported version #{@version}"
       end
     end
+
     def self.get_component_key_name(component_name)
-        return 'LIMNAMEBAG' if /LIMITATION/i.match(component_name)
-        return 'PRODNO' if /PRODUCT/i.match(component_name)
-        return 'GTIN' if /ITEM/i.match(component_name)
-        raise "Cannot determine keyname for component #{component_name}"
+      return "LIMNAMEBAG" if /LIMITATION/i.match?(component_name)
+      return "PRODNO" if /PRODUCT/i.match?(component_name)
+      return "GTIN" if /ITEM/i.match?(component_name)
+      raise "Cannot determine keyname for component #{component_name}"
     end
+
     def get_limitation_from_v5(item)
-      get_item('PRODUCTS', item['PRODNO'].first.to_i)['LIMNAMEBAG'] ? ['true'] : nil
+      get_item("PRODUCTS", item["PRODNO"].first.to_i)["LIMNAMEBAG"] ? ["true"] : nil
     end
+
     def get_field_from_v5_product(item, field_name)
-      get_item('PRODUCTS', item['PRODNO'].first.to_i)[field_name]
+      get_item("PRODUCTS", item["PRODNO"].first.to_i)[field_name]
     end
+
     def get_items(component_name)
       if @version == 3
-        items = @hash[component_name]
+        @hash[component_name]
       else
-        items = @hash[component_name].first.values.first
+        @hash[component_name].first.values.first
       end
-      items
     end
+
     def get_item(component_name, id)
       keyname = StammXML.get_component_key_name(component_name)
-      get_items(component_name).find{|item| item[keyname].first.to_i == id}
+      get_items(component_name).find { |item| item[keyname].first.to_i == id }
     end
+
     def load_file(name)
-      Oddb2xml.log_timestamp "Reading #{name} #{(File.size(name)/1024/1024).to_i} MB. This may take some time"
+      Oddb2xml.log_timestamp "Reading #{name} #{(File.size(name) / 1024 / 1024).to_i} MB. This may take some time"
       XmlSimple.xml_in(IO.read(name))
     end
   end
+
   class CompareV5
     DEFAULTS = {
-      :components => ["PRODUCTS", "LIMITATIONS", "ITEMS",],
-      :fields_to_ignore => ['COMP', 'DOSAGE_FORMF', 'MEASUREF'],
-      :fields_as_floats => [ 'PEXT', 'PEXF', 'PPUB' ],
-      :min_diff_for_floats => 0.01,
+      components: ["PRODUCTS", "LIMITATIONS", "ITEMS"],
+      fields_to_ignore: ["COMP", "DOSAGE_FORMF", "MEASUREF"],
+      fields_as_floats: ["PEXT", "PEXF", "PPUB"],
+      min_diff_for_floats: 0.01
     }
     def initialize(left, right, options = DEFAULTS.clone)
       @options = options
@@ -68,37 +74,38 @@ module Oddb2xml
       @occurrences = {}
       @report = []
     end
-    def get_keys(items, key='GTIN')
-      items.collect{|item| item[key].first.to_i }
+
+    def get_keys(items, key = "GTIN")
+      items.collect { |item| item[key].first.to_i }
     end
+
     def get_names(items)
-       items.collect{|item| item.keys}.flatten.uniq.sort
+      items.collect { |item| item.keys }.flatten.uniq.sort
     end
+
     def compare
       show_header("Start comparing #{@left.filename} with #{@right.filename}")
       (@left.components & @right.components).each do |name|
-        begin
-          puts "\n#{Time.now.strftime("%H:%M:%S")}: Comparing #{name} in #{@left.basename} with #{@right.basename}"
-          key = StammXML.get_component_key_name(name)
-          left_items = @left.get_items(name)
-          next unless left_items
-          right_items = @right.get_items(name)
-          next unless right_items
-          @diff_stat[name] = {}
-          @occurrences[name] = {}
-          @diff_stat[name][NR_COMPARED] = 0
-          l_names = get_names(left_items)
-          r_names = get_names(right_items)
-          compare_names = l_names & r_names
-          l_keys = get_keys(left_items, key)
-          r_keys = get_keys(right_items, key)
-          (l_keys & r_keys).each do |id|
-            compare_details(name, compare_names, id)
-          end
-          key_results_details(name, compare_names, l_keys, r_keys)
-        rescue => error
-          puts "Execution failed with #{error}"
+        puts "\n#{Time.now.strftime("%H:%M:%S")}: Comparing #{name} in #{@left.basename} with #{@right.basename}"
+        key = StammXML.get_component_key_name(name)
+        left_items = @left.get_items(name)
+        next unless left_items
+        right_items = @right.get_items(name)
+        next unless right_items
+        @diff_stat[name] = {}
+        @occurrences[name] = {}
+        @diff_stat[name][NR_COMPARED] = 0
+        l_names = get_names(left_items)
+        r_names = get_names(right_items)
+        compare_names = l_names & r_names
+        l_keys = get_keys(left_items, key)
+        r_keys = get_keys(right_items, key)
+        (l_keys & r_keys).each do |id|
+          compare_details(name, compare_names, id)
         end
+        key_results_details(name, compare_names, l_keys, r_keys)
+      rescue => error
+        puts "Execution failed with #{error}"
       end
       show_header("Summary comparing #{@left.filename} with #{@right.filename}")
       puts "Ignored differences in #{@options[:fields_to_ignore]}. Signaled when differences in #{@options[:fields_as_floats]} were bigger than #{@options[:min_diff_for_floats]}"
@@ -116,28 +123,31 @@ module Oddb2xml
       puts "Execution failed with #{error}"
       raise error
     end
+
     private
-    NR_COMPARED = 'NR_COMPARED'
-    COUNT       = '_count'
+
+    NR_COMPARED = "NR_COMPARED"
+    COUNT = "_count"
     def show_header(header)
       text = Oddb2xml.log_timestamp(header)
       pad = 5
       puts
-      puts '-'*(text.length+2*pad)
-      puts ''.ljust(pad) + text
-      puts '-'*(text.length+2*pad)
+      puts "-" * (text.length + 2 * pad)
+      puts "".ljust(pad) + text
+      puts "-" * (text.length + 2 * pad)
       puts
     end
+
     def compare_details(component_name, compare_names, id)
       l_item = @left.get_item(component_name, id)
       r_item = @right.get_item(component_name, id)
       found_one = false
       length = 32
       found = false
-      detail_name = l_item['DSCR'] ? l_item['DSCR'].first[0..length-1].rjust(length) : ''.rjust(length)
+      detail_name = l_item["DSCR"] ? l_item["DSCR"].first[0..length - 1].rjust(length) : "".rjust(length)
       details = "Diff in #{id.to_s.ljust(15)} #{detail_name}"
       diff_name = component_name
-      diff_name += 'S' unless /S$/.match(diff_name)
+      diff_name += "S" unless /S$/.match?(diff_name)
       @diff_stat[diff_name] ||= {}
       @occurrences[diff_name] ||= {}
       @diff_stat[diff_name][NR_COMPARED] ||= 0
@@ -154,33 +164,34 @@ module Oddb2xml
           r_float = r_value ? r_value.first.to_f : 0.0
           next if (l_float - r_float).abs < @options[:min_diff_for_floats]
         end
-        next if (r_value.is_a?(Array) && '--missing--'.eql?(r_value.first)) || (l_value.is_a?(Array) && '--missing--'.eql?(l_value.first))
-                # TODO: get_field_from_v5_product
+        next if (r_value.is_a?(Array) && "--missing--".eql?(r_value.first)) || (l_value.is_a?(Array) && "--missing--".eql?(l_value.first))
+        # TODO: get_field_from_v5_product
         next if r_value.to_s.eql?(l_value.to_s)
         next if r_value.to_s.upcase.eql?(l_value.to_s.upcase) && @options[:case_insensitive]
         details += " #{sub_key}: '#{l_value}' != '#{r_value}'"
         found = found_one = true
         @diff_stat[diff_name][sub_key] += 1
       end
-      puts details.gsub(/[\[\]]/,'') if found
+      puts details.gsub(/[\[\]]/, "") if found
     end
 
     def show_keys(keys, batch_size = 20)
       0.upto(keys.size) do |idx|
         next unless idx % batch_size == 0
-        puts '  ' + keys[idx..(idx + batch_size-1)].join(' ')
+        puts "  " + keys[idx..(idx + batch_size - 1)].join(" ")
       end
     end
+
     def key_results_details(component_name, compare_names, l_keys, r_keys)
-      component_name += 'S' unless /S$/.match(component_name)
-      @report <<  "#{component_name}: Found #{l_keys.size} items only in #{@left.basename} #{r_keys.size} items only in #{@right.basename}, compared #{@diff_stat[component_name][NR_COMPARED]} items"
+      component_name += "S" unless /S$/.match?(component_name)
+      @report << "#{component_name}: Found #{l_keys.size} items only in #{@left.basename} #{r_keys.size} items only in #{@right.basename}, compared #{@diff_stat[component_name][NR_COMPARED]} items"
       keys = r_keys - l_keys
-      head = "#{component_name}: #{(keys).size} keys only in #{@right.basename}"
+      head = "#{component_name}: #{keys.size} keys only in #{@right.basename}"
       puts "#{head}: Keys were #{keys.size}"
       show_keys(keys)
       @report << head
       keys = l_keys - r_keys
-      head = "#{component_name}: #{(keys).size} keys only in #{@left.basename}"
+      head = "#{component_name}: #{keys.size} keys only in #{@left.basename}"
       puts "#{head}: Keys were #{keys.size}"
       show_keys(keys)
       @report << head

data/lib/oddb2xml/compositions_syntax.rb

@@ -1,554 +1,572 @@
-# encoding: utf-8
-
 # This file is shared since oddb2xml 2.0.0 (lib/oddb2xml/parse_compositions.rb)
 # with oddb.org src/plugin/parse_compositions.rb
 #
 # It allows an easy parsing of the column P Zusammensetzung of the swissmedic packages.xlsx file
 #
 
-require 'parslet'
-require 'parslet/convenience'
-include Parslet
+require "parslet"
+require "parslet/convenience"
 
 class CompositionParser < Parslet::Parser
-
+  include Parslet
   # Single character rules
-  rule(:lparen)     { str('(') }
-  rule(:rparen)     { str(')') }
-  rule(:comma)      { str(',') }
+  rule(:lparen) { str("(") }
+  rule(:rparen) { str(")") }
+  rule(:comma) { str(",") }
 
-  rule(:space)      { match('\s').repeat(1) }
-  rule(:space?)     { space.maybe }
+  rule(:space) { match('\s').repeat(1) }
+  rule(:space?) { space.maybe }
 
   # Things
-  rule(:digit) { match('[0-9]') }
+  rule(:digit) { match("[0-9]") }
   rule(:digits) { digit.repeat(1) }
   rule(:number) {
     (
-      str('-').maybe >> (
-        str('0') | (match('[1-9]') >> match('[0-9\']').repeat)
+      str("-").maybe >> (
+        str("0") | (match("[1-9]") >> match("[0-9']").repeat)
       ) >> (
-            (str('*') >>  digit.repeat(1)).maybe >>
-            (match(['.,^']) >> digit.repeat(1)).repeat(1)
-      ).maybe >> (
-        match('[eE]') >> (str('+') | str('-')).maybe >> digit.repeat(1)
+            (str("*") >> digit.repeat(1)).maybe >>
+            (match([".,^"]) >> digit.repeat(1)).repeat(1)
+          ).maybe >> (
+        match("[eE]") >> (str("+") | str("-")).maybe >> digit.repeat(1)
       ).maybe
     )
   }
-  rule(:radio_isotop) { match['a-zA-Z'].repeat(1) >> lparen >> digits >> str('-') >> match['a-zA-Z'].repeat(1-3) >> rparen >>
-                        ((space? >> match['a-zA-Z']).repeat(1)).repeat(0)
-                        } # e.g. Xenonum (133-Xe) or yttrii(90-Y) chloridum zum Kalibrierungszeitpunkt
-  rule(:ratio_value) { match['0-9:\-\.,'].repeat(1)  >> space?}  # eg. ratio: 1:1, ratio: 1:1.5-2.4., ratio: 1:0.68-0.95, 1:4,1
+  rule(:radio_isotop) {
+    match["a-zA-Z"].repeat(1) >> lparen >> digits >> str("-") >> match["a-zA-Z"].repeat(1 - 3) >> rparen >>
+      ((space? >> match["a-zA-Z"]).repeat(1)).repeat(0)
+  } # e.g. Xenonum (133-Xe) or yttrii(90-Y) chloridum zum Kalibrierungszeitpunkt
+  rule(:ratio_value) { match['0-9:\-\.,'].repeat(1) >> space? } # eg. ratio: 1:1, ratio: 1:1.5-2.4., ratio: 1:0.68-0.95, 1:4,1
 
   # handle stuff like acidum 9,11-linolicum or 2,2'-methylen-bis(6-tert.-butyl-4-methyl-phenolum) specially. it must contain at least one a-z
-  rule(:umlaut) { match(['éàèèçïöäüâ']) }
-  rule(:identifier_D12) { match['a-zA-Z'] >>  match['0-9'].repeat(1) }
+  rule(:umlaut) { match(["éàèèçïöäüâ"]) }
+  rule(:identifier_D12) { match["a-zA-Z"] >> match["0-9"].repeat(1) }
 
   # TODO: why do we have to hard code these identifiers?
   rule(:fix_coded_identifiers) {
     str("2,2'-methylen-bis(6-tert.-butyl-4-methyl-phenolum)") |
-    str('A + B') |
-    str('CRM 197') |
-    str('F.E.I.B.A.') |
-    str('LA ') >> digit.repeat(1,2) >> str('% TM') |
-    str('TM:') | str('&') |
-    str('ethanol.') |
-    str('poloxamerum 238') |
-    str('polysorbatum ') >> digit >> digit
+      str("A + B") |
+      str("CRM 197") |
+      str("F.E.I.B.A.") |
+      str("LA ") >> digit.repeat(1, 2) >> str("% TM") |
+      str("TM:") | str("&") |
+      str("ethanol.") |
+      str("poloxamerum 238") |
+      str("polysorbatum ") >> digit >> digit
   }
 
   # TODO: Sind diese Abkürzung wirklich Teil eines Substanznamens?
-  rule(:identifier_abbrev_with_comma)  {
-    str('aquos') |
-    str('ca.') |
-    str('deklar.') |
-    str('spag.') |
-    str('spec.') |
-    str('spp.') |
-    str('ssp.') |
-    str('var.')
+  rule(:identifier_abbrev_with_comma) {
+    str("aquos") |
+      str("ca.") |
+      str("deklar.") |
+      str("spag.") |
+      str("spec.") |
+      str("spp.") |
+      str("ssp.") |
+      str("var.")
   }
   rule(:fix_coded_doses) {
-    digit >> digit.maybe >> space >> str('per centum ') >> str('q.s.').maybe |
-    str('50/50') |
-    str('1g/9.6 cm²') |
-    str('9 g/L 5.4 ml')
-  }
-  rule(:identifier)  {  fix_coded_identifiers |
-                        identifier_abbrev_with_comma |
-                        fix_coded_doses |
-                        str('q.s.') |
-                        identifier_D12 |
-                        identifier_without_comma |
-                        identifier_with_comma
-                     }
+    digit >> digit.maybe >> space >> str("per centum ") >> str("q.s.").maybe |
+      str("50/50") |
+      str("1g/9.6 cm²") |
+      str("9 g/L 5.4 ml")
+  }
+  rule(:identifier) {
+    fix_coded_identifiers |
+      identifier_abbrev_with_comma |
+      fix_coded_doses |
+      str("q.s.") |
+      identifier_D12 |
+      identifier_without_comma |
+      identifier_with_comma
+  }
 
   rule(:identifier_with_comma) {
-    match['0-9,\-'].repeat(0) >> (match['a-zA-Z']|umlaut)  >> (match(['_,']).maybe >> (match['0-9a-zA-Z\-\'\/'] | umlaut)).repeat(0)
+    match['0-9,\-'].repeat(0) >> (match["a-zA-Z"] | umlaut) >> (match(["_,"]).maybe >> (match['0-9a-zA-Z\-\'\/'] | umlaut)).repeat(0)
   }
 
   rule(:identifier_without_comma) {
-    match['0-9\',\-'].repeat(0) >> (match['a-zA-Z']|umlaut)  >> (match(['_']).maybe >> (match['0-9a-zA-Z\-\'\/'] | umlaut)).repeat(0) >>
-        lparen >> (rparen.absent? >> any).repeat(1) >> rparen
+    match['0-9\',\-'].repeat(0) >> (match["a-zA-Z"] | umlaut) >> (match(["_"]).maybe >> (match['0-9a-zA-Z\-\'\/'] | umlaut)).repeat(0) >>
+      lparen >> (rparen.absent? >> any).repeat(1) >> rparen
   }
-  rule(:one_word) { match['a-zA-Z'] >> match['0-9'].repeat(1) | match['a-zA-Z'].repeat(1) }
+  rule(:one_word) { match["a-zA-Z"] >> match["0-9"].repeat(1) | match["a-zA-Z"].repeat(1) }
   rule(:in_parent) { lparen >> one_word.repeat(1) >> rparen }
   rule(:words_nested) { one_word.repeat(1) >> in_parent.maybe >> space? >> one_word.repeat(0) }
   # dose
   # 150 U.I. hFSH et 150 U.I. hLH
   rule(:units) {
-      str('cm²') |
-      str('g/dm²') |
-      str('g/l') |
-      str('g/L') |
-      str('% V/V') |
-      str('µg/24 h') |
-      str('µg/g') |
-      str('µg') |
-      str('ng') |
-      str('guttae') |
-      str('mg/g') |
-      str('mg/ml') |
-      str('MBq/ml') |
-      str('MBq') |
-      str('CFU') |
-      str('mg') |
-      str('Mg') |
-      str('kJ') |
-      str('G') |
-      str('g') |
-      str('I.E.') |
-      str('l') |
-      str('µl') |
-      str('U. Ph. Eur.') |
-      str('ml') |
-      str('µmol') |
-      str('mmol/l') |
-      str('mmol') |
-      str('Mio CFU') |
-      str('Mio U.I.') |
-      str('Mio U.') |
-      str('Mio. U.I.') |
-      str('Mio. U.') |
-      str('Mia. U.I.') |
-      str('Mia. U.') |
-      str('S.U.') |
-      str('U. Botox') |
-      str('U.I. hFSH') |
-      str('U.I. hCG') |
-      str('U.I. hLH') |
-      str('U.I.') |
-      str('U./ml') |
-      str('U.K.I.') |
-      str('U.') |
-      str('Mia.') |
-      str('Mrd.') |
-      str('% m/m') |
-      str('% m/m') |
-      str('%')
+    str("cm²") |
+      str("g/dm²") |
+      str("g/l") |
+      str("g/L") |
+      str("% V/V") |
+      str("µg/24 h") |
+      str("µg/g") |
+      str("µg") |
+      str("ng") |
+      str("guttae") |
+      str("mg/g") |
+      str("mg/ml") |
+      str("MBq/ml") |
+      str("MBq") |
+      str("CFU") |
+      str("mg") |
+      str("Mg") |
+      str("kJ") |
+      str("G") |
+      str("g") |
+      str("I.E.") |
+      str("l") |
+      str("µl") |
+      str("U. Ph. Eur.") |
+      str("ml") |
+      str("µmol") |
+      str("mmol/l") |
+      str("mmol") |
+      str("Mio CFU") |
+      str("Mio U.I.") |
+      str("Mio U.") |
+      str("Mio. U.I.") |
+      str("Mio. U.") |
+      str("Mia. U.I.") |
+      str("Mia. U.") |
+      str("S.U.") |
+      str("U. Botox") |
+      str("U.I. hFSH") |
+      str("U.I. hCG") |
+      str("U.I. hLH") |
+      str("U.I.") |
+      str("U./ml") |
+      str("U.K.I.") |
+      str("U.") |
+      str("Mia.") |
+      str("Mrd.") |
+      str("% m/m") |
+      str("% m/m") |
+      str("%")
   }
   rule(:dose_unit) { units.as(:unit) }
-  rule(:qty_range)       { (number >> space? >> (str('+/-') | str(' - ') | str(' -') | str('-') | str('±') ) >> space? >> number).as(:qty_range) }
-  rule(:qty_unit)       { dose_qty >> (space >> dose_unit).maybe }
-  rule(:dose_qty)       { number.as(:qty) }
-  rule(:min_max)        { (str('min.') | str('max.') | str('ca.') | str('<') ) >> space? }
+  rule(:qty_range) { (number >> space? >> (str("+/-") | str(" - ") | str(" -") | str("-") | str("±")) >> space? >> number).as(:qty_range) }
+  rule(:qty_unit) { dose_qty >> (space >> dose_unit).maybe }
+  rule(:dose_qty) { number.as(:qty) }
+  rule(:min_max) { (str("min.") | str("max.") | str("ca.") | str("<")) >> space? }
   # 75 U.I. hFSH et 75 U.I. hLH
-  rule(:dose_fsh) { qty_unit >> space >> str('et') >> space >> qty_unit.as(:dose_right) }
-  rule(:dose_per) { (digits >> str('/') >> digits).as(:qty)}
-  rule(:dose)           { dose_fsh |
-                          dose_per |
-                          ( min_max.maybe >>
-                            ( (qty_range >> (space >> dose_unit).maybe) | (qty_unit | dose_qty |dose_unit)) >> space? ) >>
-                        str('pro dosi').maybe >> space?
-                           }
-  rule(:dose_with_unit) { min_max.maybe >>
-                            dose_fsh |
-                          ( qty_range >> space >> dose_unit |
-                            dose_qty  >> space >> dose_unit
-                          ) >>
-                          space?
-                        }
-  rule(:operator)   { match('[+]') >> space? }
+  rule(:dose_fsh) { qty_unit >> space >> str("et") >> space >> qty_unit.as(:dose_right) }
+  rule(:dose_per) { (digits >> str("/") >> digits).as(:qty) }
+  rule(:dose) {
+    dose_fsh |
+      dose_per |
+      (min_max.maybe >>
+        ((qty_range >> (space >> dose_unit).maybe) | (qty_unit | dose_qty | dose_unit)) >> space?) >>
+        str("pro dosi").maybe >> space?
+  }
+  rule(:dose_with_unit) {
+    min_max.maybe >>
+      dose_fsh |
+      (qty_range >> space >> dose_unit |
+        dose_qty >> space >> dose_unit
+      ) >>
+        space?
+  }
+  rule(:operator) { match("[+]") >> space? }
 
   # Grammar parts
-  rule(:useage) {   (any >> str('berzug:')) | # match Überzug
-                    str('antiox.:') |
-                    str('arom.:') |
-                    str('conserv.:') |
-                    str('color.:')
-                   }
+  rule(:useage) {
+    (any >> str("berzug:")) | # match Überzug
+      str("antiox.:") |
+      str("arom.:") |
+      str("conserv.:") |
+      str("color.:")
+  }
 
   # Match Wirkstoffe like E 270
-  rule(:lebensmittel_zusatz) {  str('E').as(:lebensmittel_zusatz) >> space >>
-                                (digits >> match['(a-z)'].repeat(0,3)).as(:digits) >>
-                                (space >> dose.as(:dose_lebensmittel_zusatz)).maybe >> space?
-
-                   }
-   # DER: 1:4 or DER: 3.5:1 or DER: 6-8:1 or DER: 4.0-9.0:1'
-  rule(:der_identifier) { str('DER:')  >> space >> digit >> match['0-9\.\-:'].repeat }
+  rule(:lebensmittel_zusatz) {
+    str("E").as(:lebensmittel_zusatz) >> space >>
+      (digits >> match["(a-z)"].repeat(0, 3)).as(:digits) >>
+      (space >> dose.as(:dose_lebensmittel_zusatz)).maybe >> space?
+  }
+  # DER: 1:4 or DER: 3.5:1 or DER: 6-8:1 or DER: 4.0-9.0:1'
+  rule(:der_identifier) { str("DER:") >> space >> digit >> match['0-9\.\-:'].repeat }
   rule(:der) { (der_identifier).as(:substance_name) >> space? >> dose.maybe.as(:dose) }
   rule(:forbidden_in_substance_name) {
-                            min_max |
-                            useage |
-                            excipiens_identifiers |
-                            pro_identifiers |
-                            corresp_substance_label |
-                            (digits.repeat(1) >> space >> str(':')) | # match 50 %
-                            str(', corresp.') |
-                            str('Beutel: ') |
-                            str('Mio ') |
-                            str('ad emulsionem') |
-                            str('ad globulos') |
-                            str('ad pulverem') |
-                            str('ad q.s. ') |
-                            str('ad solutionem') |
-                            str('ad suspensionem') |
-                            str('ana partes') |
-                            str('ana ') |
-                            str('aqua ad ') |
-                            str('aqua q.s. ') |
-                            str('corresp. ca.,') |
-                            str('et ') |
-                            str('excipiens') |
-                            str('partes') |
-                            str('pro capsula') |
-                            str('pro dosi') |
-                            str('pro vitroe') |
-                            str('q.s. ad ') |
-                            str('q.s. pro ') |
-                            str('ratio:') |
-                            str('ut alia: ') |
-                            str('ut ')
-    }
+    min_max |
+      useage |
+      excipiens_identifiers |
+      pro_identifiers |
+      corresp_substance_label |
+      (digits.repeat(1) >> space >> str(":")) | # match 50 %
+      str(", corresp.") |
+      str("Beutel: ") |
+      str("Mio ") |
+      str("ad emulsionem") |
+      str("ad globulos") |
+      str("ad pulverem") |
+      str("ad q.s. ") |
+      str("ad solutionem") |
+      str("ad suspensionem") |
+      str("ana partes") |
+      str("ana ") |
+      str("aqua ad ") |
+      str("aqua q.s. ") |
+      str("corresp. ca.,") |
+      str("et ") |
+      str("excipiens") |
+      str("partes") |
+      str("pro capsula") |
+      str("pro dosi") |
+      str("pro vitroe") |
+      str("q.s. ad ") |
+      str("q.s. pro ") |
+      str("ratio:") |
+      str("ut alia: ") |
+      str("ut ")
+  }
   rule(:name_without_parenthesis) {
     (
-      (str('(') | forbidden_in_substance_name).absent? >>
-        (radio_isotop | str('> 1000') | str('> 500') | identifier.repeat(1) >> str('.').maybe) >>
+      (str("(") | forbidden_in_substance_name).absent? >>
+        (radio_isotop | str("> 1000") | str("> 500") | identifier.repeat(1) >> str(".").maybe) >>
       space?
     ).repeat(1)
   }
 
-  rule(:part_with_parenthesis) { lparen >> ( (lparen | rparen).absent? >> any).repeat(1) >>
-                                 (part_with_parenthesis | rparen >> str('-like:') | rparen  ) >> space?
-                               }
+  rule(:part_with_parenthesis) {
+    lparen >> ((lparen | rparen).absent? >> any).repeat(1) >>
+      (part_with_parenthesis | rparen >> str("-like:") | rparen) >> space?
+  }
   rule(:name_with_parenthesis) {
     forbidden_in_substance_name.absent? >>
-    ((comma | lparen).absent? >> any).repeat(0) >> part_with_parenthesis >>
-    (forbidden_in_substance_name.absent? >> (identifier.repeat(1) | part_with_parenthesis | rparen) >> space?).repeat(0)
+      ((comma | lparen).absent? >> any).repeat(0) >> part_with_parenthesis >>
+      (forbidden_in_substance_name.absent? >> (identifier.repeat(1) | part_with_parenthesis | rparen) >> space?).repeat(0)
   }
-  rule(:substance_name) { (
+  rule(:substance_name) {
+    (
                             name_with_parenthesis |
                             name_without_parenthesis
                           ) >>
-                          str('pro dosi').maybe >> space?
-                          }
-  rule(:simple_substance) { substance_name.as(:substance_name) >> space? >> dose.maybe.as(:dose)}
-  rule(:simple_subtance_with_digits_in_name_and_dose)  {
+      str("pro dosi").maybe >> space?
+  }
+  rule(:simple_substance) { substance_name.as(:substance_name) >> space? >> dose.maybe.as(:dose) }
+  rule(:simple_subtance_with_digits_in_name_and_dose) {
     substance_lead.maybe.as(:more_info) >> space? >>
-    (name_without_parenthesis >> space? >> ((digits.repeat(1) >> (str(' %') | str('%')) | digits.repeat(1)))).as(:substance_name) >>
-    space >> dose_with_unit.as(:dose)
+      (name_without_parenthesis >> space? >> ((digits.repeat(1) >> (str(" %") | str("%")) | digits.repeat(1)))).as(:substance_name) >>
+      space >> dose_with_unit.as(:dose)
   }
 
-
   rule(:substance_more_info) { # e.g. "acari allergeni extractum 5000 U.:
-      (str('ratio:').absent? >> (identifier|digits) >> space?).repeat(1) >> space? >> (str('U.:') | str(':')| str('.:')) >> space?
-    }
+    (str("ratio:").absent? >> (identifier | digits) >> space?).repeat(1) >> space? >> (str("U.:") | str(":") | str(".:")) >> space?
+  }
 
   rule(:pro_identifiers) {
-                       str('ut aqua ad iniectabilia q.s. ad emulsionem pro ') |
-                       str('aqua ').maybe >> str('ad iniectabilia q.s. ad solutionem pro ') |
-                       str('aqua ').maybe >> str('ad solutionem pro ')  |
-                       str('aqua ').maybe >> str('q.s. ad emulsionem pro ') |
-                       str('aqua ').maybe >> str('q.s. ad gelatume pro ') |
-                       str('aqua ').maybe >> str('q.s. ad solutionem pro ') |
-                       str('aqua ').maybe >> str('q.s. ad suspensionem pro ') |
-                       str('doses pro vase ') |
-                       str('excipiens ad emulsionem pro ') |
-                       str('excipiens ad pulverem pro ') |
-                       str('excipiens ad solutionem pro ') |
-                       str('pro vase ') |
-                       str('q.s. ad pulverem pro ')
-  }
-  rule(:excipiens_dose) { pro_identifiers.as(:excipiens_description) >> space? >> dose.as(:dose) >> space? >> ratio.maybe.as(:ratio) >>
-                    space? >> str('corresp.').maybe >> space? >> dose.maybe.as(:dose_corresp)
-                    }
-
-  rule(:excipiens_identifiers)  {
-                       str('ad globulos') |
-                       str('ad pulverem') |
-                       str('ad solutionem') |
-                       str('aether q.s.') |
-                       str('ana partes') |
-                       str('aqua ad iniectabilia q.s. ad solutionem') |
-                       str('aqua ad iniectabilia') |
-                       str('aqua q.s. ad') |
-                       str('excipiens pro compresso obducto') |
-                       str('excipiens pro compresso') |
-                       str('excipiens pro praeparatione') |
-                       str('excipiens') |
-                       str('pro charta') |
-                       str('pro praeparatione') |
-                       str('pro vitro') |
-                       str('q.s. ad') |
-                       str('q.s. pro praeparatione') |
-                       str('saccharum ad') |
-                       str('solvens (i.v.): aqua ad iniectabilia')
-                      }
-
-  rule(:excipiens)  { substance_lead.maybe.as(:more_info) >> space? >>
-                      ( excipiens_dose | (excipiens_identifiers >> any.repeat(0)).as(:excipiens_description)) >>
-                      any.repeat(0)
-                    }
-
-  rule(:substance_lead) { useage >> space? |
-                      str('Beutel:') >> space? |
-                      str('residui:') >> space? |
-                      str('mineralia:') >> str(':') >> space? |
-                      str('Solvens:') >> space? |
-                      substance_more_info
-    }
+    str("ut aqua ad iniectabilia q.s. ad emulsionem pro ") |
+      str("aqua ").maybe >> str("ad iniectabilia q.s. ad solutionem pro ") |
+      str("aqua ").maybe >> str("ad solutionem pro ") |
+      str("aqua ").maybe >> str("q.s. ad emulsionem pro ") |
+      str("aqua ").maybe >> str("q.s. ad gelatume pro ") |
+      str("aqua ").maybe >> str("q.s. ad solutionem pro ") |
+      str("aqua ").maybe >> str("q.s. ad suspensionem pro ") |
+      str("doses pro vase ") |
+      str("excipiens ad emulsionem pro ") |
+      str("excipiens ad pulverem pro ") |
+      str("excipiens ad solutionem pro ") |
+      str("pro vase ") |
+      str("q.s. ad pulverem pro ")
+  }
+  rule(:excipiens_dose) {
+    pro_identifiers.as(:excipiens_description) >> space? >> dose.as(:dose) >> space? >> ratio.maybe.as(:ratio) >>
+      space? >> str("corresp.").maybe >> space? >> dose.maybe.as(:dose_corresp)
+  }
+
+  rule(:excipiens_identifiers) {
+    str("ad globulos") |
+      str("ad pulverem") |
+      str("ad solutionem") |
+      str("aether q.s.") |
+      str("ana partes") |
+      str("aqua ad iniectabilia q.s. ad solutionem") |
+      str("aqua ad iniectabilia") |
+      str("aqua q.s. ad") |
+      str("excipiens pro compresso obducto") |
+      str("excipiens pro compresso") |
+      str("excipiens pro praeparatione") |
+      str("excipiens") |
+      str("pro charta") |
+      str("pro praeparatione") |
+      str("pro vitro") |
+      str("q.s. ad") |
+      str("q.s. pro praeparatione") |
+      str("saccharum ad") |
+      str("solvens (i.v.): aqua ad iniectabilia")
+  }
+
+  rule(:excipiens) {
+    substance_lead.maybe.as(:more_info) >> space? >>
+      (excipiens_dose | (excipiens_identifiers >> any.repeat(0)).as(:excipiens_description)) >>
+      any.repeat(0)
+  }
+
+  rule(:substance_lead) {
+    useage >> space? |
+      str("Beutel:") >> space? |
+      str("residui:") >> space? |
+      str("mineralia:") >> str(":") >> space? |
+      str("Solvens:") >> space? |
+      substance_more_info
+  }
   rule(:corresp_substance_label) {
-      str(', corresp. ca.,') |
-      str('corresp. ca.,') |
-      str('corresp.,') |
-      str('corresp.') |
-      str(', corresp.')
-    }
-  rule(:ratio) { str('ratio:') >>  space >> ratio_value }
-
-  rule(:solvens) { (str('Solvens:') | str('Solvens (i.m.):'))>> space >> (any.repeat).as(:more_info) >> space? >>
-                   (substance.as(:substance) >> str('/L').maybe).maybe  >>
-                    any.maybe
-                }
-    # Perhaps we could have some syntax sugar to make this more easy?
-    #
-    def tag(opts={})
-        close = opts[:close] || false
-    end
-
-    # TODO: what does ut alia: impl?
+    str(", corresp. ca.,") |
+      str("corresp. ca.,") |
+      str("corresp.,") |
+      str("corresp.") |
+      str(", corresp.")
+  }
+  rule(:ratio) { str("ratio:") >> space >> ratio_value }
+
+  rule(:solvens) {
+    (str("Solvens:") | str("Solvens (i.m.):")) >> space >> (any.repeat).as(:more_info) >> space? >>
+      (substance.as(:substance) >> str("/L").maybe).maybe >>
+      any.maybe
+  }
+  # Perhaps we could have some syntax sugar to make this more easy?
+  #
+  def tag(opts = {})
+    opts[:close] || false
+  end
+
+  # TODO: what does ut alia: impl?
   rule(:substance_ut) {
-   (space? >> (str('pro dosi ut ') | str('ut ') ) >>
-    space? >> str('alia:').absent? >>substance
-  ) >>
-    space?
-    }
+    (space? >> (str("pro dosi ut ") | str("ut ")) >>
+     space? >> str("alia:").absent? >> substance
+    ) >>
+      space?
+  }
 
   rule(:corresp_substance) {
-                            (corresp_substance_label) >> space? >>
-                            (
-                             substance |
-                             dose.as(:dose_corresp_2) |
-                             excipiens.as(:excipiens)
-                            )
+    (corresp_substance_label) >> space? >>
+      (
+       substance |
+       dose.as(:dose_corresp_2) |
+       excipiens.as(:excipiens)
+     )
   }
 
   rule(:substance) {
-      (
-        simple_subtance_with_digits_in_name_and_dose |
-        der |
-        substance_lead.maybe.as(:more_info) >> space? >> lebensmittel_zusatz |
-        substance_lead.maybe.as(:more_info) >> space? >> simple_substance >> str('pro dosi').maybe
-      ).as(:substance) >>
-      (space? >> str(', ').maybe >> ratio.maybe).as(:ratio) >>
+    (
+      simple_subtance_with_digits_in_name_and_dose |
+      der |
+      substance_lead.maybe.as(:more_info) >> space? >> lebensmittel_zusatz |
+      substance_lead.maybe.as(:more_info) >> space? >> simple_substance >> str("pro dosi").maybe
+    ).as(:substance) >>
+      (space? >> str(", ").maybe >> ratio.maybe).as(:ratio) >>
       space? >> corresp_substance.maybe.as(:chemical_substance) >>
       space? >> substance_ut.repeat(0).as(:substance_ut)
   }
-  rule(:histamin) { str('U = Histamin Equivalent Prick').as(:histamin) }
-  rule(:praeparatio){ ((one_word >> space?).repeat(1).as(:description) >> str(':') >> space?).maybe >>
-                      (name_with_parenthesis | name_without_parenthesis).repeat(1).as(:substance_name) >>
-                      number.as(:qty) >> space >> str('U.:') >> space? >>
-                      ((identifier >> space?).repeat(1).as(:more_info) >> space?).maybe
-                    }
-  rule(:substance_separator) { (str(', et ') | comma | str('et ') | str('ut alia: ')) >> space? }
-  rule(:one_substance)       { (praeparatio | histamin | substance) >> space? >> ratio.as(:ratio).maybe >> space? }
-  rule(:all_substances)      { (one_substance >> substance_separator.maybe).repeat(1) >> space? >> excipiens.as(:excipiens).maybe}
-  rule(:composition)         { all_substances }
+  rule(:histamin) { str("U = Histamin Equivalent Prick").as(:histamin) }
+  rule(:praeparatio) {
+    ((one_word >> space?).repeat(1).as(:description) >> str(":") >> space?).maybe >>
+      (name_with_parenthesis | name_without_parenthesis).repeat(1).as(:substance_name) >>
+      number.as(:qty) >> space >> str("U.:") >> space? >>
+      ((identifier >> space?).repeat(1).as(:more_info) >> space?).maybe
+  }
+  rule(:substance_separator) { (str(", et ") | comma | str("et ") | str("ut alia: ")) >> space? }
+  rule(:one_substance) { (praeparatio | histamin | substance) >> space? >> ratio.as(:ratio).maybe >> space? }
+  rule(:all_substances) { (one_substance >> substance_separator.maybe).repeat(1) >> space? >> excipiens.as(:excipiens).maybe }
+  rule(:composition) { all_substances }
   rule(:long_labels) {
-        str('Praeparatio sicca cum solvens: praeparatio sicca:') |
-        str('Praeparatio cryodesiccata') >> (str(':').absent? >> any).repeat(0) >> str(':') |
-        str('Tela cum praeparatione (Panel ') >> digit >> str('):')
-      }
+    str("Praeparatio sicca cum solvens: praeparatio sicca:") |
+      str("Praeparatio cryodesiccata") >> (str(":").absent? >> any).repeat(0) >> str(":") |
+      str("Tela cum praeparatione (Panel ") >> digit >> str("):")
+  }
   rule(:label_id) {
-     (
-        str('V') |
-        str('IV') |
-        str('III') |
-        str('II') |
-        str('I') |
-        str('A') |
-        str('B') |
-        str('C') |
-        str('D') |
-        str('E')
+    (
+       str("V") |
+       str("IV") |
+       str("III") |
+       str("II") |
+       str("I") |
+       str("A") |
+       str("B") |
+       str("C") |
+       str("D") |
+       str("E")
      )
   }
-  rule(:label_separator) {  (str('):')  | str(')')) }
-  rule(:label) { label_id.as(:label) >> space? >>
-    label_separator >> str(',').absent?  >>
-               (space? >> (match(/[^:]/).repeat(0)).as(:label_description)  >> str(':') >> space).maybe
+  rule(:label_separator) { (str("):") | str(")")) }
+  rule(:label) {
+    label_id.as(:label) >> space? >>
+      label_separator >> str(",").absent? >>
+      (space? >> (match(/[^:]/).repeat(0)).as(:label_description) >> str(":") >> space).maybe
+  }
+  rule(:leading_label) {
+    label_id >> label_separator >> (str(" et ") | str(", ") | str(" pro usu: ") | space) >>
+      label_id >> label_separator >> any.repeat(1) |
+      long_labels.as(:label) |
+      label
   }
-  rule(:leading_label) {    label_id >> label_separator >> (str(' et ') | str(', ') | str(' pro usu: ') | space) >>
-                            label_id >> label_separator >> any.repeat(1)  |
-                            long_labels.as(:label) |
-                            label
-    }
   rule(:corresp_label) {
-    str('aqua ') |
-    str('excipiens ') |
-    str('doses ') |
-    str('Pulver: ') |
-    str('Diluens: ') |
-    str('Solutio reconstituta:') |
-    str('Corresp., ') |
-    str('Corresp. ') |
-    str('corresp. ')
-  }
-  rule(:corresp_line) { corresp_label >> any.repeat(1).as(:corresp)  |
-                        ((label_id >> label_separator >> space? >> str('et ').maybe).repeat(1) >> any.repeat(1)).as(:corresp)
-                      }
+    str("aqua ") |
+      str("excipiens ") |
+      str("doses ") |
+      str("Pulver: ") |
+      str("Diluens: ") |
+      str("Solutio reconstituta:") |
+      str("Corresp., ") |
+      str("Corresp. ") |
+      str("corresp. ")
+  }
+  rule(:corresp_line) {
+    corresp_label >> any.repeat(1).as(:corresp) |
+      ((label_id >> label_separator >> space? >> str("et ").maybe).repeat(1) >> any.repeat(1)).as(:corresp)
+  }
   rule(:corresp_line_neu) { corresp_label >> any.repeat(1).as(:corresp) }
 
   rule(:solvens_label) {
-    str('Solvens (i.v.)') |
-    str('Solvens (i.m.)') |
-    str('Solvens')
+    str("Solvens (i.v.)") |
+      str("Solvens (i.m.)") |
+      str("Solvens")
   }
-  rule(:solvens_line) { solvens_label.as(:label) >> (str(': ') >> composition.repeat(1).as(:composition) | any.repeat(1).as(:corresp))}
+  rule(:solvens_line) { solvens_label.as(:label) >> (str(": ") >> composition.repeat(1).as(:composition) | any.repeat(1).as(:corresp)) }
 
   rule(:multiple_et_line) {
-                        ((label_id >> label_separator >> space? >> (str('pro usu') |str('et '))).repeat(1) >> any.repeat(1)).as(:corresp)
+    ((label_id >> label_separator >> space? >> (str("pro usu") | str("et "))).repeat(1) >> any.repeat(1)).as(:corresp)
   }
 
-  rule(:polvac) { label_id.as(:label) >> label_separator >> space? >> composition.as(:composition) >> space? >> str('.').maybe >> space? }
+  rule(:polvac) { label_id.as(:label) >> label_separator >> space? >> composition.as(:composition) >> space? >> str(".").maybe >> space? }
 
-  rule(:label_comment_excipiens) { label >> space? >> excipiens.as(:excipiens) >> space? >> str('.').maybe >> space? }
+  rule(:label_comment_excipiens) { label >> space? >> excipiens.as(:excipiens) >> space? >> str(".").maybe >> space? }
 
-  rule(:label_id_composition) { label_id.as(:label) >> label_separator >>
-                                ((space >> identifier).repeat(1) >> str(':')).maybe.as(:label_description) >>
-                                composition.as(:composition)  }
+  rule(:label_id_composition) {
+    label_id.as(:label) >> label_separator >>
+      ((space >> identifier).repeat(1) >> str(":")).maybe.as(:label_description) >>
+      composition.as(:composition)
+  }
 
   rule(:expression_comp) {
     solvens_line |
-    multiple_et_line |
-    label_id_composition |
-    corresp_line_neu |
-    leading_label.maybe >> space? >> composition.as(:composition) >> space? >> str('.').maybe >> space? |
-    polvac |
-    label_comment_excipiens |
-    excipiens.as(:composition) |
-    space.repeat(3)
+      multiple_et_line |
+      label_id_composition |
+      corresp_line_neu |
+      leading_label.maybe >> space? >> composition.as(:composition) >> space? >> str(".").maybe >> space? |
+      polvac |
+      label_comment_excipiens |
+      excipiens.as(:composition) |
+      space.repeat(3)
   }
 
   rule(:expression_compD) {
     solvens_line |
-    multiple_et_line.as('multiple_et_line') |
-    label_id_composition.as('label_id_composition') |
-    corresp_line_neu.as('corresp_line_neu') |
-    leading_label.maybe >> space? >> composition.as(:composition) >> space? >> str('.').maybe >> space? |
-    polvac.as('polvac') |
-    label_comment_excipiens.as('label_comment_excipiens') |
-    excipiens.as(:composition) |
-    space.repeat(3)
+      multiple_et_line.as("multiple_et_line") |
+      label_id_composition.as("label_id_composition") |
+      corresp_line_neu.as("corresp_line_neu") |
+      leading_label.maybe >> space? >> composition.as(:composition) >> space? >> str(".").maybe >> space? |
+      polvac.as("polvac") |
+      label_comment_excipiens.as("label_comment_excipiens") |
+      excipiens.as(:composition) |
+      space.repeat(3)
   }
 
   root :expression_comp
 end
 
 class GalenicFormParser < CompositionParser
+  rule(:prepation_separator) { str(", ") | str("\n") }
 
-  rule(:prepation_separator) { str(', ') | str("\n") }
-
-  rule(:prepation_name) { ((prepation_separator|lparen).absent? >> any).repeat(1)
-                          }
+  rule(:prepation_name) {
+    ((prepation_separator | lparen).absent? >> any).repeat(1)
+  }
   rule(:dose_with_pro) {
-                            ( match('[0-9a-zA-Z]').repeat(1) >>
-                               str('/') >>
-                              match('[0-9a-zA-Z\'%]').repeat(1)
-                            ).maybe
+    (match("[0-9a-zA-Z]").repeat(1) >>
+       str("/") >>
+      match("[0-9a-zA-Z'%]").repeat(1)
+    ).maybe
   }
 
   rule(:gal_form) {
     qty_unit_silent.maybe >>
-    ((( str("\n") # |
-        str(',') >> space? >> qty_unit_silent |
-        digits >> str('%')
-      ).absent? >> any).repeat(1) >>
-        (lparen >> (rparen.absent? >> any).repeat(1) >> rparen).maybe
-    ).as(:galenic_form) >>
-    space?
-
+      (((str("\n") # |
+         str(",") >> space? >> qty_unit_silent |
+         digits >> str("%")
+        ).absent? >> any).repeat(1) >>
+          (lparen >> (rparen.absent? >> any).repeat(1) >> rparen).maybe
+      ).as(:galenic_form) >>
+      space?
   }
 
   rule(:standard_galenic) {
-                            prepation_name.as(:prepation_name) >> space? >>
-                            prepation_separator >> space? >>
-                            (name_without_parenthesis >> qty_unit_silent >> prepation_separator).maybe >>
-                            (qty_unit_silent >> space?).maybe >>
-                            (dose_with_pro >> space? >> str(',') >> space?).maybe >>
-                            gal_form >> space?
-                         }
-
-  rule(:qty_unit_silent) { number >> space >> units  }
-  rule(:name_then_dose) { ((space.absent? >> any).repeat(1) >>
+    prepation_name.as(:prepation_name) >> space? >>
+      prepation_separator >> space? >>
+      (name_without_parenthesis >> qty_unit_silent >> prepation_separator).maybe >>
+      (qty_unit_silent >> space?).maybe >>
+      (dose_with_pro >> space? >> str(",") >> space?).maybe >>
+      gal_form >> space?
+  }
+
+  rule(:qty_unit_silent) { number >> space >> units }
+  rule(:name_then_dose) {
+    ((space.absent? >> any).repeat(1) >>
                             space >> qty_unit_silent).as(:prepation_name) >> space?.as(:galenic_form)
-                          }
-
-  rule(:only_name) { any.repeat(1).as(:prepation_name) >> space?.as(:galenic_form)
-                     }
-
-  rule(:name_comma_gal_form) { (space.absent? >> any).repeat(1).as(:prepation_name) >>
-                                comma >> space >>
-                                any.repeat(1).as(:galenic_form)
-                              }
-  rule(:simple_name) { ((match(["a-zA-Z0-9,%"]) | str('-') | umlaut).repeat(1))  >>
-                       (lparen >> (rparen.absent? >> any.repeat(1)) >> rparen).maybe
-                     }
+  }
+
+  rule(:only_name) {
+    any.repeat(1).as(:prepation_name) >> space?.as(:galenic_form)
+  }
+
+  rule(:name_comma_gal_form) {
+    (space.absent? >> any).repeat(1).as(:prepation_name) >>
+      comma >> space >>
+      any.repeat(1).as(:galenic_form)
+  }
+  rule(:simple_name) {
+    ((match(["a-zA-Z0-9,%"]) | str("-") | umlaut).repeat(1)) >>
+      (lparen >> (rparen.absent? >> any.repeat(1)) >> rparen).maybe
+  }
   rule(:name_gal_form) { # e.g. Dicloabak 0,1% Augentropfen or 35 Clear-Flex 3,86 % Peritonealdialyselösung
-                           (simple_name >> space).repeat(1).as(:prepation_name) >>
-                           space? >>
-                            (dose_with_pro >> space?).maybe >>
-                          (digits.absent? >> gal_form) >> space?
+    (simple_name >> space).repeat(1).as(:prepation_name) >>
+      space? >>
+      (dose_with_pro >> space?).maybe >>
+      (digits.absent? >> gal_form) >> space?
   }
 
   rule(:name_without_comma_gal_form) { # Sulfure de Rhénium (186Re)-RE-186-MM-1 Cis bio International
-    ((str(', ')| str(',') >> match(['A-Z'])).absent? >> any).repeat(1).as(:prepation_name) >>
-    comma >> space? >>
-    gal_form >> space?
-  }
-
-# Phytopharma foie et bile capsules/Leber-Galle Kapseln
-  rule(:leber_gallen_kapseln) { ((str('/Leber-Galle Kapseln').absent? >> any).repeat(1)).as(:prepation_name)  >>
-                                str('/') >> any.repeat(1).as(:galenic_form) >>
-                                space?
-                              }
-# Plak-out Spray 0,1 %
-  rule(:plak_out_spray) { str('Plak-out Spray 0,1 %').as(:prepation_name)  >>
-                                space? >> str('dummy').maybe.as(:galenic_form) >> space?
-                              }
-  rule(:galenic)   {
-                     plak_out_spray |
-                     leber_gallen_kapseln |
-                     standard_galenic |
-                     name_comma_gal_form |
-                     name_then_dose >> space? |
-                     name_without_comma_gal_form |
-                     name_gal_form |
-                     only_name >> space? |
-                     space?
-                   }
+    ((str(", ") | str(",") >> match(["A-Z"])).absent? >> any).repeat(1).as(:prepation_name) >>
+      comma >> space? >>
+      gal_form >> space?
+  }
+
+  # Phytopharma foie et bile capsules/Leber-Galle Kapseln
+  rule(:leber_gallen_kapseln) {
+    ((str("/Leber-Galle Kapseln").absent? >> any).repeat(1)).as(:prepation_name) >>
+      str("/") >> any.repeat(1).as(:galenic_form) >>
+      space?
+  }
+  # Plak-out Spray 0,1 %
+  rule(:plak_out_spray) {
+    str("Plak-out Spray 0,1 %").as(:prepation_name) >>
+      space? >> str("dummy").maybe.as(:galenic_form) >> space?
+  }
+  rule(:galenic) {
+    plak_out_spray |
+      leber_gallen_kapseln |
+      standard_galenic |
+      name_comma_gal_form |
+      name_then_dose >> space? |
+      name_without_comma_gal_form |
+      name_gal_form |
+      only_name >> space? |
+      space?
+  }
 
   # for debugging purposes only
-  rule(:galenicD)   {
-                     plak_out_spray.as(:plak_out_spray) |
-                     leber_gallen_kapseln.as(:leber_gallen_kapseln) |
-                     standard_galenic.as(:standard_galenic) |
-                     name_comma_gal_form.as(:name_comma_gal_form) |
-                     name_then_dose.as(:name_then_dose) >> space? |
-                     name_without_comma_gal_form.as(:name_without_comma_gal_form) |
-                     name_gal_form.as(:name_gal_form) |
-                     only_name.as(:only_name) >> space? |
-                     space?
-                   }
+  rule(:galenicD) {
+    plak_out_spray.as(:plak_out_spray) |
+      leber_gallen_kapseln.as(:leber_gallen_kapseln) |
+      standard_galenic.as(:standard_galenic) |
+      name_comma_gal_form.as(:name_comma_gal_form) |
+      name_then_dose.as(:name_then_dose) >> space? |
+      name_without_comma_gal_form.as(:name_without_comma_gal_form) |
+      name_gal_form.as(:name_gal_form) |
+      only_name.as(:only_name) >> space? |
+      space?
+  }
   root :galenic
-end
+end