oddb2xml 2.4.4 → 2.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d53eced411a8265a49354d1c7ffb1309c10a4545
-  data.tar.gz: d53b5e31652a7b16b3889a3bf6636f2a06ca5ba8
+  metadata.gz: 952fe0868841bf075f3db7cd128326004b2ab2bf
+  data.tar.gz: c026575530d35d1ef75ff9b3ac4688f647d07427
 SHA512:
-  metadata.gz: 9f782573e7dca61022e7f44c2a34794673473def7c79d20676106387c779e6965a157a29f510f56a396afad5c3838558d59b0e876d2b0e54a38ec60cf2536faf
-  data.tar.gz: ddb93469191bbcb33f3ae744fbf463bad8480d863b45631fb43e543a7a1052a7a596baec4fd044396d8508270c5289c3944201ef6ff41d0d9ad0d072a05eb6dd
+  metadata.gz: e4baa838d2b817cfd994882092585e768a4375f82e3bb4843d083ade252666f939628129fa4bfecd709c36f63e81168dd2f996c5dd1f2cae6fbacb05e578a37e
+  data.tar.gz: c839a38f2739a18c515d5b90b7c64c9dd7f8dff06c17ea0a549a106dbc95faded479ae986bed4575c3780d0492f420b18c99ff568057e99e273454da70bcbf85

data/History.txt

@@ -1,3 +1,10 @@
+=== 2.4.5 / 25.10.2017
+
+* Fix parsing shire products
+* Don't emit barcode if 0.
+* Do not get price for barcode 0
+* Fix some failing spec tests
+
 === 2.4.4 / 23.10.2017
 
 * Add articles which are only found in the Preparation.xml (e.g. Mutagrid)

data/lib/oddb2xml/builder.rb

@@ -220,6 +220,7 @@ module Oddb2xml
         @refdata.each_pair do |ean13, item|
           next if item and item.is_a?(Hash) and item[:atc_code] and /^Q/i.match(item[:atc_code])
           next if item[:prodno] and @products[item[:prodno]]
+          next unless ean13.to_s.length == 13
           obj = {
             :seq => @items[ean13] ? @items[ean13] : @items[item[:ean]],
             :pac => nil,
@@ -808,7 +809,7 @@ module Oddb2xml
             if obj[:seq]
               pac = obj[:seq][:packages][obj[:pharmacode]]
               pac = obj[:seq][:packages][ean] unless pac
-            else
+            elsif ean > 0
               pac = @items[ean][:packages][ean] if @items and ean and @items[ean] and @items[ean][:packages]
             end
             if no8
@@ -922,7 +923,7 @@ module Oddb2xml
                 xml.BC     /^9999|^0000|^0$/.match(ean.to_s) ? 0 : sprintf('%013d', ean)
                 xml.BCSTAT 'A' # P is alternative
                 #xml.PHAR2
-              } if ean
+              } if ean && ean > 0
               #xml.ARTCH {
                 #xml.PHAR2
                 #xml.CHTYPE

data/lib/oddb2xml/extractor.rb

@@ -485,14 +485,14 @@ module Oddb2xml
           ean13 = $1.to_i
         end
         if data[ean13]
-          @@error_file.puts "Duplicate ean13 #{ean13} in line \nact: #{line.chomp}\norg: #{data[ean13][:line]}"
+          @@error_file.puts "Duplicate ean13 #{ean13} in line \nact: #{line}\norg: #{data[ean13][:line]}"
           @@items_without_ean13s -= 1
           @@duplicated_ean13s += 1
           next
         end
 
         data[ean13] = {
-          :line   => line.chomp,
+          :line   => line,
           :ean   => ean13,
           :clag  => line[73],
           :vat   => line[96],

data/lib/oddb2xml/parslet_compositions.rb

@@ -74,11 +74,9 @@ module ParseUtil
       if composition.is_a?(ParseComposition)
         composition.substances.each do
           |substance_item|
-          substance_item.is_active_agent = (active_agents.find {|x| x.downcase.eql?(substance_item.name.downcase) } != nil)
+          active_substance_name = substance_item.name.downcase.sub(/^cum\s/, '')
+          substance_item.is_active_agent = (active_agents.find {|x| /#{x.downcase.gsub('(', '\(').gsub(')', '\)')}($|\s)/.match(active_substance_name) } != nil)
           substance_item.is_active_agent = true if substance_item.chemical_substance and active_agents.find {|x| x.downcase.eql?(substance_item.chemical_substance.name.downcase) }
-          # next line is an ugly hack for 24 entries with names containing commas between brackets, eg.
-          # globulina equina (immunisé avec coeur, tissu pulmonaire, reins de porcins)
-          substance_item.is_active_agent = true if /globulina equina/.match(substance_item.name.downcase)
          end
         comps << composition
       end
@@ -489,4 +487,4 @@ class ParseGalenicForm
     name = ast[:prepation_name] ? ast[:prepation_name].to_s.strip : nil
     return [name,  form]
   end
-end
+end

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.4.4"
+  VERSION = "2.4.5"
 end

data/spec/builder_spec.rb

@@ -309,6 +309,7 @@ def check_validation_via_xsd
       |error|
         if error.message
           puts "Failed validating #{file} with #{File.size(file)} bytes using XSD from #{@oddb2xml_xsd}"
+          puts "cmd would be: xsdvalidate #{@oddb2xml_xsd} #{file}"
         end
         expect(error.message).to be_nil, "expected #{error.message} to be nil\nfor #{file} content \n#{File.read(file)}"
     end
@@ -377,7 +378,6 @@ def checkArticleXml(checkERYTHROCIN = true)
 
   desitin = checkAndGetArticleWithGTIN(doc, Oddb2xml::LEVETIRACETAM_GTIN)
   expect(desitin).not_to eq nil
-  # TODO: why is this now nil? desitin.elements['ATC'].text.should == 'N03AX14'
   expect(desitin.elements['DSCRD'].text).to eq("LEVETIRACETAM DESITIN Mini Filmtab 250 mg 30 Stk")
   expect(desitin.elements['DSCRF'].text).to eq('LEVETIRACETAM DESITIN mini cpr pel 250 mg 30 pce')
   expect(desitin.elements['REF_DATA'].text).to eq('1')
@@ -405,7 +405,6 @@ def checkArticleXml(checkERYTHROCIN = true)
   expect(zyvoxid.elements['DSCRD'].text).to eq 'ZYVOXID Filmtabl 600 mg 10 Stk'
 
   expect(XPath.match( doc, "//LIMPTS" ).size).to be >= 1
-  # TODO: desitin.elements['QTY'].text.should eq '250 mg'
 end
 
 def checkProductXml(nbr_record = -1)
@@ -581,7 +580,7 @@ describe Oddb2xml::Builder do
       m = /<paragraph><!\[CDATA\[(.+)\n(.*)/.match(inhalt.to_s)
       expect(m[1]).to eq '<?xml version="1.0" encoding="utf-8"?><div xmlns="http://www.w3.org/1999/xhtml">'
       expected = '<p class="s2"> </p>'
-      skip { m[2].should eq '<p class="s4" id="section1"><span class="s2"><span>Zyvoxid</span></span><sup class="s3"><span>®</span></sup></p>'  }
+      skip { expect(m[2]).to eq '<p class="s4" id="section1"><span class="s2"><span>Zyvoxid</span></span><sup class="s3"><span>®</span></sup></p>'  }
       expect(File.exists?(@oddb_fi_product_xml)).to eq true
       inhalt = IO.read(@oddb_fi_product_xml)
     end
@@ -881,7 +880,7 @@ if RUN_ALL
       expect(File.exists?(oddb_article_xml)).to eq true
       doc = REXML::Document.new IO.read(oddb_article_xml)
       article = XPath.match( doc, "//ART[PHAR=5822801]").first
-      article.elements['DSCRD'].text.should match /EPIMINERAL/i
+      expect(article.elements['DSCRD'].text).to match(/EPIMINERAL/)
     end
 
     it 'should generate a correct oddb_product.xml' do
@@ -891,7 +890,7 @@ if RUN_ALL
     it 'should generate an article with the COOL (fridge) attribute' do
       doc = REXML::Document.new File.new(oddb_article_xml)
       fridge_product = checkAndGetArticleWithGTIN(doc, Oddb2xml::FRIDGE_GTIN)
-      fridge_product.elements['COOL'].text.should == '1'
+      expect(fridge_product.elements['COOL'].text).to eq '1'
     end
 
     it 'should generate a correct oddb_article.xml' do
@@ -919,7 +918,6 @@ if RUN_ALL
       expect(oddb_dat).to match(/^..3/), "should have a record with '3' in CMUT field"
       expect(oddb_dat).to match(RegExpDesitin), "should have Desitin"
       IO.readlines(dat_filename).each{ |line| check_article_IGM_format(line, 0) }
-      # oddb_dat.should match(/^..1/), "should have a record with '1' in CMUT field" # we have no
     end
   end
 

data/spec/calc_spec.rb

@@ -608,6 +608,17 @@ Die HILFSSTOFFE sind Aqua ad iniectabilia und Natrii chloridum.
       specify { expect(argenti.chemical_substance).to eq  nil }
     end
   end
+  context 'shire Subcuvia' do
+#   def initialize(column_c = nil, size = nil, unit = nil, active_substance = nil, composition= nil)
+    substance = 'immunoglobulinum humanum normale'
+    composition = 'proteina 160 mg cum immunoglobulinum humanum normale min. 95 %, glycinum, natrii chloridum, aqua ad iniectabilia, q.s. ad solutionem pro 1 ml.'
+    info = Calc.new('Subcuvia, Injektionslösung', '5', 'ml', substance, composition)
+    specify { expect(info.compositions.first.substances.first.name).to eq 'Proteina' }
+    specify { expect(info.compositions.first.substances[1].name).to eq 'Cum Immunoglobulinum Humanum Normale' }
+    specify { expect(info.compositions.first.substances[1].is_active_agent).to eq true }
+    specify { expect(info.pkg_size).to eq '5' }
+  end
+
 end
 
 describe Oddb2xml::Calc do

data/spec/parslet_spec.rb

@@ -35,6 +35,32 @@ describe ParseComposition do
     specify { expect( composition.substances.first.name).to eq "E 216" }
   end
 
+  context 'Shire Subcuvia' do
+#   def initialize(column_c = nil, size = nil, unit = nil, active_substance = nil, composition= nil)
+    active_substance = 'immunoglobulinum humanum normale'
+    composition_text = 'proteina 160 mg cum immunoglobulinum humanum normale min. 95 %, glycinum, natrii chloridum, aqua ad iniectabilia, q.s. ad solutionem pro 1 ml.'
+    composition = ParseUtil.parse_compositions(composition_text, active_substance).first
+    specify { expect(composition.substances.size).to eq 4 }
+    specify { expect(composition.label).to eq nil }
+    specify { expect(composition.label_description).to eq nil }
+    specify { expect(composition.substances[0].name).to eq 'Proteina' }
+    specify { expect(composition.substances[1].name).to eq 'Cum Immunoglobulinum Humanum Normale' }
+    specify { expect(composition.substances[0].is_active_agent).to eq false }
+    specify { expect(composition.substances[1].is_active_agent).to eq true }
+  end
+
+  context 'Shire Fosrenol' do
+#   def initialize(column_c = nil, size = nil, unit = nil, active_substance = nil, composition= nil)
+    active_substance = 'lanthanum'
+    composition_text = 'lanthanum 500 mg ut lanthani (III) carbonas hydricum, excipiens pro compresso.'
+    composition = ParseUtil.parse_compositions(composition_text, active_substance).first
+    specify { expect(composition.substances.size).to eq 1 }
+    specify { expect(composition.label).to eq nil }
+    specify { expect(composition.label_description).to eq nil }
+    specify { expect(composition.substances[0].is_active_agent).to eq true }
+    specify { expect(composition.substances[0].name).to eq 'Lanthanum 500 Mg Ut Lanthani (iii) Carbonas Hydricum' }
+  end
+
   context "should return label with description" do
     string = "I) Glucoselösung: glucosum anhydricum 240 g ut glucosum monohydricum, calcii chloridum dihydricum 600 mg, acidum citricum monohydricum, aqua ad iniectabilia q.s. ad solutionem pro 500 ml."
     composition = ParseComposition.from_string(string)
@@ -708,8 +734,9 @@ describe ParseComposition do
     end
 
     context "should parse a complex composition" do
-      string = 'globulina equina (immunisé avec coeur) 8 mg'
-      composition = ParseUtil.parse_compositions(string).first
+      composition = ParseUtil.parse_compositions(
+        'globulina equina (immunisé avec coeur) 8 mg',
+        'globulina equina (immunisé avec coeur)').first
       specify { expect(composition.substances.size).to eq 1 }
       globulina = composition.substances.find{ |x| /globulina/i.match(x.name) }
       specify { expect(globulina.name).to eq 'Globulina Equina (immunisé Avec Coeur)' }
@@ -719,8 +746,9 @@ describe ParseComposition do
     end
 
     context "should parse globulina equina (immunise" do
-      string = 'globulina equina (immunisé avec coeur, tissu pulmonaire, reins de porcins) 8 mg'
-      composition = ParseUtil.parse_compositions(string).first
+      composition = ParseUtil.parse_compositions(
+        'globulina equina (immunisé avec coeur, Tissu Pulmonaire, Reins De Porcins) 8 mg',
+        'globulina equina (immunisé avec coeur, Tissu Pulmonaire, Reins De Porcins)').first
       specify { expect(composition.substances.size).to eq 1 }
       globulina = composition.substances.find{ |x| /globulina/i.match(x.name) }
       specify { expect(globulina.name).to eq 'Globulina Equina (immunisé Avec Coeur, Tissu Pulmonaire, Reins De Porcins)' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.4.5
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-23 00:00:00.000000000 Z
+date: 2017-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip