oddb2xml 2.7.1 → 2.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c31777bcd85038bd65d38d67d6ebdf2197f174389403b76ff146b18d3ef4557e
-  data.tar.gz: 8d8930ed04518838084ae4aeb69181418b2eddb36cfa83ece2cbc84ccd06e1f4
+  metadata.gz: 2b92ef261a1ad3ea6a8e2ce6d60302b0acf4c50efe1897ec9379633d31c5cced
+  data.tar.gz: ebaca1d2e02274a59b416e407a1049662564b48abb474f28de50b00f5b250147
 SHA512:
-  metadata.gz: abe9685cc40ba1fbf9525c3cbeb9f332a98725e76621074c9f1df179c91e53cb50a4f15e78a800a28224351d3a47ec8aef0e3b9ee17787a8dccd519db65bc6d8
-  data.tar.gz: 415b9049a316af98279f7af0b602ecd85b0bd2e86493133af512d37b494d43155822ef754ad6dcaa39b1aa474fddba57081860588b7e896da13bf891e9b522d6
+  metadata.gz: db2fe198ad3ace938014038ab1260c2351113c93b67bceed5148352aac9e8c5c4596fd7beb310869913e2dafcecb93da1abc1836b2296a8bab514e5937a47fce
+  data.tar.gz: 3a41d7685173bc57d9dfd0618f179ac0405140d203b50b2e750a97ebe438d2a285858972e081724d1ab525f4f106b22b7b673d2fa5511790b87287eac8e5609b

data/.github/workflows/ruby.yml

@@ -22,8 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu]
-        ruby: [2.4, 2.5, 2.6, 2.7, 3.0, head]
-    continue-on-error: ${{ endsWith(matrix.ruby, 'head') }}
+        ruby: [2.6, 2.7, "3.0", 3.1]
     steps:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1

data/.standard.yml

@@ -0,0 +1,2 @@
+ignore:                 # default: []
+  - 'vendor/**/*'

data/Gemfile

@@ -1,8 +1,8 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec
 
 group :debugger do
-  gem 'pry-byebug'
-  gem 'pry-doc'
+  gem "pry-byebug"
+  gem "pry-doc"
 end

data/History.txt

@@ -1,3 +1,27 @@
+=== 2.7.5 / 1.02.2022
+* Specify old versions of savon and rdoc to avoid importing psych
+* Added ruby 3.1 to tested ruby versions
+* Removed ruby 2.5 from supported versions
+* Force psych to < 4.0 to avoid the error Psych::DisallowedClass: Tried to load unspecified class: Struct::GalenicGroup
+*   Therefor rdoc < 6.4
+
+=== 2.7.4 / 30.03.2021
+* Update needed Ruby-Version to 2.5.0 in gemspec
+* Ensure downloads directory is created at first run
+
+=== 2.7.3 / 29.03.2021
+* Do not delete swissmedic_package.xlsx and swissmedic_orphan.xlsx
+* Save swissmedic_package.xlsx and swissmedic_orphan.xlsx under downloads
+* Log removing files
+
+=== 2.7.2 / 18.03.2021
+* Added https://github.com/testdouble/standard and fixed all useful warnings
+* Added standard to rake tasks
+* Use ATC-code from refdata if available and show differences
+* Get pharmacode from tranfer.dat for artikelstamm if possible
+* We do not longer test Ruby 2.4 with github/actions
+* Update build status to use github/actions instead of travis
+
 === 2.7.1 / 03.02.2021
 * travis-ci -> Github Actions
 * limit DSCRD/DSCRF to 120 chars as specified in the XSD

data/README.md

@@ -1,6 +1,6 @@
 # oddb2xml
 
-[![Build Status](https://secure.travis-ci.org/zdavatz/oddb2xml.png)](http://travis-ci.org/zdavatz/oddb2xml)
+[![Build Status](https://github.com/zdavatz/oddb2xml/workflows/Ruby/badge.svg)](https://github.com/zdavatz/oddb2xml/actions)
 
 * oddb2xml -a nonpharma -o fi
 
@@ -106,8 +106,8 @@ FR
 
 ## Supported ruby version
 
-We run tests on travis-ci.org for the Ruby versions mentioned in the .travis.yml file. You will need ruby > 2.4 to work correctly.
-Ruby 2.2/2.3 have problems with i18n encoding and fail a spec test for Naropin
+We run tests on travis-ci.org for the Ruby versions mentioned in the .travis.yml file. You will need ruby > 2.5 to work correctly.
+Look at the github actions to see the spec test results. We ignore errors against ruby head, as it is sometimes unstable.
 
 
 ## XSD files

data/Rakefile

@@ -1,25 +1,26 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'oddb2xml/version'
+require "oddb2xml/version"
 require "bundler/gem_tasks"
-require 'rspec/core/rake_task'
+require "standard/rake"
+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
+desc "Offer a gem task like hoe"
+task gem: :build do
   Rake::Task[:build].invoke
 end
 
-task :spec => :clean
+task spec: :clean
 
-desc 'Run oddb2xml with all commonly used combinations'
-task :test => [:clean, :spec, :gem] do
-  log_file = 'test_options.log'
+desc "Run oddb2xml with all commonly used combinations"
+task test: [:clean, :spec, :gem] do
+  log_file = "test_options.log"
   puts "Running test_options.rb with Output redirected to #{log_file}. This will take some time (e.g. 20 minutes)"
   # must use bash -o pipefail to catch error in test_options.rb and not tee
   # see http://stackoverflow.com/questions/985876/tee-and-exit-status
@@ -28,16 +29,16 @@ task :test => [:clean, :spec, :gem] do
   exit 1 unless res
 end
 
-require 'rake/clean'
-CLEAN.include FileList['pkg/*.gem']
-CLEAN.include FileList['*.zip*']
-CLEAN.include FileList['*.xls*']
-CLEAN.include FileList['*.xml*']
-CLEAN.include FileList['*.dat*']
-CLEAN.include FileList['*.tar.gz']
-CLEAN.include FileList['*.txt.*']
-CLEAN.include FileList['*.csv.*']
-CLEAN.include FileList['*.zip.*']
-CLEAN.include FileList['ruby*.tmp']
-CLEAN.include FileList['data/download']
-CLEAN.include FileList['duplicate_ean13_from_zur_rose.txt']
+require "rake/clean"
+CLEAN.include FileList["pkg/*.gem"]
+CLEAN.include FileList["*.zip*"]
+CLEAN.include FileList["*.xls*"]
+CLEAN.include FileList["*.xml*"]
+CLEAN.include FileList["*.dat*"]
+CLEAN.include FileList["*.tar.gz"]
+CLEAN.include FileList["*.txt.*"]
+CLEAN.include FileList["*.csv.*"]
+CLEAN.include FileList["*.zip.*"]
+CLEAN.include FileList["ruby*.tmp"]
+CLEAN.include FileList["data/download"]
+CLEAN.include FileList["duplicate_ean13_from_zur_rose.txt"]

data/bin/check_artikelstamm

@@ -1,20 +1,20 @@
 #!/usr/bin/env ruby
-require 'pathname'
+require "pathname"
 
 root = Pathname.new(__FILE__).realpath.parent.parent
-$:.unshift root.join('lib') if $0 == __FILE__
+$:.unshift root.join("lib") if $0 == __FILE__
 
-require 'oddb2xml/version'
-require 'oddb2xml/semantic_check'
-require 'optimist'
+require "oddb2xml/version"
+require "oddb2xml/semantic_check"
+require "optimist"
 
-@opts = Optimist::options(ARGV) do
-  version "#$0 ver.#{Oddb2xml::VERSION}"
+@opts = Optimist.options(ARGV) do
+  version "#{$0} ver.#{Oddb2xml::VERSION}"
   banner <<-EOS
     Runs various semanti_check for the Elexis artikelstamm
   Usage:
   #{File.basename(__FILE__)} xml_file_to_check
-EOS
+  EOS
 end
 $stdout.sync = true
 
@@ -24,7 +24,7 @@ if args.size != 1
   exit 2
 end
 
-startTime = Time.now
-result = Oddb2xml::SemanticCheck.new(ARGV.first).allSemanticChecks
-diff = (Time.now-startTime).to_i
+start_time = Time.now
+Oddb2xml::SemanticCheck.new(ARGV.first).allSemanticChecks
+diff = (Time.now - start_time).to_i
 puts "#{Time.now.strftime("%H:%M:%S")}: #{__FILE__} done. Took #{diff} seconds"

data/bin/compare_v5

@@ -1,31 +1,31 @@
 #!/usr/bin/env ruby
-require 'pathname'
+require "pathname"
 
 root = Pathname.new(__FILE__).realpath.parent.parent
-$:.unshift root.join('lib') if $0 == __FILE__
+$:.unshift root.join("lib") if $0 == __FILE__
 
-require 'oddb2xml/version'
-require 'oddb2xml/compare'
-require 'optimist'
-    DEFAULTSx = {
-      :components => ["PRODUCTS", "LIMITATIONS", "ITEMS",],
-      :fields_to_ignore => ['COMP', 'DOSAGE_FORMF', 'MEASUREF'],
-      :fields_as_floats => [ 'PEXT', 'PEXF', 'PPUB' ],
-      :min_diff_for_floats => 0.01,
-      :case_insensitive => true,
-    }
+require "oddb2xml/version"
+require "oddb2xml/compare"
+require "optimist"
+DEFAULTS_X = {
+  components: ["PRODUCTS", "LIMITATIONS", "ITEMS"],
+  fields_to_ignore: ["COMP", "DOSAGE_FORMF", "MEASUREF"],
+  fields_as_floats: ["PEXT", "PEXF", "PPUB"],
+  min_diff_for_floats: 0.01,
+  case_insensitive: true
+}
 
-@opts = Optimist::options(ARGV) do
-  version "#$0 ver.#{Oddb2xml::VERSION}"
+@opts = Optimist.options(ARGV) do
+  version "#{$0} ver.#{Oddb2xml::VERSION}"
   banner <<-EOS
   Usage:
   compare_v5 [option] first_v5_xml second_v5_xml
-EOS
-  opt :components,          "components to compare", :default => Oddb2xml::CompareV5::DEFAULTS[:components]
-  opt :fields_as_floats,    "Fields that should be compared as floats", :default => Oddb2xml::CompareV5::DEFAULTS[:fields_as_floats]
-  opt :fields_to_ignore,    "Ignore these fields", :default => Oddb2xml::CompareV5::DEFAULTS[:fields_to_ignore]
-  opt :min_diff_for_floats, "Minimal difference when comparing floats", :default => Oddb2xml::CompareV5::DEFAULTS[:min_diff_for_floats]
-  opt :case_insensitive,    "case_insensitive comparison", :default => Oddb2xml::CompareV5::DEFAULTS[:case_insensitive]
+  EOS
+  opt :components, "components to compare", default: Oddb2xml::CompareV5::DEFAULTS[:components]
+  opt :fields_as_floats, "Fields that should be compared as floats", default: Oddb2xml::CompareV5::DEFAULTS[:fields_as_floats]
+  opt :fields_to_ignore, "Ignore these fields", default: Oddb2xml::CompareV5::DEFAULTS[:fields_to_ignore]
+  opt :min_diff_for_floats, "Minimal difference when comparing floats", default: Oddb2xml::CompareV5::DEFAULTS[:min_diff_for_floats]
+  opt :case_insensitive, "case_insensitive comparison", default: Oddb2xml::CompareV5::DEFAULTS[:case_insensitive]
 end
 $stdout.sync = false
 
@@ -35,7 +35,7 @@ if args.size != 2
   exit 2
 end
 
-startTime = Time.now
-result = Oddb2xml::CompareV5.new(ARGV.first, ARGV.last, @opts).compare
-diff = (Time.now-startTime).to_i
+start_time = Time.now
+Oddb2xml::CompareV5.new(ARGV.first, ARGV.last, @opts).compare
+diff = (Time.now - start_time).to_i
 puts "#{Time.now.strftime("%H:%M:%S")}: #{__FILE__} done. Took #{diff} seconds"

data/bin/oddb2xml

@@ -1,12 +1,12 @@
 #!/usr/bin/env ruby
 
-require 'pathname'
+require "pathname"
 root = Pathname.new(__FILE__).realpath.parent.parent
-$:.unshift root.join('lib') if $0 == __FILE__
+$:.unshift root.join("lib") if $0 == __FILE__
 
-require 'mechanize'
-require 'oddb2xml'
-require 'oddb2xml/options'
+require "mechanize"
+require "oddb2xml"
+require "oddb2xml/options"
 $stdout.sync = true
 
 opts = Oddb2xml::Options.parse(ARGV)
@@ -17,21 +17,21 @@ if args.size > 0
   exit 2
 end
 # TEMP
-if path = args.first
+if (path = args.first)
   opts[:transfer_dat] = path
 end
 
-startTime = Time.now
+start_time = Time.now
 ui = Oddb2xml::Cli.new(opts)
 begin
   if opts[:format] == :xml
     opts[:ean14] = true # force
   end
-  #puts opts if opts[:debug]
+  # puts opts if opts[:debug]
   if RUBY_VERSION.to_f < 1.9
-    message = <<-MES
-Once you find some time, please upgrade your Ruby to 1.9.3 ;)
-then you will not see anymore warnings
+    message = <<~MES
+      Once you find some time, please upgrade your Ruby to 1.9.3 ;)
+      then you will not see anymore warnings
     MES
     warn message
   end
@@ -39,5 +39,6 @@ then you will not see anymore warnings
 rescue Interrupt
   exit
 end
-diff = (Time.now-startTime).to_i
-puts "#{Time.now}: #{__LINE__} done. Took #{diff} seconds"; $stdout.sync
+diff = (Time.now - start_time).to_i
+puts "#{Time.now}: #{__LINE__} done. Took #{diff} seconds"
+$stdout.sync