oddb2xml 2.2.6 → 2.2.7

data/spec/downloader_spec.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require 'spec_helper'
+require "rexml/document"
 
 VCR.eject_cassette # we use insert/eject around each example
 
@@ -60,7 +61,7 @@ shared_examples_for 'any downloader' do
     expect {
       Array.new(3).map do
         Thread.new do
-          @downloader.send(:retrievable?).should be(true)
+          expect(@downloader.send(:retrievable?)).to be(true)
         end
       end.map(&:join)
     }.to change {
@@ -155,13 +156,13 @@ describe Oddb2xml::RefdataDownloader do
     it_behaves_like 'any downloader'
     context 'when download_by is called' do
       it 'should parse response hash to xml' do
-        @xml.should be_a String
-        @xml.length.should_not == 0
-        @xml.should =~ XML_VERSION_1_0
+        expect(@xml).to be_a String
+        expect(@xml.length).not_to eq(0)
+        expect(@xml).to match(XML_VERSION_1_0)
       end
       it 'should return valid xml' do
-        @xml.should =~ /PHAR/
-        @xml.should =~ /ITEM/
+        expect(@xml).to match(/PHAR/)
+        expect(@xml).to match(/ITEM/)
       end
     end
   end
@@ -174,13 +175,13 @@ describe Oddb2xml::RefdataDownloader do
     end
     context 'when download_by is ' do
       it 'should parse response hash to xml' do
-        @xml.should be_a String
-        @xml.length.should_not == 0
-        @xml.should =~ XML_VERSION_1_0
+        expect(@xml).to be_a String
+        expect(@xml.length).not_to eq(0)
+        expect(@xml).to match(XML_VERSION_1_0)
       end
       it 'should return valid xml' do
-        @xml.should =~ /NONPHAR/
-        @xml.should =~ /ITEM/
+        expect(@xml).to match(/NONPHAR/)
+        expect(@xml).to match(/ITEM/)
       end
     end
   end
@@ -250,14 +251,14 @@ end
       }
       it 'should return valid Binary-String' do
         # unless [:orphan, :package].index(@downloader.type)
-          bin.should be_a String
-          bin.bytes.should_not nil
+          expect(bin).to be_a String
+          expect(bin.bytes).not_to be nil
         # end
       end
       it 'should clean up current directory' do
         unless [:orphan, :package].index(@downloader.type)
           expect { bin }.not_to raise_error
-          File.exist?('oddb_orphan.xls').should eq(false)
+          expect(File.exist?('oddb_orphan.xls')).to eq(false)
         end
       end
     end
@@ -275,8 +276,8 @@ end
         @downloader.download
       }
       it 'should return valid Binary-String' do
-        bin.should be_a String
-        bin.bytes.should_not nil
+        expect(bin).to be_a String
+        expect(bin.bytes).not_to be nil
       end
     end
   end
@@ -293,8 +294,8 @@ end
         @downloader.download
       }
       it 'should return valid Binary-String' do
-        bin.should be_a String
-        bin.bytes.should_not nil
+        expect(bin).to be_a String
+        expect(bin.bytes).not_to be nil
       end
     end
   end
@@ -333,8 +334,8 @@ describe Oddb2xml::EphaDownloader do
       @downloader.download
     }
     it 'should read csv as String' do
-      csv.should be_a String
-      csv.bytes.should_not nil
+      expect(csv).to be_a String
+      expect(csv.bytes).not_to be nil
     end
     it 'should clean up current directory' do
       expect { csv }.not_to raise_error
@@ -389,13 +390,13 @@ describe Oddb2xml::BagXmlDownloader do
       end
     }
     it 'should parse zip to string' do
-      xml.should be_a String
-      xml.length.should_not == 0
+      expect(xml).to be_a String
+      expect(xml.length).not_to eq(0)
     end
     it 'should return valid xml' do
-      xml.should =~ XML_VERSION_1_0
-      xml.should =~ /Preparations/
-      xml.should =~ /DescriptionDe/
+      expect(xml).to match(XML_VERSION_1_0)
+      expect(xml).to match(/Preparations/)
+      expect(xml).to match(/DescriptionDe/)
     end
   end
 end
@@ -415,8 +416,8 @@ describe Oddb2xml::LppvDownloader do
   context 'when download is called' do
     let(:txt) { @downloader.download }
     it 'should read txt as String' do
-      @text.should be_a String
-      @text.bytes.should_not nil
+      expect(@text).to be_a String
+      expect(@text.bytes).not_to be nil
     end
   end
 end
@@ -435,12 +436,12 @@ describe Oddb2xml::MigelDownloader do
     context 'when download is called' do
     let(:bin) { @downloader.download }
     it 'should read xls as Binary-String' do
-      bin.should be_a String
-      bin.bytes.should_not nil
+      expect(bin).to be_a String
+      expect(bin.bytes).not_to be nil
     end
     it 'should clean up current directory' do
       expect { bin }.not_to raise_error
-      File.exist?('oddb2xml_files_nonpharma.txt').should eq(false)
+      expect(File.exist?('oddb2xml_files_nonpharma.txt')).to eq(false)
     end
   end
 end
@@ -471,12 +472,12 @@ describe Oddb2xml::ZurroseDownloader do
   context 'when download is called' do
     let(:dat) { @downloader.download }
     it 'should read dat as String' do
-      dat.should be_a String
-      dat.bytes.should_not nil
+      expect(dat).to be_a String
+      expect(dat.bytes).not_to be nil
     end
     it 'should clean up current directory' do
       expect { dat }.not_to raise_error
-      File.exist?('oddb2xml_zurrose_transfer.dat').should eq(false)
+      expect(File.exist?('oddb2xml_zurrose_transfer.dat')).to eq(false)
     end
   end
 end
@@ -528,12 +529,14 @@ describe Oddb2xml::MedregbmDownloader do
     context 'download betrieb txt' do
       let(:txt) { @downloader.download }
       it 'should return valid String' do
-        txt.should be_a String
-        txt.bytes.should_not nil
+        pending 'Should handle SSL issues'
+        expect(txt).to be_a String
+        expect(txt.bytes).not_to be nil
       end
       it 'should clean up current directory' do
+        pending 'Should handle SSL issues'
         expect { txt }.not_to raise_error
-        File.exist?('oddb_company.xls').should eq(false)
+        expect(File.exist?('oddb_company.xls')).to eq(false)
       end
     end
   end
@@ -551,12 +554,14 @@ describe Oddb2xml::MedregbmDownloader do
         @downloader.download
       }
       it 'should return valid String' do
-        txt.should be_a String
-        txt.bytes.should_not nil
+        pending 'Should handle SSL issues'
+        expect(txt).to be_a String
+        expect(txt.bytes).not_to be nil
       end
       it 'should clean up current directory' do
+        pending 'Should handle SSL issues'
         expect { txt }.not_to raise_error
-        File.exist?('oddb_person.xls').should eq(false)
+        expect(File.exist?('oddb_person.xls')).to eq(false)
       end
     end
   end
@@ -594,17 +599,17 @@ describe Oddb2xml::SwissmedicInfoDownloader do
   context 'when download is called' do
     let(:xml) { @downloader.download  }
     it 'should parse zip to String' do
-      xml.should be_a String
-      xml.length.should_not == 0
+      expect(xml).to be_a String
+      expect(xml.length).not_to eq(0)
     end
     it 'should return valid xml' do
-      xml.should =~ XML_VERSION_1_0
-      xml.should =~ /medicalInformations/
-      xml.should =~ /content/
+      expect(xml).to match(XML_VERSION_1_0)
+      expect(xml).to match(/medicalInformations/)
+      expect(xml).to match(/content/)
     end
     it 'should clean up current directory' do
       expect { xml }.not_to raise_error
-      File.exist?('swissmedic_info.zip').should eq(false)
+      expect(File.exist?('swissmedic_info.zip')).to eq(false)
     end
   end
 end

data/spec/extractor_spec.rb

@@ -4,7 +4,7 @@ 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 = 17
+NR_PACKS = 23
 
 describe Oddb2xml::LppvExtractor do
   before(:all) {
@@ -39,7 +39,7 @@ end
 describe Oddb2xml::RefdataExtractor do
   before(:all) { VCR.eject_cassette; VCR.insert_cassette('oddb2xml') }
   after(:all)  { VCR.eject_cassette }
-  @@last_change = '2015-09-09 00:00:00 +0000'
+  @@last_change = '2015-11-24 00:00:00 +0000'
 
   context 'should handle pharma articles' do
     subject do
@@ -64,7 +64,7 @@ describe Oddb2xml::RefdataExtractor do
         :company_name=>"Desitin Pharma GmbH",
         :company_ean=>"7601001320451"}
       expect(item_found).to eq(expected)
-      expect(@pharma_items.size).to eq(NR_PACKS)
+      expect(@pharma_items.size).to eq(19)
     end
 	end
   context 'should handle nonpharma articles' do
@@ -208,7 +208,7 @@ describe Oddb2xml::SwissmedicExtractor do
     it {
         @filename = File.join(Oddb2xml::SpecData, 'swissmedic_fridge.xlsx')
         @packs = Oddb2xml::SwissmedicExtractor.new(@filename, :fridge).to_arry
-        expect(@packs.size).to eq NR_PACKS
+        expect(@packs.size).to eq 16
         expect(@packs[0]).to eq("58618")
         expect(@packs[1]).to eq("00696")
       }
@@ -218,7 +218,7 @@ describe Oddb2xml::SwissmedicExtractor do
         @filename = File.join(Oddb2xml::SpecData, 'swissmedic_orphan.xlsx')
         expect(File.exists?(@filename)).to eq(true), "File #{@filename} must exists"
         @packs = Oddb2xml::SwissmedicExtractor.new(@filename, :orphan).to_arry
-        expect(@packs.size).to eq 78
+        expect(@packs.size).to eq 95
         expect(@packs.first).to eq("62132")
         expect(@packs[7]).to eq("00687")
       }
@@ -239,8 +239,8 @@ 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) { VCR.eject_cassette; VCR.insert_cassette('oddb2xml') }
+  # after(:all) { VCR.eject_cassette }
   it "pending"
 end
 
@@ -262,7 +262,7 @@ describe Oddb2xml::ZurroseExtractor do
       DAT
       Oddb2xml::ZurroseExtractor.new(dat)
     end
-    it { subject.to_hash.size.should eq(1) }
+    it { expect(subject.to_hash.size).to eq(1) }
   end
   context 'when expected line is given' do
     subject do