oddb2xml 2.3.9 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fca3e8cb403c6b1018420e04b9b1cbcb75c38ba
-  data.tar.gz: c7dd0da5fee78db1d4455f8e3b3cc85509fecfbb
+  metadata.gz: 3ee7a2f5a9b16cb824676ba720cfc37bf14f293d
+  data.tar.gz: 3e75b9996fe29533d5479899630fa5b3e48a05f4
 SHA512:
-  metadata.gz: cacc0a90106da5da0ef3fe85ddde95947aac9a023095b5eed345e4d6c1cd2a88cb55020b9d9fd390f94e17d548265766e73255d3a2e9a342bc61ba578eb1e572
-  data.tar.gz: 4e2ef6fec5b3b7f1544ce1fb7d5322e99ba3af217189388523f2891521818ae5d21cc3516d823254e4d5f517059cd5916ac478a885fdb16dae3d368dc9b85a4d
+  metadata.gz: 2f8d17701b4cd24180ceb9ad11350ffe23b821e39bab8cde731f1e008a49eb52face6cc760c6dfcb76dbdc003260cb5eefbc0557ec68b0cd93b8b9d2443d54a6
+  data.tar.gz: 6157bec8affd1492a2858368bf454dca7e247cfa7bf157e6236a863eba3dcb342968c2376eb1e9f6ff2d1efcd4359c018e61a1b103e94ee584db99d3fb358ffa

data/History.txt

@@ -1,3 +1,7 @@
+=== 2.4.0 /25.08.2016
+
+* Remove transfer.zip in current directory. Added spec tests for downloaded files
+
 === 2.3.9 /23.08.2016
 
 * Get ZurRose data from http://pillbox.oddb.org/TRANSFER.ZIP

data/lib/oddb2xml/downloader.rb

@@ -132,7 +132,9 @@ module Oddb2xml
     include DownloadMethod
     def download
       @url ||= 'https://download.epha.ch/cleaned/matrix.csv'
-      download_as('epha_interactions.csv', 'r')
+      content = download_as('epha_interactions.csv', 'r')
+      FileUtils.rm_f('epha_interactions.csv', :verbose => true)
+      content
     end
   end
   class LppvDownloader < Downloader
@@ -152,7 +154,7 @@ module Oddb2xml
         Oddb2xml.log("ZurroseDownloader #{__LINE__} download #{@url} @url returns #{content.bytes}")
         content
       else
-        file = File.join(WorkDir, 'transfer.zip')
+        file = File.join(Downloads, 'transfer.zip')
         unless Oddb2xml.skip_download(file)
           Oddb2xml.log "ZurroseDownloader #{__LINE__}: #{file}"
           begin
@@ -165,7 +167,7 @@ module Oddb2xml
             Oddb2xml.download_finished(file)
           end
         end
-        read_xml_from_zip(/transfer.dat/, File.join(Downloads, File.basename(file)))
+        read_xml_from_zip(/transfer.dat/, file)
         dest = File.join(Downloads, 'transfer.dat')
         File.open(dest, 'r:iso-8859-1:utf-8').read
       end

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.3.9"
+  VERSION = "2.4.0"
 end

data/spec/builder_spec.rb

@@ -268,11 +268,11 @@ def check_article_IGM_format(line, price_kendural=825, add_80_percents=false)
   if /7680353660163\d$/.match(line) # KENDURAL Depottabl 30 Stk
     puts "found_SL for #{line}" if $VERBOSE
     found_SL = true
-    expect(line[60..65]).to eq '000495'
-    expect(price_exf).to eq 495
+    expect(line[60..65]).to eq '000496'
+    expect(price_exf).to eq 496
     expect(ckzl).to eq '1'
     expect(price_public).to eq price_kendural     # this is a SL-product. Therefore we may not have a price increase
-    expect(line[66..71]).to eq '000'+price_kendural.to_s  # the dat format requires leading zeroes and not point
+    expect(line[66..71]).to eq '000'+sprintf('%03d', price_kendural)  # the dat format requires leading zeroes and not point
   end
 
   if /7680403330459\d$/.match(line) # CARBADERM
@@ -392,7 +392,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'
@@ -616,7 +616,7 @@ if RUN_ALL
       expect(oddb_dat).to match(/^..2/), "should have a record with '2' in CMUT field"
       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) }
+      IO.readlines(dat_filename).each{ |line| check_article_IGM_format(line, 0) }
       m = /.+DIAPHIN Trocke.*7680555610041.+/.match(oddb_dat)
       expect(m[0].size).to eq 97 # size of IGM 1 record
       expect(m[0][74]).to eq '3'
@@ -918,7 +918,7 @@ if RUN_ALL
       expect(oddb_dat).to match(/^..2/), "should have a record with '2' in CMUT field"
       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) }
+      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
@@ -940,7 +940,7 @@ if RUN_ALL
       expect(File.exists?(dat_filename)).to eq true
       oddb_dat = IO.read(dat_filename)
       oddb_dat_lines = IO.readlines(dat_filename)
-      IO.readlines(dat_filename).each{ |line| check_article_IGM_format(line, 891, true) }
+      IO.readlines(dat_filename).each{ |line| check_article_IGM_format(line, 892, true) }
     end
   end
 end

data/spec/cli_spec.rb

@@ -181,9 +181,10 @@ describe Oddb2xml::Cli do
     end
     it 'should create the needed files' do
       expect(@cli_output).to match(/\sPharma\s/)
+      expect(File.exists?(File.join(Oddb2xml::Downloads, 'transfer.zip'))).to eq true
+      expect(File.exists?(File.join(Oddb2xml::WorkDir, 'transfer.zip'))).to eq false
       expected = [
         'duplicate_ean13_from_zur_rose.txt',
-        'transfer.zip',
         'oddb.dat',
       ].each{ |file|
         expect(File.exists?(File.join(Oddb2xml::WorkDir, file))).to eq true

data/spec/data/vcr/transfer.dat

@@ -0,0 +1,41 @@
+1130020209ERYTHROCIN i.v. Trockensub 1000 mg Amp            004137005995300B080160076802025804752
+1120020244FERRO-GRADUMET Depottabl 30 Stk                   000896001380300C060710076803164401152
+1120020273KENDURAL Depottabl 30 Stk                         000496000000100C060710076803536601632
+1130020646SELSUN Shampoo Susp 60 ml                         000911001650300D100400076801723304142
+1130020652SELSUN Shampoo Susp (alt) 120 ml                  001576002430300D100400076801723306812
+1130021806EAU PRECIEUSE D�pensier L�s 375 ml                001220001870300D100600040123461177062
+1125822801EPIMINERAL Paste 20 g                             0043200060004000000000000000000000001
+1125822801EPIMINERAL Paste 20 g                             0043200060004000000000000000000000001
+1125574740ADCETRIS Trockensub 50 mg Durchstf                369513394945101A000000076806213200102
+1120055805TENSOPLAST Kompressionsbinde 5cmx4.5m             0000000015001000000000040428090182881
+1125822801EPIMINERAL Paste 20 g                             0043200060004000000000000000000000001
+1120055834TENSOPLAST Kompressionsbinde 10cmx4.5m            0000000025001000000000040428090184931
+1125822801EPIMINERAL Paste 20 g                             0043200060004000000000000000000000001
+1125822801EPIMINERAL Paste 20 g                             0043200060004000000000000000000000001
+1120058502TUBEGAZE Verband weiss Nr 01 20m Finger Zehen     0000000014201000000000076116004410131
+1120058519TUBEGAZE Verband weiss Nr 12 20m Finger gross     0000000017001000000000076116004410201
+1120058525TUBEGAZE Verband weiss Nr 34 20m Arm Fuss         0000000023201000000000076116004410371
+1122731179HIRUDOID Creme 3 mg/g 40 g                        000477000880100D020820076801610505832
+1130020646SELSUN Shampoo Susp 60 ml                         000911001650300D100400076801723304142
+1120177804ANCOPIR Inj L�s 5 Amp 2 ml                        000337000795100B070240076802848601442
+1120020244FERRO-GRADUMET Depottabl 30 Stk                   000896001380300C060710076803164401152
+1130598003SOFRADEX Gtt Auric 8 ml                           000718001545300B120130076803169501572
+1130023722LANSOYL Gel 225 g                                 001054001625200D040811076803247501902
+1120020273KENDURAL Depottabl 30 Stk                         000496000000100C060710076803536601632
+1133603779CARBADERM Creme Tb 300 ml                         001622002770300D101000076804033304592
+11216999473TC Filmtabl 150 mg 60 Stk                        017201020530100A080300076805366201372
+1122465312ZYVOXID Filmtabl 600 mg 10 Stk                    084173094135100A080190076805555800542
+1125819012LEVETIRACETAM DESITIN Mini Filmtab 250 mg 30 Stk  001349002780100B000000076806206900842
+1121323751MAGNESIUMCHLORID Braun 0.5 molar 10ml Amp 5 Stk   001497002750300B050320076804588202022
+1125822801EPIMINERAL Paste 20 g                             0043200060004000000000000000000000001
+1125822801EPIMINERAL Paste 20 g                             0043200060004000000000000000000000001
+1120850684LIDOCAIN Streuli 1% 20 mg/2ml 10 Amp 2 ml         000556000975300B010220076803001501052
+1120935914ROCEPHIN 500 mg i.v. c Solv Durchstf 5 Stk        006084008160100A080130076804462505922
+1125822801EPIMINERAL Paste 20 g                             0043200060004000000000000000000000001
+1130216094W TROPFEN liq 11.5 g                              000658001080201D100700076801659801142
+1125822801EPIMINERAL Paste 20 g                             0043200060004000000000000000000000001
+1122497134CAVERJECT DC Trockensub 20 mcg Fertspr 2 Stk      003496005420100A059900076805567400752
+1122134986NAROPIN Inj L�s 0.2 % 100ml Polybag 5 Stk         008275010690300B010220076805401510092
+1125822801EPIMINERAL Paste 20 g                             0043200060004000000000000000000000001
+1121699999HUMALOG Inj L�s 100 IE/ml Durchstf 10 ml          003040005130101B070610076805329001962
+1125822801EPIMINERAL Paste 20 g                             0043200060004000000000000000000000001

data/spec/downloader_spec.rb

@@ -262,6 +262,9 @@ end
           expect(File.exist?('oddb_orphan.xls')).to eq(false)
         end
       end
+      it 'should not save into the download directory' do
+        expect(File.exist?(File.join(Oddb2xml::Downloads, 'oddb_orphan.xls'))).to eq(false)
+      end
     end
   end
   context 'package' do
@@ -270,15 +273,16 @@ end
       VCR.insert_cassette('oddb2xml', :tag => :swissmedic, :exclusive => false)
       common_before
       @downloader = Oddb2xml::SwissmedicDownloader.new(:package)
+      @bin = @downloader.download
     end
     after(:each) do common_after end
     context 'download_by for package xls' do
-      let(:bin) {
-        @downloader.download
-      }
       it 'should return valid Binary-String' do
-        expect(bin).to be_a String
-        expect(bin.bytes).not_to be nil
+        expect(@bin).to be_a String
+        expect(@bin.bytes).not_to be nil
+      end
+      it 'should save into the download directory' do
+        expect(File.exist?(File.join(Oddb2xml::Downloads, 'swissmedic_package.xlsx'))).to eq(true)
       end
     end
   end
@@ -305,6 +309,7 @@ describe Oddb2xml::EphaDownloader do
     VCR.insert_cassette('oddb2xml', :tag => :epha)
     @downloader = Oddb2xml::EphaDownloader.new
     common_before
+    @downloader.download
   end
   after(:all) do
     common_after
@@ -321,8 +326,10 @@ describe Oddb2xml::EphaDownloader do
       expect(csv.bytes).not_to be nil
     end
     it 'should clean up current directory' do
-      expect { csv }.not_to raise_error
-      # File.exist?('epha_interactions.csv').should eq(false)
+      File.exist?('epha_interactions.csv').should eq(false)
+    end
+    it 'should save under download' do
+      expect(File.exist?(File.join(Oddb2xml::Downloads, 'epha_interactions.csv'))).to eq(true)
     end
   end
 end
@@ -413,6 +420,7 @@ describe Oddb2xml::MigelDownloader do
     @downloader = Oddb2xml::MigelDownloader.new
     VCR.insert_cassette('oddb2xml', :tag => :migel)
     common_before
+    @downloader.download
   end
   after(:each) do common_after end
 
@@ -436,12 +444,10 @@ describe Oddb2xml::ZurroseDownloader do
   before(:each) do
     VCR.configure do |c|
       c.before_record(:zurrose) do |i|
-        if /zurrose/i.match(i.request.uri)
+        if /pillbox/i.match(i.request.uri)
           puts "#{Time.now}: #{__LINE__}: URI was #{i.request.uri}"
-          lines = i.response.body.clone.split("\n")
-          to_add = lines[0..5]
-          Oddb2xml::GTINS_DRUGS.each{ |ean| to_add << lines.find{ |line| line.index(ean.to_s) || /EPIMINERAL/i.match(line) } }
-          i.response.body = to_add.compact.join("\n")
+          tmp_zip = File.join(Oddb2xml::SpecData, 'vcr', 'transfer.zip')
+          i.response.body = IO.binread(tmp_zip)
           i.response.headers['Content-Length'] = i.response.body.size
         end
       end
@@ -449,6 +455,7 @@ describe Oddb2xml::ZurroseDownloader do
     VCR.insert_cassette('oddb2xml', :tag => :zurrose)
     @downloader = Oddb2xml::ZurroseDownloader.new
     common_before
+    @downloader.download
   end
   after(:each) do common_after end
   
@@ -463,6 +470,11 @@ describe Oddb2xml::ZurroseDownloader do
       expect { dat }.not_to raise_error
       expect(File.exist?('transfer.dat')).to eq(false)
       expect(File.exist?('oddb2xml_zurrose_transfer.dat')).to eq(false)
+      expect(File.exist?('transfer.zip')).to eq(false)
+    end
+    it 'should save into the download directory' do
+      expect(File.exist?(File.join(Oddb2xml::Downloads, 'transfer.zip'))).to eq(true)
+      expect(File.exist?(File.join(Oddb2xml::Downloads, 'transfer.dat'))).to eq(true)
     end
   end
 end
@@ -475,26 +487,32 @@ describe Oddb2xml::MedregbmDownloader do
       c.before_record(:medreg) do |i|
         if /medregbm.admin.ch/i.match(i.request.uri)
           puts "#{Time.now}: #{__LINE__}: URI was #{i.request.uri} containing #{i.response.body.size/(1024*1024)} MB "
-          medreg_dir = File.join(Oddb2xml::WorkDir, 'medreg')
-          FileUtils.makedirs(medreg_dir)
-          xlsx_name = File.join(medreg_dir, /ListBetrieb/.match(i.request.uri) ? 'Betriebe.xlsx' : 'Personen.xlsx')
-          File.open(xlsx_name, 'wb+') { |f| f.write(i.response.body) }
-          puts "#{Time.now}: Openening saved #{xlsx_name} (#{File.size(xlsx_name)} bytes) will take some time. URI was #{i.request.uri}"
-          workbook = RubyXL::Parser.parse(xlsx_name)
-          worksheet = workbook[0]
-          idx = 1; to_delete = []
-          while (worksheet.sheet_data[idx])
-            idx += 1
-            next unless worksheet.sheet_data[idx-1][0]
-            to_delete << (idx-1) unless Oddb2xml::GTINS_MEDREG.index(worksheet.sheet_data[idx-1][0].value.to_i)
-          end
-          if to_delete.size > 0
-            puts "#{Time.now}: Deleting #{to_delete.size} of the #{idx} items will take some time"
-            to_delete.reverse.each{ |row_id|  worksheet.delete_row(row_id) }
-            workbook.write(xlsx_name)
-            i.response.body = IO.binread(xlsx_name)
+          begin
+            medreg_dir = File.join(Oddb2xml::WorkDir, 'medreg')
+            FileUtils.makedirs(medreg_dir)
+            xlsx_name = File.join(medreg_dir, /ListBetrieb/.match(i.request.uri) ? 'Betriebe.xlsx' : 'Personen.xlsx')
+            File.open(xlsx_name, 'wb+') { |f| f.write(i.response.body) }
+            puts "#{Time.now}: Openening saved #{xlsx_name} (#{File.size(xlsx_name)} bytes) will take some time. URI was #{i.request.uri}"
+            workbook = RubyXL::Parser.parse(xlsx_name)
+            worksheet = workbook[0]
+            idx = 1; to_delete = []
+            while (worksheet.sheet_data[idx])
+              idx += 1
+              next unless worksheet.sheet_data[idx-1][0]
+              to_delete << (idx-1) unless Oddb2xml::GTINS_MEDREG.index(worksheet.sheet_data[idx-1][0].value.to_i)
+            end
+            if to_delete.size > 0
+              puts "#{Time.now}: Deleting #{to_delete.size} of the #{idx} items will take some time"
+              to_delete.reverse.each{ |row_id|  worksheet.delete_row(row_id) }
+              workbook.write(xlsx_name)
+              i.response.body = IO.binread(xlsx_name)
+              i.response.headers['Content-Length'] = i.response.body.size
+              puts "#{Time.now}: response.body is now #{i.response.body.size/(1024*1024)} MB  long. #{xlsx_name} was #{File.size(xlsx_name)}"
+            end
+          rescue
+            puts "Creating empty content, as I am unable to parse the XLSX file"
+            i.response.body = ""
             i.response.headers['Content-Length'] = i.response.body.size
-            puts "#{Time.now}: response.body is now #{i.response.body.size/(1024*1024)} MB  long. #{xlsx_name} was #{File.size(xlsx_name)}"
           end
         end
       end
@@ -508,6 +526,7 @@ describe Oddb2xml::MedregbmDownloader do
       VCR.eject_cassette
       VCR.insert_cassette('oddb2xml', :tag => :medreg)
       @downloader = Oddb2xml::MedregbmDownloader.new(:company)
+      @downloader.download
     end
     after(:each) do common_after end
     it_behaves_like 'any downloader'
@@ -578,6 +597,7 @@ describe Oddb2xml::SwissmedicInfoDownloader do
     VCR.insert_cassette('oddb2xml', :tag => :swissmedicInfo)
     common_before
     @downloader = Oddb2xml::SwissmedicInfoDownloader.new
+    @downloader.download
   end
   after(:all) do common_after end
   it_behaves_like 'any downloader'
@@ -596,6 +616,9 @@ describe Oddb2xml::SwissmedicInfoDownloader do
       expect { xml }.not_to raise_error
       expect(File.exist?('swissmedic_info.zip')).to eq(false)
     end
+    it 'should save into the download directory' do
+      expect(File.exist?(File.join(Oddb2xml::Downloads, 'swissmedic_info.zip'))).to eq(true)
+    end
   end
 end