swissmedic-diff 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 148fd8071ce6cb4e6d8800719cf00a9389533d78b44639e3e6d8abdf63e748ec
-  data.tar.gz: 9f898594652b70299dd2813632cfe5c802cc36fa8d5281af1bf53f0e264ba368
+  metadata.gz: dbedd2453003bfa00e428d41445471400b23c016a04cc19708dd13e82a390192
+  data.tar.gz: 3df6a9a5b8f38e6f0016c35e4c8eb8b6b3aefc3b5d01cbda1ff86c2fca451ce4
 SHA512:
-  metadata.gz: 103e81c93f7df059a2985f7840c5092441438a2c57d8b360470aa6e242f17937170ae91a20ec4aa90c1727c5ee279bc84832047b1c1c185482d5a207bc5e497b
-  data.tar.gz: f9d4ceedc50676eaa4ccb3bbab86d11e70db961ec7f879b6d39b9aa93bd54cf479bc7860f75d2bf239d2ca7444ae3a358b506f53985a574ad8cf6199da4aa0a7
+  metadata.gz: 4f0c588ba8a0949c18015b582a37084406d6b79394fd2bd6e7452c1f79199232594f637d569f018da135e4500ff4fb1be5af563887f9a38a29807dc9e5722b08
+  data.tar.gz: 4c07343f38c2322d6a872af07855b5006e310f3e3dc0d6c4a1ed3e62544b344044260c6b8af40160c029dc15e2974d165e7eaffcd3957281e4f6ff640ea1a6e2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    swissmedic-diff (0.3.0)
+    swissmedic-diff (0.3.1)
       logger
       nokogiri
       ostruct
@@ -14,62 +14,52 @@ GEM
     ansi (1.5.0)
     ast (2.4.3)
     builder (3.3.0)
-    byebug (11.1.3)
-    coderay (1.1.3)
-    date (3.4.1)
-    debug (1.11.0)
+    date (3.5.1)
+    debug (1.11.1)
       irb (~> 1.10)
       reline (>= 0.3.8)
-    erb (5.0.1)
-    io-console (0.8.0)
-    irb (1.15.2)
+    erb (6.0.1)
+    io-console (0.8.2)
+    irb (1.16.0)
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.12.2)
+    json (2.18.0)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
-    logger (1.6.4)
-    method_source (1.1.0)
-    minitest (5.25.4)
+    logger (1.7.0)
+    minitest (6.0.1)
+      prism (~> 1.5)
     minitest-reporters (1.7.1)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    nokogiri (1.18.1-x86_64-linux-gnu)
+    nokogiri (1.19.0-x86_64-linux-gnu)
       racc (~> 1.4)
-    ostruct (0.6.1)
+    ostruct (0.6.3)
     parallel (1.27.0)
-    parser (3.3.8.0)
+    parser (3.3.10.0)
       ast (~> 2.4.1)
       racc
-    pp (0.6.2)
+    pp (0.6.3)
       prettyprint
     prettyprint (0.2.0)
-    prism (1.4.0)
-    pry (0.14.2)
-      coderay (~> 1.1)
-      method_source (~> 1.0)
-    pry-byebug (3.10.1)
-      byebug (~> 11.0)
-      pry (>= 0.13, < 0.15)
-    pry-doc (1.5.0)
-      pry (~> 0.11)
-      yard (~> 0.9.11)
-    psych (5.2.6)
+    prism (1.7.0)
+    psych (5.3.1)
       date
       stringio
     racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.2.1)
-    rdoc (6.14.2)
+    rake (13.3.1)
+    rdoc (7.0.3)
       erb
       psych (>= 4.0.0)
-    regexp_parser (2.10.0)
-    reline (0.6.1)
+      tsort
+    regexp_parser (2.11.3)
+    reline (0.6.3)
       io-console (~> 0.5)
-    rubocop (1.75.8)
+    rubocop (1.81.7)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -77,38 +67,38 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.44.0, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.45.1)
+    rubocop-ast (1.49.0)
       parser (>= 3.3.7.2)
-      prism (~> 1.4)
-    rubocop-performance (1.25.0)
+      prism (~> 1.7)
+    rubocop-performance (1.26.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.75.0, < 2.0)
-      rubocop-ast (>= 1.38.0, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
     ruby-progressbar (1.13.0)
-    rubyzip (2.4.1)
+    rubyzip (3.2.2)
     simple_xlsx_reader (5.1.0)
       nokogiri
       rubyzip
-    standard (1.50.0)
+    standard (1.52.0)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.75.5)
+      rubocop (~> 1.81.7)
       standard-custom (~> 1.0.0)
       standard-performance (~> 1.8)
     standard-custom (1.0.2)
       lint_roller (~> 1.0)
       rubocop (~> 1.50)
-    standard-performance (1.8.0)
+    standard-performance (1.9.0)
       lint_roller (~> 1.1)
-      rubocop-performance (~> 1.25.0)
-    stringio (3.1.7)
-    unicode-display_width (3.1.4)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
-    yard (0.9.37)
+      rubocop-performance (~> 1.26.0)
+    stringio (3.2.0)
+    tsort (0.2.0)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.2.0)
 
 PLATFORMS
   x86_64-linux
@@ -117,8 +107,6 @@ DEPENDENCIES
   debug
   minitest
   minitest-reporters
-  pry-byebug
-  pry-doc
   rake
   standard
   swissmedic-diff!

data/History.md

@@ -1,3 +1,11 @@
+# 0.3.1 / 09.01.2026
+* Ruby 4.0 to tests
+* Added stat method to show the result of the diff
+* Fixes for running bundle exec ruby bin/swissmedic-diff
+* Use standardrb to format the code
+* Removed unused constant GALFORM_P
+* Requires at least Ruby 2.6
+
 # 0.3.0 / 05.07.2025
 
 * Use simple_xlsx_reader insted of RubyXL to speed up comparision

data/Rakefile

@@ -2,6 +2,12 @@
 
 require "rubygems"
 require "bundler/gem_tasks"
-
+require "rake/testtask"
 require "rake/clean"
+
 CLEAN.include FileList["*.log"]
+
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList["test/test_*.rb"]
+end

data/lib/swissmedic-diff.rb

@@ -75,7 +75,6 @@ class SwissmedicDiff
       production_science: "Heilmittelcode",
       atc_class: "ATC-Code"
     }
-    GALFORM_P = %r{excipiens\s+(ad|pro)\s+(?<galform>((?!\bpro\b)[^.])+)}
     DATE_FORMAT = "%Y:%m:%d"
 
     def capitalize(string)
@@ -96,6 +95,7 @@ class SwissmedicDiff
       txt = FLAGS.fetch(flag, flag)
       case flag
       when :sequence
+        txt
       when :replaced_package
         pairs = diff.newest_rows[iksnr].collect { |rep, row|
           if (old = diff.replacements[row])
@@ -104,15 +104,15 @@ class SwissmedicDiff
         }.compact
         sprintf "%s (%s)", txt, pairs.join(",")
       when :registration_date, :expiry_date
-        row = diff.newest_rows[iksnr].sort.first.last
-        if row[COLUMNS_2014.keys.index(flag)].to_s.match(REGEXP_UNLIMITED)
+        row = diff.newest_rows[iksnr].min.last
+        if row[COLUMNS_FEBRUARY_2019.keys.index(flag)].to_s.match(REGEXP_UNLIMITED)
           sprintf "%s (%s)", txt, "unbegrenzt"
         else
-          sprintf "%s (%s)", txt, row[COLUMNS_2014.keys.index(flag)].strftime("%d.%m.%Y")
+          sprintf "%s (%s)", txt, row[COLUMNS_FEBRUARY_2019.keys.index(flag)].strftime("%d.%m.%Y")
         end
       else
-        row = diff.newest_rows[iksnr].sort.first.last
-        sprintf "%s (%s)", txt, cell(row, COLUMNS_2014.keys.index(flag))
+        row = diff.newest_rows[iksnr].min.last
+        sprintf "%s (%s)", txt, cell(row, COLUMNS_FEBRUARY_2019.keys.index(flag))
       end
     end
 
@@ -144,7 +144,7 @@ class SwissmedicDiff
         multiples[iksnr] ||= {}
         if prr == iksnr && prp == pacnr
           idx += 1
-        elsif previous = multiples[iksnr][pacnr]
+        elsif (previous = multiples[iksnr][pacnr])
           prr = iksnr
           prp = pacnr
           idx = previous[@target_keys.size].to_i + 1
@@ -194,9 +194,17 @@ class SwissmedicDiff
       }
       @diff.sequence_deletions = known_seqs.keys
       @diff.registration_deletions = known_regs.keys
+      @@stat = {}
+      @@stat[:target] = "#{File.basename(target)} #{File.size(target)} bytes"
+      @@stat[:latest] = "#{File.basename(latest)} #{File.size(latest)} bytes"
+      @diff.to_h.keys.each { |name| @diff.instance_eval("@@stat[:#{name}] = #{name}.size", __FILE__, __LINE__) }
       @diff
     end
 
+    def SwissmedicDiff.stat
+      @@stat
+    end
+
     def format_flags(flags)
       flags.delete(:revision)
       flags.collect { |flag|
@@ -227,7 +235,7 @@ class SwissmedicDiff
         multiples[iksnr] ||= {}
         if prr == iksnr && prp == pacnr
           idx += 1
-        elsif previous = multiples[iksnr][pacnr]
+        elsif (previous = multiples[iksnr][pacnr])
           prr = iksnr
           prp = pacnr
           idx = previous[@latest_keys.size].to_i + 1
@@ -247,8 +255,8 @@ class SwissmedicDiff
 
     def name(diff, iksnr)
       rows = diff.newest_rows[iksnr]
-      row = rows.sort.first.last
-      cell(row, COLUMNS_2014.keys.index(:name_base))
+      row = rows.min.last
+      cell(row, COLUMNS_FEBRUARY_2019.keys.index(:name_base))
     end
 
     def rows_diff(row, other, ignore = [])
@@ -316,7 +324,7 @@ class SwissmedicDiff
       if row[idx]
         case key
         when :registration_date, :expiry_date
-          if row[idx] && row[idx] && REGEXP_UNLIMITED.match(row[idx].to_s)
+          if row[idx] && REGEXP_UNLIMITED.match(row[idx].to_s)
             VALUE_UNLIMITED # Date.new(2099,12,31)
           else
             row[idx]
@@ -330,8 +338,8 @@ class SwissmedicDiff
     end
 
     def get_column_indices(rows)
-      headerRowId = rows_to_skip(rows) - 1
-      rows[headerRowId]
+      header_row_id = rows_to_skip(rows) - 1
+      rows[header_row_id]
       row = rows[5] # Headers are found at row 5 since February 5
       0.upto(COLUMNS_FEBRUARY_2019.size - 1).each { |idx| puts "#{idx}: #{row[idx]}" } if $VERBOSE
       COLUMNS_FEBRUARY_2019.each { |key, value|
@@ -358,12 +366,12 @@ class SwissmedicDiff
     #
     # return  ::
     def each_valid_row(rows)
-      skipRows = rows_to_skip(rows)
+      skip_rows = rows_to_skip(rows)
       column_keys = get_column_indices(rows).keys
       row_nr = 0
       rows.each { |row|
         row_nr += 1
-        next if row_nr <= skipRows
+        next if row_nr <= skip_rows
         break unless row
         if row.size < column_keys.size / 2
           $stdout.puts "Data missing in \n(line " + row_nr.to_s + "): " + row.join(", ").to_s + "\n"
@@ -379,9 +387,9 @@ class SwissmedicDiff
 
     def rows_to_skip(rows)
       j = 0
-      while true
+      loop do
         cell = rows[j][0]
-        break if cell.respond_to?(:to_i) and cell.to_i != 0
+        break if cell.respond_to?(:to_i) && cell.to_i != 0
         j += 1
       end
       j

data/lib/version.rb

@@ -1,3 +1,3 @@
 class SwissmedicDiff
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/test/test_swissmedic-diff-bin.rb

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+
+# SwissmedicPluginTest -- oddb.org -- 18.03.2008 -- hwyss@ywesee.com
+
+$: << File.expand_path("../lib", File.dirname(__FILE__))
+
+require "minitest/autorun"
+require "tempfile"
+require "open3"
+
+module ODDB
+  class SwissmedicPluginBinTest < Minitest::Test
+    def test_running_binary
+      cmd = "bundle exec ruby bin/swissmedic-diff test/data/Packungen-2025.07.01.xlsx test/data/Packungen-2019.03.06.xlsx"
+      stdout, stderr, status = Open3.capture3(cmd)
+      puts "Output: #{stdout}"
+      puts "Error: #{stderr}" if stderr
+      puts "Exit Status: #{status.exitstatus}"
+      assert_equal(0, status.exitstatus)
+      lines = stdout.split("\n")
+      assert_equal(40, lines.size)
+      found = lines.find { |line| line.eql?("+ 16105: Hirudoid, Creme") }
+      assert(found, "Must find + 16105: Hirudoid, Creme")
+      found = lines.find { |line| line.eql?("> 44447: Lopresor Retard 200, Divitabs; Namensänderung (Lopresor Retard 200, Divitabs), Heilmittelcode (Synthetika human), Ablaufdatum der Zulassung (22.12.2019), Wirkstoffe (metoprololi tartras (2:1)), Zusammensetzung (metoprololi tartras (2:1) 200 mg, excipiens pro compresso obducto.)") }
+      assert(found, "must found Ablaufdatum")
+    end
+  end
+end

data/test/test_swissmedic-diff.rb

@@ -14,6 +14,28 @@ module ODDB
       @diff = SwissmedicDiff.new
     end
 
+    def test_diff_changes_january_2026
+      start_time = Time.now
+      @diff = SwissmedicDiff.new
+      last_month = File.expand_path "data/Packungen-2025.12.15.xlsx", File.dirname(__FILE__)
+      this_month = File.expand_path "data/Packungen-2026.01.08.xlsx", File.dirname(__FILE__)
+      result = @diff.diff this_month, last_month
+      duration = (Time.now - start_time).to_i
+      puts "Took #{duration} seconds"
+      assert_equal(487, result.updates.size)
+      assert_equal(336, result.changes.size)
+      assert_equal(148, result.news.size)
+      assert_equal(7, result.replacements.size)
+      assert_equal(107, result.package_deletions.size)
+
+      assert_equal(["16105", "01", "Hirudoid, Creme", "Medinova AG", "Synthetika", "02.08.2.", "C05BA01", Date.new(1951, 9, 1), Date.new(1951, 9, 1), "unbegrenzt", "001", "14", "g", "D", "D", "D", "heparinoidum (chondroitini polysulfas)", "heparinoidum (chondroitini polysulfas) 3 mg, corresp. 250 U., glycerolum (85 per centum), acidum stearicum, alcoholes adipis lanae, alcohol cetylicus et stearylicus 31.375 mg, vaselinum album, alcohol myristylicus, alcohol isopropylicus, kalii hydroxidum, E 218 1.6 mg, thymolum, propylis parahydroxybenzoas 0.4 mg, aqua purificata, ad unguentum pro 1 g.", "X", "Venenmittel für den äusserlichen Gebrauch", nil, nil, nil, nil, 0], result.news.first)
+
+      assert_equal([["55249", "01", "Bronchosan Husten, Tropfen zum Einnehmen", "A.Vogel AG", "Phytoarzneimittel", "03.02.0.", "R05CA10", Date.new(2000, 10, 18), Date.new(2000, 10, 18), "unbegrenzt", "001", "50", "ml", "D", "D", "D", "hederae helicis herbae recentis tinctura (Hedera helix L., herba), thymi herbae recentis tinctura (Thymus vulgaris L., herba), liquiritiae radicis tinctura (Glycyrrhiza glabra L., radix)", "hederae helicis herbae recentis tinctura (Hedera helix L., herba) 376.1 mg, ratio: 1:5.6, Auszugsmittel ethanolum 50.6% (V/V), thymi herbae recentis tinctura (Thymus vulgaris L., herba) 329.1 mg, ratio: 1:7.9, Auszugsmittel ethanolum 50.6% (V/V), liquiritiae radicis tinctura (Glycyrrhiza glabra L., radix) 233.9 mg, ratio: 1:10, Auszugsmittel ethanolum 50.6% (V/V), anisi stellati aetheroleum, eucalypti aetheroleum, ad solutionem pro 1 ml, corresp. ethanolum 51 % V/V.", "X", "Bei Erkältungshusten", nil, nil, nil, nil, 0], "052"], result.replacements.first)
+
+      assert_equal(["00613", [:expiry_date]], result.changes.first)
+      assert_equal({target: "Packungen-2026.01.08.xlsx 3198082 bytes", latest: "Packungen-2025.12.15.xlsx 3218271 bytes",  news: 148, updates: 487, changes: 336, newest_rows: 6305, replacements: 147, package_deletions: 107, sequence_deletions: 60, registration_deletions: 47}, SwissmedicDiff.stat)
+    end
+
     def test_diff_changes_february_2019
       @diff = SwissmedicDiff.new
       last_month = File.expand_path "data/Packungen-2019.03.06.xlsx", File.dirname(__FILE__)
@@ -61,6 +83,7 @@ module ODDB
 
       result = @diff.diff this_month, last_month
       assert_equal(expected, result.changes)
+      assert_equal({target: "Packungen-2025.07.01.xlsx 245310 bytes", latest: "Packungen-2019.03.06.xlsx 347989 bytes", news: 41, updates: 2, changes: 40, newest_rows: 40, replacements: 9, package_deletions: 39, sequence_deletions: 34, registration_deletions: 32}, SwissmedicDiff.stat)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swissmedic-diff
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Hannes Wyss, Masaomi Hatakeyama
@@ -164,11 +164,14 @@ files:
 - Manifest.txt
 - Packungen-2023.08.08.xlsx
 - Packungen-2023.09.08.xlsx
+- Packungen-2025.12.15.xlsx
+- Packungen-2026.01.08.xlsx
 - README.md
 - Rakefile
 - bin/swissmedic-diff
 - lib/swissmedic-diff.rb
 - lib/version.rb
+- test/test_swissmedic-diff-bin.rb
 - test/test_swissmedic-diff.rb
 homepage: https://github.com/zdavatz/swissmedic-diff
 licenses:
@@ -182,14 +185,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Find out what Products have changed on the swiss healthcare market
 test_files: