oddb2xml 1.7.9 → 1.8.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oddb2xml (1.7.9)
+    oddb2xml (1.8.0)
       archive-tar-minitar
       mechanize (~> 2.5.1)
       nokogiri (~> 1.5.10)

data/README.md

@@ -74,6 +74,7 @@ $ oddb2xml -t md                        # => md_article.xml, md_product.xml, md_
 $ oddb2xml -a nonpharma -t md -c tar.gz # => md_xml_dd.mm.yyyy_hh.mm.tar.gz
 $ oddb2xml -f dat                       # => oddb.dat
 $ oddb2xml -f dat -a nonpharma          # => oddb_with_migel.dat
+$ oddb2xml -e                           # => oddb_article.xml
 ```
 
 output.
@@ -253,3 +254,9 @@ You can also run
 * tools/win_fetch_cacerts.rb
 
 for your currently open Terminal to download and set the Certificate.
+
+
+## Testing
+
+* Calling rake spec runs spec tests.
+* Calling rake test installs the gems and runs oddb2xml with the most commonly used combinations. All output is placed under under ausgabe/<timestamp>. These files should be manually compared to the ones generated by the last release to check for possible problems.

data/Rakefile

@@ -4,10 +4,28 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'oddb2xml/version'
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
 
 # dependencies are now declared in oddb2xml.gemspec
 
 desc 'Offer a gem task like hoe'
 task :gem => :build do
   Rake::Task[:build].invoke
-end
+end
+
+task :spec => :clean
+
+desc 'Run oddb2xml with all commonly used combinations'
+task :test => [:clean, :spec, :gem] do
+  system("./test_options.rb 2>&1 | tee test_options.log")
+end
+
+require 'rake/clean'
+CLEAN.include FileList['*.xls*']
+CLEAN.include FileList['*.xml*']
+CLEAN.include FileList['*.dat*']
+CLEAN.include FileList['ruby*.tmp']
+CLEAN.include FileList['data/download']
+CLEAN.include FileList['duplicate_ean13_from_zur_rose.txt']

data/bin/oddb2xml

@@ -28,8 +28,9 @@ Usage:
     -x N, --context=N    context N {product|address}. product is default.
                          
                          For debugging purposes
-    --skip-download      skips downloading files it the file is already under data/downloads.
-                         Downloaded files are saved under data/downloads
+    --skip-download      skips downloading files it the file is already under data/download.
+                         Downloaded files are saved under data/download
+    --log                log important actions
     -h,   --help         Show this help message.
 EOS
 end
@@ -46,7 +47,8 @@ opts = {
   :debug        => false,
   :ean14        => false,
   :skip_download=> false,
-}
+  :log          => false,
+  }
 
 parser.on('-a v', '--append v',     /^nonpharma$/)  {|v| opts[:nonpharma] = true }
 parser.on('-c v', '--compress v',   /^tar\.gz|zip$/){|v| opts[:compress_ext] = v }
@@ -60,7 +62,8 @@ parser.on('-i v', '--include v',    /^ean14$/)      {|v| opts[:ean14] = true }
 parser.on('-t v', '--tag-suffix v', /^[A-z0-9]*$/i) {|v| opts[:tag_suffix] = v.upcase }
 parser.on('-x v', '--context v',    /^addr(ess)*$/i){|v| opts[:address] = true }
 parser.on('-p v', '--price v',      /^zurrose$/)    {|v| opts[:price] = v.intern }
-parser.on('--skip-download') {|v| opts[:skip_download] = true }
+parser.on('--skip-download')                        {|v| opts[:skip_download] = true }
+parser.on('--log')                                  {|v| opts[:log] = :true }
 parser.on_tail('-h', '--help') { puts help; exit }
 
 args = ARGV.dup
@@ -78,6 +81,7 @@ if path = args.first
   opts[:transfer_dat] = path
 end
 
+startTime = Time.now
 ui = Oddb2xml::Cli.new(opts)
 begin
   if opts[:format] == :xml
@@ -95,4 +99,5 @@ then you will not see anymore warnings
 rescue Interrupt
   exit
 end
-puts "#{Time.now}: #{__LINE__} done"; $stdout.sync
+diff = (Time.now-startTime).to_i
+puts "#{Time.now}: #{__LINE__} done. Took #{diff} seconds"; $stdout.sync

data/lib/oddb2xml/builder.rb

@@ -44,6 +44,7 @@ module Oddb2xml
       end
     end
     def to_xml(subject=nil)
+      Oddb2xml.log "to_xml subject #{subject ? subject.to_s :  @subject.to_s} for #{self.class}"
       if subject
         self.send('build_' + subject.to_s)
       elsif @subject
@@ -51,6 +52,7 @@ module Oddb2xml
       end
     end
     def to_dat(subject=nil)
+      Oddb2xml.log  "to_dat subject #{subject ? subject.to_s :  @subject.to_s} for #{self.class}"
       if subject
         self.send('build_' + subject.to_s)
       elsif @subject
@@ -61,6 +63,7 @@ module Oddb2xml
     def prepare_articles(reset=false)
       @articles = nil if reset
       unless @articles
+        Oddb2xml.log("prepare_articles starting with #{@articles ? @articles.size : 'no'} articles")
         @articles = [] # base is 'DE'
         @index['DE'].each_pair do |phar, indices|
           obj = {
@@ -98,34 +101,59 @@ module Oddb2xml
           end
           @articles << obj
         end
+        nrAdded = 0
         if @options[:extended]
-          nrAdded = 0
+          Oddb2xml.log("prepare_articles prepare_local_index")
+          local_index = {}
+          %w[de fr].each { |lang| local_index[lang] = {} }
+          %w[de fr].each {
+            |lang|
+          @articles.each{|article|
+                         ean = article[lang.intern][0][:ean]
+                                                       next if ean == nil or ean.to_i == 0
+                                                      local_index[lang][ean] = article
+                                                      }
+                                                      }
+          Oddb2xml.log("prepare_articles extended")
           @prices.each{
             |ean13, info|
-            obj = {}
+          obj = {}
+          found = false
           %w[de fr].each do |lang|
-          next if @index[lang] and @index[lang][ean13]
-            entry = {
-                     :desc            => info[:description],
-                     :status          => 'I', # or it will not be emitted in the dat
-                     :atc_code        => '',
-                     :ean             => ean13,
-                     :lang            => lang.capitalize,
-                     :pharmacode      => info[:pharmacode],
-                     :price           => info[:price],
-                     :pub_price       => info[:pub_price],
-                     :type            => info[:type],
-                     }
-            obj[lang.intern] = [entry]
+          #              existing = @articles.find{|art| art[lang.intern] and art[lang.intern][0][:ean] == ean13 }
+          existing = local_index[lang][ean13]
+            if existing
+              found = true
+              existing[:price] = info[:price]
+                                      existing[:pub_price] = info[:pub_price]
+                      else
+                      entry = {
+                               :desc            => info[:description],
+                               :status          => 'I', # or it will not be emitted in the dat
+                              :atc_code        => '',
+                               :ean             => ean13,
+                               :lang            => lang.capitalize,
+                               :pharmacode      => info[:pharmacode],
+                               :price           => info[:price],
+                               :pub_price       => info[:pub_price],
+                               :type            => info[:type],
+                               }
+                      obj[lang.intern] = [entry]
+                      @index[lang.upcase][ean13] = entry
+                      end
+                      end
+                      unless found
+                      @articles << obj
+                      nrAdded += 1
+                      end
+                      }
           end
-          nrAdded += 1
-          @articles << obj
-          }
-        end
       end
+      Oddb2xml.log("prepare_articles done. Added #{nrAdded} prices. Total #{@articles.size}")
     end
     def prepare_substances
       unless @substances
+        Oddb2xml.log("prepare_substances from #{@items.size} items")
         @substances = []
         @items.values.uniq.each do |seq|
           next unless seq[:substances]
@@ -135,10 +163,13 @@ module Oddb2xml
         end
         @substances.uniq!
         @substances.sort!
+        Oddb2xml.log("prepare_substances done. Total #{@substances.size} from #{@items.size} items")
+        exit 2 if @options[:extended] and @substances.size == 0
       end
     end
     def prepare_limitations
       unless @limitations
+        Oddb2xml.log("prepare_limitations from #{@items.size} items")
         limitations = []
         @items.values.uniq.each do |seq|
           next unless seq[:packages]
@@ -150,6 +181,7 @@ module Oddb2xml
         # limitation.xml needs all duplicate entries by this keys.
         limitations.uniq! {|lim| lim[:id] + lim[:code] + lim[:type] }
         @limitations = limitations.sort_by {|lim| lim[:code] }
+        Oddb2xml.log("prepare_limitations done. Total #{@limitations.size} from #{@items.size} items")
       end
     end
     def prepare_interactions
@@ -231,7 +263,9 @@ module Oddb2xml
           'PROD_DATE'         => datetime,
           'VALID_DATE'        => datetime
         ) {
-          @substances.each_with_index do |sub_name, i|
+          Oddb2xml.log "build_substance #{@substances.size} substances"
+        exit 2 if @options[:extended] and @substances.size == 0
+        @substances.each_with_index do |sub_name, i|
             xml.SB('DT' => '') {
               xml.SUBNO((i + 1).to_i)
               #xml.NAMD
@@ -252,6 +286,7 @@ module Oddb2xml
     end
     def build_limitation
       prepare_limitations
+      Oddb2xml.log "build_limitation #{@limitations.size} limitations"
       _builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
         xml.doc.tag_suffix = @tag_suffix
         datetime = Time.new.strftime('%FT%T%z')
@@ -263,7 +298,7 @@ module Oddb2xml
           'PROD_DATE'         => datetime,
           'VALID_DATE'        => datetime
         ) {
-          @limitations.each do |lim|
+        @limitations.each do |lim|
             xml.LIM('DT' => '') {
               case lim[:key]
               when :swissmedic_number8
@@ -310,6 +345,7 @@ module Oddb2xml
           'PROD_DATE'         => datetime,
           'VALID_DATE'        => datetime
         ) {
+          Oddb2xml.log "build_interaction #{@interactions.size} interactions"
           @interactions.sort_by{|ix| ix[:ixno] }.each do |ix|
             xml.IX('DT' => '') {
               xml.IXNO  ix[:ixno]
@@ -360,6 +396,7 @@ module Oddb2xml
     end
     def build_code
       prepare_codes
+      Oddb2xml.log "build_code #{@codes.size} codes"
       _builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
         xml.doc.tag_suffix = @tag_suffix
         datetime = Time.new.strftime('%FT%T%z')
@@ -399,6 +436,7 @@ module Oddb2xml
       prepare_products
       prepare_interactions
       prepare_codes
+      Oddb2xml.log "build_product #{@products.size} products"
       _builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
         xml.doc.tag_suffix = @tag_suffix
         datetime = Time.new.strftime('%FT%T%z')
@@ -551,6 +589,8 @@ module Oddb2xml
     def build_article
       prepare_limitations
       prepare_articles
+      idx = 0
+      Oddb2xml.log "build_article #{idx} of #{@articles.size} articles"
       _builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
         xml.doc.tag_suffix = @tag_suffix
         datetime = Time.new.strftime('%FT%T%z')
@@ -563,8 +603,10 @@ module Oddb2xml
           'VALID_DATE'        => datetime
         ) {
           @articles.each do |obj|
-            obj[:de].each_with_index do |de_idx, i|
-        fr_idx = obj[:fr][i]              # swissindex FR
+            idx += 1
+        Oddb2xml.log "build_article #{idx} of #{@articles.size} articles" if idx % 500 == 0
+        obj[:de].each_with_index do |de_idx, i|
+              fr_idx = obj[:fr][i]              # swissindex FR
               pac,no8 = nil,de_idx[:ean][4..11] # BAG-XML(SL/LS)
               ppac = nil                        # Packungen
               ean = de_idx[:ean]
@@ -743,6 +785,7 @@ module Oddb2xml
           }
         }
       end
+      Oddb2xml.log "build_article. Done #{idx} of #{@articles.size} articles"
       _builder.to_xml
     end
     def build_fi
@@ -834,6 +877,7 @@ module Oddb2xml
       _builder.to_xml
     end
     def build_company
+      Oddb2xml.log "build_company #{@companies.size} companies"
       _builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
         xml.doc.tag_suffix = @tag_suffix
         datetime = Time.new.strftime('%FT%T%z')
@@ -870,6 +914,7 @@ module Oddb2xml
       _builder.to_xml
     end
     def build_person
+      Oddb2xml.log "build_person #{@people.size} persons"
       _builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
         xml.doc.tag_suffix = @tag_suffix
         datetime = Time.new.strftime('%FT%T%z')

data/lib/oddb2xml/cli.rb

@@ -238,8 +238,8 @@ module Oddb2xml
           xml = downloader.download
           @mutex.synchronize do
             hsh = ZurroseExtractor.new(xml, @options[:extended]).to_hash
-            @items = hsh if  @options[:extended]
             @prices = hsh
+            Oddb2xml.log("zurrose added #{@prices.size} prices")
           end
         end
       when :index

data/lib/oddb2xml/downloader.rb

@@ -8,6 +8,7 @@ module Oddb2xml
   module DownloadMethod
     private
     def download_as(file, option='r')
+      Oddb2xml.log "download_as file #{file} from #{@url}"
       data = nil
       if Oddb2xml.skip_download(file)
         io = File.open(file, option)
@@ -36,6 +37,7 @@ module Oddb2xml
       @url         = url
       @retry_times = 3
       HTTPI.log = false # disable httpi warning
+      Oddb2xml.log "Downloader from #{@url} for #{self.class}"
       init
     end
     def init

data/lib/oddb2xml/util.rb

@@ -1,7 +1,13 @@
 module Oddb2xml
   Backup = "#{Dir.pwd}/data/download"
   @options = {}
-  
+
+  def Oddb2xml.log(msg)
+    return unless @options[:log]
+    $stdout.puts "#{Time.now.strftime("%Y-%m-%d %H:%M:%S")}: #{msg}"
+    $stdout.flush
+  end
+
   def Oddb2xml.save_options(options)
     @options = options
   end

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.7.9"
+  VERSION = "1.8.0"
 end

data/spec/builder_spec.rb

@@ -1,6 +1,8 @@
 # encoding: utf-8
 
 require 'spec_helper'
+require "rexml/document"
+include REXML
 
 module Kernel
   def capture(stream)
@@ -27,6 +29,7 @@ describe Oddb2xml::Builder do
     setup_server_mocks
     setup_swiss_index_server_mock(types =  ['NonPharma', 'Pharma'])
   end
+  if true
   context 'should handle BAG-articles with and without pharmacode' do
     it {
       dat = File.read(File.expand_path('../data/Preparation.xml', __FILE__))
@@ -41,42 +44,42 @@ describe Oddb2xml::Builder do
     let(:cli) do
       opts = {}
       Oddb2xml::Cli.new(opts)
-    end    
+    end
     it 'should generate a valid oddb_product.xml' do
       res = capture(:stdout){ cli.run }
       res.should match(/products/)
       article_filename = File.expand_path(File.join(File.dirname(__FILE__), '..', 'oddb_article.xml'))
-      File.exists?(article_filename).should be_true   
+      File.exists?(article_filename).should be_true
       article_xml = IO.read(article_filename)
       product_filename = File.expand_path(File.join(File.dirname(__FILE__), '..', 'oddb_product.xml'))
       File.exists?(product_filename).should be_true
       unless /1\.8\.7/.match(RUBY_VERSION)
         product_xml = IO.read(product_filename)
-        article_xml.should match(/3TC/) 
+        article_xml.should match(/3TC/)
         article_xml.should match(/<PHAR>1699947</)
-        article_xml.should match(/<SMNO>53662013</) 
-        article_xml.should match(/<DSCRD>3TC Filmtabl 150 mg</) 
-        article_xml.should match(/<COMPNO>7601001392175</) 
+        article_xml.should match(/<SMNO>53662013</)
+        article_xml.should match(/<DSCRD>3TC Filmtabl 150 mg</)
+        article_xml.should match(/<COMPNO>7601001392175</)
         article_xml.should match(/<BC>7680536620137</)
         article_xml.should match(/<VDAT>01.10.2011</)
         article_xml.should match(/<PTYP>PEXF</)
         article_xml.should match(/<PRICE>164.55</)
         article_xml.should match(/<PTYP>PPUB</)
         article_xml.should match(/<PRICE>205.3</)
-        
-        article_xml.should match(/Levetiracetam DESITIN/i) # 
+
+        article_xml.should match(/Levetiracetam DESITIN/i) #
         article_xml.should match(/7680536620137/) # Pharmacode
-        article_xml.should match(/<PRICE>13.49</) 
-        article_xml.should match(/<PRICE>27.8</) 
+        article_xml.should match(/<PRICE>13.49</)
+        article_xml.should match(/<PRICE>27.8</)
 
         product_xml.should match(/3TC/)
         product_xml.should match(/7680620690084/) # Levetiracetam DESITIN
-        article_xml.scan(/<ART DT=/).size.should eq(2) # we should find two articles
+        article_xml.scan(/<ART DT=/).size.should eq(3) # we should find two articles
         article_xml.should match(/<PHAR>5819012</)
         article_xml.should match(/<DSCRD>LEVETIRACETAM DESITIN Filmtabl 250 mg/)
         article_xml.should match(/<COMPNO>7601001320451</)
       end
-    end    
+    end
   end
   
   context 'when -a nonpharma -f dat is given' do
@@ -99,5 +102,78 @@ describe Oddb2xml::Builder do
     it "pending should match EAN of Desitin. returns 0 at the moment" 
 
   end
+  end
+  context 'when option -e is given' do
+    let(:cli) do
+      opts = {
+        :extended    => :true,
+        :nonpharma    => :true,
+        :price      => :zurrose,
+        }
+      Oddb2xml::Cli.new(opts)
+    end
+
+    it 'should emit correct data when called with -e (extended)' do
+      res = capture(:stdout){ cli.run }
+      res.should match(/products/)
+      article_filename = File.expand_path(File.join(File.dirname(__FILE__), '..', 'oddb_article.xml'))
+      File.exists?(article_filename).should be_true
+      article_xml = IO.read(article_filename)
+      product_filename = File.expand_path(File.join(File.dirname(__FILE__), '..', 'oddb_product.xml'))
+      File.exists?(product_filename).should be_true
+
+      # check substances
+      doc = REXML::Document.new File.new(File.join(File.dirname(__FILE__), '..', 'oddb_substance.xml'))
+      names = XPath.match( doc, "//NAML" )
+      names.size.should == 2
+      names.find_all{|x| x.text.match('Lamivudinum') }.size.should == 1
+
+      # check interactions
+      doc = REXML::Document.new File.new(File.join(File.dirname(__FILE__), '..', 'oddb_interaction.xml'))
+      titles = XPath.match( doc, "//TITD" )
+      titles.size.should == 2
+      titles.find_all{|x| x.text.match('Keine Interaktion') }.size.should == 1
+      titles.find_all{|x| x.text.match('Erhöhtes Risiko für Myopathie und Rhabdomyolyse') }.size.should == 1
+
+      unless /1\.8\.7/.match(RUBY_VERSION)
+        # check articles
+        article_xml.should match(/3TC/)
+        article_xml.should match(/<PHAR>1699947</)
+                                 article_xml.should match(/<SMNO>53662013</)
+                                article_xml.should match(/<DSCRD>3TC Filmtabl 150 mg</)
+        article_xml.should match(/<COMPNO>7601001392175</)
+        article_xml.should match(/<BC>7680536620137</)
+        article_xml.should match(/<VDAT>01.10.2011</)
+        article_xml.should match(/<PTYP>PEXF</)
+        article_xml.should match(/<PRICE>164.55</)
+        article_xml.should match(/<PTYP>PPUB</)
+        article_xml.should match(/<PRICE>205.3</)
+
+        article_xml.should match(/Levetiracetam DESITIN/i) #
+        article_xml.should match(/7680536620137/) # Pharmacode
+        article_xml.should match(/<PRICE>13.49</)
+        article_xml.should match(/<PRICE>27.8</)
+        article_xml.scan(/<ART DT=/).size.should eq(60) # we should find some articles
+        article_xml.should match(/<PHAR>5819012</)
+        article_xml.should match(/<DSCRD>LEVETIRACETAM DESITIN Filmtabl 250 mg/)
+        article_xml.should match(/<COMPNO>7601001320451</)
+
+        # check products
+        product_xml = IO.read(product_filename)
+        product_xml.should match(/3TC/)
+        product_xml.should match(/7680620690084/) # Levetiracetam DESITIN
+
+        # check ZYVOXID in article
+        article_xml.should match(/7680555580054/) # ZYVOXID
+        article_xml.should match(/ZYVOXID/i)
+
+        product_xml.should match(/7680555580054/) # ZYVOXID
+        product_xml.should_not match(/ZYVOXID/i)
+        doc = REXML::Document.new File.new article_filename
+        dscrds = XPath.match( doc, "//DSCRD" )
+        dscrds.find_all{|x| x.text.match('ZYVOXID Filmtabl 600 mg') }.size.should == 1
+      end
+    end
+  end
 end
 

data/spec/data/swissindex_pharma.xml

@@ -33,6 +33,20 @@
           <GLN>7601001320451</GLN>
         </COMP>
       </ITEM>
+      <ITEM DT="2013-06-22T00:00:00">
+        <GTIN>7680555580054</GTIN>
+        <PHAR>2465312</PHAR>
+        <STATUS>A</STATUS>
+        <STDATE>2002-01-16T00:00:00</STDATE>
+        <LANG>DE</LANG>
+        <DSCR>ZYVOXID Filmtabl 600 mg</DSCR>
+        <ADDSCR>10 Stk</ADDSCR>
+        <ATC>J01XX08</ATC>
+        <COMP>
+          <NAME>Pfizer AG</NAME>
+          <GLN>7601001010604</GLN>
+        </COMP>
+      </ITEM>
       <RESULT>
         <OK_ERROR>OK</OK_ERROR>
         <NBR_RECORD>2</NBR_RECORD>

data/spec/data/zurrose_transfer.dat

@@ -1,3 +1,4 @@
+1122465312ZYVOXID Filmtabl 600 mg 10 Stk                    096114108275100A080190076805555800542
 1120020209ERYTRHOCIN I.V. Trockensub Fl 1g                  001518002010300B080160000000000000002
 1120020244FERRO-GRADUMET Depottabl 30 Stk                   000895001090300C060710076803164401152
 1120020273KENDURAL Depottabl 30 Stk                         000492000840100C060710076803536601632

data/spec/extractor_spec.rb

@@ -90,10 +90,10 @@ describe Oddb2xml::SwissmedicInfoExtractor do
   end
   context 'can parse swissmedic_orphans.xls' do
     it {
-        filename = File.join(File.dirname(__FILE__), 'data/swissmedic_orphans.xls')
+        filename = File.join(File.dirname(__FILE__), 'data/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(72)
+        expect(@packs.size).to eq(79)
         expect(@packs.first).to eq("62132")
         expect(@packs[7]).to eq("00687")
       }

data/spec/spec_helper.rb

@@ -26,6 +26,7 @@ module ServerMockHelper
     setup_lppv_server_mock
     setup_migel_server_mock
     setup_medregbm_server_mock
+    setup_zurrose_server_mock
   end
   def setup_bag_xml_server_mock
     # zip
@@ -93,8 +94,8 @@ module ServerMockHelper
           :body    => stub_response)
       # xls
       if type == :orphans
-        stub_xls_url  = "http://#{host}" + urls[:xls] + "/swissmedic_#{type.to_s}.xls"
-        stub_response = File.read(File.expand_path("../data/swissmedic_#{type.to_s}.xls", __FILE__))
+        stub_xls_url  = "http://#{host}" + urls[:xls] + "/swissmedic_orphan.xlsx"
+        stub_response = File.read(File.expand_path("../data/swissmedic_orphan.xlsx", __FILE__))
       else
         stub_xls_url  = "http://#{host}" + urls[:xls] + "/swissmedic_#{type.to_s}.xlsx"
         stub_response = 'no_such_file'

data/test_options.rb

@@ -0,0 +1,42 @@
+#!/usr/bin/env ruby
+# Helper script to test all common usageas of oddb2xml
+# - runs rake install to install the gem
+# - Creates an output directory ausgabe/time_stamp
+# - runs all commands (and add ---skip-download)
+# - saveds output and data/download to ausgabe/time_stamp
+
+
+require 'fileutils'
+
+def test_one_call(cmd)
+  dest = File.join(Ausgabe, cmd.gsub(/[ -]/, '_'))
+  cmd.sub!('oddb2xml',  'oddb2xml --skip-download --log')
+  files = (Dir.glob('%.xls*') + Dir.glob('*.dat*') + Dir.glob('*.xml'))
+  FileUtils.rm(files, :verbose => true)
+  puts "#{Time.now}: Running cmd #{cmd}"
+  startTime = Time.now
+  res = system(cmd)
+  endTime = Time.now
+  diffSeconds = (endTime - startTime).to_i
+  duration = "#{Time.now}: Took #{sprintf('%3d', diffSeconds)} seconds for"
+  puts "#{duration} success #{res} for #{cmd}"
+  exit 2 unless res
+  FileUtils.makedirs(dest)
+  FileUtils.cp_r('data/download', dest, :preserve => true, :verbose => true) if Dir.glob(Ausgabe).size > 0
+  FileUtils.cp(Dir.glob('*.dat'), dest, :preserve => true, :verbose => true) if Dir.glob('*.dat').size > 0
+  FileUtils.cp(Dir.glob('*.xml'), dest, :preserve => true, :verbose => true) if Dir.glob('*.xml').size > 0
+  FileUtils.cp(Dir.glob('*.gz'),  dest, :preserve => true, :verbose => true) if Dir.glob('*.gz').size > 0
+end
+
+
+system("rake install") # build and install our gem first
+Ausgabe = File.join(Dir.pwd, 'ausgabe', Time.now.strftime('%Y.%m.%d-%H:%M'))
+FileUtils.makedirs(Ausgabe)
+test_one_call('oddb2xml -x address')
+test_one_call('oddb2xml -f dat')
+test_one_call('oddb2xml -f xml')
+test_one_call('oddb2xml -f dat -a nonpharma')
+test_one_call('oddb2xml -t md')
+test_one_call('oddb2xml -a nonpharma -t md -c tar.gz')
+test_one_call('oddb2xml -a nonpharma')
+test_one_call('oddb2xml -e') # take hours, therefor at the end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 1.7.9
+  version: 1.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -264,8 +264,8 @@ files:
 - spec/data/swissmedic_info.html
 - spec/data/swissmedic_info.zip
 - spec/data/swissmedic_info_2.html
+- spec/data/swissmedic_orphan.xlsx
 - spec/data/swissmedic_orphans.html
-- spec/data/swissmedic_orphans.xls
 - spec/data/swissmedic_packages.html
 - spec/data/swissmedic_packages.xls
 - spec/data/swissmedic_packages.xlsx
@@ -276,6 +276,7 @@ files:
 - spec/downloader_spec.rb
 - spec/extractor_spec.rb
 - spec/spec_helper.rb
+- test_options.rb
 - tools/cacert.pem
 - tools/set.bat
 - tools/win_fetch_cacerts.rb
@@ -338,8 +339,8 @@ test_files:
 - spec/data/swissmedic_info.html
 - spec/data/swissmedic_info.zip
 - spec/data/swissmedic_info_2.html
+- spec/data/swissmedic_orphan.xlsx
 - spec/data/swissmedic_orphans.html
-- spec/data/swissmedic_orphans.xls
 - spec/data/swissmedic_packages.html
 - spec/data/swissmedic_packages.xls
 - spec/data/swissmedic_packages.xlsx