oddb2xml 1.9.9 → 2.0.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MGNmNGQ3MWQ2ODJmZWU1NTQ0NTlhNjMxZTM2ZDQwMDNhMDQxZTVmOQ==
-  data.tar.gz: !binary |-
-    ZmIzODJjZTg3MjUyMjFjNTY2YmViMWNlZmZkMGU0OTE0YTc0NzVkNA==
+SHA1:
+  metadata.gz: 3a0dff7ea1897c93913176510675ffb84641763c
+  data.tar.gz: ea3b174167d1a38862cf5eba377989c3ed8244f2
 SHA512:
-  metadata.gz: !binary |-
-    MWYzZWFiMDkwYzJkYTdkY2E2ZjNkNjE1ZDM4MjEyYzcyMmFhYWJjMDVlNjJl
-    MWE2MmU2M2UxZTdjZDRmOTIxNDZkNzA3OTQwNjZmZWQ1MGUxZjlhMWIyMzdh
-    MGNjZWUxZTYwM2U0NjZkMjlhYTllYTk1MThjNmU4NmNlMDI0YWM=
-  data.tar.gz: !binary |-
-    NzhiNzFkNWM0MWM2MDA4MWNkNTA0Zjc1NWJmYWQzNjA0ZjlkZTI5M2U3YWRi
-    NWVmZmE5ZDJjNzk1YThiOGMxODIzM2JhYTM5MDkxY2E3YzQ4ZDc3NTVhYzMz
-    NzcyMjRkNzRmYmQyMjU0NDMxODBiYmMzOTA2MDlkMTFkMDQwMjU=
+  metadata.gz: ab2bef6593e7fbd5957d97d0e7fe42808527585ad63af64d689630fb29650ce7d0b4fd2cf208e7e81ff9e2bc66a807f4cb2ed6c05831cd80daff0a71427415a8
+  data.tar.gz: 61757a8be3030715495f361467febf3f991e6669637b5cefe2cb967739d20009f2feca35c0ac12e88a2e9aafda421e4c3c7db654f1f4a085d77f302a8016bc91

data/Gemfile.lock

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

data/History.txt

@@ -1,3 +1,8 @@
+=== 2.0.0 / 17.03.2015
+
+* Adding CHEMICAL_SUBSTANCE/DOSE for ut|corresponding
+* Added COMPOSITION containing array of SUBSTANCES
+
 === 1.9.9 / 13.03.2015
 
 * Rename NAME -> COMPOSITION_NAME in calc.xml for composition

data/lib/oddb2xml/builder.rb

@@ -668,11 +668,7 @@ module Oddb2xml
               xml.NAME          info.name
               xml.PKG_SIZE      info.pkg_size
               xml.SELLING_UNITS info.selling_units
-#              xml.COUNT         info.count
-#              xml.MULTI         info.multi
               xml.MEASURE       info.measure # Nur wenn Lösung wen Spalte M ml, Spritze
-#              xml.ADDITION      info.addition
-#              xml.SCALE         info.scale
               if  info.galenic_form.is_a?(String)
                 xml.GALENIC_FORM  info.galenic_form
                 xml.GALENIC_GROUP "Unknown"
@@ -681,18 +677,23 @@ module Oddb2xml
                 xml.GALENIC_GROUP info.galenic_group ? info.galenic_group.description : "Unknown"
               end
               xml.COMPOSITIONS {
-                info.compositions.each {
-                  |composition|
-                  xml.COMPONENT {
-                                    xml.COMPOSITION_NAME composition.name
-                                    if composition.unit
-                                      xml.QTY  composition.qty
-                                      xml.UNIT composition.unit
-                                    end
-                                    xml.LABEL composition.label if composition.label
-                                  }
+                info.compositions.each { |composition|
+                  xml.COMPOSITION {
+                    # xml.SOURCE composition.source # emit this if you want to debug the results
+                    xml.LABEL composition.label if composition.label
+                    xml.SUBSTANCES {
+                      composition.substances.each { |substance|
+                        xml.SUBSTANCE {
+                          xml.SUBSTANCE_NAME substance.name
+                          if substance.unit
+                            xml.QTY  substance.qty
+                            xml.UNIT substance.unit
+                          end
+                        }
+                      }
+                    } if composition.substances
                   }
-                xml.COMMENT info.composition_comment if info.composition_comment
+                }
               }
             } if info.compositions
           end

data/lib/oddb2xml/calc.rb

@@ -6,7 +6,6 @@ require 'yaml'
 module Oddb2xml
  # Calc is responsible for analysing the columns "Packungsgrösse" and "Einheit"
  #
-  Composition   = Struct.new("Composition",  :name, :qty, :unit, :label)
   GalenicGroup  = Struct.new("GalenicGroup", :oid, :descriptions)
   GalenicForm   = Struct.new("GalenicForm",  :oid, :descriptions, :galenic_group)
 
@@ -103,7 +102,7 @@ module Oddb2xml
     @@names_without_galenic_forms = []
     @@rules_counter = {}
     attr_accessor   :galenic_form, :unit, :pkg_size
-    attr_reader     :name, :substances, :composition, :compositions, :composition_comment
+    attr_reader     :name, :substances, :composition, :compositions
     attr_reader     :selling_units, :count, :multi, :measure, :addition, :scale # s.a. commercial_form in oddb.org/src/model/part.rb
     def self.get_galenic_group(name, lang = 'de')
       @@galenic_groups.values.collect { |galenic_group|
@@ -158,6 +157,71 @@ private
       string ? string.to_s.gsub(/\s\s+/, ' ') : nil
     end
 public
+    # Update of active substances, etc picked up from oddb.org/src/plugin/swissmedic.rb update_compositions
+    Composition   = Struct.new("Composition",  :source, :label, :substances, :galenic_form, :route_of_administration)
+    Substance     = Struct.new("Substance",  :name, :qty, :unit, :chemical_substance, :chemical_dose)
+    def update_compositions(active_substance)
+      rep_1 = '----';   to_1 = '('
+      rep_2 = '-----';  to_2 = ')'
+      rep_3 = '------'; to_3 = ','
+
+      comps = []
+      label_pattern = /^(?<label>A|I|B|II|C|III|D|IV|E|V|F|VI)[)]\s*(?<designation>[^)]+):/
+      composition_text = composition.gsub(/\r\n?/u, "\n")
+      puts "composition_text for #{name}: #{composition_text}" if composition_text.split(/\n/u).size > 1 and $VERBOSE
+      lines = composition_text.split(/\n/u)
+      idx = 0
+      compositions = lines.select do |line|
+        if match = label_pattern.match(line)
+          label = match[:label]
+        else
+          label = nil
+        end
+        idx += 1
+        next if idx > 1 and not label # avoid lines like 'I) et II)'
+        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 {
+          |component|
+          next unless component.size > 0
+          to_consider = component.strip.split(':')[-1] # remove label
+          # very ugly hack to ignore ,()
+          m = /^(?<name>[^,\d()]+)\s*(?<dose>[\d\-.]+(\s*(?:(Mio\.?\s*)?(U\.\s*Ph\.\s*Eur\.|[^\s,]+))))/.match(to_consider
+                                                            .gsub(to_1, rep_1).gsub(to_2, rep_2).gsub(to_3, rep_3))
+          if m2 = /^(|[^:]+:\s)(E\s+\d+)$/.match(component.strip)
+            to_add = Substance.new(m2[2], '', '')
+            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(component.strip)
+            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]
+            end
+            next if /\s+pro($|\s+)|emulsion|solution/i.match(name)
+            chemical = m3 ? capitalize(m3[:chemical]) : nil
+            cdose    = m3 ? m3[:cdose] : nil
+            substances << Substance.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)
+          end
+        }
+        comps << Composition.new(line, label, substances) if substances.size > 0
+      end
+      comps
+    end
+
     def initialize(name = nil, size = nil, unit = nil, active_substance = nil, composition= nil)
       @name = remove_duplicated_spaces(name)
       @pkg_size = remove_duplicated_spaces(size)
@@ -171,91 +235,8 @@ public
 
       unless active_substance
         @compositions = []
-        @active_substances = []
       else
-        # Update of active substances, etc picked up from oddb.org/src/plugin/swissmedic.rb update_compositions
-        @active_substances = active_substance.split(/\s*,(?!\d|[^(]+\))\s*/u).collect { |name| capitalize(name) }.uniq
-
-        res = []
-        numbers = [ "A|I", "B|II", "C|III", "D|IV", "E|V", "F|VI" ]
-        current = numbers.shift
-        labels = []
-        composition_text = composition.gsub(/\r\n?/u, "\n")
-        puts "composition_text for #{name}: #{composition_text}" if composition_text.split(/\n/u).size > 1 and $VERBOSE
-        compositions = composition_text.split(/\n/u).select do |line|
-          if match = /^(#{current})\)([^:]+)/.match(line)
-            labels.push [match[1], match[2]]
-            current = numbers.shift
-          end
-        end
-        puts "labels for #{name}: #{labels}" if labels.size > 0 and $VERBOSE
-        if  composition_text.split(/\n/u).size > 1
-          last_line = composition_text.split(/\n/u)[-1]
-          @composition_comment = last_line
-        else
-          @composition_comment = nil
-        end
-        if compositions.empty?
-          compositions.push composition_text.gsub(/\n/u, ' ')
-        end
-        agents = []
-        comps = []
-        units = 'U\.\s*Ph\.\s*Eur\.'
-        name = 'dummy'
-        ptrn = %r{(?ix)
-                  (^|[[:punct:]]|\bet|\bex)\s*#{Regexp.escape name}(?![:\-])
-                  (\s*(?<dose>[\d\-.]+(\s*(?:(Mio\.?\s*)?(#{units}|[^\s,]+))
-                                      (\s*[mv]/[mv])?)))?
-                  (\s*(?:ut|corresp\.?)\s+(?<chemical>[^\d,]+)
-                        \s*(?<cdose>[\d\-.]+(\s*(?:(Mio\.?\s*)?(#{units}|[^\s,]+))
-                                            (\s*[mv]/[mv])?))?)?
-                }u
-        rep_1 = '----';   to_1 = '('
-        rep_2 = '-----';  to_2 = ')'
-        rep_3 = '------'; to_3 = ','
-        compositions.each_with_index do |composition, idx|
-          composition.gsub!(/'/, '')
-          label = nil
-          composition_text.split(/\n/u).each {
-            |line|
-            if m = /^(?<part_id>A|I|B|II|C|III|D|IV|E|V|F|VI)\)\s+(?<part_name>[^\s:, ]+):/.match(line)
-              label = "#{m[:part_id]} #{m[:part_name]}"
-            end
-            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 {
-              |component|
-              next unless component.size > 0
-              to_consider = component.strip.split(':')[-1] # remove label
-              # very ugly hack to ignore ,()
-              m = /^(?<name>[^,\d()]+)\s*(?<dose>[\d\-.]+(\s*(?:(Mio\.?\s*)?(U\.\s*Ph\.\s*Eur\.|[^\s,]+))))/.match(to_consider
-                                                                .gsub(to_1, rep_1).gsub(to_2, rep_2).gsub(to_3, rep_3))
-              if m2 = /^(|[^:]+:\s)(E\s+\d+)$/.match(component.strip)
-                to_add = Composition.new(m2[2], '', '', nil)
-                res << to_add
-              elsif m
-                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]
-                end
-                to_add = Composition.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, label)
-                res << to_add
-              end
-            }
-          }
-        end
-        @compositions = res
+        @compositions = update_compositions(active_substance)
       end
     end
 

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.9.9"
+  VERSION = "2.0.0"
 end

data/spec/calc_spec.rb

@@ -22,10 +22,25 @@ describe Oddb2xml::Calc do
     FileUtils.rm(Dir.glob(File.join(Oddb2xml::WorkDir, '*.csv')))
   end
 
+  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.'
+  Line_2 = 'II) Fettemulsion: sojae oleum 25 g, triglycerida saturata media 25 g, lecithinum ex ovo 3 g, glycerolum, natrii oleas, aqua q.s. ad emulsionem pro 250 ml.'
+  Line_3 = 'III) Aminosäurenlösung: isoleucinum 2.34 g, leucinum 3.13 g, lysinum anhydricum 2.26 g ut lysini hydrochloridum, methioninum 1.96 g, aqua ad iniectabilia q.s. ad solutionem pro 400 ml.'
+  Line_4 = 'I) et II) et III) corresp.: aminoacida 32 g/l, acetas 32 mmol/l, acidum citricum monohydricum, in emulsione recenter mixta 1250 ml.'
+  Line_5 = 'Corresp. 4000 kJ.'
+
   # after each name you find the column of swissmedic_package.xlsx file
   TestExample = Struct.new("TestExample", :test_description, :iksnr_A, :seqnr_B, :pack_K, :name_C, :package_size_L, :einheit_M, :active_substance_0, :composition_P,
                            :values_to_compare)
 
+  tst_grains_de_valse = TestExample.new('Grains de Vals',
+                                55491, 1, 1, "Grains de Vals, comprimés ",
+                                '20', 'Tablette(n)',
+                                'sennae folii extractum methanolicum siccum',
+                                'sennae folii extractum methanolicum siccum 78-104 mg corresp. sennosidum B 12.5 mg, DER: 18:1, excipiens pro compresso.',
+                                { :selling_units => 20,
+                                  :measure => 'Tablette(n)',
+                                  }
+                            )
   tst_cardio_pumal = TestExample.new('Cardio-Pulmo-Rénal Sérocytol',
                                 274, 1, 1, "Cardio-Pulmo-Rénal Sérocytol, suppositoire",
                                 '3', 'Suppositorien',
@@ -88,7 +103,7 @@ describe Oddb2xml::Calc do
                                   }
                             )
   tst_nutriflex = TestExample.new('Nutriflex Lipid plus ohne Elektrolyte, Infusionsemulsion 1250ml',
-                                56089, 1, 1, 'Nutriflex Lipid plus ohne Elektrolyte, Infusionsemulsion 1250ml',
+                                56089, 1, 1, 'Nutriflex Lipid plus, Infusionsemulsion, 1250ml',
                                 '5 x 1250', 'ml',
                                 'glucosum anhydricum, isoleucinum, leucinum, lysinum anhydricum, methioninum, phenylalaninum, threoninum, tryptophanum, valinum, argininum, histidinum, alaninum, acidum asparticum, acidum glutamicum, glycinum, prolinum, serinum, aminoacida, carbohydrata, materia crassa, sojae oleum, triglycerida saturata media',
                                 "I) Glucoselösung: glucosum anhydricum 150 g ut glucosum monohydricum, acidum citricum anhydricum, aqua ad iniectabilia q.s. ad solutionem pro 500 ml.
@@ -296,8 +311,10 @@ Corresp. 5300 kJ.",
           puts "Testing key #{key.inspect} #{value.inspect} against #{result} seems to fail" unless result == value.to_s
           result.should eq value.to_s
       }
-      XPath.match( doc, "//ARTICLE[GTIN='7680545250363']/COMPOSITIONS/COMPONENT/NAME").last.text.should eq 'Alprostadilum'
+      XPath.match( doc, "//ARTICLE[GTIN='7680545250363']/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/SUBSTANCE_NAME").last.text.should eq 'Alprostadilum'
       XPath.match( doc, "//ARTICLE[GTIN='7680458820202']/NAME").last.text.should eq 'Magnesiumchlorid 0,5 molar B. Braun, Zusatzampulle für Infusionslösungen'
+      XPath.match( doc, "//ARTICLE[GTIN='7680555940018']/COMPOSITIONS/COMPOSITION/LABEL").first.text.should eq 'I'
+      XPath.match( doc, "//ARTICLE[GTIN='7680555940018']/COMPOSITIONS/COMPOSITION/LABEL").last.text.should eq 'III'
    end
   end
 
@@ -328,8 +345,7 @@ Corresp. 5300 kJ.",
   context 'find correct result for Nutriflex' do
     info = Calc.new(tst_nutriflex.name_C, tst_nutriflex.package_size_L, tst_nutriflex.einheit_M, tst_nutriflex.active_substance_0, tst_nutriflex.composition_P)
     specify { expect(info.selling_units).to eq  5 }
-    skip "Nutriflex Infusionsemulsion"
-    # specify { expect(info.galenic_form.description).to eq  "Infusionsemulsion" }
+    specify { expect(info.galenic_form.description).to eq  "Infusionsemulsion" }
   end
 
   context 'should handle CFU' do
@@ -337,56 +353,14 @@ Corresp. 5300 kJ.",
                       'lactobacillus acidophilus cryodesiccatus min. 10^9 CFU, bifidobacterium infantis min. 10^9 CFU, color.: E 127, E 132, E 104, excipiens pro capsula.')
     skip "Infloran, capsule mit cryodesiccatus min. 10^9 CFU"
   end
-
-  context 'find correct result compositions' do
-    text = 'I) Glucoselösung: glucosum anhydricum 80 g ut glucosum monohydricum, natrii dihydrogenophosphas dihydricus 1.17 g glycerolum, zinci acetas dihydricus 6.625 mg, natrii oleas, aqua q.s. ad emulsionem pro 250 ml.
-II) Fettemulsion: sojae oleum 25 g, triglycerida saturata media 25 g, lecithinum ex ovo 3 g, glycerolum, natrii oleas, aqua q.s. ad emulsionem pro 250 ml.
-III) Aminosäurenlösung: isoleucinum 2.34 g, leucinum 3.13 g, lysinum anhydricum 2.26 g ut lysini hydrochloridum, methioninum 1.96 g, aqua ad iniectabilia q.s. ad solutionem pro 400 ml.
-.
-I) et II) et III) corresp.: aminoacida 32 g/l, acetas 32 mmol/l, acidum citricum monohydricum, in emulsione recenter mixta 1250 ml.
-Corresp. 4000 kJ.'
-    result = Calc.new('Nutriflex Lipid peri, Infusionsemulsion, 1250ml', nil, nil,
-                      'glucosum anhydricum, zinci acetas dihydricus, isoleucinum, leucinum',
-                      text
-                      )
-    specify { expect(result.compositions.first.name).to eq  'Glucosum Anhydricum' }
-    specify { expect(result.compositions.first.qty).to eq  80.0}
-    specify { expect(result.compositions.first.unit).to eq  'g/250 ml'}
-    specify { expect(result.compositions.first.label).to eq 'I Glucoselösung' }
-
-    # from II)
-    lecithinum =  result.compositions.find{ |x| x.name.match(/lecithinum/i) }
-    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.unit).to eq  'g/250 ml'}
-      specify { expect(lecithinum.label).to eq 'II Fettemulsion' }
-    end
-
-    # From III
-    leucinum =  result.compositions.find{ |x| x.name.eql?('Leucinum') and x.label.match(/^III /) }
-    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.unit).to eq  'g/400 ml'}
-      specify { expect(leucinum.label).to eq 'III Aminosäurenlösung' }
-    end
-    leucinum_I =  result.compositions.find{ |x| x.name.eql?('Leucinum') and x.label.match(/^I /) }
-    specify { expect(leucinum_I).to eq nil}
-    leucinum_II =  result.compositions.find{ |x| x.name.eql?('Leucinum') and x.label.match(/^II /) }
-    specify { expect(leucinum_II).to eq nil}
-  end
-
   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.name).to eq  'Rutosidum Trihydricum' }
-    specify { expect(result.compositions.first.qty).to eq  20}
-    specify { expect(result.compositions.first.unit).to eq  'mg'}
-    specify { expect(result.compositions[1].name).to eq  'Aescinum' }
-    specify { expect(result.compositions[1].qty).to eq  25}
-    specify { expect(result.compositions[1].unit).to eq  'mg'}
+    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.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].unit).to eq  'mg'}
   end
 
   context 'find correct result for Inflora, capsule' do
@@ -397,14 +371,14 @@ Corresp. 4000 kJ.'
     specify { expect(info.pkg_size).to eq '2x10' }
     specify { expect(info.selling_units).to eq  20 }
     skip { expect(info.measure).to eq  '0' }
-    bifidobacterium =  info.compositions.find{ |x| x.name.match(/Bifidobacterium/i) }
+    bifidobacterium =  info.compositions.first.substances.find{ |x| x.name.match(/Bifidobacterium/i) }
     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.unit).to eq  'CFU'}
     end
-    e_127 =  info.compositions.find{ |x| x.name.match(/E 127/i) }
+    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' }
@@ -420,21 +394,84 @@ Corresp. 4000 kJ.'
     specify { expect(info.selling_units).to eq  3 }
     specify { expect(info.name).to eq 'Cardio-Pulmo-Rénal Sérocytol, suppositoire'}
     specify { expect(info.measure).to eq  'Suppositorien' }
-    globulina =  info.compositions.find{ |x| x.name.match(/porcins|globulina/i) }
+    globulina =  info.compositions.first.substances.find{ |x| x.name.match(/porcins|globulina/i) }
     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.unit).to eq  'mg'}
     end
-    e_216 =  info.compositions.find{ |x| x.name.match(/E 216/i) }
+    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  ''}
     end
-    e_218 =  info.compositions.find{ |x| x.name.match(/E 218/i) }
+    e_218 =  info.compositions.first.substances.find{ |x| x.name.match(/E 218/i) }
     specify { expect(e_218).not_to eq nil}
   end
 
+  context 'find correct result compositions for nutriflex' do
+    text = "#{Line_1}\n#{Line_2}\n#{Line_3}\n#{Line_4}\n#{Line_5}"
+    result = Calc.new('Nutriflex Lipid peri, Infusionsemulsion, 1250ml', nil, nil,
+                      'glucosum anhydricum, zinci acetas dihydricus, isoleucinum, leucinum',
+                      text
+                      )
+    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[0].source).to eq Line_1}
+    specify { expect(result.compositions[0].label).to eq 'I'}
+    specify { expect(result.compositions[1].label).to eq 'II' }
+    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.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}
+    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}
+
+    # from II)
+    lecithinum =  result.compositions[1].substances.find{ |x| x.name.match(/lecithinum/i) }
+    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.unit).to eq  'g/250 ml'}
+    end
+
+    # From III
+    leucinum =  result.compositions[2].substances.find{ |x| x.name.eql?('Leucinum') }
+    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.unit).to eq  'g/400 ml'}
+    end
+    leucinum_I =  result.compositions[0].substances.find{ |x| x.name.eql?('Leucinum') }
+    specify { expect(leucinum_I).to eq nil}
+    leucinum_II =  result.compositions[1].substances.find{ |x| x.name.eql?('Leucinum') }
+    specify { expect(leucinum_II).to eq nil}
+    aqua =  result.compositions[2].substances.find{ |x| /aqua ad/i.match(x.name) }
+    specify { expect(aqua).to eq nil}
+  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' }
+      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  78.0}
+      specify { expect(sennosidum.unit).to eq  'mg'}
+    end
+  end
+
 end

metadata

@@ -1,195 +1,195 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 1.9.9
+  version: 2.0.0
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-14 00:00:00.000000000 Z
+date: 2015-03-17 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
@@ -290,12 +290,12 @@ 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: []