oddb2xml 2.3.8 → 2.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0df0b68570a06023f0f84f78759eba514f5a4b2
-  data.tar.gz: 484b181df37c6813c3c62ea6feeb429dee57aa55
+  metadata.gz: 6fca3e8cb403c6b1018420e04b9b1cbcb75c38ba
+  data.tar.gz: c7dd0da5fee78db1d4455f8e3b3cc85509fecfbb
 SHA512:
-  metadata.gz: c79037072f934cba4a8910756dacf0984dd62d4f059572b50346ab3d0475377452e9c5cafb14f8961b9a88706c9a66d42ff44ef720af16d5d2ce8c7d1f7cb844
-  data.tar.gz: 6f444c348ee935c90d54331ebcdd8736354e00ca9e7aebc5adea2e81f8733c39db1e275001539139d8f03442c57ad75d49009e649903040a00f70275589faeea
+  metadata.gz: cacc0a90106da5da0ef3fe85ddde95947aac9a023095b5eed345e4d6c1cd2a88cb55020b9d9fd390f94e17d548265766e73255d3a2e9a342bc61ba578eb1e572
+  data.tar.gz: 4e2ef6fec5b3b7f1544ce1fb7d5322e99ba3af217189388523f2891521818ae5d21cc3516d823254e4d5f517059cd5916ac478a885fdb16dae3d368dc9b85a4d

data/.travis.yml

@@ -15,6 +15,7 @@ rvm:
   - 2.0.0
   - 2.1
   - 2.2
+  - 2.3.1
   - ruby-head
   
 matrix:

data/History.txt

@@ -1,3 +1,7 @@
+=== 2.3.9 /23.08.2016
+
+* Get ZurRose data from http://pillbox.oddb.org/TRANSFER.ZIP
+
 === 2.3.8 /19.04.2016
 
 * DSCRD/DSCRD for article/product must be between 3 and 120 chars long

data/lib/oddb2xml/downloader.rb

@@ -145,15 +145,29 @@ module Oddb2xml
   class ZurroseDownloader < Downloader
     include DownloadMethod
     def download
-      @url ||= 'http://zurrose.com/fileadmin/main/lib/download.php?file=/fileadmin/user_upload/downloads/ProduktUpdate/IGM11_mit_MwSt/Vollstamm/transfer.dat'
+      @url ||= 'http://pillbox.oddb.org/TRANSFER.ZIP'
       unless @url =~ /^http/
         io = File.open(@url, 'r:iso-8859-1:utf-8')
         content = io.read
         Oddb2xml.log("ZurroseDownloader #{__LINE__} download #{@url} @url returns #{content.bytes}")
-        content   
+        content
       else
-        Oddb2xml.log("ZurroseDownloader #{__LINE__} download #{@url} @url")
-        download_as('zurrose_transfer.dat', 'r:iso-8859-1:utf-8')
+        file = File.join(WorkDir, 'transfer.zip')
+        unless Oddb2xml.skip_download(file)
+          Oddb2xml.log "ZurroseDownloader #{__LINE__}: #{file}"
+          begin
+            response = @agent.get(@url)
+            response.save_as(file)
+            response = nil # win
+          rescue Timeout::Error, Errno::ETIMEDOUT
+            retrievable? ? retry : raise
+          ensure
+            Oddb2xml.download_finished(file)
+          end
+        end
+        read_xml_from_zip(/transfer.dat/, File.join(Downloads, File.basename(file)))
+        dest = File.join(Downloads, 'transfer.dat')
+        File.open(dest, 'r:iso-8859-1:utf-8').read
       end
     end
   end

data/lib/oddb2xml/version.rb

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

data/spec/builder_spec.rb

@@ -608,7 +608,7 @@ if RUN_ALL
       # Oddb2xml::Cli.new(options.opts).run # to debug
     end
 
-    it 'should contain the correct values fo CMUT from zurrose_transfer.dat' do
+    it 'should contain the correct values fo CMUT from transfer.dat' do
       expect(@res).to match(/products/)
       dat_filename = File.join(Oddb2xml::WorkDir, 'oddb.dat')
       expect(File.exists?(dat_filename)).to eq true
@@ -911,7 +911,7 @@ if RUN_ALL
       expect(@res).to match(/products/)
     end
 
-    it 'should contain the correct values fo CMUT from zurrose_transfer.dat' do
+    it 'should contain the correct values fo CMUT from transfer.dat' do
       dat_filename = File.join(Oddb2xml::WorkDir, 'oddb.dat')
       expect(File.exists?(dat_filename)).to eq true
       oddb_dat = IO.read(dat_filename)

data/spec/cli_spec.rb

@@ -183,7 +183,7 @@ describe Oddb2xml::Cli do
       expect(@cli_output).to match(/\sPharma\s/)
       expected = [
         'duplicate_ean13_from_zur_rose.txt',
-        'zurrose_transfer.dat',
+        'transfer.zip',
         'oddb.dat',
       ].each{ |file|
         expect(File.exists?(File.join(Oddb2xml::WorkDir, file))).to eq true

data/spec/downloader_spec.rb

@@ -461,6 +461,7 @@ describe Oddb2xml::ZurroseDownloader do
     end
     it 'should clean up current directory' 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)
     end
   end

data/spec/extractor_spec.rb

@@ -331,7 +331,7 @@ describe Oddb2xml::ZurroseExtractor do
   end
   context 'when parsing examples' do
     subject do
-      filename = File.expand_path(File.join(__FILE__, '..', 'data', 'zurrose_transfer.dat'))
+      filename = File.expand_path(File.join(__FILE__, '..', 'data', 'transfer.dat'))
       Oddb2xml::ZurroseExtractor.new(filename, true)
     end