oddb2xml 2.5.0 → 2.5.1

data/spec/spec_helper.rb

@@ -8,11 +8,9 @@
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 $:.unshift File.dirname(__FILE__)
 
-require 'bundler/setup'
-Bundler.require
-
 require 'rspec'
 require 'webmock/rspec'
+require 'flexmock/rspec'
 require 'pp'
 
 begin # load pry if is available
@@ -47,8 +45,8 @@ module Oddb2xml
                   '7680532900196', # Insulin, gentechnik
                   '7680555610041', # Diaphin 10 g i.v. drug
     ]
-  FRIDGE_GTIN = '7680586180018'   # fridge drug IKSNR 58618: ARTISS 2 ml, tiefgefrorene Lösung
-  ORPHAN_GTIN = '7680621320010'   # orphan drug IKSNR 62132: Adcetris, Pulver zur Herstellung einer Infusionslösung
+  FRIDGE_GTIN = '7680002770014'   # fridge drug 7680002770014 Coeur-Vaisseaux Sérocytol, suppositoire
+  ORPHAN_GTIN = '7680587340015'   # orphan drug IKSNR 62132: Adcetris, Pulver zur Herstellung einer Infusionslösung
   GTINS_DRUGS = [ '733905577161', # 1-DAY ACUVUE Moist Tag -2.00dpt BC 8.5
                   FRIDGE_GTIN,
                   ORPHAN_GTIN,
@@ -72,44 +70,47 @@ module Oddb2xml
                   '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
+    FERRO_GRADUMET_GTIN           = '7680316440115'
+    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_GTIN            = '7680620690084'
     LEVETIRACETAM_PRICE_PPUB      = 27.8
     LEVETIRACETAM_PRICE_ZURROSE   = 13.49
     LEVETIRACETAM_PRICE_RESELLER_PUB = 24.3
-    SOFRADEX_GTIN                 = 7680316950157
+    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
+    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
+    '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
 
+RSpec.configure do |config|
+    config.mock_with :flexmock
+  end        
+
 VCR.configure do |config|
   config.cassette_library_dir = "spec/fixtures/vcr_cassettes"
   config.hook_into :webmock
   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 ,
+  config.default_cassette_options = { :record =>:once, # ARGV.join(' ').index('downloader_spec') ? :new_episodes : :once ,
                                       :preserve_exact_body_bytes => true,
                                       :allow_playback_repeats => true,
                                       :serialize_with => :json,
@@ -133,6 +134,7 @@ require 'oddb2xml'
 
 module Kernel
   def buildr_capture(stream)
+    Pry.config.output = STDOUT
     begin
       stream = stream.to_s
       eval "$#{stream} = StringIO.new"
@@ -161,8 +163,9 @@ module ServerMockHelper
     dirs.each{ |dir| FileUtils.rm_rf(Dir.glob(File.join(dir, '*')), :verbose => false) }
     dirs.each{ |dir| FileUtils.makedirs(dir, :verbose => false) }
     cleanup_compressor
+    mock_downloads
   end
-  
+
   def setup_server_mocks
     puts "Skip setup_server_mocks as we want to use vcr"
   end
@@ -218,3 +221,49 @@ RSpec.configure do |config|
   # Helper
   config.include(ServerMockHelper)
 end
+
+def validate_via_xsd(xsd_file, xml_file)
+  xsd =open(xsd_file).read
+  xsd_rtikelstamm_xml = Nokogiri::XML::Schema(xsd)
+  doc = Nokogiri::XML(File.read(xml_file))
+  xsd_rtikelstamm_xml.validate(doc).each do
+    |error|
+      if error.message
+        puts "Failed validating #{xml_file} with #{File.size(xml_file)} bytes using XSD from #{xsd_file}"
+        puts "CMD: xmllint --noout --schema #{xsd_file} #{xml_file}"
+      end
+      msg = "expected #{error.message} to be nil\nfor #{xml_file}"
+      puts msg
+      expect(error.message).to be_nil, msg
+  end
+end
+
+def mock_downloads
+    WebMock.enable!
+    { 'transfer.zip' => ['transfer.dat'],
+      'XMLPublications.zip' => ['Preparations.xml', 'ItCodes.xml', 'GL_Diff_SB.xml']
+      }.each do |zip, entries|
+        zip_file = File.join(Oddb2xml::SpecData,zip)
+        files = entries.collect{|entry| File.join(Oddb2xml::SpecData, entry)}
+        FileUtils.rm(zip_file, :verbose => false) if File.exist?(zip_file)
+        cmd = "zip --quiet --junk-paths #{zip_file} #{files.join(' ')}"
+        system(cmd)
+    end
+    { 'https://download.epha.ch/cleaned/matrix.csv' =>  'epha_interactions.csv',
+      'https://www.swissmedic.ch/dam/swissmedic/de/dokumente/listen/humanarzneimittel.orphan.xlsx.download.xlsx/humanarzneimittel.xlsx' =>  'swissmedic_orphan.xlsx',
+      'https://www.swissmedic.ch/dam/swissmedic/de/dokumente/listen/excel-version_zugelasseneverpackungen.xlsx.download.xlsx/excel-version_zugelasseneverpackungen.xlsx' => 'swissmedic_package.xlsx',
+      'http://pillbox.oddb.org/TRANSFER.ZIP' =>  'transfer.zip',
+      'https://raw.githubusercontent.com/epha/robot/master/data/manual/swissmedic/atc.csv' => 'atc.csv',
+      'https://raw.githubusercontent.com/zdavatz/oddb2xml_files/master/LPPV.txt' => 'oddb2xml_files_lppv.txt',
+      'http://bag.e-mediat.net/SL2007.Web.External/File.axd?file=XMLPublications.zip' => 'XMLPublications.zip',
+#      'http://refdatabase.refdata.ch/Service/Article.asmx?WSDL' => 'refdata_Pharma.xml',
+      }.each do |url, file|
+      inhalt = File.read(File.join(Oddb2xml::SpecData, file))
+      m = flexmock('open-uri')
+      m.should_receive(:open).with(url).and_return(inhalt)
+      stub_request(:any,url).to_return(body: inhalt)
+      stub_request(:get,url).to_return(body: inhalt)
+      stub_request(:open,url).to_return(body: inhalt)
+    end
+    VCR.eject_cassette; VCR.insert_cassette('oddb2xml')
+end

data/test_options.rb

@@ -8,6 +8,7 @@
 
 require 'fileutils'
 require 'socket'
+require 'oddb2xml/version'
 
 def test_one_call(cmd)
   dest = File.join(Ausgabe, cmd.gsub(/[ -]/, '_'))
@@ -46,7 +47,7 @@ def prepare_for_gem_test
   }
 end
 
-Ausgabe = File.join(Dir.pwd, 'ausgabe', Time.now.strftime('%Y.%m.%d-%H:%M'))
+Ausgabe = File.join(Dir.pwd, 'ausgabe', "#{Oddb2xml::VERSION}-#{Time.now.strftime('%Y.%m.%d')}") 
 puts "FQDN hostname #{Socket.gethostbyname(Socket.gethostname).inspect}"
 FileUtils.makedirs(Ausgabe)
 prepare_for_gem_test
@@ -54,6 +55,7 @@ prepare_for_gem_test
 # unfortunately it returns a very common name
 unless 'localhost.localdomain'.eql?(Socket.gethostbyname(Socket.gethostname).first)
   test_one_call('oddb2xml -e')
+  test_one_call('oddb2xml --artikelstamm')
   test_one_call('oddb2xml -e -I80')
   test_one_call('oddb2xml -f dat --append -I 80')
   test_one_call('oddb2xml -f dat --append')
@@ -65,4 +67,4 @@ test_one_call('oddb2xml -o')
 test_one_call('oddb2xml -f xml')
 test_one_call('oddb2xml -f dat')
 test_one_call('oddb2xml -t md')
-test_one_call('oddb2xml -x address')
+# test_one_call('oddb2xml -x address')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-06 00:00:00.000000000 Z
+date: 2018-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: archive-tar-minitar
+  name: minitar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.2
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
@@ -164,20 +164,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: httpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: xml-simple
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -276,9 +318,24 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: flexmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: oddb2xml creates xml files using swissINDEX, BAG-XML and Swissmedic.
 email: yasaka@ywesee.com, zdavatz@ywesee.com, ngiger@ywesee.com
 executables:
+- compare_v5
 - oddb2xml
 extensions: []
 extra_rdoc_files: []
@@ -286,6 +343,8 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- Elexis_Artikelstamm_v003.xsd
+- Elexis_Artikelstamm_v5.xsd
 - Gemfile
 - History.txt
 - LICENSE
@@ -293,14 +352,20 @@ files:
 - QA.md
 - README.md
 - Rakefile
+- artikelstamm.md
+- bin/compare_v5
 - bin/oddb2xml
+- data/article_overrides.yaml
 - data/gal_forms.yaml
 - data/gal_groups.yaml
+- data/gtin2ignore.yaml
+- data/product_overrides.yaml
 - dokumentation_calc.textile
 - lib/oddb2xml.rb
 - lib/oddb2xml/builder.rb
 - lib/oddb2xml/calc.rb
 - lib/oddb2xml/cli.rb
+- lib/oddb2xml/compare.rb
 - lib/oddb2xml/compositions_syntax.rb
 - lib/oddb2xml/compressor.rb
 - lib/oddb2xml/downloader.rb
@@ -313,30 +378,31 @@ files:
 - oddb2xml.gemspec
 - oddb2xml.xsd
 - oddb_calc.xsd
+- spec/artikelstamm_spec.rb
 - spec/builder_spec.rb
 - spec/calc_spec.rb
 - spec/cli_spec.rb
+- spec/compare_spec.rb
 - spec/composition_syntax_spec.rb
 - spec/compressor_spec.rb
 - spec/data/AipsDownload.zip
+- spec/data/Elexis_Artikelstamm_v5.xsd
 - spec/data/GL_Diff_SB.xml
 - spec/data/ItCodes.xml
 - spec/data/PR121001.txt
 - spec/data/PR121002.txt
 - spec/data/Preparations.xml
-- spec/data/XMLPublications.zip
+- spec/data/Publications.xls
+- spec/data/artikelstamm_N_010917.xml
+- spec/data/artikelstamm_N_011217.xml
+- spec/data/artikelstamm_P_010917.xml
+- spec/data/artikelstamm_P_011217.xml
 - spec/data/atc.csv
 - spec/data/column_c.txt
 - spec/data/compositions.txt
 - spec/data/compressor/oddb2xml_files_bm_update.txt
 - spec/data/compressor/oddb2xml_files_lppv.txt
 - spec/data/compressor/oddb2xml_files_nonpharma.xls
-- spec/data/compressor/oddb_article.xml
-- spec/data/compressor/oddb_fi.xml
-- spec/data/compressor/oddb_fi_product.xml
-- spec/data/compressor/oddb_limitation.xml
-- spec/data/compressor/oddb_product.xml
-- spec/data/compressor/oddb_substance.xml
 - spec/data/epha_interactions.csv
 - spec/data/medregbm_betrieb.txt
 - spec/data/medregbm_person.txt
@@ -344,6 +410,8 @@ files:
 - spec/data/oddb2xml_files_lppv.txt
 - spec/data/oddb2xml_files_nonpharma.xls
 - spec/data/problems.txt
+- spec/data/refdata_NonPharma.xml
+- spec/data/refdata_Pharma.xml
 - spec/data/swissmedic_fridges.html
 - spec/data/swissmedic_info.html
 - spec/data/swissmedic_info_2.html
@@ -352,12 +420,16 @@ files:
 - spec/data/swissmedic_package.xlsx
 - spec/data/swissmedic_packages.html
 - spec/data/transfer.dat
+- spec/data/v5_first.xml
+- spec/data/v5_second.xml
 - spec/data/vcr/transfer.dat
 - spec/data/vcr/transfer.zip
 - spec/data/wsdl_nonpharma.xml
 - spec/data/wsdl_pharma.xml
+- spec/data_helper.rb
 - spec/downloader_spec.rb
 - spec/extractor_spec.rb
+- spec/fixtures/vcr_cassettes/artikelstamm.json
 - spec/fixtures/vcr_cassettes/oddb2xml.json
 - spec/galenic_spec.rb
 - spec/options_spec.rb
@@ -392,30 +464,31 @@ signing_key:
 specification_version: 4
 summary: oddb2xml creates xml files.
 test_files:
+- spec/artikelstamm_spec.rb
 - spec/builder_spec.rb
 - spec/calc_spec.rb
 - spec/cli_spec.rb
+- spec/compare_spec.rb
 - spec/composition_syntax_spec.rb
 - spec/compressor_spec.rb
 - spec/data/AipsDownload.zip
+- spec/data/Elexis_Artikelstamm_v5.xsd
 - spec/data/GL_Diff_SB.xml
 - spec/data/ItCodes.xml
 - spec/data/PR121001.txt
 - spec/data/PR121002.txt
 - spec/data/Preparations.xml
-- spec/data/XMLPublications.zip
+- spec/data/Publications.xls
+- spec/data/artikelstamm_N_010917.xml
+- spec/data/artikelstamm_N_011217.xml
+- spec/data/artikelstamm_P_010917.xml
+- spec/data/artikelstamm_P_011217.xml
 - spec/data/atc.csv
 - spec/data/column_c.txt
 - spec/data/compositions.txt
 - spec/data/compressor/oddb2xml_files_bm_update.txt
 - spec/data/compressor/oddb2xml_files_lppv.txt
 - spec/data/compressor/oddb2xml_files_nonpharma.xls
-- spec/data/compressor/oddb_article.xml
-- spec/data/compressor/oddb_fi.xml
-- spec/data/compressor/oddb_fi_product.xml
-- spec/data/compressor/oddb_limitation.xml
-- spec/data/compressor/oddb_product.xml
-- spec/data/compressor/oddb_substance.xml
 - spec/data/epha_interactions.csv
 - spec/data/medregbm_betrieb.txt
 - spec/data/medregbm_person.txt
@@ -423,6 +496,8 @@ test_files:
 - spec/data/oddb2xml_files_lppv.txt
 - spec/data/oddb2xml_files_nonpharma.xls
 - spec/data/problems.txt
+- spec/data/refdata_NonPharma.xml
+- spec/data/refdata_Pharma.xml
 - spec/data/swissmedic_fridges.html
 - spec/data/swissmedic_info.html
 - spec/data/swissmedic_info_2.html
@@ -431,12 +506,16 @@ test_files:
 - spec/data/swissmedic_package.xlsx
 - spec/data/swissmedic_packages.html
 - spec/data/transfer.dat
+- spec/data/v5_first.xml
+- spec/data/v5_second.xml
 - spec/data/vcr/transfer.dat
 - spec/data/vcr/transfer.zip
 - spec/data/wsdl_nonpharma.xml
 - spec/data/wsdl_pharma.xml
+- spec/data_helper.rb
 - spec/downloader_spec.rb
 - spec/extractor_spec.rb
+- spec/fixtures/vcr_cassettes/artikelstamm.json
 - spec/fixtures/vcr_cassettes/oddb2xml.json
 - spec/galenic_spec.rb
 - spec/options_spec.rb