oddb2xml 2.0.4 → 2.0.5

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NjA0ZDE5ZTQ1MGZhNDZiYTQ5YTY2ZTEyYTBiOTMwMWJmODQ1ODdjYw==
-  data.tar.gz: !binary |-
-    OWVlNWVkNzJiYmNkNDk5NWNlOTAyNGRjODBiM2Y1ZjEwZWM1MTIyNg==
+SHA1:
+  metadata.gz: 4e7b29934682850002244797289099295579fb51
+  data.tar.gz: a3d02cc3c125315dc26938cb6ce77ec033f98561
 SHA512:
-  metadata.gz: !binary |-
-    OGNhZWJkMjNhMjBhYmE3NTAyNTcxYzczYTc4NGYzZDcwMGNhYzA2M2QwZThk
-    N2IyZmMyNTZlMWU5NDkxOTQ4YmVkNGRjMmYwNjQ3OTZhY2I5NDM3ZTQ2OWYw
-    NTFhMmIzZTg3YWYwZTIwNmZlM2VlOTc2YzIzMDg3YjNiZjg3OTg=
-  data.tar.gz: !binary |-
-    YzQ4NjJjOTU1ZTMzZjRjZmY4OTc3NzM4ZGNlZTdjNDA1NGU0YmU2MDRjMjc4
-    NjQ2MjVkNjk1Mzk1MmY2ZjBhNTNmMGVmMjhiNjMyMGRlMWQxMTAxOWE0MGVl
-    ZGYwMzhiMzk1Y2U0MWZlZmE3MmZmZmQ0ZDZiZDY4MTJkMWE0NjU=
+  metadata.gz: 035cfd64bf3ffffa1a1e0b99c41331326dbb4cf181033c73491c89d81a785f48033e269cd004a262ba646996374c2807229960a140b9b839dca9c2adca528995
+  data.tar.gz: 2f50567e9e4d2e84e1bbf1ca34ae185d1b7b91f323772bde33e29059e56d7d99a2d552d8e40dc1f2d15a0eb7143d60db64d8ace9caf6b42641f1340437c70391

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oddb2xml (2.0.4)
+    oddb2xml (2.0.5)
       archive-tar-minitar (~> 0.5.2)
       mechanize (~> 2.5.1)
       nokogiri (~> 1.5.10)

data/History.txt

@@ -1,3 +1,9 @@
+=== 2.0.5 / 31.03.2015
+
+* --calc adds boolean flag is_active_agent
+* --calc fixes recognition of some substances
+* --calc fixes recognition of dose/unit/qty
+
 === 2.0.4 / 30.03.2015
 
 * --calc now recognizes correct labels, like 'A):' and stops when seeing first ':' in label-description

data/lib/oddb2xml/builder.rb

@@ -634,6 +634,7 @@ module Oddb2xml
     def build_calc
       packungen_xlsx = File.join(Oddb2xml::WorkDir, "swissmedic_package.xlsx")
       idx = 0
+      return unless File.exists?(packungen_xlsx)
       workbook = RubyXL::Parser.parse(packungen_xlsx)
       items = {}
       row_nr = 0
@@ -686,10 +687,16 @@ module Oddb2xml
                       composition.substances.each { |substance|
                         xml.SUBSTANCE {
                           xml.SUBSTANCE_NAME substance.name
+                          xml.IS_ACTIVE_AGENT substance.is_active_agent
                           if substance.unit
                             xml.QTY  substance.qty
                             xml.UNIT substance.unit
                           end
+                          if substance.chemical_substance
+                            xml.CHEMICAL_SUBSTANCE  substance.chemical_substance
+                            xml.CHEMICAL_QTY  substance.chemical_qty
+                            xml.CHEMICAL_UNIT substance.chemical_unit
+                          end
                         }
                       }
                     } if composition.substances

data/lib/oddb2xml/calc.rb

@@ -170,7 +170,7 @@ public
       unless composition
         @compositions = []
       else
-        @compositions = ParseUtil.parse_compositions(composition)
+        @compositions = ParseUtil.parse_compositions(composition, active_substance)
       end
     end
 
@@ -245,7 +245,7 @@ public
                             puts "liquid_form in einheit_M #{einheit_M} matched: #{x}" if $VERBOSE
                             update_rule('liquid_form einheit_M')
                             @measure = x
-                            return pkg_size_to_int(pkg_size_L, true)
+                            return pkg_size_to_int(pkg_size_L, false)
                           end
                         }
         Measurements.each{ |x|

data/lib/oddb2xml/cli.rb

@@ -152,7 +152,7 @@ module Oddb2xml
           end
           File.open(File.join(WorkDir, file), 'w:utf-8'){ |fh| fh << output }
           if @options[:calc]
-            FileUtils.cp(File.join(WorkDir, file), File.join(WorkDir, file.sub('.xml', '_'+Time.now.strftime("%d.%m.%Y_%H.%M")+'.xml')), :verbose => true)
+            FileUtils.cp(File.join(WorkDir, file), File.join(WorkDir, file.sub('.xml', '_'+Time.now.strftime("%d.%m.%Y_%H.%M")+'.xml')), :verbose => false)
           end
         end
       rescue Interrupt

data/lib/oddb2xml/downloader.rb

@@ -280,7 +280,7 @@ XML
         return File.expand_path(file)
       end
       begin
-        FileUtils.rm(File.expand_path(file), :verbose => true) if File.exists?(File.expand_path(file))
+        FileUtils.rm(File.expand_path(file), :verbose => !defined?(RSpec)) if File.exists?(File.expand_path(file))
         page = @agent.get(@url)
         if link_node = page.search(@xpath).first
           link = Mechanize::Page::Link.new(link_node, @agent, page)

data/lib/oddb2xml/parse_compositions.rb

@@ -9,16 +9,34 @@
 module ParseUtil
   SCALE_P = %r{pro\s+(?<scale>(?<qty>[\d.,]+)\s*(?<unit>[kcmuµn]?[glh]))}u
   ParseComposition   = Struct.new("ParseComposition",  :source, :label, :label_description, :substances, :galenic_form, :route_of_administration)
-  ParseSubstance     = Struct.new("ParseSubstance",    :name, :qty, :unit, :chemical_substance, :chemical_dose)
+  ParseSubstance     = Struct.new("ParseSubstance",    :name, :qty, :unit, :chemical_substance, :chemical_qty, :chemical_unit, :is_active_agent, :dose, :cdose)
   def ParseUtil.capitalize(string)
     string.split(/\s+/u).collect { |word| word.capitalize }.join(' ')
   end
 
-  def ParseUtil.parse_compositions(composition)
+  def ParseUtil.dose_to_qty_unit(string, filler=nil)
+    return nil unless string
+    dose = string.split(/\b\s*(?![.,\d\-]|Mio\.?)/u, 2)
+    if dose && (scale = SCALE_P.match(filler)) && dose[1] && !dose[1].include?('/')
+      unit = dose[1] << '/'
+      num = scale[:qty].to_f
+      if num <= 1
+        unit << scale[:unit]
+      else
+        unit << scale[:scale]
+      end
+      dose[1] = unit
+    elsif dose and dose.size == 2
+      unit = dose[1]
+    end
+    dose
+  end
+
+  def ParseUtil.parse_compositions(composition, active_agents_string = '')
     rep_1 = '----';   to_1 = '('
     rep_2 = '-----';  to_2 = ')'
     rep_3 = '------'; to_3 = ','
-
+    active_agents = active_agents_string ? active_agents_string.downcase.split(/,\s+/) : []
     comps = []
     label_pattern = /^(?<label>A|I|B|II|C|III|D|IV|E|V|F|VI)(\):|\))\s*(?<description>[^:]+)/
     composition_text = composition.gsub(/\r\n?/u, "\n")
@@ -39,39 +57,46 @@ module ParseUtil
       substances = []
       filler = line.split(',')[-1].sub(/\.$/, '')
       filler_match = /^(?<name>[^,\d]+)\s*(?<dose>[\d\-.]+(\s*(?:(Mio\.?\s*)?(U\.\s*Ph\.\s*Eur\.|[^\s,]+))))/.match(filler)
-      components = line.split(/([^\(]+\([^)]+\)[^,]+|),/).each {
+      components = line.gsub(/(\d),(\d+)/, "\\1.\\2").split(/([^\(]+\([^)]+\)[^,]+|),/).each {
         |component|
         next unless component.size > 0
+        next if /^ratio:/i.match(component.strip)
         to_consider = component.strip.split(':')[-1].gsub(to_1, rep_1).gsub(to_2, rep_2).gsub(to_3, rep_3) # remove label
         # very ugly hack to ignore ,()
-        ptrn1 = /^(?<name>.+)\s+(?<dose>[\d\-.]+(\s*(?:(Mio\.?\s*)?(U\.\s*Ph\.\s*Eur\.|[^\s,]+))))/
-        m = ptrn1.match(to_consider)
+        ptrn1 = /^(?<name>.+)(\s+|$)(?<dose>[\d\-.]+(\s*(?:(Mio\.?\s*)?(U\.\s*Ph\.\s*Eur\.|[^\s,]+))))/
+        m =  /^(?<name>.+)(\s+|$)/.match(to_consider)
+        m_with_dose = ptrn1.match(to_consider)
+        m = m_with_dose if m_with_dose
         if m2 = /^(|[^:]+:\s)(E\s+\d+)$/.match(component.strip)
-          to_add = ParseSubstance.new(m2[2], '', '')
+          to_add = ParseSubstance.new(m2[2], '', nil, nil, nil, nil, active_agents.index(m2[2].downcase) ? true : false)
           substances << to_add
         elsif m
-          ptrn = /(\s*(?:ut|corresp\.?)\s+(?<chemical>[^\d,]+)\s*(?<cdose>[\d\-.]+(\s*(?:(Mio\.?\s*)?(U\.\s*Ph\.\s*Eur\.|[^\s,]+))(\s*[mv]\/[mv])?))?)/
-          m3 = ptrn.match(to_consider)
-          dose = nil
-          unit = nil
-          name = m[:name].split(/\s/).collect{ |x| x.capitalize }.join(' ').strip.gsub(rep_3, to_3).gsub(rep_2, to_2).gsub(rep_1, to_1)
-          dose = m[:dose].split(/\b\s*(?![.,\d\-]|Mio\.?)/u, 2) if m[:dose]
-          if dose && (scale = SCALE_P.match(filler)) && dose[1] && !dose[1].include?('/')
-            unit = dose[1] << '/'
-            num = scale[:qty].to_f
-            if num <= 1
-              unit << scale[:unit]
-            else
-              unit << scale[:scale]
-            end
-          elsif dose.size == 2
-            unit = dose[1]
+          ptrn = /(?<name>.+)\s+(?<dose>[\d\-.]+(\s*(?:(Mio\.?\s*)?(U\.\s*Ph\.\s*Eur\.|[^\s,]+))))(\s*(?:ut|corresp\.?)\s+(?<chemical>[^\d,]+)\s*(?<cdose>[\d\-.]+(\s*(?:(Mio\.?\s*)?(U\.\s*Ph\.\s*Eur\.|[^\s,]+))(\s*[mv]\/[mv])?))?)/
+          m_with_chemical = ptrn.match(to_consider)
+          m = m_with_chemical if m_with_chemical
+          name      = m[:name].strip
+          chemical  = m_with_chemical ? m[:chemical] : nil
+          cdose     = m_with_chemical ? m[:cdose] : nil
+          dose      = m_with_dose     ? m[:dose]  : nil
+          if m_with_chemical and active_agents.index(m_with_chemical[:chemical].strip)
+            is_active_agent = true
+            name            = m[:chemical].strip
+            dose            = m[:cdose]
+            chemical        = m[:name].strip
+            cdose           = m[:dose]
+          else
+            is_active_agent =  active_agents.index(m[:name].strip) != nil
           end
-          next if /\s+pro($|\s+)|emulsion|solution/i.match(name)
-          chemical = m3 ? capitalize(m3[:chemical]) : nil
-          cdose    = m3 ? m3[:cdose] : nil
-          substances << ParseSubstance.new(name, dose ? dose[0].to_f : nil, unit ? unit.gsub(rep_3, to_3).gsub(rep_2, to_2).gsub(rep_1, to_1) : nil,
-                                      chemical, cdose)
+          unit = nil
+          name = name.gsub(rep_3, to_3).gsub(rep_2, to_2).gsub(rep_1, to_1)
+          emulsion_pattern = /\s+pro($|\s+)|emulsion|solution/i
+          next if emulsion_pattern.match(name)
+          name = name.split(/\s/).collect{ |x| x.capitalize }.join(' ').strip
+          chemical = chemical.split(/\s/).collect{ |x| x.capitalize }.join(' ').strip if chemical
+          qty,  unit  = ParseUtil.dose_to_qty_unit(dose, filler)
+          cqty, cunit = ParseUtil.dose_to_qty_unit(cdose, filler)
+          dose = "#{qty} #{unit}" if unit and unit.match(/\//)
+          substances << ParseSubstance.new(name, qty, unit, chemical, cqty, cunit, is_active_agent, dose, cdose)
         end
       }
       comps << ParseComposition.new(line, label, label_description, substances) if substances.size > 0

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.0.4"
+  VERSION = "2.0.5"
 end

data/spec/builder_spec.rb

@@ -18,6 +18,16 @@ module Kernel
   end
 end
 
+def setup_package_xlsx_for_calc
+  src = File.expand_path(File.join(File.dirname(__FILE__), 'data', 'swissmedic_package-galenic.xlsx'))
+  dest =  File.join(Oddb2xml::WorkDir, 'swissmedic_package.xlsx')
+  FileUtils.makedirs(Oddb2xml::WorkDir)
+  FileUtils.cp(src, dest, { :verbose => false, :preserve => true})
+  FileUtils.cp(File.expand_path(File.join(File.dirname(__FILE__), 'data', 'XMLPublications.zip')),
+              File.join(Oddb2xml::WorkDir, 'downloads'),
+              { :verbose => false, :preserve => true})
+end
+
 def check_validation_via_xsd
   @oddb2xml_xsd = File.expand_path(File.join(File.dirname(__FILE__), '..', 'oddb2xml.xsd'))
   File.exists?(@oddb2xml_xsd).should eq true
@@ -181,6 +191,7 @@ describe Oddb2xml::Builder do
     let(:cli) do
       options = Oddb2xml::Options.new
       options.parser.parse!('--append -I 80 -e'.split(' '))
+      setup_package_xlsx_for_calc
       Oddb2xml::Cli.new(options.opts)
     end
 
@@ -208,11 +219,12 @@ describe Oddb2xml::Builder do
     let(:cli) do
       options = Oddb2xml::Options.new
       options.parser.parse!('-e'.split(' '))
+      cleanup_directories_before_run
+      setup_package_xlsx_for_calc
       Oddb2xml::Cli.new(options.opts)
     end
 
     it 'should contain the correct prices' do
-      cleanup_directories_before_run
       res = buildr_capture(:stdout){ cli.run }
       @article_xml = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_article.xml'))
       File.exists?(@article_xml).should eq true
@@ -230,7 +242,6 @@ describe Oddb2xml::Builder do
       end
     end
 
-
     def checkItemForRefdata(doc, pharmacode, isRefdata)
       article = XPath.match( doc, "//ART[PHAR=#{pharmacode.to_s}]").first
       name =  article.elements['DSCRD'].text
@@ -434,12 +445,14 @@ describe Oddb2xml::Builder do
     let(:cli) do
       options = Oddb2xml::Options.new
       options.parser.parse!('-e --skip-download'.split(' '))
+      setup_package_xlsx_for_calc
       Oddb2xml::Cli.new(options.opts)
     end
 
     let(:cli_I80) do
       options = Oddb2xml::Options.new
       options.parser.parse!('-e -I 80 --skip-download'.split(' '))
+      setup_package_xlsx_for_calc
       Oddb2xml::Cli.new(options.opts)
     end
     search_path_reseller = "//ART[PHAR=0023722]/ARTPRI[PTYP='RESELLERPUB']/PRICE"
@@ -567,5 +580,4 @@ describe Oddb2xml::Builder do
       IO.readlines(dat_filename).each{ |line| check_article(line, true, true) }
     end
   end
-
 end

data/spec/calc_spec.rb

@@ -12,6 +12,7 @@ require "#{Dir.pwd}/lib/oddb2xml/calc"
 include Oddb2xml
 
 describe Oddb2xml::Calc do
+  RunAllTests = true
 
   after(:each) do
     FileUtils.rm(Dir.glob(File.join(Oddb2xml::WorkDir, '*.*')))
@@ -138,6 +139,8 @@ Corresp. 5300 kJ.",
                                #:count => 5, :multi => 1
                                }
                             )
+
+if RunAllTests
   context 'should return correct value for liquid' do
     pkg_size_L = '1 x 5 x 200'
     einheit_M  = 'ml'
@@ -317,6 +320,13 @@ Corresp. 5300 kJ.",
       XPath.match( doc, "//ARTICLE[GTIN='7680555940018']/COMPOSITIONS/COMPOSITION/LABEL_DESCRIPTION").first.text.should eq 'Glucoselösung'
       XPath.match( doc, "//ARTICLE[GTIN='7680555940018']/COMPOSITIONS/COMPOSITION/LABEL").each{ |x| puts x.text }
       XPath.match( doc, "//ARTICLE[GTIN='7680555940018']/COMPOSITIONS/COMPOSITION/LABEL").last.text.should eq 'III'
+      XPath.match( doc, "//ARTICLE[GTIN='7680555940018']/COMPOSITIONS/COMPOSITION/LABEL").last.text.should eq 'III'
+      XPath.match( doc, "//ARTICLE[GTIN='7680434541015']/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/SUBSTANCE_NAME").last.text.should eq 'Matricariae Extractum Isopropanolicum Liquidum'
+      XPath.match( doc, "//ARTICLE[GTIN='7680434541015']/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/CHEMICAL_SUBSTANCE").last.text.should eq 'Levomenolum'
+      XPath.match( doc, "//ARTICLE[GTIN='7680434541015']/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/QTY").last.text.should eq '98.9'
+      XPath.match( doc, "//ARTICLE[GTIN='7680434541015']/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/UNIT").last.text.should eq 'g/100 g'
+      XPath.match( doc, "//ARTICLE[GTIN='7680434541015']/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/CHEMICAL_QTY").last.text.should eq '10-50'
+      XPath.match( doc, "//ARTICLE[GTIN='7680434541015']/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/CHEMICAL_UNIT").last.text.should eq 'mg/100 g'
    end
   end
 
@@ -358,10 +368,10 @@ Corresp. 5300 kJ.",
   context 'find correct result compositions' do
     result = Calc.new(nil, nil, nil, 'rutosidum trihydricum, aescinum', 'rutosidum trihydricum 20 mg, aescinum 25 mg, aromatica, excipiens pro compresso.')
     specify { expect(result.compositions.first.substances.first.name).to eq  'Rutosidum Trihydricum' }
-    specify { expect(result.compositions.first.substances.first.qty).to eq  20}
+    specify { expect(result.compositions.first.substances.first.qty.to_f).to eq  20}
     specify { expect(result.compositions.first.substances.first.unit).to eq  'mg'}
     specify { expect(result.compositions.first.substances[1].name).to eq  'Aescinum' }
-    specify { expect(result.compositions.first.substances[1].qty).to eq  25}
+    specify { expect(result.compositions.first.substances[1].qty.to_f).to eq  25}
     specify { expect(result.compositions.first.substances[1].unit).to eq  'mg'}
   end
 
@@ -377,14 +387,14 @@ Corresp. 5300 kJ.",
     specify { expect(bifidobacterium).not_to eq nil}
     if bifidobacterium
       specify { expect(bifidobacterium.name).to eq  'Bifidobacterium Infantis Min.' }
-      skip { expect(bifidobacterium.qty).to eq  '10^9'}
+      skip { expect(bifidobacterium.qty.to_f).to eq  '10^9'}
       skip { expect(bifidobacterium.unit).to eq  'CFU'}
     end
     e_127 =  info.compositions.first.substances.find{ |x| x.name.match(/E 127/i) }
     skip { expect(e_127).not_to eq nil}
     if e_127
       specify { expect(e_127.name).to eq  'E 127' }
-      specify { expect(e_127.unit).to eq  ''}
+      specify { expect(e_127.unit).to eq  nil}
     end
   end
 
@@ -400,14 +410,14 @@ Corresp. 5300 kJ.",
     specify { expect(globulina).not_to eq nil}
     if globulina
       specify { expect(globulina.name).to eq  'Globulina Equina (immunisé Avec Coeur, Tissu Pulmonaire, Reins De Porcins)' }
-      specify { expect(globulina.qty).to eq  8.0}
+      specify { expect(globulina.qty.to_f).to eq  8.0}
       specify { expect(globulina.unit).to eq  'mg'}
     end
     e_216 =  info.compositions.first.substances.find{ |x| x.name.match(/E 216/i) }
     specify { expect(e_216).not_to eq nil}
     if e_216
       specify { expect(e_216.name).to eq  'E 216' }
-      specify { expect(e_216.unit).to eq  ''}
+      specify { expect(e_216.unit).to eq  nil}
     end
     e_218 =  info.compositions.first.substances.find{ |x| x.name.match(/E 218/i) }
     specify { expect(e_218).not_to eq nil}
@@ -419,9 +429,11 @@ Corresp. 5300 kJ.",
                       'glucosum anhydricum, zinci acetas dihydricus, isoleucinum, leucinum',
                       text
                       )
+#  Line_1 = 'I) Glucoselösung: glucosum anhydricum 150 g ut glucosum monohydricum, natrii dihydrogenophosphas dihydricus 2.34 g, zinci acetas dihydricus 6.58 mg, aqua ad iniectabilia q.s. ad solutionem pro 500 ml.'
     specify { expect(result.compositions.first.substances.first.name).to eq 'Glucosum Anhydricum'}
     specify { expect(result.compositions.first.substances.first.chemical_substance).to eq 'Glucosum Monohydricum'}
-    specify { expect(result.compositions.first.substances.first.chemical_dose).to eq nil}
+    specify { expect(result.compositions.first.substances.first.qty.to_f).to eq 150.0}
+    specify { expect(result.compositions.first.substances.first.unit).to eq 'g/500 ml'}
 
     specify { expect(result.compositions[0].source).to eq Line_1}
     specify { expect(result.compositions[0].label).to eq 'I'}
@@ -430,11 +442,11 @@ Corresp. 5300 kJ.",
     specify { expect(result.compositions[2].label).to eq 'III' }
     glucosum = result.compositions.first.substances.first
     specify { expect(glucosum.name).to eq  'Glucosum Anhydricum' }
-    specify { expect(glucosum.qty).to eq  150.0}
+    specify { expect(glucosum.qty.to_f).to eq  150.0}
     specify { expect(glucosum.unit).to eq  'g/500 ml'}
     specify { expect(result.compositions.size).to eq 3}
     specify { expect(result.compositions[0].substances.size).to eq 3}
-    specify { expect(result.compositions[1].substances.size).to eq 3} # should have  glycerolum, natrii oleas, aqua
+    specify { expect(result.compositions[1].substances.size).to eq 5} # should have  glycerolum, natrii oleas, aqua
     specify { expect(result.compositions[2].substances.size).to eq 4}
     specify { expect(result.compositions[1].source).to eq Line_2}
     specify { expect(result.compositions[2].source).to eq Line_3}
@@ -444,7 +456,7 @@ Corresp. 5300 kJ.",
     specify { expect(lecithinum).not_to eq nil}
     if lecithinum
       specify { expect(lecithinum.name).to eq  'Lecithinum Ex Ovo' }
-      specify { expect(lecithinum.qty).to eq   3.0}
+      specify { expect(lecithinum.qty.to_f).to eq   3.0}
       specify { expect(lecithinum.unit).to eq  'g/250 ml'}
     end
 
@@ -453,7 +465,7 @@ Corresp. 5300 kJ.",
     specify { expect(leucinum).not_to eq nil}
     if leucinum
       specify { expect(leucinum.name).to eq  'Leucinum' }
-      specify { expect(leucinum.qty).to eq  3.13}
+      specify { expect(leucinum.qty.to_f).to eq  3.13}
       specify { expect(leucinum.unit).to eq  'g/400 ml'}
     end
     leucinum_I =  result.compositions[0].substances.find{ |x| x.name.eql?('Leucinum') }
@@ -463,19 +475,9 @@ Corresp. 5300 kJ.",
     aqua =  result.compositions[2].substances.find{ |x| /aqua ad/i.match(x.name) }
     specify { expect(aqua).to eq nil}
   end
+end
 
-  context 'find correct result compositions for tst_grains_de_valse with chemical_dose' do
-    info = Calc.new(tst_grains_de_valse.name_C, tst_grains_de_valse.package_size_L, tst_grains_de_valse.einheit_M, tst_grains_de_valse.active_substance_0, tst_grains_de_valse.composition_P)
-    sennosidum =  info.compositions.first.substances.find{ |x| x.name.match(/Sennae/i) }
-    specify { expect(sennosidum).not_to eq nil}
-    if sennosidum
-      specify { expect(sennosidum.name).to eq  'Sennae Folii Extractum Methanolicum Siccum 78-104 Mg Corresp. Sennosidum B' }
-      specify { expect(sennosidum.chemical_substance).to eq  'Sennosidum B' }
-      specify { expect(sennosidum.chemical_dose).to eq  '12.5 mg' }
-      specify { expect(sennosidum.qty).to eq  12.5}
-      specify { expect(sennosidum.unit).to eq  'mg'}
-    end
-  end
+if RunAllTests
 
   context 'find correct result compositions for fluticasoni with chemical_dose' do
     info = ParseUtil.parse_compositions('fluticasoni-17 propionas 100 µg, lactosum monohydricum q.s. ad pulverem pro 25 mg.')
@@ -483,8 +485,9 @@ Corresp. 5300 kJ.",
     specify { expect(info.first.substances.size).to eq  1 }
     fluticasoni =  info.first.substances.find{ |x| x.name.match(/Fluticasoni/i) }
     specify { expect(fluticasoni.name).to eq  'Fluticasoni-17 Propionas' }
-    specify { expect(fluticasoni.qty).to eq  100.0 }
+    specify { expect(fluticasoni.qty.to_f).to eq  100.0 }
     specify { expect(fluticasoni.unit).to eq  'µg/25 mg' }
+    specify { expect(fluticasoni.dose).to eq  "100 µg/25 mg" }
     lactosum =  info.first.substances.find{ |x| x.name.match(/Lactosum/i) }
     specify { expect(lactosum).to eq nil }
   end
@@ -493,10 +496,10 @@ Corresp. 5300 kJ.",
     txt = 'calcium carbonicum hahnemanni C7 5 %, chamomilla recutita D5 22.5 %, magnesii hydrogenophosphas trihydricus C5 50 %, passiflora incarnata D5 22.5 %, xylitolum, excipiens ad globulos.'
     info = ParseUtil.parse_compositions(txt)
     specify { expect(info.size).to eq  1 }
-    specify { expect(info.first.substances.size).to eq  4 }
+    specify { expect(info.first.substances.size).to eq  6 }
     recutita =  info.first.substances.find{ |x| x.name.match(/recutita/i) }
     specify { expect(recutita.name).to eq  'Chamomilla Recutita D5' }
-    specify { expect(recutita.qty).to eq  22.5 }
+    specify { expect(recutita.qty.to_f).to eq  22.5 }
     specify { expect(recutita.unit).to eq  '%' }
   end
 
@@ -505,9 +508,9 @@ Corresp. 5300 kJ.",
     info = ParseUtil.parse_compositions(txt)
     specify { expect(info.size).to eq  1 }
     specify { expect(info.first.substances.size).to eq  3 }
-    procainum =  info.first.substances.find{ |x| x.name.match(/procainum/i) }
+    procainum =  info.first.substances.find{ |x| x.name.match(/procain/i) }
     specify { expect(procainum.name).to eq  'Procainum' }
-    specify { expect(procainum.qty).to eq  10.0 }
+    specify { expect(procainum.qty.to_f).to eq  10.0 }
     specify { expect(procainum.unit).to eq  'mg/g' }
   end
 
@@ -518,10 +521,10 @@ Corresp. 5300 kJ.",
     info = ParseUtil.parse_compositions(txt)
     specify { expect(info.first.label).to eq  'I' }
     specify { expect(info.size).to eq  2 }
-    specify { expect(info.first.substances.size).to eq  6 }
+    specify { expect(info.first.substances.size).to eq  11 }
     toxoidum =  info.first.substances.find{ |x| x.name.match(/Toxoidum Diphtheriae/i) }
     specify { expect(toxoidum.name).to eq  'Toxoidum Diphtheriae' }
-    specify { expect(toxoidum.qty).to eq  30.0 }
+    specify { expect(toxoidum.qty.to_f).to eq  30.0 }
     specify { expect(toxoidum.unit).to eq  'U.I./ml' }
   end
 
@@ -533,12 +536,11 @@ Corresp. 5300 kJ.",
                       'albuminum humanum colloidale, stanni(II) chloridum dihydricum',
                       text
                       )
-    # pp info; binding.pry
     specify { expect(info.compositions.size).to eq  2 }
-    specify { expect(info.compositions.first.substances.size).to eq  2 }
+    specify { expect(info.compositions.first.substances.size).to eq  5 }
     poloxamerum =  info.compositions.first.substances.find{ |x| x.name.match(/poloxamerum/i) }
     skip { expect(poloxamerum.name).to eq  'Poloxamerum 238' }
-    skip { expect(poloxamerum.qty).to eq  "" }
+    skip { expect(poloxamerum.qty.to_f).to eq  "" }
     specify { expect(poloxamerum.unit).to eq  "" }
   end
 
@@ -548,9 +550,127 @@ Corresp. 5300 kJ.",
                       'pollinis allergeni extractum',
                       text
                       )
-    # pp info; binding.pry
     specify { expect(info.compositions.size).to eq  1 }
     specify { expect(info.compositions.first.label).to eq  'A' }
   end
 
+  context 'find correct result for 47837 Ecodurex' do
+    text = "amiloridi hydrochloridum dihydricum 5.67 mg corresp. amiloridi hydrochloridum anhydricum 5 mg, hydrochlorothiazidum 50 mg, excipiens pro compresso."
+    info = Calc.new('Ecodurex', nil, nil,
+                      'amiloridi hydrochloridum anhydricum, hydrochlorothiazidum',
+                      text
+                      )
+    specify { expect(info.compositions.size).to eq  1 }
+    specify { expect(info.compositions.first.label).to eq  nil }
+    substance1 =  info.compositions.first.substances.find{ |x| x.name.match(/hydrochlorothiazidum/i) }
+    specify { expect(substance1.name).to eq  'Hydrochlorothiazidum' }
+    substance3 =  info.compositions.first.substances.find{ |x| x.name.match(/amiloridi hydrochloridum/i) }
+    specify { expect(substance3.class).to eq  Struct::ParseSubstance }
+    if substance3
+      specify { expect(substance3.name).to eq                'Amiloridi Hydrochloridum Anhydricum' }
+      specify { expect(substance3.chemical_substance).to eq  'Amiloridi Hydrochloridum Dihydricum' }
+      specify { expect(substance3.qty.to_f).to eq  5 }
+      specify { expect(substance3.unit).to eq  'mg' }
+      specify { expect(substance3.chemical_qty.to_f).to eq  5.67 }
+      specify { expect(substance3.chemical_unit).to eq  'mg' }
+      specify { expect(substance3.is_active_agent).to eq true }
+    end
+
+  end
+
+  context 'find correct result for 45079 Dr. Reckeweg R 51 Thyreosan, gouttes homéopathiques' do
+    text = "atropa belladonna D30, iodum D30, lapis albus D12, lycopus virginicus D12, natrii chloridum D30 ana partes 0.1 ml, excipiens ad solutionem pro 1 ml, corresp. ethanolum 35 % V/V."
+    info = Calc.new('Dr. Reckeweg R 51 Thyreosan, gouttes homéopathiques', nil, nil,
+                      'atropa belladonna D30, iodum D30, lapis albus D12, lycopus virginicus D12, natrii chloridum D30',
+                      text
+                      )
+    specify { expect(info.compositions.size).to eq  1 }
+    specify { expect(info.compositions.first.label).to eq  nil }
+    substance1 =  info.compositions.first.substances.find{ |x| x.name.match(/atropa belladonna/i) }
+    specify { expect(substance1.name).to eq  'Atropa Belladonna D30' }
+    substance2 =  info.compositions.first.substances.find{ |x| x.name.match(/lycopus virginicus/i) }
+    specify { expect(substance2.class).to eq  Struct::ParseSubstance }
+    substance3 =  info.compositions.first.substances.find{ |x| x.name.match(/lapis albus/i) }
+    specify { expect(substance3.class).to eq  Struct::ParseSubstance }
+    if substance3
+      specify { expect(substance3.name).to eq                'Lapis Albus D12' }
+    end
+  end
+
+  context 'find correct result for 00417 Tollwut Impfstoff Mérieu' do
+    text = "Praeparatio cryodesiccata: virus rabiei inactivatum (Stamm: Wistar Rabies PM/WI 38-1503-3M) min. 2.5 U.I., albuminum humanum, neomycini sulfas, residui: phenolsulfonphthaleinum.
+Solvens: aqua ad iniectabilia q.s. ad suspensionem pro 1 ml."
+    info = Calc.new('Tollwut Impfstoff Mérieu', nil, nil,
+                      'virus rabiei inactivatum (Stamm: Wistar Rabies PM/WI 38-1503-3M) ',
+                      text
+                      )
+    specify { expect(info.compositions.size).to eq  1 }
+    specify { expect(info.compositions.first.label).to eq  nil }
+    substance1 =  info.compositions.first.substances.find{ |x| x.name.match(/virus rabiei inactivatu/i) }
+    specify { expect(substance1).should_not be  nil }
+    if substance1
+      specify { expect(substance1.name).to eq  'Virus Rabiei Inactivatum (Stamm: Wistar Rabies Pm/wi 38-1503-3M)' }
+    end
+    substance2 =  info.compositions.first.substances.find{ |x| x.name.match(/albuminum humanu/i) }
+    if substance2
+      specify { expect(substance2.name).to eq  'Albuminum Humanum' }
+    end
+    specify { expect(substance2.class).to eq  Struct::ParseSubstance }
+    substance3 =  info.compositions.first.substances.find{ |x| x.name.match(/neomycini sulfas/i) }
+    specify { expect(substance3.class).to eq  Struct::ParseSubstance }
+    if substance3
+      specify { expect(substance3.name).to eq  'Neomycini Sulfas' }
+    end
+  end
+
+  context 'find correct result compositions for tst_grains_de_valse with chemical_dose' do
+    info = Calc.new(tst_grains_de_valse.name_C, tst_grains_de_valse.package_size_L, tst_grains_de_valse.einheit_M, tst_grains_de_valse.active_substance_0, tst_grains_de_valse.composition_P)
+    sennosidum =  info.compositions.first.substances.find{ |x| x.name.match(/Senn/i) }
+    specify { expect(sennosidum).not_to eq nil}
+    if sennosidum
+      specify { expect(sennosidum.name).to eq  'Sennae Folii Extractum Methanolicum Siccum' }
+      specify { expect(sennosidum.dose).to eq  '78-104 mg' }
+      specify { expect(sennosidum.qty.to_f).to eq  78.0}
+      specify { expect(sennosidum.unit).to eq  'mg'}
+      specify { expect(sennosidum.chemical_substance).to eq  'Sennosidum B' }
+      specify { expect(sennosidum.chemical_qty.to_f).to eq  12.5 }
+      specify { expect(sennosidum.chemical_unit).to eq  'mg' }
+    end
+  end
+
+end
+  context 'find correct result compositions for 56829 Iscador Ag 0,01 mg' do
+    text = 'extractum aquosum liquidum fermentatum 0.05 mg ex viscum album (mali) recens 0.01 mg, natrii chloridum, argenti carbonas (0,01 ug pro 100 mg herba recente), aqua q.s. ad solutionem pro 1 ml.'
+    info = Calc.new("Iscador M c. Arg. 0,01 mg, Injektionslösung, anthroposophisches Arzneimittel", '2 x 7', 'Ampulle(n)',
+                    'viscum album (mali) recens, argenti carbonas (0,01 ug pro 100 mg herba recente)',
+                    text)
+    specify { expect(info.pkg_size).to eq '2 x 7' }
+    specify { expect(info.selling_units).to eq 14 }
+    specify { expect(info.compositions.first.substances.size).to eq 2 }
+    viscum =  info.compositions.first.substances.find{ |x| x.name.match(/viscum/i) }
+    specify { expect(viscum).not_to eq nil}
+    if viscum
+      specify { expect(viscum.name).to eq  'Extractum Aquosum Liquidum Fermentatum 0.05 Mg Ex Viscum Album (mali) Recens' }
+      specify { expect(viscum.dose).to eq  '0.01 mg/ml' }
+      specify { expect(viscum.qty.to_f).to eq  0.01}
+      specify { expect(viscum.unit).to eq  'mg/ml'}
+      specify { expect(viscum.chemical_substance).to eq  nil }
+      specify { expect(viscum.chemical_qty).to eq  nil }
+      specify { expect(viscum.chemical_unit).to eq nil }
+    end
+    # we don't handle argenti at the moment, because it skipped as it contain pro in its name
+    if false
+      argenti =  info.compositions.first.substances.find{ |x| x.name.match(/Argenti/i) }
+      specify { expect(argenti).not_to eq nil}
+      if argenti
+        specify { expect(argenti.name).to eq  'Argenti Carbonas' }
+        skip  { expect(argenti.dose).to eq  '0.01 mg/ml' } # 100 mg/ml
+        skip  { expect(argenti.qty.to_f).to eq  0.01}
+        skip  { expect(argenti.unit).to eq  'mg/ml'}
+        specify { expect(argenti.chemical_substance).to eq  nil }
+        specify { expect(argenti.chemical_qty).to eq  nil }
+        specify { expect(argenti.chemical_unit).to eq nil }
+      end
+    end
+  end
 end

metadata

@@ -1,195 +1,195 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-31 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.10
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: spreadsheet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rubyXL
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.3.1
 - !ruby/object:Gem::Dependency
   name: sax-machine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: oddb2xml creates xml files using swissINDEX, BAG-XML and Swissmedic.
@@ -199,9 +199,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - History.txt
@@ -291,17 +291,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: oddb2xml creates xml files.