oddb2xml 2.6.7 → 2.7.2

data/lib/oddb2xml/options.rb

@@ -1,61 +1,60 @@
-# encoding: utf-8
-require 'optimist'
-require 'oddb2xml/version'
+require "optimist"
+require "oddb2xml/version"
 
 module Oddb2xml
   module Options
-    def self.parse(args =ARGV)
+    def self.parse(args = ARGV)
       if args.is_a?(String)
-        args = args.split(' ') 
+        args = args.split(" ")
       end
 
-      @opts = Optimist::options(args) do
-        version "#$0 ver.#{Oddb2xml::VERSION}"
+      @opts = Optimist.options(args) do
+        version "#{$0} ver.#{Oddb2xml::VERSION}"
         banner <<-EOS
         #{File.expand_path($0)} version #{Oddb2xml::VERSION}
         Usage:
         oddb2xml [option]
           produced files are found under data
-EOS
-        opt :append,       "Additional target nonpharma", :default => false
+        EOS
+        opt :append, "Additional target nonpharma", default: false
         opt :artikelstamm, "Create Artikelstamm Version 3 and 5 for Elexis >= 3.1"
-        opt :compress_ext,     "format F. {tar.gz|zip}", :type => :string, :default => nil, :short => 'c'
-        opt :extended,     "pharma, non-pharma plus prices and non-pharma from zurrose.
+        opt :compress_ext, "format F. {tar.gz|zip}", type: :string, default: nil, short: "c"
+        opt :extended, "pharma, non-pharma plus prices and non-pharma from zurrose.
                             Products without EAN-Code will also be listed.
                             File oddb_calc.xml will also be generated"
-        opt :format,        "File format F, default is xml. {xml|dat}
-                            If F is given, -o option is ignored.", :type => :string, :default => 'xml'
-        opt :include,       "Include target option for ean14  for 'dat' format.
-                            'xml' format includes always ean14 records.", :short => 'i'
-        opt :increment,     "Increment price by x percent. Forces -f dat -p zurrose.
+        opt :format, "File format F, default is xml. {xml|dat}
+                            If F is given, -o option is ignored.", type: :string, default: "xml"
+        opt :include, "Include target option for ean14  for 'dat' format.
+                            'xml' format includes always ean14 records.", short: "i"
+        opt :increment, "Increment price by x percent. Forces -f dat -p zurrose.
                             create additional field price_resellerpub as
                             price_extfactory incremented by x percent (rounded to the next 0.05 francs)
                             in oddb_article.xml. In generated zurrose_transfer.dat PRPU is set to this price
-                            Forces -f dat -p zurrose.", :type => :int, :default => nil, :short => 'I'
-        opt :fi,            "Optional fachinfo output.", :short => 'o'
-        opt :price,         "Price source (transfer.dat) from ZurRose", :default => nil
-        opt :tag_suffix,   "XML tag suffix S. Default is none. [A-z0-9]
-                            If S is given, it is also used as prefix of filename.", :type => :string, :short => 't'
-        opt :context,       "{product|address}. product is default.", :default => 'product', :type => :string, :short => 'x'
-        opt :calc,          "create only oddb_calc.xml with GTIN, name and galenic information"
+                            Forces -f dat -p zurrose.", type: :int, default: nil, short: "I"
+        opt :fi, "Optional fachinfo output.", short: "o"
+        opt :price, "Price source (transfer.dat) from ZurRose", default: nil
+        opt :tag_suffix, "XML tag suffix S. Default is none. [A-z0-9]
+                            If S is given, it is also used as prefix of filename.", type: :string, short: "t"
+        opt :context, "{product|address}. product is default.", default: "product", type: :string, short: "x"
+        opt :calc, "create only oddb_calc.xml with GTIN, name and galenic information"
 
         opt :skip_download, "skips downloading files it the file is already under downloads.
                             Downloaded files are saved under downloads"
-        opt :log,           "log important actions", :short => :none
-        opt :use_ra11zip,   "Use the ra11.zip (a zipped transfer.dat from Galexis)",
-                            :default => File.exist?('ra11.zip') ? 'ra11.zip' : nil, :type => :string
+        opt :log, "log important actions", short: :none
+        opt :use_ra11zip, "Use the ra11.zip (a zipped transfer.dat from Galexis)",
+          default: File.exist?("ra11.zip") ? "ra11.zip" : nil, type: :string
       end
-          
+
       @opts[:percent] = @opts[:increment]
-      if @opts[:increment] 
+      if @opts[:increment]
         @opts[:nonpharma] = true
         @opts[:price] = :zurrose
       end
-      @opts[:ean14]  = @opts[:increment]
+      @opts[:ean14] = @opts[:increment]
       @opts.delete(:increment)
       @opts[:nonpharma] = @opts[:append]
       @opts.delete(:append)
-      if @opts[:extended] 
+      if @opts[:extended]
         @opts[:nonpharma] = true
         @opts[:price] = :zurrose
         @opts[:calc] = true
@@ -63,22 +62,22 @@ EOS
       if @opts[:artikelstamm]
         @opts[:extended] = true
         @opts[:price] = :zurrose
-      end      
+      end
       @opts[:price] = :zurrose if @opts[:price].is_a?(TrueClass)
-      @opts[:price]  = @opts[:price].to_sym if @opts[:price]
+      @opts[:price] = @opts[:price].to_sym if @opts[:price]
       @opts[:ean14] = @opts[:include]
       @opts[:format] = @opts[:format].to_sym if @opts[:format]
       @opts.delete(:include)
       @opts.delete(:help)
       @opts.delete(:version)
 
-      @opts[:address]  = false
-      @opts[:address]  = true  if /^addr(ess)*$/i.match(@opts[:context])
+      @opts[:address] = false
+      @opts[:address] = true if /^addr(ess)*$/i.match?(@opts[:context])
       @opts.delete(:context)
 
       @opts.delete(:price) unless @opts[:price]
 
-      @opts.each{|k,v| @opts.delete(k) if /_given$/.match(k.to_s)}
+      @opts.each { |k, v| @opts.delete(k) if /_given$/.match?(k.to_s) }
     end
   end
 end

data/lib/oddb2xml/parslet_compositions.rb

@@ -1,79 +1,74 @@
-# 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'
-require 'oddb2xml/compositions_syntax'
-include Parslet
+require "parslet"
+require "parslet/convenience"
+require "oddb2xml/compositions_syntax"
 VERBOSE_MESSAGES ||= false
 
 module ParseUtil
+  include Parslet
   # this class is responsible to patch errors in swissmedic entries after
   # oddb.org detected them, as it takes sometimes a few days (or more) till they get corrected
   # Reports the number of occurrences of each entry
   @@saved_parsed ||= {}
-  @@nr_saved_parsed_used  ||= 0
+  @@nr_saved_parsed_used ||= 0
 
   class HandleSwissmedicErrors
-
     attr_accessor :nrParsingErrors
-    class ErrorEntry   < Struct.new('ErrorEntry', :pattern, :replacement, :nr_occurrences)
+    class ErrorEntry < Struct.new("ErrorEntry", :pattern, :replacement, :nr_occurrences)
     end
 
     def reset_errors
       @errors = []
-      @nrLines = 0
-      @nrParsingErrors = 0
+      @nr_lines = 0
+      @nr_parsing_errors = 0
     end
 
     # error_entries should be a hash of  pattern, replacement
     def initialize(error_entries)
       reset_errors
-      error_entries.each{ |pattern, replacement| @errors << ErrorEntry.new(pattern, replacement, 0) }
+      error_entries.each { |pattern, replacement| @errors << ErrorEntry.new(pattern, replacement, 0) }
     end
 
     def report
-      s = ["Report of changed compositions in #{@nrLines} lines. Had #{@nrParsingErrors} parsing errors" ]
-      @errors.each {
-        |entry|
-      s << "  replaced #{entry.nr_occurrences} times '#{entry.pattern}'  by '#{entry.replacement}'"
+      s = ["Report of changed compositions in #{@nr_lines} lines. Had #{@nr_parsing_errors} parsing errors"]
+      @errors.each { |entry|
+        s << "  replaced #{entry.nr_occurrences} times '#{entry.pattern}'  by '#{entry.replacement}'"
       }
       s
     end
 
     def apply_fixes(string)
       result = string.clone
-      @errors.each{
-        |entry|
+      @errors.each { |entry|
         intermediate = result.clone
-        result = result.gsub(entry.pattern,  entry.replacement)
+        result = result.gsub(entry.pattern, entry.replacement)
         unless result.eql?(intermediate)
-            entry.nr_occurrences += 1
-            puts "#{File.basename(__FILE__)}:#{__LINE__}: fixed \nbefore: #{intermediate}\nafter:  #{result}" if $VERBOSE
+          entry.nr_occurrences += 1
+          puts "#{File.basename(__FILE__)}:#{__LINE__}: fixed \nbefore: #{intermediate}\nafter:  #{result}" if $VERBOSE
         end
       }
-      @nrLines += 1
+      @nr_lines += 1
       result
     end
     #  hepar sulfuris D6 2,2 mg hypericum perforatum D2 0,66 mg where itlacks a comma and should be hepar sulfuris D6 2,2 mg, hypericum perforatum D2 0,66 mg
   end
 
-  def ParseUtil.capitalize(string)
-    string.split(/\s+/u).collect { |word| word.capitalize }.join(' ').strip
+  def self.capitalize(string)
+    string.split(/\s+/u).collect { |word| word.capitalize }.join(" ").strip
   end
 
-  def ParseUtil.nr_saved_parsed_used
+  def self.nr_saved_parsed_used
     @@nr_saved_parsed_used
   end
 
-  def ParseUtil.parse_compositions(composition_text, active_agents_string = '')
-    active_agents = active_agents_string ? active_agents_string.gsub('[', '').downcase.split(/,\s+/) : []
-    key = [ composition_text, active_agents ]
+  def self.parse_compositions(composition_text, active_agents_string = "")
+    active_agents = active_agents_string ? active_agents_string.delete("[").downcase.split(/,\s+/) : []
+    key = [composition_text, active_agents]
     saved_value = @@saved_parsed[key]
     if saved_value
       @@nr_saved_parsed_used += 1
@@ -81,16 +76,22 @@ module ParseUtil
     end
     comps = []
     lines = composition_text.gsub(/\r\n?/u, "\n").split(/\n/u)
-    lines.select do
-      |line|
-      composition =  ParseComposition.from_string(line)
+    lines.select do |line|
+      composition = ParseComposition.from_string(line)
       if composition.is_a?(ParseComposition)
-        composition.substances.each do
-          |substance_item|
-          active_substance_name = substance_item.name.downcase.sub(/^cum\s/, '')
-          substance_item.is_active_agent = (active_agents.find {|x| /#{x.downcase.gsub('(', '\(').gsub(')', '\)')}($|\s)/.match(active_substance_name) } != nil)
-          substance_item.is_active_agent = true if substance_item.chemical_substance and active_agents.find {|x| x.downcase.eql?(substance_item.chemical_substance.name.downcase) }
-         end
+        composition.substances.each do |substance_item|
+          active_substance_name = substance_item.name.downcase.sub(/^cum\s/, "")
+          substance_item.is_active_agent = !active_agents.find { |x|
+            /#{x.downcase
+            .gsub('(', '\(')
+            .gsub(')', '\)')
+            .gsub('[', '\[')
+            .gsub(']', '\]')
+              }($|\s)/
+              .match(active_substance_name)
+          }.nil?
+          substance_item.is_active_agent = true if substance_item.chemical_substance && active_agents.find { |x| x.downcase.eql?(substance_item.chemical_substance.name.downcase) }
+        end
         comps << composition
       end
     end
@@ -99,202 +100,194 @@ module ParseUtil
     comps
   rescue => error
     puts "error #{error}"
-      # binding.pry
+    # binding.pry
   end
-
 end
 
-class IntLit   < Struct.new(:int)
-  def eval; int.to_i; end
+class IntLit < Struct.new(:int)
+  def eval
+    int.to_i
+  end
 end
-class QtyLit   < Struct.new(:qty)
-  def eval; qty.to_i; end
+
+class QtyLit < Struct.new(:qty)
+  def eval
+    qty.to_i
+  end
 end
 
 class CompositionTransformer < Parslet::Transform
   @@more_info = nil
-  def CompositionTransformer.get_ratio(parse_info)
+  def self.get_ratio(parse_info)
     if parse_info[:ratio]
-      if parse_info[:ratio].to_s.length > 0 and parse_info[:ratio].to_s != ', '
-        parse_info[:ratio].to_s.sub(/^,\s+/, '').sub(/,\s+$/,'')
-      else
-        nil
+      if (parse_info[:ratio].to_s.length > 0) && (parse_info[:ratio].to_s != ", ")
+        parse_info[:ratio].to_s.sub(/^,\s+/, "").sub(/,\s+$/, "")
       end
-    else
-      nil
     end
   end
 
-  def CompositionTransformer.check_e_substance(substance)
-    return unless /^E \d\d\d/.match(substance.name)
+  def self.check_e_substance(substance)
+    return unless /^E \d\d\d/.match?(substance.name)
     unless substance.more_info
       case substance.name[2]
       when "1"
-        substance.more_info = 'color.'
+        substance.more_info = "color."
       when "2"
-        substance.more_info = 'conserv.'
-      else
+        substance.more_info = "conserv."
       end
       substance.more_info ||= @@more_info
     end
     @@more_info = substance.more_info
   end
 
-  def CompositionTransformer.add_excipiens(info)
-    @@more_info           = nil
-    @@excipiens           = ParseSubstance.new(info[:excipiens_description] ? info[:excipiens_description] : 'Excipiens')
-    @@excipiens.dose      = info[:dose] if info[:dose]
+  def self.add_excipiens(info)
+    @@more_info = nil
+    @@excipiens = ParseSubstance.new(info[:excipiens_description] || "Excipiens")
+    @@excipiens.dose = info[:dose] if info[:dose]
     @@excipiens.more_info = CompositionTransformer.get_ratio(info)
-    @@excipiens.cdose     = info[:dose_corresp] if info[:dose_corresp]
+    @@excipiens.cdose = info[:dose_corresp] if info[:dose_corresp]
     @@excipiens.more_info = info[:more_info] if info[:more_info]
   end
 
-  rule(:corresp => simple(:corresp),
-       ) {
-    |dictionary|
-      puts "#{File.basename(__FILE__)}:#{__LINE__}: dictionary #{dictionary}" if VERBOSE_MESSAGES
-      @@corresp = dictionary[:corresp].to_s
+  rule(corresp: simple(:corresp)) { |dictionary|
+    puts "#{File.basename(__FILE__)}:#{__LINE__}: dictionary #{dictionary}" if VERBOSE_MESSAGES
+    @@corresp = dictionary[:corresp].to_s
   }
-  rule( :substance_name => simple(:substance_name),
-        :dose => simple(:dose),
-      ) {
-    |dictionary|
-        puts "#{File.basename(__FILE__)}:#{__LINE__}: dictionary #{dictionary}" if VERBOSE_MESSAGES
-        dose = dictionary[:dose].is_a?(ParseDose) ? dictionary[:dose] : nil
-        substance = ParseSubstance.new(dictionary[:substance_name], dose)
-        @@substances <<  substance
-        substance
+  rule(substance_name: simple(:substance_name),
+       dose: simple(:dose)) { |dictionary|
+    puts "#{File.basename(__FILE__)}:#{__LINE__}: dictionary #{dictionary}" if VERBOSE_MESSAGES
+    dose = dictionary[:dose].is_a?(ParseDose) ? dictionary[:dose] : nil
+    substance = ParseSubstance.new(dictionary[:substance_name], dose)
+    @@substances << substance
+    substance
   }
 
-  rule( :more_info => simple(:more_info),
-      ) {
-    |dictionary|
-        puts "#{File.basename(__FILE__)}:#{__LINE__}: dictionary #{dictionary}" if VERBOSE_MESSAGES
-        @@corresp = dictionary[:more_info].to_s.strip.sub(/:$/, '')
+  rule(more_info: simple(:more_info)) { |dictionary|
+    puts "#{File.basename(__FILE__)}:#{__LINE__}: dictionary #{dictionary}" if VERBOSE_MESSAGES
+    @@corresp = dictionary[:more_info].to_s.strip.sub(/:$/, "")
   }
-  rule( :more_info => simple(:more_info),
-        :substance_name => simple(:substance_name),
-        :dose => simple(:dose),
-      ) {
-    |dictionary|
-        puts "#{File.basename(__FILE__)}:#{__LINE__}: dictionary #{dictionary}" if VERBOSE_MESSAGES
-        dose = dictionary[:dose].is_a?(ParseDose) ? dictionary[:dose] : nil
-        substance = ParseSubstance.new(dictionary[:substance_name].to_s, dose)
-        substance.more_info = dictionary[:more_info].to_s.strip.sub(/:$/, '') if dictionary[:more_info] and dictionary[:more_info].to_s.length > 0
-        CompositionTransformer.check_e_substance(substance)
-        @@substances <<  substance
-        substance
+  rule(more_info: simple(:more_info),
+       substance_name: simple(:substance_name),
+       dose: simple(:dose)) { |dictionary|
+    puts "#{File.basename(__FILE__)}:#{__LINE__}: dictionary #{dictionary}" if VERBOSE_MESSAGES
+    dose = dictionary[:dose].is_a?(ParseDose) ? dictionary[:dose] : nil
+    substance = ParseSubstance.new(dictionary[:substance_name].to_s, dose)
+    substance.more_info = dictionary[:more_info].to_s.strip.sub(/:$/, "") if dictionary[:more_info] && (dictionary[:more_info].to_s.length > 0)
+    CompositionTransformer.check_e_substance(substance)
+    @@substances << substance
+    substance
   }
 
-  rule(:lebensmittel_zusatz => simple(:lebensmittel_zusatz),
-       :more_info => simple(:more_info),
-       :digits => simple(:digits)) {
-    |dictionary|
-      puts "#{File.basename(__FILE__)}:#{__LINE__}: dictionary #{dictionary}" if VERBOSE_MESSAGES
-      substance =  ParseSubstance.new("#{dictionary[:lebensmittel_zusatz]} #{dictionary[:digits]}")
-      substance.more_info = dictionary[:more_info].to_s.strip.sub(/:$/, '') if dictionary[:more_info] and dictionary[:more_info].to_s.length > 0
-      CompositionTransformer.check_e_substance(substance)
-      @@substances <<  substance
-      substance
+  rule(lebensmittel_zusatz: simple(:lebensmittel_zusatz),
+       more_info: simple(:more_info),
+       digits: simple(:digits)) { |dictionary|
+    puts "#{File.basename(__FILE__)}:#{__LINE__}: dictionary #{dictionary}" if VERBOSE_MESSAGES
+    substance = ParseSubstance.new("#{dictionary[:lebensmittel_zusatz]} #{dictionary[:digits]}")
+    substance.more_info = dictionary[:more_info].to_s.strip.sub(/:$/, "") if dictionary[:more_info] && (dictionary[:more_info].to_s.length > 0)
+    CompositionTransformer.check_e_substance(substance)
+    @@substances << substance
+    substance
   }
-  rule(:excipiens => subtree(:excipiens),
-       ) {
-    |dictionary|
-      puts "#{File.basename(__FILE__)}:#{__LINE__}: dictionary #{dictionary}" if VERBOSE_MESSAGES
-      info = dictionary[:excipiens].is_a?(Hash) ? dictionary[:excipiens] : dictionary[:excipiens].first
-      if info[:excipiens_description] or
-       info[:dose] or
-       info[:dose_corresp] or
-       info[:more_info] or
-       CompositionTransformer.get_ratio(dictionary)
-       CompositionTransformer.add_excipiens(info)
-       info
-      end
-      nil
+  rule(excipiens: subtree(:excipiens)) { |dictionary|
+    puts "#{File.basename(__FILE__)}:#{__LINE__}: dictionary #{dictionary}" if VERBOSE_MESSAGES
+    info = dictionary[:excipiens].is_a?(Hash) ? dictionary[:excipiens] : dictionary[:excipiens].first
+    if info[:excipiens_description] ||
+        info[:dose] ||
+        info[:dose_corresp] ||
+        info[:more_info] ||
+        CompositionTransformer.get_ratio(dictionary)
+      CompositionTransformer.add_excipiens(info)
+      info
+    end
+    nil
   }
-  rule(:composition => subtree(:composition),
-       ) {
-    |dictionary|
-       puts "#{File.basename(__FILE__)}:#{__LINE__}: dictionary #{dictionary}" if VERBOSE_MESSAGES
-       info = dictionary[:composition].is_a?(Hash) ? dictionary[:composition] : dictionary[:composition].first
-       CompositionTransformer.add_excipiens(info) if info.is_a?(Hash)
-       info
-       }
-  rule(:substance => simple(:substance),
-       :chemical_substance => simple(:chemical_substance),
-       :substance_ut => sequence(:substance_ut),
-       :ratio => simple(:ratio),
-       ) {
-    |dictionary|
-       puts "#{File.basename(__FILE__)}:#{__LINE__}: dictionary #{dictionary}" if VERBOSE_MESSAGES
-       ratio = CompositionTransformer.get_ratio(dictionary)
-       if ratio and ratio.length > 0
-        if dictionary[:substance].more_info
-          dictionary[:substance].more_info += ' ' + ratio.strip
-        else
-          dictionary[:substance].more_info = ratio.strip
-        end
-       end
-       if  dictionary[:chemical_substance]
-        dictionary[:substance].chemical_substance = dictionary[:chemical_substance]
-        @@substances -= [dictionary[:chemical_substance]]
-       end
-       if  dictionary[:substance_ut].size > 0
-        dictionary[:substance].salts += dictionary[:substance_ut].last.salts
-        dictionary[:substance_ut].last.salts = []
-        dictionary[:substance].salts << dictionary[:substance_ut].last
-        @@substances -= dictionary[:substance_ut]
-       end
-       dictionary[:substance]
+  rule(composition: subtree(:composition)) { |dictionary|
+    puts "#{File.basename(__FILE__)}:#{__LINE__}: dictionary #{dictionary}" if VERBOSE_MESSAGES
+    info = dictionary[:composition].is_a?(Hash) ? dictionary[:composition] : dictionary[:composition].first
+    CompositionTransformer.add_excipiens(info) if info.is_a?(Hash)
+    info
+  }
+  rule(substance: simple(:substance),
+       chemical_substance: simple(:chemical_substance),
+       substance_ut: sequence(:substance_ut),
+       ratio: simple(:ratio)) { |dictionary|
+    puts "#{File.basename(__FILE__)}:#{__LINE__}: dictionary #{dictionary}" if VERBOSE_MESSAGES
+    ratio = CompositionTransformer.get_ratio(dictionary)
+    if ratio && (ratio.length > 0)
+      if dictionary[:substance].more_info
+        dictionary[:substance].more_info += " " + ratio.strip
+      else
+        dictionary[:substance].more_info = ratio.strip
+      end
+    end
+    if dictionary[:chemical_substance]
+      dictionary[:substance].chemical_substance = dictionary[:chemical_substance]
+      @@substances -= [dictionary[:chemical_substance]]
+    end
+    if dictionary[:substance_ut].size > 0
+      dictionary[:substance].salts += dictionary[:substance_ut].last.salts
+      dictionary[:substance_ut].last.salts = []
+      dictionary[:substance].salts << dictionary[:substance_ut].last
+      @@substances -= dictionary[:substance_ut]
+    end
+    dictionary[:substance]
   }
 
-  rule(:int => simple(:int))        { IntLit.new(int) }
-  rule(:number => simple(:nb)) {
-    nb.match(/[eE\.]/) ? Float(nb) : Integer(nb)
+  rule(int: simple(:int)) { IntLit.new(int) }
+  rule(number: simple(:nb)) {
+    /[eE.]/.match?(nb) ? Float(nb) : Integer(nb)
   }
   rule(
-    :qty_range    => simple(:qty_range),
-    :unit   => simple(:unit))  {
-      ParseDose.new(qty_range, unit)
-    }
+    qty_range: simple(:qty_range),
+    unit: simple(:unit)
+  ) {
+    ParseDose.new(qty_range, unit)
+  }
   rule(
-    :qty_range    => simple(:qty_range)) {
-      ParseDose.new(qty_range)
-    }
+    qty_range: simple(:qty_range)
+  ) {
+    ParseDose.new(qty_range)
+  }
   rule(
-    :qty    => simple(:qty),
-    :unit   => simple(:unit))  {
-      ParseDose.new(qty, unit)
-    }
+    qty: simple(:qty),
+    unit: simple(:unit)
+  ) {
+    ParseDose.new(qty, unit)
+  }
   rule(
-    :unit    => simple(:unit))  { ParseDose.new(nil, unit) }
+    unit: simple(:unit)
+  ) { ParseDose.new(nil, unit) }
   rule(
-    :qty    => simple(:qty))  { ParseDose.new(qty, nil) }
+    qty: simple(:qty)
+  ) { ParseDose.new(qty, nil) }
   rule(
-    :qty    => simple(:qty),
-    :unit    => simple(:unit),
-    :dose_right    => simple(:dose_right),
-  )  {
+    qty: simple(:qty),
+    unit: simple(:unit),
+    dose_right: simple(:dose_right)
+  ) {
     dose = ParseDose.new(qty, unit)
-    dose.unit = dose.unit.to_s + ' et ' + ParseDose.new(dose_right).to_s
+    dose.unit = dose.unit.to_s + " et " + ParseDose.new(dose_right).to_s
     dose
   }
 
   @@substances ||= []
-  @@excipiens  = nil
-  def CompositionTransformer.clear_substances
-    @@more_info  = nil
+  @@excipiens = nil
+  def self.clear_substances
+    @@more_info = nil
     @@substances = []
-    @@excipiens  = nil
-    @@corresp    = nil
+    @@excipiens = nil
+    @@corresp = nil
   end
-  def CompositionTransformer.substances
+
+  def self.substances
     @@substances.clone
   end
-  def CompositionTransformer.excipiens
+
+  def self.excipiens
     @@excipiens ? @@excipiens.clone : nil
   end
-  def CompositionTransformer.corresp
+
+  def self.corresp
     @@corresp ? @@corresp.clone : nil
   end
 end
@@ -302,29 +295,31 @@ end
 class ParseDose
   attr_reader :qty, :qty_range
   attr_accessor :unit
-  def initialize(qty=nil, unit=nil)
+  def initialize(qty = nil, unit = nil)
     puts "ParseDose.new from #{qty.inspect} #{unit.inspect} #{unit.inspect}" if VERBOSE_MESSAGES
-    if qty and (qty.is_a?(String) || qty.is_a?(Parslet::Slice))
-      string = qty.to_s.gsub("'", '')
-      if string.index('-') and (string.index('-') > 0)
+    if qty && (qty.is_a?(String) || qty.is_a?(Parslet::Slice))
+      string = qty.to_s.delete("'")
+      if string.index("-") && (string.index("-") > 0)
         @qty_range = string
       elsif string.index(/\^|\*|\//)
-        @qty  = string
+        @qty = string
       else
-        @qty  = string.index('.') ? string.to_f : string.to_i
+        @qty = string.index(".") ? string.to_f : string.to_i
       end
     elsif qty
-      @qty  = qty.eval
+      @qty = qty.eval
     else
       @qty = 1
     end
     @unit = unit ? unit.to_s : nil
   end
+
   def eval
     self
   end
+
   def to_s
-    return @unit unless @qty or @qty_range
+    return @unit unless @qty || @qty_range
     res = "#{@qty}#{@qty_range}"
     res = "#{res} #{@unit}" if @unit
     res
@@ -332,32 +327,36 @@ class ParseDose
 end
 
 class ParseSubstance
-  attr_accessor  :name, :qty, :unit, :chemical_substance, :chemical_qty, :chemical_unit, :is_active_agent, :dose, :cdose, :is_excipiens
-  attr_accessor  :description, :more_info, :salts
-  def initialize(name, dose=nil)
+  attr_accessor :name, :chemical_substance, :chemical_qty, :chemical_unit, :is_active_agent, :dose, :cdose, :is_excipiens
+  attr_accessor :description, :more_info, :salts
+  attr_writer :unit, :qty
+  def initialize(name, dose = nil)
     puts "ParseSubstance.new from #{name.inspect} #{dose.inspect}" if VERBOSE_MESSAGES
     @name = ParseUtil.capitalize(name.to_s)
-    @name.sub!(/\baqua\b/i, 'aqua')
-    @name.sub!(/\bDER\b/i, 'DER')
-    @name.sub!(/\bad pulverem\b/i, 'ad pulverem')
-    @name.sub!(/\bad iniectabilia\b/i, 'ad iniectabilia')
-    @name.sub!(/\bad suspensionem\b/i, 'ad suspensionem')
-    @name.sub!(/\bad solutionem\b/i, 'ad solutionem')
-    @name.sub!(/\bpro compresso\b/i, 'pro compresso')
-    @name.sub!(/\bpro\b/i, 'pro')
-    @name.sub!(/ Q\.S\. /i, ' q.s. ')
-    @name.sub!(/\s+\bpro$/i, '')
+    @name.sub!(/\baqua\b/i, "aqua")
+    @name.sub!(/\bDER\b/i, "DER")
+    @name.sub!(/\bad pulverem\b/i, "ad pulverem")
+    @name.sub!(/\bad iniectabilia\b/i, "ad iniectabilia")
+    @name.sub!(/\bad suspensionem\b/i, "ad suspensionem")
+    @name.sub!(/\bad solutionem\b/i, "ad solutionem")
+    @name.sub!(/\bpro compresso\b/i, "pro compresso")
+    @name.sub!(/\bpro\b/i, "pro")
+    @name.sub!(/ Q\.S\. /i, " q.s. ")
+    @name.sub!(/\s+\bpro$/i, "")
     @dose = dose if dose
     @salts = []
   end
+
   def qty
-    return @dose.qty_range if @dose and @dose.qty_range
+    return @dose.qty_range if @dose&.qty_range
     @dose ? @dose.qty : @qty
   end
+
   def unit
     return @unit if @unit
     @dose ? @dose.unit : @unit
   end
+
   def to_string
     s = "#{@name}:"
     s = " #{@qty}" if @qty
@@ -368,51 +367,54 @@ class ParseSubstance
 end
 
 class ParseComposition
-  attr_accessor   :source, :label, :label_description, :substances, :galenic_form, :route_of_administration,
-                  :corresp, :excipiens
-
-  ErrorsToFix = { /(\d+)\s+\-\s*(\d+)/ => '\1-\2',
-                  'o.1' => '0.1',
-                  /\s+(mg|g) DER:/ => ' \1, DER:',
-                  ' mind. ' => ' min. ',
-                  ' streptococci pyogen. ' => ' streptococci pyogen ',
-                  ' ut excipiens' => ', excipiens',
-                  ' Corresp. ' => ' corresp. ',
-                  ',,' => ',',
-                  'avena elatior,dactylis glomerata' => 'avena elatior, dactylis glomerata',
-                  ' color.: corresp. ' => ' corresp.',
-                  / U\.: (excipiens) / =>  ' U. \1 ',
-                  / U\.: (alnus|betula|betula|betulae) / =>  ' U., \1 ',
-                  /^(acari allergeni extractum (\(acarus siro\)|).+\s+U\.\:)/ => 'A): \1',
-                  'Solvens: alprostadilum' => 'alprostadilum',
-                }
-  @@errorHandler = ParseUtil::HandleSwissmedicErrors.new( ErrorsToFix )
+  attr_accessor :source, :label, :label_description, :substances, :galenic_form, :route_of_administration,
+    :corresp, :excipiens
+
+  ERRORS_TO_FIX = {
+    /(\d+)\s+-\s*(\d+)/ => '\1-\2',
+    "o.1" => "0.1",
+    /\s+(mg|g) DER:/ => ' \1, DER:',
+    " mind. " => " min. ",
+    " streptococci pyogen. " => " streptococci pyogen ",
+    " ut excipiens" => ", excipiens",
+    " Corresp. " => " corresp. ",
+    ",," => ",",
+    "avena elatior,dactylis glomerata" => "avena elatior, dactylis glomerata",
+    " color.: corresp. " => " corresp.",
+    / U\.: (excipiens) / => ' U. \1 ',
+    / U\.: (alnus|betula|betula|betulae) / => ' U., \1 ',
+    /^(acari allergeni extractum (\(acarus siro\)|).+\s+U\.:)/ => 'A): \1',
+    "Solvens: alprostadilum" => "alprostadilum"
+  }
+  @@error_handler = ParseUtil::HandleSwissmedicErrors.new(ERRORS_TO_FIX)
 
   def initialize(source)
     @substances ||= []
     puts "ParseComposition.new from #{source.inspect} @substances #{@substances.inspect}" if VERBOSE_MESSAGES
     @source = source.to_s
   end
-  def ParseComposition.reset
-    @@errorHandler = ParseUtil::HandleSwissmedicErrors.new( ErrorsToFix )
+
+  def self.reset
+    @@error_handler = ParseUtil::HandleSwissmedicErrors.new(ERRORS_TO_FIX)
   end
-  def ParseComposition.report
-    @@errorHandler.report
+
+  def self.report
+    @@error_handler.report
   end
-  def ParseComposition.from_string(string)
-    return nil if string == nil or  string.eql?('.') or string.eql?('')
-    stripped = string.gsub(/^"|["\n]+$/, '')
+
+  def self.from_string(string)
+    return nil if string.nil? || string.eql?(".") || string.eql?("")
+    stripped = string.gsub(/^"|["\n]+$/, "")
     return nil unless stripped
-    if /(U\.I\.|U\.)$/.match(stripped)
-      cleaned = stripped
+    cleaned = if /(U\.I\.|U\.)$/.match?(stripped)
+      stripped
     else
-      cleaned = stripped.sub(/[\.]+$/, '')
+      stripped.sub(/\.+$/, "")
     end
-    value = nil
     puts "ParseComposition.from_string #{string}" if VERBOSE_MESSAGES # /ng-tr/.match(Socket.gethostbyname(Socket.gethostname).first)
 
-    cleaned = @@errorHandler.apply_fixes(cleaned)
-    puts "ParseComposition.new cleaned #{cleaned}" if VERBOSE_MESSAGES and not cleaned.eql?(stripped)
+    cleaned = @@error_handler.apply_fixes(cleaned)
+    puts "ParseComposition.new cleaned #{cleaned}" if VERBOSE_MESSAGES && !cleaned.eql?(stripped)
     CompositionTransformer.clear_substances
     result = ParseComposition.new(cleaned)
     parser = CompositionParser.new
@@ -426,8 +428,8 @@ class ParseComposition
         ast = transf.apply(parser.parse(cleaned))
       end
     rescue Parslet::ParseFailed => error
-      @@errorHandler.nrParsingErrors += 1
-      puts "#{File.basename(__FILE__)}:#{__LINE__}: failed parsing ==>  #{cleaned}"
+      @@error_handler.nrParsingErrors += 1
+      puts "#{File.basename(__FILE__)}:#{__LINE__}: failed parsing ==>  #{cleaned} #{error}"
       return nil
     end
     result.source = string
@@ -437,50 +439,46 @@ class ParseComposition
     result.substances = CompositionTransformer.substances
     result.excipiens = CompositionTransformer.excipiens
     result.corresp = CompositionTransformer.corresp if CompositionTransformer.corresp
-    if result.excipiens and result.excipiens.unit
-      pro_qty = "/#{result.excipiens.qty} #{result.excipiens.unit}".sub(/\/1\s+/, '/')
-      result.substances.each {
-        |substance|
-            next unless substance.is_a?(ParseSubstance)
-          substance.chemical_substance.unit = "#{substance.chemical_substance.unit}#{pro_qty}"    if substance.chemical_substance
-          substance.dose.unit               = "#{substance.dose.unit}#{pro_qty}"                  if substance.unit and not substance.unit.eql?(result.excipiens.unit)
+    if result&.excipiens&.unit
+      pro_qty = "/#{result.excipiens.qty} #{result.excipiens.unit}".sub(/\/1\s+/, "/")
+      result.substances.each { |substance|
+        next unless substance.is_a?(ParseSubstance)
+        substance.chemical_substance.unit = "#{substance.chemical_substance.unit}#{pro_qty}" if substance.chemical_substance
+        substance.dose.unit = "#{substance.dose.unit}#{pro_qty}" if substance.unit && !substance.unit.eql?(result.excipiens.unit)
       }
     end
-    if ast.is_a?(Array) and  ast.first.is_a?(Hash)
+    if ast.is_a?(Array) && ast.first.is_a?(Hash)
       label = ast.first[:label].to_s if ast.first[:label]
       label_description = ast.first[:label_description].to_s if ast.first[:label_description]
-    elsif ast and ast.is_a?(Hash)
-      label = ast[:label].to_s if  ast[:label]
+    elsif ast&.is_a?(Hash)
+      label = ast[:label].to_s if ast[:label]
       label_description = ast[:label_description].to_s if ast[:label_description]
     end
     if label
-      if label and not /((A|B|C|D|E|I|II|III|IV|\)+)\s+et\s+(A|B|C|D|E|I|II|III|IV|\))+)/.match(label)
-        result.label  = label
+      if label && !/((A|B|C|D|E|I|II|III|IV|\)+)\s+et\s+(A|B|C|D|E|I|II|III|IV|\))+)/.match(label)
+        result.label = label
       end
-      result.label_description = label_description.gsub(/:+$/, '').strip if label_description
+      result.label_description = label_description.gsub(/:+$/, "").strip if label_description
     end
-    result.corresp = ast[:corresp].to_s.sub(/:\s+/, '') if not result.corresp and ast.is_a?(Hash) and ast[:corresp]
-    return result
+    result.corresp = ast[:corresp].to_s.sub(/:\s+/, "") if !result.corresp && ast.is_a?(Hash) && ast[:corresp]
+    result
   end
 end
 
 class GalenicFormTransformer < CompositionTransformer
-
-  rule( :preparation_name => simple(:preparation_name),
-        :galenic_form => simple(:preparation_name),
-      ) {
-    |dictionary|
-        puts "#{File.basename(__FILE__)}:#{__LINE__}: dictionary #{dictionary}" if VERBOSE_MESSAGES
-        name = dictionary[:preparation_name] ? dictionary[:preparation_name].to_s : nil
-        form = dictionary[:galenic_form] ? dictionary[:galenic_form].to_s : nil
-        # name, form
+  rule(preparation_name: simple(:preparation_name),
+       galenic_form: simple(:preparation_name)) { |dictionary|
+    puts "#{File.basename(__FILE__)}:#{__LINE__}: dictionary #{dictionary}" if VERBOSE_MESSAGES
+    dictionary[:preparation_name] ? dictionary[:preparation_name].to_s : nil
+    dictionary[:galenic_form] ? dictionary[:galenic_form].to_s : nil
+    # name, form
   }
 end
 
 class ParseGalenicForm
-  def ParseGalenicForm.from_string(string)
-    return nil if string == nil
-    stripped = string.gsub(/^"|["\n]+$/, '')
+  def self.from_string(string)
+    return nil if string.nil?
+    stripped = string.gsub(/^"|["\n]+$/, "")
     return nil unless stripped
     puts "ParseGalenicForm.from_string #{string}" if VERBOSE_MESSAGES # /ng-tr/.match(Socket.gethostbyname(Socket.gethostname).first)
 
@@ -495,13 +493,13 @@ class ParseGalenicForm
         ast = transf.apply(parser.parse(string))
       end
     rescue Parslet::ParseFailed => error
-      @@errorHandler.nrParsingErrors += 1
-      puts "#{File.basename(__FILE__)}:#{__LINE__}: failed parsing ==>  #{string}"
+      @@error_handler.nrParsingErrors += 1
+      puts "#{File.basename(__FILE__)}:#{__LINE__}: failed parsing ==>  #{string} #{error}"
       return nil
     end
     return [] unless ast
-    form = ast[:galenic_form] ? ast[:galenic_form].to_s.sub(/^\/\s+/, '') : nil
+    form = ast[:galenic_form] ? ast[:galenic_form].to_s.sub(/^\/\s+/, "") : nil
     name = ast[:prepation_name] ? ast[:prepation_name].to_s.strip : nil
-    return [name,  form]
+    [name, form]
   end
 end