oddb2xml 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82754e27fde87282a1643f1acb81a8e30f2bee99
-  data.tar.gz: 13ae8919c8572bf3d8bf3261802a096bbab9ead2
+  metadata.gz: 91e209f6f384705d053e56609465c69349b2f09b
+  data.tar.gz: fee149a15fe84a106f74aa3b9c5018ea9a641951
 SHA512:
-  metadata.gz: 74e386dab573b605b60e3e4fd92740f1ab482b546e41998bd51e60105361bb8c2164723098a24bec2c64e43ff4c338612c6212806c22748c94077788bca59967
-  data.tar.gz: 785ab82c497388b1278c5dba170e9318fdec62fe223fa4fa4a7aa22be3100b3094339d74d29bf7f9bb03f8fa758c8e2d9131d6e2d08ea09d3ae9873ff4a34572
+  metadata.gz: 13362a32f7f7c3f3bcf63826a7ead70e03678cd219439e2c88f87a3d2ac082ade71093790b2d6a2c59f86094e1c91152cf88fddbee5e3407f98f93be40e1f1e1
+  data.tar.gz: 3afe7a0686b90a0c1c33cde46fdd82f8f057d3ea2cb2decadcd2e07f0a796ee984b9fbdb2ce95d424c639d0bcc8e0c388adef0626c4e55e2dfd3916294b1c56c

data/Gemfile.lock

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

data/History.txt

@@ -1,3 +1,7 @@
+=== 2.0.2 / 24.03.2015
+
+* Fixed handling of chemicals and units with '%'
+
 === 2.0.1 / 17.03.2015
 
 * Readded description for label

data/lib/oddb2xml/parse_compositions.rb

@@ -41,16 +41,16 @@ module ParseUtil
       components = line.split(/([^\(]+\([^)]+\)[^,]+|),/).each {
         |component|
         next unless component.size > 0
-        to_consider = component.strip.split(':')[-1] # remove label
+        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 ,()
-        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))
+        ptrn1 = /^(?<name>.+)\s+(?<dose>[\d\-.]+(\s*(?:(Mio\.?\s*)?(U\.\s*Ph\.\s*Eur\.|[^\s,]+))))/
+        m = ptrn1.match(to_consider)
         if m2 = /^(|[^:]+:\s)(E\s+\d+)$/.match(component.strip)
           to_add = ParseSubstance.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)
+          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)

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/spec/calc_spec.rb

@@ -468,12 +468,45 @@ Corresp. 5300 kJ.",
     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.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  78.0}
+      specify { expect(sennosidum.qty).to eq  12.5}
       specify { expect(sennosidum.unit).to eq  'mg'}
     end
   end
 
-end
+  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.')
+    specify { expect(info.size).to eq  1 }
+    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.unit).to eq  'µg/25 mg' }
+    lactosum =  info.first.substances.find{ |x| x.name.match(/Lactosum/i) }
+    specify { expect(lactosum).to eq nil }
+  end
+
+  context 'find correct result compositions for stuff with percents' do
+    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 }
+    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.unit).to eq  '%' }
+  end
+
+  context 'find correct result compositions for procainum with chemical_dose' do
+    txt = 'procainum 10 mg ut procaini hydrochloridum, phenazonum 50 mg, Antiox.: E 320, glycerolum q.s. ad solutionem pro 1 g.'
+    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) }
+    specify { expect(procainum.name).to eq  'Procainum' }
+    specify { expect(procainum.qty).to eq  10.0 }
+    specify { expect(procainum.unit).to eq  'mg/g' }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip