oddb2xml 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcd2bcecb959ae01393d121cc9df70f8f6edacea
-  data.tar.gz: c7c703884fd6a15a85482e121f9bb754f7798b2e
+  metadata.gz: 12904cf51c69c49aecda97c93bdb269532b7d7ea
+  data.tar.gz: dccb51dcc69f94ba4ccff505abd35c2a47fc37d3
 SHA512:
-  metadata.gz: 29158f982e6bb02096eaad7c05fb1928338df4d7aef0db02336baca454486d661c062caf4e15338cf0ee8ddb559d9886255999dd0b87a44da068d551bb372720
-  data.tar.gz: b55dcb60e96a34f0c8bd8911fb27b20d035d2299c4fe2d2f4ad1eed042fcadeabeb646934c49af8db8516d184c95392dedb4d2c577db56060430699e39465774
+  metadata.gz: 4b955af367c78f85b7ec1599f603d5120c0ecfa601ef1adb0183fab34096934f8225b3751c439056dbf33b6ea4c77ffd31a4f04ab019fc25b4f0b8ce21d27694
+  data.tar.gz: aa8139d20ac1c3fccb7d7c3b0374afcea22f2a6f9229006d26e4ce95af48a1d2ae5289916774dcf1a0495246c3405352742f47453f332044529509b2bc2a9212

data/Gemfile.lock

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

data/History.txt

@@ -1,3 +1,7 @@
+=== 2.1.3 / 02.06.2015
+
+* Fix Caverjet by eliminatins semantically wrong leading "Solvens:"
+
 === 2.1.2 / 13.05.2015
 
 * Fix parslet_spec.rb

data/lib/oddb2xml/parslet_compositions.rb

@@ -366,6 +366,7 @@ class ParseComposition
                   / 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 )
 
@@ -396,15 +397,15 @@ class ParseComposition
     puts "ParseComposition.new cleaned #{cleaned}" if VERBOSE_MESSAGES and not cleaned.eql?(stripped)
     CompositionTransformer.clear_substances
     result = ParseComposition.new(cleaned)
-    parser3 = CompositionParser.new
-    transf3 = CompositionTransformer.new
+    parser = CompositionParser.new
+    transf = CompositionTransformer.new
     begin
       if defined?(RSpec)
-        ast = transf3.apply(parser3.parse_with_debug(cleaned))
+        ast = transf.apply(parser.parse_with_debug(cleaned))
         puts "#{File.basename(__FILE__)}:#{__LINE__}: ==> " if VERBOSE_MESSAGES
         pp ast if VERBOSE_MESSAGES
       else
-        ast = transf3.apply(parser3.parse(cleaned))
+        ast = transf.apply(parser.parse(cleaned))
       end
     rescue Parslet::ParseFailed => error
       @@errorHandler.nrParsingErrors += 1

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.1.2"
+  VERSION = "2.1.3"
 end

data/spec/calc_spec.rb

@@ -141,6 +141,7 @@ Corresp. 5300 kJ.",
                                }
                             )
 
+if RunAllTests
   context 'handle E substances correctly' do
     e_200_examples =
         {
@@ -163,7 +164,6 @@ Corresp. 5300 kJ.",
     }
   end
 
-if RunAllTests
   context 'should return correct value for liquid' do
     pkg_size_L = '1 x 5 x 200'
     einheit_M  = 'ml'
@@ -369,6 +369,10 @@ if RunAllTests
 
       XPath.match( doc, "//ARTICLE[GTIN='7680589430011']/NAME").first.text.should eq 'Apligraf'
       XPath.match( doc, "//ARTICLE[GTIN='7680589430011']/GALENIC_FORM").last.text.should eq 'Unbekannt' # TODO?? 'Scheibe(n)/disque(s)'
+
+      XPath.match( doc, "//ARTICLE[GTIN='7680556740075']/NAME").first.text.should eq "Caverject DC 20, Injektionspräparat"
+      XPath.match( doc, "//ARTICLE[GTIN='7680556740075']/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE").size.should eq 5
+      XPath.match( doc, "//ARTICLE[GTIN='7680556740075']/COMPOSITIONS/COMPOSITION/EXCIPIENS/SUBSTANCE_NAME").first.text.should eq "aqua ad iniectabilia q.s. ad solutionem"
     end
   end
 
@@ -691,4 +695,4 @@ Die HILFSSTOFFE sind Aqua ad iniectabilia und Natrii chloridum.
     end
   end
 end
-  end
+end

metadata

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