oddb2xml 2.1.7 → 2.1.8

data/spec/galenic_spec.rb

@@ -149,9 +149,7 @@ def test_one_string(parser, string, expected)
   res1.delete(:unit)  if res1
   stringified = res1 ? res1.to_s.gsub(/@\d+/, '') : nil
   if res1 == nil or ! stringified.eql? expected.to_s
-    puts "Failed testing: #{string}"
-    pp res1
-    binding.pry
+    puts "Failed testing: #{string}"; binding.pry
   end
   expect(stringified).to eq expected.to_s if expected
 end

data/spec/options_spec.rb

@@ -2,19 +2,6 @@
 
 require 'spec_helper'
 require "#{Dir.pwd}/lib/oddb2xml/options"
-module Kernel
-  def cli_capture(stream)
-    begin
-      stream = stream.to_s
-      eval "$#{stream} = StringIO.new"
-      yield
-      result = eval("$#{stream}").string
-    ensure
-      eval "$#{stream} = #{stream.upcase}"
-    end
-    result
-  end
-end
 
 describe Oddb2xml::Options do
   include ServerMockHelper

data/spec/parslet_spec.rb

@@ -1,9 +1,5 @@
 # encoding: utf-8
 
-begin
-require 'pry'
-rescue LoadError
-end
 require 'pp'
 VERBOSE_MESSAGES = false
 require 'spec_helper'
@@ -1375,8 +1371,6 @@ describe ParseComposition do
     rescue Parslet::ParseFailed
       @nrErrors += 1
       puts "#{File.basename(AllCompositionLines)}:#{nr} parse_error #{@nrErrors} in: #{line}"
-#      binding.pry
-#      binding.pry if nr > 300
     end
     }
     at_exit { puts "Testing whether #{nr} composition lines can be parsed. Found #{@nrErrors} errors in #{(Time.now - start_time).to_i} seconds" }

data/spec/spec_helper.rb

@@ -20,6 +20,9 @@ require 'pry'
 rescue LoadError
 end
 
+require 'vcr'
+require 'timecop'
+
 module Oddb2xml
   # we override here a few directories to make input/output when running specs to
   # be in different places compared when running
@@ -27,6 +30,93 @@ module Oddb2xml
   WorkDir        = File.join(File.dirname(__FILE__), 'run')
   Downloads      = File.join(WorkDir, 'downloads')
   SpecCompressor = File.join(Oddb2xml::SpecData, 'compressor')
+
+  GTINS_CALC = [
+                  '7680458820202', # for calc_spec.rb
+                  '7680555940018', # for calc_spec.rb
+                  '7680434541015', # for calc_spec.rb
+                  '7680300150105', # for calc_spec.rb
+                  '7680446250592', # for calc_spec.rb
+                  '7680611860045', # for calc_spec.rb
+                  '7680165980114', # for calc_spec.rb
+                  '7680589430011', # for calc_spec.rb
+                  '7680556740075', # for calc_spec.rb
+                  '7680540151009', # for calc_spec.rb
+                  '7680560890018', # for calc_spec.rb
+    ]
+  GTINS_DRUGS = [ '733905577161', # 1-DAY ACUVUE Moist Tag -2.00dpt BC 8.5
+                  '4042809018288',
+                  '4042809018400',
+                  '4042809018493',
+                  '5000223074777',
+                  '5000223439507',
+                  '7611600441013',
+                  '7611600441020',
+                  '7611600441037',
+                  '7680161050583', # Hirudoid Creme 3 mg/g
+                  '7680172330414', # SELSUN
+                  '7680284860144',
+                  '7680316440115', # FERRO-GRADUMET Depottabl 30 Stk
+                  '7680316950157', # SOFRADEX Gtt Auric 8 ml
+                  '7680324750190', # LANSOYL Gel
+                  '7680353660163',
+                  '7680403330459',
+                  '7680536620137', # 3TC Filmtabl 150 mg
+                  '7680555580054', # ZYVOXID
+                  '7680620690084', # LEVETIRACETAM DESITIN Mini Filmtab 250 mg needed for extractor_spec.rb
+                  ] + GTINS_CALC
+    FERRO_GRADUMET_GTIN           = '7680316440115'
+    FIRST_DAY_ACUVUE_GTIN         = '733905577161'
+    HIRUDOID_GTIN                 = '7680161050583'
+    LANSOYL_GTIN                  = '7680324750190'
+    LANSOYL_PRICE_RESELLER_PUB    = 18.95
+    LANSOYL_PRICE_ZURROSE         = 10.54
+    LANSOYL_PRICE_ZURROSEPUB      = 16.25
+    LEVETIRACETAM_GTIN            = '7680620690084'
+    LEVETIRACETAM_PRICE_PPUB      = 27.8
+    LEVETIRACETAM_PRICE_ZURROSE   = 13.49
+    LEVETIRACETAM_PRICE_RESELLER_PUB = 24.3
+    SOFRADEX_GTIN                 = '7680316950157'
+    SOFRADEX_PRICE_RESELLER_PUB   = 12.9
+    SOFRADEX_PRICE_ZURROSE        = 7.18
+    SOFRADEX_PRICE_ZURROSEPUB     = 15.45
+    THREE_TC_GTIN                 = '7680536620137'
+    ZYVOXID_GTIN                  = '7680555580054'
+
+  GTINS_MEDREG = [
+    7601001380028, # Glarus
+    7601002017145, # Kantonsspital Glarus AG
+    7601001395145, # Kantonstierärztlicher Dienst
+    7601001396043, # St. Fridolin Pharma AG
+    7601000159199, #  Davatz  Ursula
+    7601000159199, #  Davatz  Ursula
+    7601000254344, #  Pfister Daniel  8753  Mollis
+    7601000254207, #  Züst  Peter 8753  Mollis
+    7601000752314, #  Züst  Yvonne  8753  Mollis
+    ]
+
+end
+
+VCR.configure do |config|
+  config.cassette_library_dir = "spec/fixtures/vcr_cassettes"
+  config.hook_into :webmock # or :fakeweb
+  config.debug_logger = File.open(File.join(File.dirname(File.dirname(__FILE__)), 'vcr.log'), 'w+')
+  config.debug_logger.sync = true
+  config.default_cassette_options = { :record => ARGV.join(' ').index('downloader_spec') ? :new_episodes : :once ,
+                                      :preserve_exact_body_bytes => true,
+                                      :allow_playback_repeats => true,
+                                      :serialize_with => :json,
+                                      :decode_compressed_response => true,
+                                      :match_requests_on => [:method, :uri, :body],
+                                    }
+#	 :match_requests_on (Array<Symbol, #call>) —
+#
+# List of request matchers to use to determine what recorded HTTP interaction to replay. Defaults to [:method, :uri]. The built-in matchers are :method, :uri, :host, :path, :headers and :body. You can also pass the name of a registered custom request matcher or any object that responds to #call.
+
+  config.before_http_request(:real?) do |request|
+    $stderr.puts("before real request: #{request.method} #{request.uri}")
+    $stderr.flush
+  end
 end
 
 AllCompositionLines = File.expand_path("#{__FILE__}/../data/compositions.txt")
@@ -34,6 +124,20 @@ AllColumn_C_Lines = File.expand_path("#{__FILE__}/../data/column_c.txt")
 
 require 'oddb2xml'
 
+module Kernel
+  def buildr_capture(stream)
+    begin
+      stream = stream.to_s
+      eval "$#{stream} = StringIO.new"
+      yield
+      result = eval("$#{stream}").string
+    ensure
+      eval "$#{stream} = #{stream.upcase}"
+    end
+    result
+  end
+end
+
 module ServerMockHelper
   def cleanup_compressor
     [ File.join(Oddb2xml::SpecCompressor, '*.zip'),
@@ -53,246 +157,7 @@ module ServerMockHelper
   end
   
   def setup_server_mocks
-    setup_bag_xml_server_mock
-    setup_swiss_index_server_mock
-    setup_swissmedic_server_mock
-    setup_swissmedic_info_server_mock
-    setup_epha_server_mock
-    setup_bm_update_server_mock
-    setup_lppv_server_mock
-    setup_migel_server_mock
-    setup_medregbm_server_mock
-    setup_zurrose_server_mock
-    setup_epha_atc_csv_mock
-  end
-
-  def setup_epha_atc_csv_mock
-    body =  File.read(File.join(Oddb2xml::SpecData, 'atc.csv'))
-    stub_request(:get, "https://raw.githubusercontent.com/epha/robot/master/data/manual/swissmedic/atc.csv").
-      with(:headers => {'Accept'=>'*/*', 'User-Agent'=>'Ruby'}).
-      to_return(:status => 200, :body => body, :headers => {})
-  end
-  def setup_bag_xml_server_mock
-    # zip
-    stub_zip_url = 'http://bag.e-mediat.net/SL2007.Web.External/File.axd?file=XMLPublications.zip'
-    stub_response = File.read(File.join(Oddb2xml::SpecData, 'XMLPublications.zip'))
-    stub_request(:get, stub_zip_url).
-      with(:headers => {
-        'Accept'          => '*/*',
-        'Accept-Encoding' => 'gzip,deflate,identity',
-        'Host'            => 'bag.e-mediat.net',
-      }).
-      to_return(
-        :status  => 200,
-        :headers => {'Content-Type' => 'application/zip; charset=utf-8'},
-        :body    => stub_response)
-  end
-  def setup_swiss_index_server_mock(types =['NonPharma', 'Pharma'], languages=['DE', 'FR'])
-    types.each do |type|
-      languages.each do |language|
-        # wsdl
-        stub_wsdl_url = "https://index.ws.e-mediat.net/Swissindex/#{type}/ws_#{type}_V101.asmx?WSDL"
-        first_file = File.join(Oddb2xml::SpecData, "wsdl_#{type.downcase}.xml")
-        stub_response_wsdl = File.read(File.join(Oddb2xml::SpecData, "wsdl_#{type.downcase}.xml"))
-        stub_request(:get, stub_wsdl_url).
-          with(:headers => {
-            'Accept' => '*/*',
-          }).
-          to_return(
-            :status  => 200,
-            :headers => {'Content-Type' => 'text/xml; charset=utf-8'},
-            :body    => stub_response_wsdl)
-        # soap (dummy)
-        stub_soap_url = 'https://example.com/test'
-        stub_file = File.join(Oddb2xml::SpecData, "swissindex_#{type}_#{language}.xml")
-        stub_response = File.read(stub_file)
-        stub_request(:post, "https://example.com/test").
-          with(:body => "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<soap:Envelope xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">\n<soap:Body>\n  <lang xmlns=\"http://swissindex.e-mediat.net/Swissindex#{type}_out_V101\">#{language}</lang>\n</soap:Body>\n</soap:Envelope>\n",
-                :headers => {'Accept'=>'*/*', 'Content-Type'=>'text/xml;charset=UTF-8', 'Soapaction'=>'"http://example.com/DownloadAll"', 'User-Agent'=>'Ruby'}).
-          to_return(:status => 200, :body => stub_response, :headers => {})
-      end
-    end
-  end
-
-  def setup_swissmedic_server_mock
-    host = 'www.swissmedic.ch'
-    {    
-      :orphans  => {:html => '/arzneimittel/00156/00221/00222/00223/00224/00227/00228/index.html?lang=de',       :xls => '/download'},
-      :fridges  => {:html => '/arzneimittel/00156/00221/00222/00235/index.html?lang=de', :xls => '/download'},
-      :packages => {:html => '/arzneimittel/00156/00221/00222/00230/index.html?lang=de', :xls => '/download'},
-    }.each_pair do |type, urls|
-      # html (dummy)
-      stub_html_url = "https://#{host}" + urls[:html]
-      filename = File.join(Oddb2xml::SpecData, "swissmedic_#{type.to_s}.html")
-      
-      stub_response = File.read(filename)
-      stub_request(:get, stub_html_url).
-        with(:headers => {
-          'Accept' => '*/*',
-          'Accept-Encoding'=>'gzip,deflate,identity',
-          'Host'            => host,
-        }).
-        to_return(
-          :status  => 200,
-          :headers => {'Content-Type' => 'text/html; charset=utf-8'},
-          :body    => stub_response)
-      # xls
-      if type == :orphans
-        stub_xls_url  = "https://#{host}" + urls[:xls] + "/swissmedic_orphan.xlsx"
-        stub_response = File.read(File.join(Oddb2xml::SpecData, "swissmedic_orphan.xlsx"))
-      else
-        stub_xls_url  = "https://#{host}" + urls[:xls] + "/swissmedic_#{type.to_s}.xlsx"
-        stub_response = 'no_such_file'
-      end
-      stub_request(:get, stub_xls_url).
-        with(:headers => {
-          'Accept'          => '*/*',
-          'Accept-Encoding' => 'gzip,deflate,identity',
-          'Host'            => host,
-        }).
-        to_return(
-          :status  => 200,
-          :headers => {'Content-Type' => 'application/octet-stream; charset=utf-8'},
-          :body    => stub_response)
-    end
-  end
-  def setup_swissmedic_info_server_mock
-    # html (dummy)
-    stub_html_url = "http://download.swissmedicinfo.ch/Accept.aspx?ReturnUrl=%2f"
-    stub_response = File.read(File.join(Oddb2xml::SpecData, "swissmedic_info.html"))
-    stub_request(:get, stub_html_url).
-      with(
-        :headers => {
-          'Accept' => '*/*',
-          'Host'   => 'download.swissmedicinfo.ch',
-        }).
-      to_return(
-        :status  => 200,
-        :headers => {'Content-Type' => 'text/html; charset=utf-8'},
-        :body    => stub_response)
-    # html (dummy 2)
-    stub_html_url = 'http://download.swissmedicinfo.ch/Accept.aspx?ctl00$MainContent$btnOK=1'
-    stub_response = File.read(File.join(Oddb2xml::SpecData, "swissmedic_info_2.html"))
-    stub_request(:get, stub_html_url).
-      with(
-        :headers => {
-          'Accept' => '*/*',
-          'Host'   => 'download.swissmedicinfo.ch',
-        }).
-      to_return(
-        :status  => 200,
-        :headers => {'Content-Type' => 'text/html; charset=utf-8'},
-        :body    => stub_response)
-    # zip
-    stub_zip_url = 'http://download.swissmedicinfo.ch/Accept.aspx?ctl00$MainContent$BtnYes=1'
-    stub_response = File.read(File.join(Oddb2xml::SpecData, 'swissmedic_info.zip'))
-    stub_request(:get, stub_zip_url).
-      with(
-        :headers => {
-          'Accept'          => '*/*',
-          'Accept-Encoding' => 'gzip,deflate,identity',
-          'Host'            => 'download.swissmedicinfo.ch',
-        }).
-      to_return(
-        :status  => 200,
-        :headers => {'Content-Type' => 'application/zip; charset=utf-8'},
-        :body    => stub_response)
-  end
-  def setup_epha_server_mock
-    # csv
-    stub_csv_url = 'https://download.epha.ch/cleaned/matrix.csv'
-    stub_response = File.read(File.join(Oddb2xml::SpecData, 'epha_interactions.csv'))
-    stub_request(:get, stub_csv_url).
-      with(:headers => {
-        'Accept' => '*/*',
-        'Host'   => 'download.epha.ch',
-      }).
-      to_return(
-        :status  => 200,
-        :headers => {'Content-Type' => 'text/csv; charset=utf-8'},
-        :body    => stub_response)
-  end
-  def setup_bm_update_server_mock
-    # txt
-    stub_txt_url = 'https://raw.github.com/zdavatz/oddb2xml_files/master/BM_Update.txt'
-    stub_response = File.read(File.join(Oddb2xml::SpecData, 'oddb2xml_files_bm_update.txt'))
-    stub_request(:get, stub_txt_url).
-      with(:headers => {
-        'Accept' => '*/*',
-        'Host'   => 'raw.github.com',
-      }).
-      to_return(
-        :status  => 200,
-        :headers => {'Content-Type' => 'text/plain; charset=utf-8'},
-        :body    => stub_response)
-  end
-  def setup_lppv_server_mock
-    # txt
-    stub_txt_url = 'https://raw.github.com/zdavatz/oddb2xml_files/master/LPPV.txt'
-    stub_response = File.read(File.join(Oddb2xml::SpecData, 'oddb2xml_files_lppv.txt'))
-    stub_request(:get, stub_txt_url).
-      with(:headers => {
-        'Accept' => '*/*',
-        'Host'   => 'raw.github.com',
-      }).
-      to_return(
-        :status  => 200,
-        :headers => {'Content-Type' => 'text/plain; charset=utf-8'},
-        :body    => stub_response)
-  end
-  def setup_migel_server_mock
-    # xls
-    stub_xls_url = 'https://github.com/zdavatz/oddb2xml_files/raw/master/NON-Pharma.xls'
-    stub_response = File.read(File.join(Oddb2xml::SpecData, 'oddb2xml_files_nonpharma.xls'))
-    stub_request(:get, stub_xls_url).
-      with(:headers => {
-        'Accept' => '*/*',
-        'Host'   => 'github.com',
-      }).
-      to_return(
-        :status  => 200,
-        :headers => {'Content-Type' => 'application/octet-stream; charset=utf-8'},
-        :body    => stub_response)
-  end
-  def setup_medregbm_server_mock
-    # txt betrieb
-    stub_txt_url = 'https://www.medregbm.admin.ch/Publikation/CreateExcelListBetriebs'
-    stub_response = File.read(File.join(Oddb2xml::SpecData, 'medregbm_betrieb.txt'))
-    stub_request(:get, stub_txt_url).
-      with(:headers => {
-        'Accept' => '*/*',
-        'Host'   => 'www.medregbm.admin.ch',
-      }).
-      to_return(
-        :status  => 200,
-        :headers => {'Content-Type' => 'text/plain; charset=utf-8'},
-        :body    => stub_response)
-    stub_txt_url = 'https://www.medregbm.admin.ch/Publikation/CreateExcelListMedizinalPersons'
-    # txt person
-    stub_response = File.read(File.join(Oddb2xml::SpecData, 'medregbm_person.txt'))
-    stub_request(:get, stub_txt_url).
-      with(:headers => {
-        'Accept' => '*/*',
-        'Host'   => 'www.medregbm.admin.ch',
-      }).
-      to_return(
-        :status  => 200,
-        :headers => {'Content-Type' => 'text/plain; charset=utf-8'},
-        :body    => stub_response)
-  end
-  def setup_zurrose_server_mock
-    # dat
-    stub_dat_url  = 'http://zurrose.com/fileadmin/main/lib/download.php?file=/fileadmin/user_upload/downloads/ProduktUpdate/IGM11_mit_MwSt/Vollstamm/transfer.dat'
-    stub_response = File.read(File.join(Oddb2xml::SpecData, 'zurrose_transfer.dat'))
-    stub_request(:get, stub_dat_url).
-      with(:headers => {
-        'Accept' => '*/*',
-        'Host'   => 'zurrose.com',
-      }).
-      to_return(
-        :status  => 200,
-        :headers => {'Content-Type' => 'text/plain; charset=utf-8'},
-        :body    => stub_response)
+    puts "Skip setup_server_mocks as we want to use vcr"
   end
 end
 

data/test_options.rb

@@ -11,6 +11,8 @@ require 'socket'
 
 def test_one_call(cmd)
   dest = File.join(Ausgabe, cmd.gsub(/[ -]/, '_'))
+  all_downloads = File.join(dest, 'downloads')
+  FileUtils.makedirs(all_downloads) unless File.exists?(all_downloads)
   cmd.sub!('oddb2xml',  'oddb2xml --skip-download --log')
   files = (Dir.glob('%.xls*') + Dir.glob('*.dat*') + Dir.glob('*.xml'))
   FileUtils.rm(files, :verbose => true)
@@ -28,12 +30,15 @@ def test_one_call(cmd)
   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
+  downloaded_files = Dir.glob("#{dest}/*/downloads/*")
+  FileUtils.mv(downloaded_files,  all_downloads, :verbose => true) if downloaded_files.size > 0
+  FileUtils.rm(Dir.glob("#{dest}/*#{Time.now.year}*.xml"), :verbose => true)
 end
 
 def prepare_for_gem_test
   [ "rake clean gem install"      , # build  and install our gem first
 #    "gem uninstall --all --ignore-dependencies --executables",
-    "gem install pkg/*.gem"
+    "gem install --no-ri --no-rdoc pkg/*.gem"
   ].each {
     |cmd|
       puts "Running #{cmd}"
@@ -48,13 +53,13 @@ prepare_for_gem_test
 # we will skip some long running tests as travis jobs must finish in less than 50 minutes
 # unfortunately it returns a very common name
 unless 'localhost.localdomain'.eql?(Socket.gethostbyname(Socket.gethostname).first)
-  test_one_call('oddb2xml --calc')
   test_one_call('oddb2xml -e')
   test_one_call('oddb2xml -e -I80')
   test_one_call('oddb2xml -f dat --append -I 80')
   test_one_call('oddb2xml -f dat --append')
   test_one_call('oddb2xml --append')
 end
+test_one_call('oddb2xml --calc')
 test_one_call('oddb2xml -t md -c tar.gz')
 test_one_call('oddb2xml -o')
 test_one_call('oddb2xml -f xml')