oddb2xml 2.2.7 → 2.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5231618926015f8fe6730a4bb96e5c1b02bcd7a6
-  data.tar.gz: 46d8563881526d72bfafa74d328b599e59f5ead8
+  metadata.gz: 0a750539ac436cafb6b5b818c9767cdce87ba5a4
+  data.tar.gz: 98b62a3bbc44b6b68d69f7b1fb474c66d5627b74
 SHA512:
-  metadata.gz: bcaad4b40f4e4a353c8d81a0628a766f71072926365ab4227b28c495448ef504f7a3870b13cbbe1ce6bc32f47f18ad844d6bade36f5ac4118275352361eaf044
-  data.tar.gz: c34d48f22e6f16b235695f1fe911d0249884287d0f787ec891b3cd4db7d145a3c60b011b91c0228c7af33db0d5d61fdbb5c521ff197ca682d82a111506524abd
+  metadata.gz: 5325bf91c6a88bc753c4d9611397923bf1e62e1fd2c974e894c939eefd737c88201196ce919d69b35458aa6e281560fc3e9fa1201252c5e383baf3238609098c
+  data.tar.gz: 75990e37f5267bcebf5bf97a347cc6df2d4bc2863ea15b29c1fc5dfc73f5edee1d8d8553527c56e9a0d8f54a2ec53a4850ad8769e1c2b9c6e5fe3927da34f40b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oddb2xml (2.2.7)
+    oddb2xml (2.2.8)
       archive-tar-minitar
       httpi (>= 2.4.1)
       mechanize

data/History.txt

@@ -1,3 +1,8 @@
+=== 2.2.8 / 25.11.2015
+
+* Improved spec tests against all XSD elements
+* Fixed NINCD for LPPV items
+
 === 2.2.7 / 24.11.2015
 
 * Removed no more emitted QTY from definition of ART in oddb2xml.xsd

data/lib/oddb2xml/builder.rb

@@ -1103,7 +1103,7 @@ module Oddb2xml
       Oddb2xml.add_hash(_builder.to_xml)
     end
     def detect_nincd(de_idx)
-      if @lppvs[de_idx[:ean]] # LPPV
+      if @lppvs[de_idx[:ean].to_s] # LPPV
         20
       elsif @items[de_idx[:pharmacode]] # BAG-XML (SL/LS)
         10

data/lib/oddb2xml/downloader.rb

@@ -183,7 +183,7 @@ module Oddb2xml
       file = File.join(WorkDir, 'XMLPublications.zip')
       Oddb2xml.log "BagXmlDownloader #{__LINE__}: #{file}"
       unless Oddb2xml.skip_download(file)
-        Oddb2xml.log "BagXmlDownloader #{__LINE__}: #{file}"                                       
+        Oddb2xml.log "BagXmlDownloader #{__LINE__}: #{file}"
         begin
           response = @agent.get(@url)
           response.save_as(file)

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.2.7"
+  VERSION = "2.2.8"
 end

data/oddb2xml.xsd

@@ -184,12 +184,12 @@
   <xs:element name="LIMPTS">
     <xs:simpleType>
       <xs:restriction base="xs:byte">
+        <xs:enumeration value="10" />
         <xs:enumeration value="20" />
         <xs:enumeration value="30" />
-        <xs:enumeration value="60" />
-        <xs:enumeration value="10" />
         <xs:enumeration value="40" />
         <xs:enumeration value="50" />
+        <xs:enumeration value="60" />
         <xs:enumeration value="80" />
         <xs:enumeration value="100" />
       </xs:restriction>
@@ -1084,12 +1084,12 @@
   <xs:element name="CDVALMD">
     <xs:simpleType>
       <xs:restriction base="xs:string">
-        <xs:enumeration value="X" />
-        <xs:enumeration value="E" />
-        <xs:enumeration value="D" />
-        <xs:enumeration value="C" />
-        <xs:enumeration value="B" />
         <xs:enumeration value="A" />
+        <xs:enumeration value="B" />
+        <xs:enumeration value="C" />
+        <xs:enumeration value="D" />
+        <xs:enumeration value="E" />
+        <xs:enumeration value="X" />
       </xs:restriction>
     </xs:simpleType>
   </xs:element>

data/spec/builder_spec.rb

@@ -3,7 +3,232 @@
 require 'spec_helper'
 require "rexml/document"
 include REXML
-RUN_ALL = false
+RUN_ALL = true
+
+# TODO: Add articles which contain these values
+# not done, because it was easy to verify this by running on the command line grep 'LIMPTS' oddb_article.xml | sort | uniq
+ARTICLE_ATTRIBUTE_TESTS =   [
+  ['ARTICLE', 'CREATION_DATETIME', Oddb2xml::DATE_REGEXP],
+  ['ARTICLE', 'PROD_DATE', Oddb2xml::DATE_REGEXP],
+  ['ARTICLE', 'VALID_DATE', Oddb2xml::DATE_REGEXP],
+  ['ARTICLE/ART', 'SHA256', /[a-f0-9]{32}/],
+  ['ARTICLE/ART', 'DT', /\d{4}-\d{2}-\d{2}/],
+]
+
+ARTICLE_MISSING_ELEMENTS =    [
+  ['ARTICLE/ART/LIMPTS', '10'],
+  ['ARTICLE/ART/LIMPTS', '30'],
+  ['ARTICLE/ART/LIMPTS', '40'],
+  ['ARTICLE/ART/LIMPTS', '50'],
+  ['ARTICLE/ART/LIMPTS', '60'],
+  ['ARTICLE/ART/LIMPTS', '80'],
+  ['ARTICLE/ART/LIMPTS', '100'],
+  ['ARTICLE/ART/SLOPLUS', '1'],
+]
+
+ARTICLE_ZURROSE_ELEMENTS =    [
+  ['ARTICLE/ART/REF_DATA', '0'],
+  ['ARTICLE/ART/ARTCOMP/COMPNO', '7601001000858'],
+  ['ARTICLE/ART/ARTPRI/VDAT', Date.today.strftime('%d.%m.%Y')], # TODO:
+  ['ARTICLE/ART/ARTPRI/PTYP', 'PEXF'],
+  ['ARTICLE/ART/ARTPRI/PTYP', 'PPUB'],
+  ['ARTICLE/ART/ARTPRI/PTYP', 'ZURROSE'],
+  ['ARTICLE/ART/ARTPRI/PTYP', 'ZURROSEPUB'],
+  ['ARTICLE/ART/ARTINS/NINCD', '13'],
+  ['ARTICLE/ART/ARTINS/NINCD', '20'],
+]
+
+ARTICLE_COMMON_ELEMENTS =    [
+  ['ARTICLE/ART/REF_DATA', '1'],
+  ['ARTICLE/ART/SMCAT', 'A'],
+  ['ARTICLE/ART/SMCAT', 'B'],
+  ['ARTICLE/ART/SMCAT', 'C'],
+  ['ARTICLE/ART/SMCAT', 'D'],
+  ['ARTICLE/ART/GEN_PRODUCTION', 'X'],
+  ['ARTICLE/ART/DRUG_INDEX', 'd'],
+  ['ARTICLE/ART/INSULIN_CATEGORY', 'Insulinanalog: schnell wirkend'],
+  ['ARTICLE/ART/SMNO', '16105058'],
+  ['ARTICLE/ART/PRODNO', '161051'],
+  ['ARTICLE/ART/VAT', '2'],
+  ['ARTICLE/ART/SALECD', 'A'],
+  ['ARTICLE/ART/SALECD', 'I'],
+  ['ARTICLE/ART/COOL', '1'],
+  ['ARTICLE/ART/LIMPTS', '20'],
+  ['ARTICLE/ART/CDBG', 'Y'],
+  ['ARTICLE/ART/CDBG', 'N'],
+  ['ARTICLE/ART/BG', 'Y'],
+  ['ARTICLE/ART/BG', 'N'],
+  ['ARTICLE/ART/ARTBAR/BC', Oddb2xml::ORPHAN_GTIN.to_s],
+  ['ARTICLE/ART/ARTBAR/BC', Oddb2xml::FRIDGE_GTIN.to_s],
+  ['ARTICLE/ART/DSCRD', 'NAROPIN Inj Lös 0.2 % 5 Polybag 100 ml'],
+  ['ARTICLE/ART/DSCRF', 'NAROPIN sol inj 0.2 % 5 polybag 100 ml"'],
+  ['ARTICLE/ART/SORTD', 'NAROPIN INJ LöS 0.2 % 5 POLYBAG 100 ML'],
+  ['ARTICLE/ART/SORTF', 'NAROPIN SOL INJ 0.2 % 5 POLYBAG 100 ML'],
+  ['ARTICLE/ART/SYN1D', 'Hirudoid'],
+  ['ARTICLE/ART/SYN1F', 'Hirudoid'],
+  ['ARTICLE/ART/SLOPLUS', '2'],
+  ['ARTICLE/ART/ARTINS/NINCD', '10'],
+]
+
+CODE_ATTRIBUTE_TESTS =   [
+  ['CODE', 'CREATION_DATETIME', Oddb2xml::DATE_REGEXP],
+  ['CODE', 'PROD_DATE', Oddb2xml::DATE_REGEXP],
+  ['CODE', 'VALID_DATE', Oddb2xml::DATE_REGEXP],
+  ['CODE/CD', 'DT', ''],
+]
+
+CODE_MISSING_ELEMENT_TESTS = [
+]
+
+CODE_ELEMENT_TESTS = [
+  ['CODE/CD/CDTYP', '11'],
+  ['CODE/CD/CDTYP', '12'],
+  ['CODE/CD/CDTYP', '13'],
+  ['CODE/CD/CDTYP', '14'],
+  ['CODE/CD/CDTYP', '15'],
+  ['CODE/CD/CDTYP', '16'],
+  ['CODE/CD/CDVAL', 'A'],
+  ['CODE/CD/CDVAL', 'B'],
+  ['CODE/CD/CDVAL', 'C'],
+  ['CODE/CD/CDVAL', 'D'],
+  ['CODE/CD/CDVAL', 'E'],
+  ['CODE/CD/CDVAL', 'X'],
+  ['CODE/CD/DSCRSD', 'Kontraindiziert'],
+  ['CODE/CD/DSCRSD', 'Kombination meiden'],
+  ['CODE/CD/DSCRSD', 'Monitorisieren'],
+  ['CODE/CD/DSCRSD', 'Vorsichtsmassnahmen'],
+  ['CODE/CD/DSCRSD', 'keine Massnahmen'],
+  ['CODE/CD/DEL', 'false'],
+]
+
+INTERACTION_ATTRIBUTE_TESTS =   [
+  ['INTERACTION', 'CREATION_DATETIME', Oddb2xml::DATE_REGEXP],
+  ['INTERACTION', 'PROD_DATE', Oddb2xml::DATE_REGEXP],
+  ['INTERACTION', 'VALID_DATE', Oddb2xml::DATE_REGEXP],
+  ['INTERACTION/IX', 'SHA256', /[a-f0-9]{32}/],
+  ['INTERACTION/IX', 'DT', ''],
+]
+
+INTERACTION_MISSING_ELEMENT_TESTS = [
+  ['INTERACTION/IX/EFFD', 'Kombination meiden'],
+  ['INTERACTION/IX/EFFD', 'Kontraindiziert'],
+  ['INTERACTION/IX/EFFD', 'Monitorisieren'],
+  ['INTERACTION/IX/EFFD', 'Vorsichtsmassnahmen'],
+  ['INTERACTION/IX/DEL', 'true'], # Never found???
+]
+
+INTERACTION_ELEMENT_TESTS = [
+  ['INTERACTION/IX/IXNO', '2'],
+  ['INTERACTION/IX/TITD', 'Keine Interaktion'],
+  ['INTERACTION/IX/GRP1D', 'N06AB06'],
+  ['INTERACTION/IX/GRP2D', 'M03BX02'],
+  ['INTERACTION/IX/EFFD', 'Keine Interaktion.'],
+  ['INTERACTION/IX/MECHD', /Tizanidin wird über CYP1A2 metabolisiert/],
+  ['INTERACTION/IX/MEASD', /Die Kombination aus Sertralin und Tizanidin/],
+  ['INTERACTION/IX/DEL', 'false'],
+  ]
+
+LIMITATION_ATTRIBUTE_TESTS =   [
+  ['LIMITATION', 'CREATION_DATETIME', Oddb2xml::DATE_REGEXP],
+  ['LIMITATION', 'PROD_DATE', Oddb2xml::DATE_REGEXP],
+  ['LIMITATION', 'VALID_DATE', Oddb2xml::DATE_REGEXP],
+  ['LIMITATION/LIM', 'SHA256', /[a-f0-9]{32}/],
+  ['LIMITATION/LIM', 'DT', ''],
+]
+
+# Found by  grep LIMTYP oddb_limitation.xml | sort | uniq
+LIMITATION_MISSING_ELEMENT_TESTS = [
+  ['LIMITATION/LIM/SwissmedicNo8', '62089002'],
+  ['LIMITATION/LIM/Pharmacode', '0'],
+  ['LIMITATION/LIM/LIMTYP', 'AUD'],
+  ['LIMITATION/LIM/LIMTYP', 'KOM'],
+  ['LIMITATION/LIM/LIMTYP', 'ZEI'],
+]
+
+LIMITATION_ELEMENT_TESTS = [
+  ['LIMITATION/LIM/LIMVAL', '10'],
+  ['LIMITATION/LIM/LIMVAL', '20'],
+  ['LIMITATION/LIM/LIMVAL', '30'],
+  ['LIMITATION/LIM/LIMVAL', '40'],
+  ['LIMITATION/LIM/LIMVAL', '50'],
+  ['LIMITATION/LIM/LIMVAL', '60'],
+  ['LIMITATION/LIM/LIMVAL', '80'],
+  ['LIMITATION/LIM/LIMVAL', '100'],
+  ['LIMITATION/LIM/IT', '07.02.40.'],
+  ['LIMITATION/LIM/LIMTYP', 'DIA'],
+  ['LIMITATION/LIM/LIMTYP', 'PKT'],
+  ['LIMITATION/LIM/LIMNAMEBAG', '070240'],
+  ['LIMITATION/LIM/LIMNIV', 'IP'],
+  ['LIMITATION/LIM/VDAT', /\d{2}\.\d{2}\.\d{4}/],
+  ['LIMITATION/LIM/DSCRD', /Therapiedauer/],
+  ['LIMITATION/LIM/DSCRF',  /Traitement de la pneumonie/],
+  ['LIMITATION/LIM/SwissmedicNo5', '28486'],
+  ]
+
+SUBSTANCE_ATTRIBUTE_TESTS =   [
+  ['SUBSTANCE', 'CREATION_DATETIME', Oddb2xml::DATE_REGEXP],
+  ['SUBSTANCE', 'PROD_DATE', Oddb2xml::DATE_REGEXP],
+  ['SUBSTANCE', 'VALID_DATE', Oddb2xml::DATE_REGEXP],
+  ['SUBSTANCE/SB', 'SHA256', /[a-f0-9]{32}/],
+  ['SUBSTANCE/SB', 'DT', ''],
+]
+
+SUBSTANCE_MISSING_ELEMENT_TESTS = [
+]
+
+SUBSTANCE_ELEMENT_TESTS = [
+  ['SUBSTANCE/SB/SUBNO', '1'],
+  ['SUBSTANCE/SB/NAML', 'Linezolidum'],
+]
+
+# Betriebe and Medizinalpersonen don't work at the moment
+BETRIEB_ATTRIBUTE_TESTS =   [
+  ['Betriebe', 'CREATION_DATETIME', Oddb2xml::DATE_REGEXP],
+  ['Betriebe', 'PROD_DATE', Oddb2xml::DATE_REGEXP],
+  ['Betriebe', 'VALID_DATE', Oddb2xml::DATE_REGEXP],
+  ['Betriebe/Betrieb', 'DT', ''],
+]
+
+BETRIEB_MISSING_ELEMENT_TESTS = [
+]
+
+BETRIEB_ELEMENT_TESTS = [
+  ['Betriebe/Betrieb/GLN_Betrieb', '974633'],
+  ['Betriebe/Betrieb/Betriebsname_1', 'Betriebsname_1'],
+  ['Betriebe/Betrieb/Betriebsname_2', 'Betriebsname_2'],
+  ['Betriebe/Betrieb/Strasse', 'Strasse'],
+  ['Betriebe/Betrieb/Nummer', 'Nummer'],
+  ['Betriebe/Betrieb/PLZ', 'PLZ'],
+  ['Betriebe/Betrieb/Ort', 'Ort'],
+  ['Betriebe/Betrieb/Bewilligungskanton', 'Bewilligungskanton'],
+  ['Betriebe/Betrieb/Land', 'Land'],
+  ['Betriebe/Betrieb/Betriebstyp', 'Betriebstyp'],
+  ['Betriebe/Betrieb/BTM_Berechtigung', 'BTM_Berechtigung'],
+]
+
+MEDIZINALPERSON_ATTRIBUTE_TESTS =   [
+  ['Personen', 'CREATION_DATETIME', Oddb2xml::DATE_REGEXP],
+  ['Personen', 'PROD_DATE', Oddb2xml::DATE_REGEXP],
+  ['Personen', 'VALID_DATE', Oddb2xml::DATE_REGEXP],
+  ['Personen/Person', 'DT', ''],
+]
+
+MEDIZINALPERSON_MISSING_ELEMENT_TESTS = [
+]
+
+MEDIZINALPERSON_ELEMENT_TESTS = [
+  ['Personen/Person/GLN_Person', '56459'],
+  ['Personen/Person/Name', 'Name'],
+  ['Personen/Person/Vorname', 'Vorname'],
+  ['Personen/Person/PLZ', 'PLZ'],
+  ['Personen/Person/Ort', 'Ort'],
+  ['Personen/Person/Bewilligungskanton', 'Bewilligungskanton'],
+  ['Personen/Person/Land', 'Land'],
+  ['Personen/Person/Bewilligung_Selbstdispensation', 'Bewilligung_Selbstdispensation'],
+  ['Personen/Person/Diplom', 'Diplom'],
+  ['Personen/Person/BTM_Berechtigung', 'BTM_Berechtigung'],
+]
+
 def checkItemForRefdata(doc, pharmacode, isRefdata)
   article = XPath.match( doc, "//ART[PHAR=#{pharmacode.to_s}]").first
   name =     article.elements['DSCRD'].text
@@ -14,6 +239,14 @@ def checkItemForRefdata(doc, pharmacode, isRefdata)
   article
 end
 
+['article', 'betrieb', 'code', 'interaction', 'limitation', 'medizinalperson', 'product', 'substance'].each do |cat|
+  eval "
+    def oddb_#{cat}_xml
+      File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_#{cat}.xml'))
+    end
+  "
+end
+
 def check_article_IGM_format(line, price_kendural=825, add_80_percents=false)
   typ            = line[0..1]
   name           = line[10..59]
@@ -154,7 +387,7 @@ def checkArticleXml(checkERYTHROCIN = true)
 
   erythrocin_gtin = '7680202580475' # picked up from zur rose
   erythrocin = checkAndGetArticleWithGTIN(doc, erythrocin_gtin)
-  expect(erythrocin.elements['DSCRD'].text).to eq("ERYTHROCIN i.v. Trockensub 1000 mg Amp") if checkERYTHROCIN
+  expect(erythrocin.elements['DSCRD'].text).to eq("ERYTHROCIN i.v. Trockensub 1000 mg Amp [!]") if checkERYTHROCIN
 
   lansoyl = checkAndGetArticleWithGTIN(doc, Oddb2xml::LANSOYL_GTIN)
   expect(lansoyl.elements['DSCRD'].text).to eq 'LANSOYL Gel 225 g'
@@ -210,8 +443,8 @@ def checkProductXml
 end
 
 describe Oddb2xml::Builder do
-  NrExtendedArticles = 86
-  NrSubstances = 12
+  NrExtendedArticles = 90
+  NrSubstances = 14
   NrProdno = 23
   NrPackages = 24
   RegExpDesitin = /1125819012LEVETIRACETAM DESITIN Mini Filmtab 250 mg 30 Stk/
@@ -232,13 +465,12 @@ describe Oddb2xml::Builder do
       options = Oddb2xml::Options.new
       # @res = buildr_capture(:stdout){ Oddb2xml::Cli.new(options.opts).run }
       Oddb2xml::Cli.new(options.opts).run # to debug
-      @article_xml = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_article.xml'))
-      @doc = Nokogiri::XML(File.open(@article_xml))
-      @rexml = REXML::Document.new File.read(@article_xml)
+      @doc = Nokogiri::XML(File.open(oddb_article_xml))
+      @rexml = REXML::Document.new File.read(oddb_article_xml)
     end
 
     it 'should return produce a oddb_article.xml' do
-      expect(File.exists?(@article_xml)).to eq true
+      expect(File.exists?(oddb_article_xml)).to eq true
     end
 
     it 'oddb_article.xml should contain a SHA256' do
@@ -247,7 +479,7 @@ describe Oddb2xml::Builder do
     end
 
     it 'should be possible to verify the oddb_article.xml' do
-      result = Oddb2xml.verify_sha256(@article_xml)
+      result = Oddb2xml.verify_sha256(oddb_article_xml)
       expect(result)
     end
 
@@ -255,6 +487,23 @@ describe Oddb2xml::Builder do
       check_validation_via_xsd
     end
 
+    context 'XSD article' do
+      check_attributes(oddb_article_xml, ARTICLE_ATTRIBUTE_TESTS)
+      check_elements(oddb_article_xml, ARTICLE_COMMON_ELEMENTS)
+    end
+
+    context 'XSD betrieb' do
+      skip 'At the moment downloading and extractiong the medreg is broken!'
+      # check_attributes(oddb_betrieb_xml, BETRIEB_ATTRIBUTE_TESTS)
+      # check_elements(oddb_betrieb_xml, BETRIEB_COMMON_ELEMENTS)
+    end
+
+    context 'XSD medizinalperson' do
+      skip 'At the moment downloading and extractiong the medreg is broken!'
+      # check_attributes(oddb_medizinalperson_xml, MEDIZINAPERSON_ATTRIBUTE_TESTS)
+      # check_elements(oddb_medizinalperson_xml, MEDIZINAPERSON_COMMON_ELEMENTS)
+    end
+
     it 'should have a correct insulin (gentechnik) for 7680532900196' do
       expect(XPath.match( @rexml, "//ART/[BC='7680532900196']").size).to eq 1
       expect(XPath.match( @rexml, "//ART//GEN_PRODUCTION").size).to eq 2
@@ -317,7 +566,7 @@ if RUN_ALL
     end
 
     it 'should generate a valid oddb_product.xml' do
-      expect(@res).to match(/products/)
+      expect(@res).to match(/products/) if @res
       checkProductXml
     end
   end
@@ -384,6 +633,12 @@ if RUN_ALL
       checkArticleXml
     end
 
+    context 'XSD' do
+      check_attributes(oddb_article_xml, ARTICLE_ATTRIBUTE_TESTS)
+      check_elements(oddb_article_xml, ARTICLE_COMMON_ELEMENTS)
+      check_elements(oddb_article_xml, ARTICLE_ZURROSE_ELEMENTS)
+    end
+
     it 'should emit a correct oddb_article.xml' do
       checkArticleXml(false)
     end
@@ -413,6 +668,26 @@ if RUN_ALL
       end
     end
 
+    context 'XSD limitation' do
+      check_attributes(oddb_limitation_xml, LIMITATION_ATTRIBUTE_TESTS)
+      check_elements(oddb_limitation_xml, LIMITATION_ELEMENT_TESTS)
+    end
+
+    context 'XSD code' do
+      check_attributes(oddb_code_xml, CODE_ATTRIBUTE_TESTS)
+      check_elements(oddb_code_xml, CODE_ELEMENT_TESTS)
+    end
+
+    context 'XSD interaction' do
+      check_attributes(oddb_interaction_xml, INTERACTION_ATTRIBUTE_TESTS)
+      check_elements(oddb_interaction_xml, INTERACTION_ELEMENT_TESTS)
+    end
+
+    context 'XSD substance' do
+      check_attributes(oddb_substance_xml, SUBSTANCE_ATTRIBUTE_TESTS)
+      check_elements(oddb_substance_xml, SUBSTANCE_ELEMENT_TESTS)
+    end
+
     it 'should emit a correct oddb_article.xml' do
       checkArticleXml
     end
@@ -431,8 +706,8 @@ if RUN_ALL
     end
 
     it 'should generate the flag ORPH for orphan' do
-      doc = REXML::Document.new File.new(checkAndGetArticleXmlName('non-refdata'))
-      orphan = checkAndGetArticleWithGTIN(doc, Oddb2xml::ORPHAN_GTIN)
+      doc = REXML::Document.new File.new(oddb_product_xml)
+      orphan = checkAndGetProductWithGTIN(doc, Oddb2xml::ORPHAN_GTIN)
       expect(orphan).not_to eq nil
       expect(orphan.elements['ORPH'].text).to eq("true")
     end
@@ -526,11 +801,10 @@ if RUN_ALL
     end
 
     it 'should generate the flag SALECD' do
-      @article_xml = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_article.xml'))
-      expect(File.exists?(@article_xml)).to eq true
-      FileUtils.cp(@article_xml, File.join(Oddb2xml::WorkDir, 'tst-SALECD.xml'))
-      article_xml = IO.read(@article_xml)
-      doc = REXML::Document.new File.new(@article_xml)
+      expect(File.exists?(oddb_article_xml)).to eq true
+      FileUtils.cp(oddb_article_xml, File.join(Oddb2xml::WorkDir, 'tst-SALECD.xml'))
+      article_xml = IO.read(oddb_article_xml)
+      doc = REXML::Document.new File.new(oddb_article_xml)
       expect(XPath.match( doc, "//REF_DATA" ).size).to be > 0
       checkItemForSALECD(doc, Oddb2xml::FERRO_GRADUMET_GTIN, 'A') # FERRO-GRADUMET Depottabl 30 Stk
       checkItemForSALECD(doc, Oddb2xml::SOFRADEX_GTIN, 'I') # SOFRADEX
@@ -546,9 +820,8 @@ if RUN_ALL
     end
 
     it 'should add 80 percent to zur_rose pubbprice' do
-      @article_xml = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_article.xml'))
-      expect(File.exists?(@article_xml)).to eq true
-      FileUtils.cp(@article_xml, File.join(Oddb2xml::WorkDir, 'tst-e80.xml'))
+      expect(File.exists?(oddb_article_xml)).to eq true
+      FileUtils.cp(oddb_article_xml, File.join(Oddb2xml::WorkDir, 'tst-e80.xml'))
       checkProductXml
       checkArticleXml
       checkPrices(true)
@@ -558,9 +831,10 @@ if RUN_ALL
       checkProductXml
     end
 
-    it 'should generate a product with the COOL (fridge) attribute' do
-        fridge_product = checkAndGetProductWithGTIN(doc, Oddb2xml::FRIDGE_GTIN)
-        fridge_product.elements['COOL'].text.should == '1'
+    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'
     end
 
     it 'should generate a correct oddb_article.xml' do

data/spec/calc_spec.rb

@@ -611,6 +611,7 @@ Die HILFSSTOFFE sind Aqua ad iniectabilia und Natrii chloridum.
 end
 
 describe Oddb2xml::Calc do
+  @@oddb_calc_xml = File.join(Oddb2xml::WorkDir, 'oddb_calc.xml')
 
   before(:all) do
     @savedDir = Dir.pwd
@@ -621,22 +622,78 @@ describe Oddb2xml::Calc do
     @run_time_options = '--calc --skip-download'
     @options = Oddb2xml::Options.new
     @options.parser.parse!(@run_time_options.split(' '))
-    @oddb_calc_xml = File.join(Oddb2xml::WorkDir, 'oddb_calc.xml')
     @res = buildr_capture(:stdout){ Oddb2xml::Cli.new(@options.opts).run }
-    expect(File.exists?(@oddb_calc_xml)).to eq true
-    @doc = REXML::Document.new File.read(@oddb_calc_xml)
+    expect(File.exists?(@@oddb_calc_xml)).to eq true
+    @doc = REXML::Document.new File.read(@@oddb_calc_xml)
+    @nokogiri = Nokogiri::XML(File.read(@@oddb_calc_xml))
   end
 
   after(:all) do
     Dir.chdir @savedDir if @savedDir and File.directory?(@savedDir)
   end
 
+  context "Verify elements from XSD" do
+    attribute_tests =   [
+      ['ARTICLES', 'CREATION_DATETIME', Oddb2xml::DATE_REGEXP],
+      ['ARTICLES', 'PROD_DATE', Oddb2xml::DATE_REGEXP],
+      ['ARTICLES', 'VALID_DATE', Oddb2xml::DATE_REGEXP],
+      ['ARTICLES/ARTICLE', 'SHA256', /[a-f0-9]{32}/],
+      ]
+
+    check_attributes(@@oddb_calc_xml, attribute_tests)
+
+    element_tests =    [
+      ['ARTICLES/ARTICLE/COMPOSITIONS/COMPOSITION/EXCIPIENS', /.*pro Vitro.*/],
+      ['ARTICLES/ARTICLE/COMPOSITIONS/COMPOSITION/EXCIPIENS', /.Excipiens ad solutionem.*/],
+      ['ARTICLES/ARTICLE/COMPOSITIONS/COMPOSITION/LABEL', 'I'],
+      ['ARTICLES/ARTICLE/COMPOSITIONS/COMPOSITION/LABEL', 'Solvens'],
+      ['ARTICLES/ARTICLE/COMPOSITIONS/COMPOSITION/LABEL_DESCRIPTION', 'Aminosäurenlösung'],
+      ['ARTICLES/ARTICLE/COMPOSITIONS/COMPOSITION/LABEL_DESCRIPTION', 'Fettemulsion'],
+#      ['ARTICLES/ARTICLE/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/DOSE_TEXT', 'mg'],
+      ['ARTICLES/ARTICLE/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/SALTS/SALT/SUBSTANCE_NAME', 'Ceftriaxonum Natricum'],
+      ['ARTICLES/ARTICLE/COMPOSITIONS/COMPOSITION/CORRESP', /4240 kJ pro 1 l/],
+      ['ARTICLES/ARTICLE/COMPOSITIONS/COMPOSITION/CORRESP', /I\) et II\) et III\) corresp.*/],
+      ['ARTICLES/ARTICLE/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/CHEMICAL_SUBSTANCE/DOSE_TEXT', '10-50 mg'],
+      ['ARTICLES/ARTICLE/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/CHEMICAL_SUBSTANCE/MORE_INFO', 'ratio: 1:2-2.8'],
+      ['ARTICLES/ARTICLE/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/CHEMICAL_SUBSTANCE/SUBSTANCE_NAME', 'Levomenolum'],
+      ['ARTICLES/ARTICLE/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/IS_ACTIVE_AGENT', 'false'],
+      ['ARTICLES/ARTICLE/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/IS_ACTIVE_AGENT', 'true'],
+      ['ARTICLES/ARTICLE/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/MORE_INFO', 'conserv.'],
+      ['ARTICLES/ARTICLE/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/MORE_INFO', 'antiox.'],
+      ['ARTICLES/ARTICLE/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/MORE_INFO', 'Praeparatio sicca'],
+      ['ARTICLES/ARTICLE/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/QTY', '100'],
+      ['ARTICLES/ARTICLE/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/QTY', /4\.08/],
+      ['ARTICLES/ARTICLE/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/SUBSTANCE_NAME', 'E 124'],
+      ['ARTICLES/ARTICLE/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/SUBSTANCE_NAME', 'Lamivudinum'],
+      ['ARTICLES/ARTICLE/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/UNIT', 'mg'],
+      ['ARTICLES/ARTICLE/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/UNIT', 'mg'],
+      ['ARTICLES/ARTICLE/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/UNIT', 'µg'],
+      ['ARTICLES/ARTICLE/COMPOSITIONS/COMPOSITION/SUBSTANCES/SUBSTANCE/UNIT', /U\.I\.\/ml/],
+      ['ARTICLES/ARTICLE/GALENIC_FORM', 'Infusionsemulsion'],
+      ['ARTICLES/ARTICLE/GALENIC_FORM', 'Tropfen'],
+      ['ARTICLES/ARTICLE/GALENIC_GROUP', 'Lösungsmittel'],
+      ['ARTICLES/ARTICLE/GALENIC_GROUP', 'Tabletten'],
+      ['ARTICLES/ARTICLE/GTIN', Oddb2xml::FRIDGE_GTIN],
+      ['ARTICLES/ARTICLE/GTIN', Oddb2xml::ORPHAN_GTIN],
+      ['ARTICLES/ARTICLE/MEASURE', 'Suppositorien'],
+      ['ARTICLES/ARTICLE/MEASURE', /Ampulle\(n\)/],
+      ['ARTICLES/ARTICLE/NAME', 'Apligraf'],
+      ['ARTICLES/ARTICLE/NAME', 'Lansoyl, gelée'],
+      ['ARTICLES/ARTICLE/PKG_SIZE', '1'],
+      ['ARTICLES/ARTICLE/PKG_SIZE', '5 x 2500 ml'],
+      ['ARTICLES/ARTICLE/PKG_SIZE', '75 mm'],
+      ['ARTICLES/ARTICLE/SELLING_UNITS', '1'],
+      ['ARTICLES/ARTICLE/SELLING_UNITS', '60'],
+      ['ARTICLES/ARTICLE/SELLING_UNITS', 'unbekannt'],
+      ]
+    check_elements(@@oddb_calc_xml, element_tests)
+  end
   context "when passing #{@run_time_options}" do
     it 'should contain the new fields as per July 2015' do
       #         xml.GEN_PRODUCTION    gen_production
       #          xml.INSULIN_CATEGORY  insulin_category
       #          xml.DRUG_INDEX        drug_index
-      expect(File.exists?(@oddb_calc_xml)).to eq true
+      expect(File.exists?(@@oddb_calc_xml)).to eq true
     end
 
     it 'should create a correct xml and a csv file' do
@@ -652,22 +709,7 @@ describe Oddb2xml::Calc do
       oddb_calc_xsd = File.expand_path(File.join(File.dirname(__FILE__), '..', 'oddb_calc.xsd'))
       expect(File.exists?(oddb_calc_xsd)).to eq true
       xsd = Nokogiri::XML::Schema(File.read(oddb_calc_xsd))
-      doc = Nokogiri::XML(File.read(@oddb_calc_xml))
-      xsd.validate(doc).each do |error|  expect(error).to be_nil end
-    end
-
-    it 'should create correct entries for narotin' do
-      gtin = '7680540151009'
-      ean12 = '7680' + sprintf('%05d',Tst_naropin.iksnr_A) + sprintf('%03d',Tst_naropin.pack_K)
-      ean13 = (ean12 + Oddb2xml.calc_checksum(ean12))
-      expect(ean13).to eq gtin
-
-      Tst_naropin.values_to_compare.each{
-        | key, value |
-          result = XPath.match( @doc, "//ARTICLE[GTIN='#{gtin}']/#{key.to_s.upcase}").first.text
-          puts "Testing key #{key.inspect} #{value.inspect} against #{result} seems to fail" unless result == value.to_s
-          expect(result).to eq value.to_s
-      }
+      xsd.validate(@nokogiri).each do |error|  expect(error).to be_nil end
     end
 
     it 'should create correct entries for narotin' do

data/spec/downloader_spec.rb

@@ -385,6 +385,7 @@ describe Oddb2xml::BagXmlDownloader do
   it_behaves_like 'any downloader'
   context 'when download is called' do
     let(:xml) {
+      VCR.eject_cassette
       VCR.use_cassette('oddb2xml', :tag => :bag_xml) do
         @downloader.download
       end

data/spec/extractor_spec.rb

@@ -4,16 +4,27 @@ require 'spec_helper'
 require "#{Dir.pwd}/lib/oddb2xml/downloader"
 ENV['TZ'] = 'UTC' # needed for last_change
 LAST_CHANGE = "2015-07-03 00:00:00 +0000"
-NR_PACKS = 23
+NR_PACKS = 24
+
+def common_before
+  @savedDir = Dir.pwd
+  Dir.chdir(Oddb2xml::WorkDir)
+  VCR.eject_cassette; VCR.insert_cassette('oddb2xml')
+end
+
+def common_after
+  VCR.eject_cassette
+  Dir.chdir(@savedDir) if @savedDir and File.directory?(@savedDir)
+end
 
 describe Oddb2xml::LppvExtractor do
   before(:all) {
-    VCR.eject_cassette; VCR.insert_cassette('oddb2xml')
+    common_before
     @downloader = Oddb2xml::LppvDownloader.new
     @content = @downloader.download
     @lppvs = Oddb2xml::LppvExtractor.new(@content).to_hash
   }
-  after(:all) { VCR.eject_cassette }
+  after(:all) { common_after }
   it "should have at least one item" do
     expect(@lppvs.size).not_to eq 0
   end
@@ -21,12 +32,12 @@ end
 
 describe Oddb2xml::MigelExtractor do
   before(:all) {
-    VCR.eject_cassette; VCR.insert_cassette('oddb2xml')
+    common_before
     @downloader = Oddb2xml::MigelDownloader.new
     xml = @downloader.download
     @items = Oddb2xml::MigelExtractor.new(xml).to_hash
   }
-  after(:all) { VCR.eject_cassette }
+  after(:all) { common_after }
   it "should have at some items" do
     expect(@items.size).not_to eq 0
     expect(@items.find{|k,v| 3248410 == v[:pharmacode] }).not_to be_nil
@@ -37,8 +48,8 @@ describe Oddb2xml::MigelExtractor do
 end
 
 describe Oddb2xml::RefdataExtractor do
-  before(:all) { VCR.eject_cassette; VCR.insert_cassette('oddb2xml') }
-  after(:all)  { VCR.eject_cassette }
+  before(:all) { common_before }
+  after(:all) { common_after }
   @@last_change = '2015-11-24 00:00:00 +0000'
 
   context 'should handle pharma articles' do
@@ -96,8 +107,8 @@ describe Oddb2xml::RefdataExtractor do
 end
 
 describe Oddb2xml::BagXmlExtractor do
-  before(:all) { VCR.eject_cassette; VCR.insert_cassette('oddb2xml') }
-  after(:all) { VCR.eject_cassette }
+  before(:all) { common_before }
+  after(:all) { common_after }
   context 'should handle articles with and without pharmacode' do
     subject do
       dat = File.read(File.join(Oddb2xml::SpecData, 'Preparations.xml'))
@@ -129,8 +140,8 @@ describe Oddb2xml::BagXmlExtractor do
 end
 
 describe Oddb2xml::SwissmedicInfoExtractor do
-  before(:all) { VCR.eject_cassette; VCR.insert_cassette('oddb2xml') }
-  after(:all) { VCR.eject_cassette }
+  before(:all) { common_before }
+  after(:all) { common_after }
   include ServerMockHelper
   before(:each) do
     @downloader = Oddb2xml::SwissmedicInfoDownloader.new
@@ -153,8 +164,8 @@ describe Oddb2xml::SwissmedicInfoExtractor do
 end
 
 describe Oddb2xml::SwissmedicExtractor do
-  before(:all) { VCR.eject_cassette; VCR.insert_cassette('oddb2xml'); cleanup_directories_before_run }
-  after(:all) { VCR.eject_cassette }
+  before(:all) { common_before; cleanup_directories_before_run  }
+  after(:all) { common_after }
   context 'when transfer.dat is empty' do
     subject { Oddb2xml::SwissmedicInfoExtractor.new("") }
     it { expect(subject.to_hash).to be_empty }
@@ -226,8 +237,8 @@ describe Oddb2xml::SwissmedicExtractor do
 end
 
 describe Oddb2xml::EphaExtractor do
-  before(:all) { VCR.eject_cassette; VCR.insert_cassette('oddb2xml') }
-  after(:all) { VCR.eject_cassette }
+  before(:all) { common_before }
+  after(:all) { common_after }
   context 'can parse epha_interactions.csv' do
     it {
         filename = File.join(Oddb2xml::SpecData, 'epha_interactions.csv')
@@ -239,14 +250,14 @@ describe Oddb2xml::EphaExtractor do
 end
 
 describe Oddb2xml::MedregbmExtractor do
-  # before(:all) { VCR.eject_cassette; VCR.insert_cassette('oddb2xml') }
-  # after(:all) { VCR.eject_cassette }
+  # before(:all) { common_before }
+  # after(:all) { common_after }
   it "pending"
 end
 
 describe Oddb2xml::ZurroseExtractor do
-  before(:all) { VCR.eject_cassette; VCR.insert_cassette('oddb2xml') }
-  after(:all) { VCR.eject_cassette }
+  before(:all) { common_before }
+  after(:all) { common_after }
   context 'when transfer.dat is empty' do
     subject { Oddb2xml::ZurroseExtractor.new("") }
     it { expect(subject.to_hash).to be_empty }

data/spec/spec_helper.rb

@@ -30,6 +30,7 @@ module Oddb2xml
   WorkDir        = File.join(File.dirname(__FILE__), 'run')
   Downloads      = File.join(WorkDir, 'downloads')
   SpecCompressor = File.join(Oddb2xml::SpecData, 'compressor')
+  DATE_REGEXP    = /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}[-+]\d{4}/
 
   GTINS_CALC = [
                   '7680458820202', # for calc_spec.rb
@@ -167,6 +168,41 @@ module ServerMockHelper
   end
 end
 
+def check_elements(xml_name, tests)
+  tests.each do |test|
+    path = test[0]
+    value = test[1]
+    it "should have correct entries #{value} for path #{path}" do
+      found = false
+        Nokogiri::XML(File.read(xml_name)).search(path, nil, nil).each do |x|
+        if value.match(x.text)
+          found= true
+          break
+        end
+      end
+      expect(found).to be true
+    end
+  end
+end
+
+def check_attributes(xml_name, tests)
+  tests.each do |test|
+    path = test[0]
+    attribute = test[1]
+    value = test[2]
+    it "should have correct value #{value} for attribute #{attribute} in #{path}" do
+      found = false
+      Nokogiri::XML(File.read(xml_name)).search(path, nil, nil).each do |x|
+        if value.match(x["#{attribute}"])
+          found= true
+          break
+        end
+      end
+      expect(found).to be true
+    end
+  end
+end
+
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run :focus

metadata

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