oddb2xml 2.1.4 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efe088433407017fa298a6e78834bbe34d4490f4
-  data.tar.gz: f4d2f7b5324fd72230a1b849c972955f71e5c16b
+  metadata.gz: c23ad09144021304d4c843e68e223d7071fa6f45
+  data.tar.gz: 28469d65080b256c22ddece82312e8a580144dfa
 SHA512:
-  metadata.gz: 4f7fd0a26a4ee072b4e1ff34dde9ba121278786b111e1f827252df903578eff88bc4e049fb59146b53b7477ce0831eb9d1bf14e629105014131326c6b9c9760b
-  data.tar.gz: 2133aea32f7d76524f25807749366cf8cfdac260b1c01845ebecb8503ab47eff892355cdcaf65aded3805aa8bcf3293f7c087f695457bbf98a23f31f73c5496c
+  metadata.gz: 1741fd3f64f4b735062b4e456e4643b673cb5bf9a31ce4fad59737b95ac3102d35c13d804796947fbc2602f8940d2aa3fe5b46dcb6d886cfb349dc3279f5dc4f
+  data.tar.gz: 6e75c9e2f02ef5811e2f6227bf5c82da6111b5d030aaa2bdbaeda1fd36220b4882d128075070670a7493cc444a60e8f2b39d72c285f11de51f7b69c7352898a5

data/Gemfile.lock

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

data/History.txt

@@ -1,3 +1,9 @@
+=== 2.1.5 / 03.06.2015
+
+* Give substances for lines starting with Solvens
+* Emit label Solvens when line stars with Solvens
+* Don't emit SUBSTANCES if no substance is contained
+
 === 2.1.4 / 02.06.2015
 
 * Consider changes in ATC-codes by EPha

data/lib/oddb2xml/builder.rb

@@ -713,12 +713,14 @@ module Oddb2xml
                 info.compositions.each { |composition|
                   xml.COMPOSITION {
                     xml.EXCIPIENS { emit_substance(xml, composition.excipiens) } if composition.excipiens
-                    xml.CORRESP composition.corresp if composition.corresp
                     xml.LABEL composition.label if composition.label
                     xml.LABEL_DESCRIPTION composition.label_description if composition.label_description
-                    xml.SUBSTANCES {
-                        composition.substances.each { |substance| xml.SUBSTANCE { emit_substance(xml, substance, true) }}
-                    } if composition.substances
+                    xml.CORRESP composition.corresp if composition.corresp
+                    if composition.substances and composition.substances.size > 0
+                      xml.SUBSTANCES {
+                          composition.substances.each { |substance| xml.SUBSTANCE { emit_substance(xml, substance, true) }}
+                      }
+                    end
                   }
                 }
               }

data/lib/oddb2xml/compositions_syntax.rb

@@ -399,9 +399,6 @@ class CompositionParser < Parslet::Parser
     str('doses ') |
     str('Pulver: ') |
     str('Diluens: ') |
-    str('Solvens (i.v.): ') |
-    str('Solvens (i.m.): ') |
-    str('Solvens: ') |
     str('Solutio reconstituta:') |
     str('Corresp., ') |
     str('Corresp. ') |
@@ -412,6 +409,13 @@ class CompositionParser < Parslet::Parser
                       }
   rule(:corresp_line_neu) { corresp_label >> any.repeat(1).as(:corresp) }
 
+  rule(:solvens_label) {
+    str('Solvens (i.v.)') |
+    str('Solvens (i.m.)') |
+    str('Solvens')
+  }
+  rule(:solvens_line) { solvens_label.as(:label) >> (str(': ') >> composition.repeat(1).as(:composition) | any.repeat(1).as(:corresp))}
+
   rule(:multiple_et_line) {
                         ((label_id >> label_separator >> space? >> (str('pro usu') |str('et '))).repeat(1) >> any.repeat(1)).as(:corresp)
   }
@@ -425,6 +429,7 @@ class CompositionParser < Parslet::Parser
                                 composition.as(:composition)  }
 
   rule(:expression_comp) {
+    solvens_line |
     multiple_et_line |
     label_id_composition |
     corresp_line_neu |
@@ -435,6 +440,18 @@ class CompositionParser < Parslet::Parser
     space.repeat(3)
   }
 
+  rule(:expression_compD) {
+    solvens_line |
+    multiple_et_line.as('multiple_et_line') |
+    label_id_composition.as('label_id_composition') |
+    corresp_line_neu.as('corresp_line_neu') |
+    leading_label.maybe >> space? >> composition.as(:composition) >> space? >> str('.').maybe >> space? |
+    polvac.as('polvac') |
+    label_comment_excipiens.as('label_comment_excipiens') |
+    excipiens.as(:composition) |
+    space.repeat(3)
+  }
+
   root :expression_comp
 end
 

data/lib/oddb2xml/parslet_compositions.rb

@@ -441,6 +441,7 @@ class ParseComposition
       end
       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
   end
 end

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.1.4"
+  VERSION = "2.1.5"
 end

data/spec/calc_spec.rb

@@ -142,6 +142,16 @@ Corresp. 5300 kJ.",
                             )
 
 if RunAllTests
+  context 'should parse Solvens:' do
+    text = 'Solvens: conserv.: alcohol benzylicus 18 mg, aqua ad iniectabilia q.s. ad solutionem pro 2 ml.'
+    info = Calc.new('Solu-Cortef 100 mg, Injektions-/Infusionspräparat', nil, nil,
+                      'hydrocortisonum',
+                      text
+                      )
+    specify { expect(info.compositions.first.substances.first.name).to eq   "Alcohol Benzylicus" }
+    specify { expect(info.compositions.first.substances.size).to eq  1 }
+  end
+
   context "adapt ATC for epha 16105 C05BA" do
     specify { expect(Oddb2xml.add_epha_changes_for_ATC(16105, 'C05BA')).to eq 'C05BA01' }
   end
@@ -311,9 +321,9 @@ if RunAllTests
       File.exists?(oddb_calc_xsd).should eq true
       xsd = Nokogiri::XML::Schema(File.read(oddb_calc_xsd))
       doc = Nokogiri::XML(File.read(xml_file_name))
+      # puts xml; binding.pry
       xsd.validate(doc).each do |error|  expect(error).to be_nil end
       doc = REXML::Document.new xml
-      # puts xml; binding.pry
       gtin = '7680540151009'
       ean12 = '7680' + sprintf('%05d',tst_naropin.iksnr_A) + sprintf('%03d',tst_naropin.pack_K)
       ean13 = (ean12 + Oddb2xml.calc_checksum(ean12))

data/spec/composition_syntax_spec.rb

@@ -23,12 +23,12 @@ let(:parser) { CompositionParser.new }
     let(:substance_name_parser) { parser.substance_name }
     let(:number_parser) { parser.number }
     let(:excipiens_parser) { parser.excipiens }
-    let(:composition_parser) { parser.composition }
+    let(:composition_parser) { parser }
 
     it "parses identifier" do
-      res1 = substance_parser.parse_with_debug('pollinis allergeni extractum (alnus glutinosa, betula alba, corylus avellana) 300 U.: excipiens ad solutionem pro 1 ml')
-      pp res1
-      # binding.pry
+      text = 'Solvens: conserv.: alcohol benzylicus 18 mg, aqua ad iniectabilia q.s. ad solutionem pro 2 ml.'
+      res1 = composition_parser.parse_with_debug(text)
+      pp res1; binding.pry
     end
   end
 end

data/spec/parslet_spec.rb

@@ -24,23 +24,9 @@ to_add = %(
       pp composition; binding.pry
 )
 
-  context "should handle failed" do
-  strings = [
-    ]
-    strings.each{ |string|
-      composition = ParseComposition.from_string(string)
-      binding.pry if composition.substances.size == 0
-      specify { expect( composition.substances.size).not_to eq 0 }
-    }
-  end
-
 end
 
 if RunFailingSpec
-describe ParseComposition do
-
-end
-
 end
 
 describe ParseComposition do

metadata

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