oddb2xml 2.6.7 → 2.7.2

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.6.7"
+  VERSION = "2.7.2"
 end

data/lib/oddb2xml/xml_definitions.rb

@@ -1,9 +1,9 @@
 # Definitions for the sax-machine parse to parse
 # Preparations.xml
 
-require 'sax-machine'
+require "sax-machine"
 
-Strip_For_Sax_Machine = '<?xml version="1.0" encoding="utf-8"?>'+"\n"
+STRIP_FOR_SAX_MACHINE = '<?xml version="1.0" encoding="utf-8"?>' + "\n"
 
 class PriceElement
   include SAXMachine
@@ -31,8 +31,8 @@ end
 
 class PricesElement
   include SAXMachine
-  element :ExFactoryPrice, :class => PriceElement
-  element :PublicPrice, :class => PriceElement
+  element :ExFactoryPrice, class: PriceElement
+  element :PublicPrice, class: PriceElement
 end
 
 class LimitationElement
@@ -50,7 +50,7 @@ end
 
 class LimitationsElement
   include SAXMachine
-  elements :Limitation, :class => LimitationElement
+  elements :Limitation, class: LimitationElement
 end
 
 class PointLimitationElement
@@ -63,7 +63,7 @@ end
 
 class PointLimitationsElement
   include SAXMachine
-  elements :PointLimitation, :class => PointLimitationElement
+  elements :PointLimitation, class: PointLimitationElement
 end
 
 class PackContent
@@ -79,14 +79,14 @@ class PackContent
   element :FlagModal
   element :BagDossierNo
   element :GTIN
-  element :Limitations, :class => LimitationsElement
-  element :PointLimitations, :class => PointLimitationsElement
-  element :Prices, :class => PricesElement
+  element :Limitations, class: LimitationsElement
+  element :PointLimitations, class: PointLimitationsElement
+  element :Prices, class: PricesElement
 end
 
 class PacksElement
   include SAXMachine
-  elements :Pack, :class => PackContent
+  elements :Pack, class: PackContent
 end
 
 class ItCodeContent
@@ -95,18 +95,18 @@ class ItCodeContent
   element :DescriptionDe
   element :DescriptionFr
   element :DescriptionIt
-  element :Limitations, :class => LimitationsElement
+  element :Limitations, class: LimitationsElement
 end
 
 class ItCodeEntry
   include SAXMachine
-  element :ItCode, :class => ItCodeContent
+  element :ItCode, class: ItCodeContent
 end
 
 # handling attributes as suggested by https://github.com/pauldix/sax-machine/issues/30
 class ItCodesElement
   include SAXMachine
-  elements :ItCode, :class => ItCodeContent
+  elements :ItCode, class: ItCodeContent
 end
 
 class SubstanceElement
@@ -118,7 +118,7 @@ end
 
 class SubstancesElement
   include SAXMachine
-  elements :Substance, :class => SubstanceElement
+  elements :Substance, class: SubstanceElement
 end
 
 class PreparationContent
@@ -127,7 +127,7 @@ class PreparationContent
   element :NameFr
   element :NameDe
   element :NameIt
-  element :Status, :class => StatusElement
+  element :Status, class: StatusElement
   element :Dummy
   element :DescriptionDe
   element :DescriptionFr
@@ -141,29 +141,28 @@ class PreparationContent
   element :CommentFr
   element :CommentIt
   element :VatInEXF
-  element :Limitations, :class => LimitationsElement
-  element :Substances, :class => SubstancesElement
-  element :Packs, :class => PacksElement
-  element :ItCodes, :class => ItCodesElement
+  element :Limitations, class: LimitationsElement
+  element :Substances, class: SubstancesElement
+  element :Packs, class: PacksElement
+  element :ItCodes, class: ItCodesElement
 end
 
 class PreparationEntry
   include SAXMachine
-  element :Preparation, :class => PreparationContent
+  element :Preparation, class: PreparationContent
 end
 
 class PreparationsContent
   include SAXMachine
   attribute :ReleaseDate
-  elements :Preparation, :class => PreparationContent
+  elements :Preparation, class: PreparationContent
 end
 
 class PreparationsEntry
   include SAXMachine
-  element :Preparations, :class => PreparationsContent
+  element :Preparations, class: PreparationsContent
 end
 
-
 class CompElement
   include SAXMachine
   element :NAME
@@ -181,20 +180,20 @@ class ItemContent
   element :DSCR
   element :ADDSCR
   element :ATC
-  element :COMP, :class => CompElement
+  element :COMP, class: CompElement
 end
 
 class PharmaContent
   include SAXMachine
   attribute :CREATION_DATETIME
-  elements :ITEM, :class => ItemContent
+  elements :ITEM, class: ItemContent
 end
 
 class PharmaEntry
   include SAXMachine
   element :CREATION_DATETIME
-  element :NONPHARMA, :as => :PHARMA, :class => PharmaContent
-  element :PHARMA, :class => PharmaContent
+  element :NONPHARMA, as: :PHARMA, class: PharmaContent
+  element :PHARMA, class: PharmaContent
 end
 
 class ItemContent
@@ -208,7 +207,7 @@ class ItemContent
   element :DSCR
   element :ADDSCR
   element :ATC
-  element :COMP, :class => CompElement
+  element :COMP, class: CompElement
 end
 
 class MedicalInformationContent
@@ -225,17 +224,17 @@ end
 
 class MedicalInformationEntry
   include SAXMachine
-  element :medicalInformation, :class => MedicalInformationContent
+  element :medicalInformation, class: MedicalInformationContent
 end
 
 class MedicalInformationsContent
   include SAXMachine
-  elements :medicalInformation, :class => MedicalInformationContent
+  elements :medicalInformation, class: MedicalInformationContent
 end
 
 class MedicalInformationsEntry
   include SAXMachine
-  element :medicalInformations, :class => MedicalInformationsContent
+  element :medicalInformations, class: MedicalInformationsContent
 end
 
 class SwissRegItemContentContent
@@ -256,11 +255,11 @@ end
 class SwissRegArticleContent
   include SAXMachine
   attribute :CREATION_DATETIME
-  elements :ITEM, :class => SwissRegItemContentContent
+  elements :ITEM, class: SwissRegItemContentContent
 end
 
 class SwissRegArticleEntry
   include SAXMachine
   element :CREATION_DATETIME
-  element :ARTICLE, :class => SwissRegArticleContent
+  element :ARTICLE, class: SwissRegArticleContent
 end

data/oddb2xml.gemspec

@@ -1,41 +1,44 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'oddb2xml/version'
+require "oddb2xml/version"
 
 Gem::Specification.new do |spec|
-  spec.name        = "oddb2xml"
-  spec.version     = Oddb2xml::VERSION
-  spec.author      = "Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger"
-  spec.email       = "yasaka@ywesee.com, zdavatz@ywesee.com, ngiger@ywesee.com"
+  spec.name = "oddb2xml"
+  spec.version = Oddb2xml::VERSION
+  spec.author = "Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger"
+  spec.email = "yasaka@ywesee.com, zdavatz@ywesee.com, ngiger@ywesee.com"
   spec.description = "oddb2xml creates xml files using swissINDEX, BAG-XML and Swissmedic."
-  spec.summary     = "oddb2xml creates xml files."
-  spec.homepage    = "https://github.com/zdavatz/oddb2xml"
-  spec.license       = "GPL-3.0"
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.summary = "oddb2xml creates xml files."
+  spec.homepage = "https://github.com/zdavatz/oddb2xml"
+  spec.license = "GPL-3.0"
+  spec.files = `git ls-files -z`.split("\x0")
+  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = ">= 2.2.0"
 
   # We fix the version of the spec to newer versions only in the third position
   # hoping that these version fix only security/severe bugs
   # Consulted the Gemfile.lock to get
-  spec.add_dependency 'rubyzip'#, '~> 1.1.3'
-  spec.add_dependency 'minitar'#, '~> 0.5.2'
-  spec.add_dependency 'mechanize'#, '~> 2.5.1'
-  spec.add_dependency 'nokogiri', '>= 1.8.2'
-  spec.add_dependency 'savon'#, '~> 2.11.0'
-  spec.add_dependency 'spreadsheet'#, '~> 1.0.0'
-  spec.add_dependency 'rubyXL', '~> 3.4.0'
-  spec.add_dependency 'sax-machine'#,  '~> 0.1.0'
-  spec.add_dependency 'parslet'#, '~> 1.7.0'
-  spec.add_dependency 'rubyntlm', '0.5.1'
-  spec.add_dependency 'multi_json'#, '>= 0.3.2'
-  spec.add_dependency 'httpi' #, '>= 2.4.1'
-  spec.add_dependency 'optimist'
-  spec.add_dependency 'xml-simple'
-  spec.add_dependency 'ox'
-  spec.add_dependency 'htmlentities'
+  spec.add_dependency "rubyzip" # , '~> 1.1.3'
+  spec.add_dependency "minitar" # , '~> 0.5.2'
+  spec.add_dependency "mechanize" # , '~> 2.5.1'
+  spec.add_dependency "nokogiri", ">= 1.8.2"
+  spec.add_dependency "savon" # , '~> 2.11.0'
+  spec.add_dependency "spreadsheet" # , '~> 1.0.0'
+  spec.add_dependency "rubyXL", "~> 3.4.0"
+  spec.add_dependency "sax-machine" # ,  '~> 0.1.0'
+  spec.add_dependency "parslet" # , '~> 1.7.0'
+  spec.add_dependency "rubyntlm", "0.5.1"
+  spec.add_dependency "multi_json" # , '>= 0.3.2'
+  spec.add_dependency "httpi" # , '>= 2.4.1'
+  spec.add_dependency "optimist"
+  spec.add_dependency "xml-simple"
+  spec.add_dependency "ox"
+  spec.add_dependency "htmlentities"
+  spec.add_dependency "webrick"
+  spec.add_dependency "rexml"
+  spec.add_dependency "standardrb"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
@@ -46,4 +49,3 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "timecop"
   spec.add_development_dependency "flexmock"
 end
-

data/spec/artikelstamm_spec.rb

@@ -1,22 +1,10 @@
-# encoding: utf-8
-
-require 'spec_helper'
+require "spec_helper"
 require "rexml/document"
-require 'webmock/rspec'
-include REXML
-RUN_ALL = true
+require "webmock/rspec"
 
 describe Oddb2xml::Builder do
-  raise "Cannot rspec in directroy containing a spac" if / /.match(Oddb2xml::SpecData)
-  NrExtendedArticles = 34
-  NrSubstances = 14
-  NrLimitations = 5
-  NrInteractions = 5
-  NrCodes = 5
-  NrProdno = 23
-  NrPackages = 24
-  NrProducts = 19
-  RegExpDesitin = /1125819012LEVETIRACETAM DESITIN Mini Filmtab 250 mg 30 Stk/
+  include REXML
+  raise "Cannot rspec in directroy containing a spac" if / /.match?(Oddb2xml::SpecData)
   include ServerMockHelper
   def check_artikelstamm_xml(key, expected_value)
     expect(@artikelstamm_name).not_to be nil
@@ -24,69 +12,69 @@ describe Oddb2xml::Builder do
     unless @inhalt.index(expected_value)
       puts expected_value
     end
-    binding.pry unless @inhalt.index(expected_value)
+    # binding.pry if defined?(Pry) && !@inhalt.index(expected_value)
     expect(@inhalt.index(expected_value)).not_to be nil
   end
+
   def common_run_init(options = {})
-    @savedDir = Dir.pwd
-    @oddb2xml_xsd = File.expand_path(File.join(File.dirname(__FILE__), '..', 'oddb2xml.xsd'))
-    @oddb_calc_xsd = File.expand_path(File.join(File.dirname(__FILE__), '..', 'oddb_calc.xsd'))
-    @elexis_v5_xsd = File.expand_path(File.join(__FILE__, '..', '..', 'Elexis_Artikelstamm_v5.xsd'))
-    @elexis_v5_csv = File.join(Oddb2xml::WorkDir, "artikelstamm_#{Date.today.strftime('%d%m%Y')}_v5.csv")
+    @saved_dir = Dir.pwd
+    @oddb2xml_xsd = File.expand_path(File.join(File.dirname(__FILE__), "..", "oddb2xml.xsd"))
+    @oddb_calc_xsd = File.expand_path(File.join(File.dirname(__FILE__), "..", "oddb_calc.xsd"))
+    @elexis_v5_xsd = File.expand_path(File.join(__FILE__, "..", "..", "Elexis_Artikelstamm_v5.xsd"))
+    @elexis_v5_csv = File.join(Oddb2xml::WORK_DIR, "artikelstamm_#{Date.today.strftime("%d%m%Y")}_v5.csv")
 
     expect(File.exist?(@oddb2xml_xsd)).to eq true
     expect(File.exist?(@oddb_calc_xsd)).to eq true
     expect(File.exist?(@elexis_v5_xsd)).to eq true
     cleanup_directories_before_run
-    FileUtils.makedirs(Oddb2xml::WorkDir)
-    Dir.chdir(Oddb2xml::WorkDir)
+    FileUtils.makedirs(Oddb2xml::WORK_DIR)
+    Dir.chdir(Oddb2xml::WORK_DIR)
     mock_downloads
   end
 
   after(:all) do
-    Dir.chdir @savedDir if @savedDir and File.directory?(@savedDir)
+    Dir.chdir @saved_dir if @saved_dir && File.directory?(@saved_dir)
   end
-  context 'when artikelstamm option is given' do
+  context "when artikelstamm option is given" do
     before(:all) do
       common_run_init
-      options = Oddb2xml::Options.parse(['--artikelstamm']) # , '--log'])
+      options = Oddb2xml::Options.parse(["--artikelstamm"]) # , '--log'])
       # @res = buildr_capture(:stdout){ Oddb2xml::Cli.new(options).run }
       Oddb2xml::Cli.new(options).run # to debug
-      @artikelstamm_name = File.join(Oddb2xml::WorkDir, "artikelstamm_#{Date.today.strftime('%d%m%Y')}_v5.xml")
+      @artikelstamm_name = File.join(Oddb2xml::WORK_DIR, "artikelstamm_#{Date.today.strftime("%d%m%Y")}_v5.xml")
       @doc = Nokogiri::XML(File.open(@artikelstamm_name))
       # @rexml = REXML::Document.new File.read(@artikelstamm_name)
       @inhalt = IO.read(@artikelstamm_name)
     end
 
-    it 'should exist' do
-      expect(File.exists?(@artikelstamm_name)).to eq true
+    it "should exist" do
+      expect(File.exist?(@artikelstamm_name)).to eq true
     end
 
-    it 'should create transfer.ut8' do
-      expect(File.exists?(File.join(Oddb2xml::Downloads, 'transfer.utf8'))).to eq true
+    it "should create transfer.ut8" do
+      expect(File.exist?(File.join(Oddb2xml::DOWNLOADS, "transfer.utf8"))).to eq true
     end
 
-    it 'should have a comment' do
-      expect(@inhalt).to match /<!--Produced by/
+    it "should have a comment" do
+      expect(@inhalt).to match(/<!--Produced by/)
     end
 
-    it 'should have a GTIN and a public price with 14 chars (ean14)' do
+    it "should have a GTIN and a public price with 14 chars (ean14)" do
+      # Till January 2021 it was possible to find a price via transfer.dat
+      # as the pharmacode was given in the refdata_NonPharma.xml
       expected = %(<ITEM PHARMATYPE="N">
             <GTIN>68711428066649</GTIN>
-            <PHAR>5863450</PHAR>
             <SALECD>A</SALECD>
             <DSCR>3M MEDIPORE+PAD Absorbtionsverb 10x15cm 8 x 25 Stk</DSCR>
             <DSCRF>3M MEDIPORE+PAD compr absorb 10x15cm 8 x 25 pce</DSCRF>
             <COMP>
                 <GLN>7610182000007</GLN>
             </COMP>
-            <PEXF>108.01</PEXF>
-            <PPUB>178.20</PPUB>
         </ITEM>)
       expect(@inhalt.index(expected)).not_to be nil
     end
 
-    it 'should have a ATC for product PRIORIX TETRA' do
+    it "should have a ATC for product PRIORIX TETRA" do
       expected = %(<PRODUCT>
             <PRODNO>5815801</PRODNO>
             <SALECD>A</SALECD>
@@ -97,35 +85,35 @@ describe Oddb2xml::Builder do
       expect(@inhalt.index(expected)).not_to be nil
     end
 
-    it 'should produce a Elexis_Artikelstamm_v5.csv' do
-      expect(File.exists?(@elexis_v5_csv)).to eq true
-      inhalt = File.open(@elexis_v5_csv, 'r+').read
+    it "should produce a Elexis_Artikelstamm_v5.csv" do
+      expect(File.exist?(@elexis_v5_csv)).to eq true
+      inhalt = File.open(@elexis_v5_csv, "r+").read
       expect(inhalt.size).to be > 0
-      expect(inhalt).to match /7680284860144/
+      expect(inhalt).to match(/7680284860144/)
     end
 
-    it 'should NOT generate a v3 nonpharma xml' do
-      v3_name = @artikelstamm_name.sub('_v5.xml', '_v3.xml').sub('artikelstamm_', 'artikelstamm_N_')
+    it "should NOT generate a v3 nonpharma xml" do
+      v3_name = @artikelstamm_name.sub("_v5.xml", "_v3.xml").sub("artikelstamm_", "artikelstamm_N_")
       expect(File.exist?(v3_name)).to eq false
     end
 
-    it 'should NOT generate a vx pharma xml' do
-      v3_name = @artikelstamm_name.sub('_v5.xml', '_v3.xml').sub('artikelstamm_', 'artikelstamm_P_')
+    it "should NOT generate a vx pharma xml" do
+      v3_name = @artikelstamm_name.sub("_v5.xml", "_v3.xml").sub("artikelstamm_", "artikelstamm_P_")
       expect(File.exist?(v3_name)).to eq false
     end
 
-    it 'should contain a LIMITATION_PTS' do
-      expect(@inhalt.index('<LIMITATION_PTS>40</LIMITATION_PTS>')).not_to be nil
+    it "should contain a LIMITATION_PTS" do
+      expect(@inhalt.index("<LIMITATION_PTS>40</LIMITATION_PTS>")).not_to be nil
     end
 
-    it 'should find price from Preparations.xml by setting' do
-      expect(File.exists?(@elexis_v5_csv)).to eq true
-      inhalt = File.open(@elexis_v5_csv, 'r+').read
+    it "should find price from Preparations.xml by setting" do
+      expect(File.exist?(@elexis_v5_csv)).to eq true
+      inhalt = File.open(@elexis_v5_csv, "r+").read
       expected = %(7680658560014,Dibase 10'000 Tropfen 10000 IE/ml Fl 10 ml,,Flasche(n),5,9.25,6585601,A11CC05,,"",,SL)
       expect(inhalt.index(expected)).to be > 0
     end
 
-    it 'should contain a PRODUCT which was not in refdata' do
+    it "should contain a PRODUCT which was not in refdata" do
       expected = %(<PRODUCT>
             <PRODNO>5559401</PRODNO>
             <SALECD>A</SALECD>
@@ -136,12 +124,12 @@ describe Oddb2xml::Builder do
       expect(@inhalt.index(expected)).not_to be nil
     end
 
-    it 'should have a price for Lynparza' do
-      expect(File.exists?(@elexis_v5_csv)).to eq true
-      inhalt = File.open(@elexis_v5_csv, 'r+').read
+    it "should have a price for Lynparza" do
+      expect(File.exist?(@elexis_v5_csv)).to eq true
+      inhalt = File.open(@elexis_v5_csv, "r+").read
       expect(inhalt.index('7680651600014,Lynparza Kaps 50 mg 448 Stk,,Kapsel(n),5562.48,5947.55,6516001,L01XX46,,"",,S')).not_to be nil
     end
-    it 'should trim the ean13 to 13 length' do
+    it "should trim the ean13 to 13 length" do
       gtin14 = "00040565124346"
       expect(gtin14.length).to eq 14
       expected14 = %(<GTIN>#{gtin14}</GTIN>)
@@ -152,41 +140,35 @@ describe Oddb2xml::Builder do
       expect(@inhalt.index(expected13)).not_to be nil
     end
 
-    it 'should not contain a GTIN=0' do
-      expect(@inhalt.index('GTIN>0</GTIN')).to be nil
+    it "should not contain a GTIN=0" do
+      expect(@inhalt.index("GTIN>0</GTIN")).to be nil
     end
 
-    it 'should contain a GTIN starting 0' do
-      expect(@inhalt.index('GTIN>0')).to be > 0
+    it "should contain a GTIN starting 0" do
+      expect(@inhalt.index("GTIN>0")).to be > 0
     end
 
-    it 'should contain a PHAR 4236857 from refdata_NonPharma.xml' do
-      expect(@inhalt.index('<PHAR>4236863</PHAR>')).to be > 0
-      # Marco leaves the 14 GTIN digit in previous importes. As of January 2018 force it to the 13 digits
-      expect(@inhalt.index('<GTIN>0040565124346</GTIN>')).to be > 0
-    end
-
-    it 'should a DSCRF for 4042809018288 TENSOPLAST Kompressionsbinde 5cmx4.5m' do
+    it "should a DSCRF for 4042809018288 TENSOPLAST Kompressionsbinde 5cmx4.5m" do
       skip("Where does the DSCR for 4042809018288 come from. It should be TENSOPLAST bande compression 5cmx4.5m")
     end
 
-    it 'should NOT add GTIN 7680172330414 SELSUN and ean13 start with 7680 (Swissmedic) which is marked as inactive in transfer.dat' do
+    it "should NOT add GTIN 7680172330414 SELSUN and ean13 start with 7680 (Swissmedic) which is marked as inactive in transfer.dat" do
       @inhalt = IO.read(@artikelstamm_name)
-      expect(@inhalt.index('7680172330414')).to be nil
+      expect(@inhalt.index("7680172330414")).to be nil
     end
 
-    it 'should add GTIN 3605520301605 Armani Attitude which is marked as inactive in transfer.dat' do
+    it "should add GTIN 3605520301605 Armani Attitude which is marked as inactive in transfer.dat" do
       @inhalt = IO.read(@artikelstamm_name)
-      expect(@inhalt.index('3605520301605')).not_to be nil
+      expect(@inhalt.index("3605520301605")).not_to be nil
     end
 
-    it 'should add BIOMARIS Voll Meersalz which is marked as inactive in transfer.dat but has PPUB and PEXF' do
+    it "should add BIOMARIS Voll Meersalz which is marked as inactive in transfer.dat but has PPUB and PEXF" do
       @inhalt = IO.read(@artikelstamm_name)
-      expect(@inhalt.index('BIOMARIS Voll Meersalz 500 g')).not_to be nil
+      expect(@inhalt.index("BIOMARIS Voll Meersalz 500 g")).not_to be nil
     end
 
-    it 'Should not contain PHAR 8809544 Sildenavil with pexf and ppub 0.0' do
-#1128809544Sildenafil Suspension 7mg/ml 100ml                0030850045801000000000000000000000002
+    it "Should not contain PHAR 8809544 Sildenavil with pexf and ppub 0.0" do
+      # 1128809544Sildenafil Suspension 7mg/ml 100ml                0030850045801000000000000000000000002
       @inhalt = IO.read(@artikelstamm_name)
       expected = %(<ITEM PHARMATYPE="N">
             <GTIN>9999998809544</GTIN>
@@ -200,23 +182,21 @@ describe Oddb2xml::Builder do
       expect(@inhalt.index(expected)).to be nil
     end
 
-    it 'should a company EAN for 4042809018288 TENSOPLAST Kompressionsbinde 5cmx4.5m' do
+    it "should a company EAN for 4042809018288 TENSOPLAST Kompressionsbinde 5cmx4.5m" do
       skip("Where does the COMP GLN for 4042809018288 come from. It should be 7601003468441")
     end
 
-    it 'shoud contain Lamivudinum as 3TC substance' do
-      expect(@inhalt.index('<SUBSTANCE>Lamivudinum</SUBSTANCE>')).not_to be nil
+    it "shoud contain Lamivudinum as 3TC substance" do
+      expect(@inhalt.index("<SUBSTANCE>Lamivudinum</SUBSTANCE>")).not_to be nil
     end
 
-    it 'shoud contain GENERIC_TYPE' do
-      expect(@inhalt.index('<GENERIC_TYPE')).not_to be nil
+    it "shoud contain GENERIC_TYPE" do
+      expect(@inhalt.index("<GENERIC_TYPE")).not_to be nil
     end
 
-    it 'should contain DIBASE with phar' do
+    it "should contain DIBASE with phar" do
       expected = %(<ITEM PHARMATYPE="P">
             <GTIN>7680658560014</GTIN>
-            <!--obsolete override-->
-            <PHAR>7199565</PHAR>
             <SALECD>A</SALECD>
             <DSCR>Dibase 10'000 Tropfen 10000 IE/ml Fl 10 ml</DSCR>
             <DSCRF>Dibase 10'000 gouttes 10000 UI/ml fl 10 ml</DSCRF>
@@ -238,18 +218,17 @@ describe Oddb2xml::Builder do
       expect(@inhalt.index(expected)).not_to be nil
     end
 
-    it 'should contain PEVISONE Creme 30 g' do
-      expect(@inhalt.index('Pevisone Creme 15 g')).not_to be nil # 7680406620144
-      expect(@inhalt.index('Pevisone Creme 30 g')).not_to be nil # 7680406620229
+    it "should contain PEVISONE Creme 30 g" do
+      expect(@inhalt.index("Pevisone Creme 15 g")).not_to be nil # 7680406620144
+      expect(@inhalt.index("Pevisone Creme 30 g")).not_to be nil # 7680406620229
       # Should also check for price!
     end
-    it 'should validate against artikelstamm.xsd' do
+    it "should validate against artikelstamm.xsd" do
       validate_via_xsd(@elexis_v5_xsd, @artikelstamm_name)
     end
-      tests = { 'item 7680403330459 CARBADERM only in Preparations(SL) with public price' =>
-        %(<ITEM PHARMATYPE="P">
+    tests = {"item 7680403330459 CARBADERM only in Preparations(SL) with public price" =>
+      %(<ITEM PHARMATYPE="P">
             <GTIN>7680403330459</GTIN>
-            <PHAR>3603779</PHAR>
             <SALECD>A</SALECD>
             <DSCR>Carbaderm Creme Tb 300 ml</DSCR>
             <DSCRF>Carbaderm crème tb 300 ml</DSCRF>
@@ -259,8 +238,8 @@ describe Oddb2xml::Builder do
             <IKSCAT>D</IKSCAT>
             <DEDUCTIBLE>10</DEDUCTIBLE>
         </ITEM>),
-        'item 4042809018288 TENSOPLAST' =>
-      %(<ITEM PHARMATYPE="N">
+             "item 4042809018288 TENSOPLAST" =>
+    %(<ITEM PHARMATYPE="N">
             <GTIN>4042809018288</GTIN>
             <PHAR>0055805</PHAR>
             <SALECD>A</SALECD>
@@ -269,9 +248,8 @@ describe Oddb2xml::Builder do
             <PEXF>0.00</PEXF>
             <PPUB>22.95</PPUB>
         </ITEM>),
-         'product 3247501 LANSOYL' => '<ITEM PHARMATYPE="P">
+             "product 3247501 LANSOYL" => '<ITEM PHARMATYPE="P">
             <GTIN>7680324750190</GTIN>
-            <PHAR>0023722</PHAR>
             <SALECD>A</SALECD>
             <DSCR>LANSOYL Gel 225 g</DSCR>
             <DSCRF>LANSOYL gel 225 g</DSCRF>
@@ -279,6 +257,8 @@ describe Oddb2xml::Builder do
                 <NAME>Actipharm SA</NAME>
                 <GLN>7601001002012</GLN>
             </COMP>
+            <PEXF>10.54</PEXF>
+            <PPUB>16.25</PPUB>
             <PKG_SIZE>225</PKG_SIZE>
             <MEASURE>g</MEASURE>
             <MEASUREF>g</MEASUREF>
@@ -287,10 +267,9 @@ describe Oddb2xml::Builder do
             <LPPV>true</LPPV>
             <PRODNO>3247501</PRODNO>
         </ITEM>',
-        'product 5366201 3TC' =>
-      %(<ITEM PHARMATYPE="P">
+             "product 5366201 3TC" =>
+    %(<ITEM PHARMATYPE="P">
             <GTIN>7680536620137</GTIN>
-            <PHAR>1699947</PHAR>
             <SALECD>A</SALECD>
             <DSCR>3TC Filmtabl 150 mg 60 Stk</DSCR>
             <DSCRF>3TC cpr pell 150 mg 60 pce</DSCRF>
@@ -311,10 +290,9 @@ describe Oddb2xml::Builder do
             <DEDUCTIBLE>10</DEDUCTIBLE>
             <PRODNO>5366201</PRODNO>
         </ITEM>),
-        'item 7680161050583 HIRUDOID 40g' =>
-         %(<ITEM PHARMATYPE="P">
+             "item 7680161050583 HIRUDOID 40g" =>
+       %(<ITEM PHARMATYPE="P">
             <GTIN>7680161050583</GTIN>
-            <PHAR>2731179</PHAR>
             <SALECD>A</SALECD>
             <DSCR>Hirudoid Creme 3 mg/g 40 g</DSCR>
             <DSCRF>Hirudoid crème 3 mg/g 40 g</DSCRF>
@@ -333,10 +311,9 @@ describe Oddb2xml::Builder do
             <DEDUCTIBLE>10</DEDUCTIBLE>
             <PRODNO>1610501</PRODNO>
         </ITEM>),
-        'item 7680161050743 Hirudoid Creme 3 mg/g 100 g' =>
-              %( <ITEM PHARMATYPE="P">
+             "item 7680161050743 Hirudoid Creme 3 mg/g 100 g" =>
+            %( <ITEM PHARMATYPE="P">
             <GTIN>7680161050743</GTIN>
-            <PHAR>2731179</PHAR>
             <SALECD>A</SALECD>
             <DSCR>Hirudoid Creme 3 mg/g 100 g</DSCR>
             <DSCRF>Hirudoid crème 3 mg/g 100 g</DSCRF>
@@ -350,9 +327,8 @@ describe Oddb2xml::Builder do
             <IKSCAT>D</IKSCAT>
             <DEDUCTIBLE>10</DEDUCTIBLE>
         </ITEM>),
-        'item 7680284860144 ANCOPIR' =>'<ITEM PHARMATYPE="P">
+             "item 7680284860144 ANCOPIR" => '<ITEM PHARMATYPE="P">
             <GTIN>7680284860144</GTIN>
-            <PHAR>0177804</PHAR>
             <SALECD>A</SALECD>
             <DSCR>ANCOPIR Inj Lös 5 Amp 2 ml</DSCR>
             <DSCRF>Ancopir, sol inj</DSCRF>
@@ -372,9 +348,8 @@ describe Oddb2xml::Builder do
             <DEDUCTIBLE>10</DEDUCTIBLE>
             <PRODNO>2848601</PRODNO>
         </ITEM>',
-                'FERRO-GRADUMET price from ZurRose  ' => %(<ITEM PHARMATYPE="P">
+             "FERRO-GRADUMET price from ZurRose  " => %(<ITEM PHARMATYPE="P">
             <GTIN>7680316440115</GTIN>
-            <PHAR>0020244</PHAR>
             <SALECD>A</SALECD>
             <DSCR>FERRO-GRADUMET Depottabl 30 Stk</DSCR>
             <DSCRF>FERRO-GRADUMET cpr dépôt 30 pce</DSCRF>
@@ -392,7 +367,7 @@ describe Oddb2xml::Builder do
             <IKSCAT>C</IKSCAT>
             <PRODNO>3164402</PRODNO>
         </ITEM>),
-      'product 3TC Filmtabl' => %(<PRODUCT>
+             "product 3TC Filmtabl" => %(<PRODUCT>
             <PRODNO>5366201</PRODNO>
             <SALECD>A</SALECD>
             <DSCR>3TC Filmtabl 150 mg</DSCR>
@@ -400,9 +375,8 @@ describe Oddb2xml::Builder do
             <ATC>J05AF05</ATC>
             <SUBSTANCE>Lamivudinum</SUBSTANCE>
         </PRODUCT>),
-        'nur aus Packungen Coeur-Vaisseaux Sérocytol,' => %(<ITEM PHARMATYPE="P">
+             "nur aus Packungen Coeur-Vaisseaux Sérocytol," => %(<ITEM PHARMATYPE="P">
             <GTIN>7680002770014</GTIN>
-            <PHAR>0361815</PHAR>
             <SALECD>A</SALECD>
             <DSCR>SEROCYTOL Herz-Gefässe Supp 3 Stk</DSCR>
             <DSCRF>SEROCYTOL Coeur-Vaisseaux supp 3 pce</DSCRF>
@@ -417,9 +391,8 @@ describe Oddb2xml::Builder do
             <IKSCAT>B</IKSCAT>
             <PRODNO>0027701</PRODNO>
         </ITEM>),
-        'HUMALOG (Richter)' => %(<ITEM PHARMATYPE="P">
+             "HUMALOG (Richter)" => %(<ITEM PHARMATYPE="P">
             <GTIN>7680532900196</GTIN>
-            <PHAR>1699999</PHAR>
             <SALECD>A</SALECD>
             <DSCR>Humalog Inj Lös Durchstf 10 ml</DSCR>
             <DSCRF>Humalog sol inj flac 10 ml</DSCRF>
@@ -439,14 +412,51 @@ describe Oddb2xml::Builder do
             <DEDUCTIBLE>20</DEDUCTIBLE>
             <PRODNO>5329001</PRODNO>
         </ITEM>),
-        'Chapter 70 product' => %(<PRODUCT>
+             "Kolon with Pharmacode for EAN 7680002780013" => %(<ITEM PHARMATYPE="P">
+            <GTIN>7680002780013</GTIN>
+            <PHAR>0361821</PHAR>
+            <SALECD>I</SALECD>
+            <DSCR>SEROCYTOL Kolon Supp 3 Stk</DSCR>
+            <DSCRF>SEROCYTOL Côlon supp 3 pce</DSCRF>
+            <COMP>
+                <GLN>7640128710004</GLN>
+            </COMP>
+            <PEXF>22.75</PEXF>
+            <PPUB>39.60</PPUB>
+        </ITEM>),
+             "Varilrix product" => %(<PRODUCT>
+            <PRODNO>0058501</PRODNO>
+            <SALECD>A</SALECD>
+            <DSCR>Varilrix Trockensub c solv</DSCR>
+            <DSCRF>Varilrix subst sèche c solv</DSCRF>
+            <ATC>J07BK01</ATC>
+            <LIMNAMEBAG>0808</LIMNAMEBAG>
+            <SUBSTANCE>Vaccinum virus varicellae vivus attenuat. (Stamm OKA)</SUBSTANCE>
+        </PRODUCT>),
+             "Varilrix item" => %(<ITEM PHARMATYPE="P">
+            <GTIN>7680005850010</GTIN>
+            <SALECD>A</SALECD>
+            <DSCR>Varilrix Trockensub c solv Fertspr 0.500 ml</DSCR>
+            <DSCRF>Varilrix subst sèche c solv ser prê 0.500 ml</DSCRF>
+            <COMP>
+                <NAME>GlaxoSmithKline AG</NAME>
+                <GLN>7601001000674</GLN>
+            </COMP>
+            <PEXF>43.64</PEXF>
+            <PPUB>66.5</PPUB>
+            <SL_ENTRY>true</SL_ENTRY>
+            <IKSCAT>B</IKSCAT>
+            <DEDUCTIBLE>10</DEDUCTIBLE>
+            <PRODNO>0058501</PRODNO>
+        </ITEM),
+             "Chapter 70 product" => %(<PRODUCT>
             <PRODNO>2069639</PRODNO>
-            <!--Chapter70 hack-->
+            <!--Chapter70 hack prodno 2069639 Ceres Urtinkturen gemäss L2 mit - im Kommentar-->
             <SALECD>A</SALECD>
-            <DSCR>Ceres Urtinkturen gemäss L2</DSCR>
+            <DSCR>Ceres Urtinkturen gemäss L2 mit -- im Kommentar</DSCR>
             <DSCRF/>
         </PRODUCT>),
-        'Chapter 70 item' => %(<ITEM PHARMATYPE="P">
+             "Chapter 70 item" => %(<ITEM PHARMATYPE="P">
             <GTIN>2500000588532</GTIN>
             <PHAR>2069639</PHAR>
             <SALECD>A</SALECD>
@@ -454,38 +464,35 @@ describe Oddb2xml::Builder do
             <DSCRF>--missing--</DSCRF>
             <PEXF>23.44</PEXF>
             <PPUB>31.30</PPUB>
-            <!--Chapter70 hack-->
+            <!--Chapter70 hack 2500000588532 EINF ARZNEI Ceres Urtinktur spez 20ml-->
             <SL_ENTRY>true</SL_ENTRY>
             <PRODNO>2069639</PRODNO>
-            <Chapter70_HACK>true</Chapter70_HACK>
         </ITEM>),
-        'HTML-encoded limitation' => %(<DSCR>Zur Erhaltungstherapie (Monotherapie) bei erwachsenen Patientinnen mit rezidiviertem, fortgeschrittenem Ovarialkarzinom mit BRCA Mutation im Anschluss an eine platinhaltige Chemotherapie bei Vorliegen einer kompletten oder partiellen Remission.
+             "HTML-encoded limitation" => %(<DSCR>Zur Erhaltungstherapie (Monotherapie) bei erwachsenen Patientinnen mit rezidiviertem, fortgeschrittenem Ovarialkarzinom mit BRCA Mutation im Anschluss an eine platinhaltige Chemotherapie bei Vorliegen einer kompletten oder partiellen Remission.
 
 Der behandelnde Arzt ist verpflichtet, die erforderlichen Daten laufend im vorgegebenen Internettool des Registers, abrufbar auf http://www.olaparib-registry.ch, zu erfassen. Eine schriftliche Einwilligung der Patientin muss vorliegen. Es sind folgende Daten zu erfassen:
 
 1\)	Geburtsjahr, sowie Vortherapien für das OC
 
 2\)	Datum Therapiestart, Dosierung, Dosisanpassungen, Datum Therapieende.
-</DSCR>),
-              }
+</DSCR>)}
 
-      tests.each do |key, expected|
-        it "should a valid entry for #{key}" do
-          check_artikelstamm_xml(key, expected)
-        end
+    tests.each do |key, expected|
+      it "should a valid entry for #{key}" do
+        check_artikelstamm_xml(key, expected)
       end
+    end
   end
-  context 'chapter 70 hack' do
+  context "chapter 70 hack" do
     before(:all) do
       mock_downloads
     end
-    it 'parsing' do
-      require 'oddb2xml/chapter_70_hack'
-      result = Oddb2xml::Chapter70xtractor.parse()
+    it "parsing" do
+      require "oddb2xml/chapter_70_hack"
+      result = Oddb2xml::Chapter70xtractor.parse
       expect(result.class).to eq Array
       expect(result.first).to eq ["2069562", "70.01.10", "Urtinktur", "1--10 g/ml", "13.40", ""]
-      expect(result.last).to eq  ["6516727", "70.02", "Allergenorum extractum varium / Inj. Susp. \tFortsetzungsbehandlung", "1 Durchstfl 1.5 ml", "311.85", "L"]
+      expect(result.last).to eq ["6516727", "70.02", "Allergenorum extractum varium / Inj. Susp. \tFortsetzungsbehandlung", "1 Durchstfl 1.5 ml", "311.85", "L"]
     end
-
   end
 end