swissmedic-diff 0.2.6 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3e653dc43ed5f34c4a8c0d074de92e12153963ea047acea5b0c7e1f9948d8e7
-  data.tar.gz: 429bdb424bc0b3df7d5b47da74d68a5815aab4aab5f7ba1f5590d8cb4bdf83b1
+  metadata.gz: 4c9f7f364660ce0313e6261e73e127c73e6f737b236e95a19934a817ba7e2eed
+  data.tar.gz: aa425b73fdfd27acc1f5a59c7b091c4655355f647e232fd91e781eef925a04e4
 SHA512:
-  metadata.gz: 38184c2634cc1328941bd850442ee2ac4fbe74ae383c20ac8f1261c72c27d0795f6b3955ad400d5eb8e5af105faa1c929b1a0ce37f86cc74ccdde3352e21060b
-  data.tar.gz: 7b7004e06ac569a7a5722821c0169e0addd52a1e7284ceefeb306290c8402dc7bd41c462d9f34521fe64550fc746fdc021b27ad8e1d9cc4bb17833e43514d971
+  metadata.gz: 002e643de90c8536d6e891420cf66960f1447636eca5bdd775a14f7469f337ad8cc98422427dc4ea8e9e9a76e046afa489667bebb705bacb983d27d7d2b6cb33
+  data.tar.gz: 9eda362cca9621f6f6ad60d5fe476bde48d691f5dcd058b618f1cbe69176d4e26e098a5a78e7ceca8dc39d4a5444b992a03a9b3d077b325f334f6bcff7f6cddd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    swissmedic-diff (0.2.6)
+    swissmedic-diff (0.2.8)
       nokogiri
       rubyXL (>= 3.3.1)
       rubyzip
@@ -11,41 +11,41 @@ GEM
   remote: https://rubygems.org/
   specs:
     ansi (1.5.0)
-    builder (3.2.3)
-    byebug (9.1.0)
-    coderay (1.1.2)
-    method_source (0.8.2)
-    mini_portile2 (2.4.0)
-    minitest (5.10.3)
-    minitest-reporters (1.1.18)
+    builder (3.2.4)
+    byebug (11.1.3)
+    coderay (1.1.3)
+    method_source (1.0.0)
+    minitest (5.20.0)
+    minitest-reporters (1.6.1)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    nokogiri (1.10.1)
-      mini_portile2 (~> 2.4.0)
-    pry (0.11.0)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-    pry-byebug (3.5.0)
-      byebug (~> 9.1)
-      pry (~> 0.10)
-    pry-doc (0.11.1)
-      pry (~> 0.9)
-      yard (~> 0.9)
-    rake (12.3.0)
-    ruby-ole (1.2.12.1)
-    ruby-progressbar (1.8.3)
-    rubyXL (3.3.33)
-      nokogiri (>= 1.4.4)
-      rubyzip (>= 1.1.6)
-    rubyzip (1.2.2)
-    spreadsheet (1.1.9)
-      ruby-ole (>= 1.0)
-    yard (0.9.9)
+    nokogiri (1.15.4-x86_64-linux)
+      racc (~> 1.4)
+    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.4.0)
+      pry (~> 0.11)
+      yard (~> 0.9.11)
+    racc (1.7.1)
+    rake (13.0.6)
+    ruby-ole (1.2.12.2)
+    ruby-progressbar (1.13.0)
+    rubyXL (3.4.25)
+      nokogiri (>= 1.10.8)
+      rubyzip (>= 1.3.0)
+    rubyzip (2.3.2)
+    spreadsheet (1.3.0)
+      ruby-ole
+    yard (0.9.34)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
   minitest
@@ -56,4 +56,4 @@ DEPENDENCIES
   swissmedic-diff!
 
 BUNDLED WITH
-   1.17.2
+   2.4.10

data/History.txt

@@ -1,3 +1,13 @@
+=== 0.2.8 / 04.10.2023
+
+* Fix problem when expiration_date is a string 'Unbegrenzt'
+* Updated tests
+* Added Ruby 3.2 for running github/workflow tests
+
+=== 0.2.7 / 13.03.2019
+
+* Set date to nil when expiration_date is a string 'Unbegrenzt'
+
 === 0.2.6 / 13.02.2019
 
 * Adapt to swissmedic new XLSX files

data/lib/swissmedic-diff.rb

@@ -23,6 +23,9 @@ require File.join(File.dirname(__FILE__), 'compatibility.rb')
 #License::   GPLv2.0 Compliance
 #Source::    http://scm.ywesee.com/?p=swissmedic-diff/.git;a=summary
 class SwissmedicDiff
+    VALUE_UNLIMITED = nil
+    REGEXP_UNLIMITED = /unbegrenzt/i
+
   module Diff
     COLUMNS_2014 = {
         :iksnr => /Zulassungs-Nummer/i,                # column-nr: 0
@@ -152,7 +155,11 @@ class SwissmedicDiff
         sprintf "%s (%s)", txt, pairs.join(',')
       when :registration_date, :expiry_date
         row = diff.newest_rows[iksnr].sort.first.last
-        sprintf "%s (%s)", txt, row[COLUMNS_2014.keys.index(flag)].value.strftime('%d.%m.%Y')
+        if row[COLUMNS_2014.keys.index(flag)].value.to_s.match(REGEXP_UNLIMITED)
+          sprintf "%s (%s)", txt, 'unbegrenzt'
+        else
+          sprintf "%s (%s)", txt, row[COLUMNS_2014.keys.index(flag)].value.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))
@@ -350,7 +357,11 @@ class SwissmedicDiff
       if cell = row[idx]
         case key
         when :registration_date, :expiry_date
-          row[idx] && row[idx].value ? row[idx].value.to_date : nil
+          if  row[idx] && row[idx].value && REGEXP_UNLIMITED.match(row[idx].value.to_s)
+            VALUE_UNLIMITED # Date.new(2099,12,31)
+          else
+            row[idx] && row[idx].value ? row[idx].value.to_date : nil
+          end
         when :seqnr
           sprintf "%02i", cell(row, idx).to_i
         else

data/lib/version.rb

@@ -1,3 +1,3 @@
 class SwissmedicDiff
-  VERSION = '0.2.6'
+  VERSION = '0.2.8'
 end

data/test/test_swissmedic-diff.rb

@@ -22,11 +22,11 @@ module ODDB
       this_month = File.expand_path 'data/Packungen-2015.07.02.xlsx',  File.dirname(__FILE__)
       result = @diff.diff this_month, last_month, [:atc_class, :sequence_date]
       assert(result.changes.flatten.index('Zulassungs-Nummer') == nil, "Should not find Zulassungs-Nummer in changes")
-      assert_equal(1, result.news.size)
-      assert_equal(3, result.changes.size)
+      assert_equal(2, result.news.size)
+      assert_equal(4, result.changes.size)
       assert_equal(4, result.updates.size)
-      assert_equal(['65838'], result.news.collect{|x| x[0] if x[0] == '65838'})
-      assert_equal({"00277"=>[:name_base, :expiry_date], "00279"=>[:expiry_date], "65838"=>[:new]}, result.changes)
+      assert_equal(['65838', nil], result.news.collect{|x| x[0] if x[0] == '65838'})
+      assert_equal({"00277"=>[:name_base, :expiry_date], "00279"=>[:expiry_date], "65838"=>[:new], "15219"=>[:new]}, result.changes)
     end
 
     def test_diff_changes
@@ -34,9 +34,10 @@ module ODDB
       last_month = File.expand_path 'data/Packungen-2015.06.04.xlsx',  File.dirname(__FILE__)
       this_month = File.expand_path 'data/Packungen-2015.07.02.xlsx',  File.dirname(__FILE__)
       expected = {
-        "00277"=>[:name_base, :expiry_date],
-        "00279"=>[:expiry_date],
-        "65838"=>[:new]
+          "00277"=>[:name_base, :expiry_date],
+          "00279"=>[:expiry_date],
+          "65838"=>[:new],
+          "15219"=>[:new]
       }
       result = @diff.diff this_month, last_month
       assert_equal(expected, result.changes)
@@ -46,9 +47,9 @@ module ODDB
     def test_diff_changes_february_2019
       @diff = SwissmedicDiff.new
       last_month = File.expand_path 'data/Packungen-2015.07.02.xlsx',  File.dirname(__FILE__)
-      this_month = File.expand_path 'data/Packungen-2019.01.31.xlsx',  File.dirname(__FILE__)
+      this_month = File.expand_path 'data/Packungen-2019.03.06.xlsx',  File.dirname(__FILE__)
       expected =  {"00277"=>[:name_base, :expiry_date, :production_science],
-        "15219"=>[:new],
+        "15219"=>[:expiry_date, :indication_registration, :indication_sequence, :sequence],
         "16105"=>[:new],
         "16598"=>[:new],
         "28486"=>[:new],
@@ -85,8 +86,7 @@ module ODDB
         "00279"=>[:delete],
         "65837"=>[:delete],
         "65838"=>[:delete]
-      }
-
+                }
       result = @diff.diff this_month, last_month
       assert_equal(expected, result.changes)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swissmedic-diff
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.8
 platform: ruby
 authors:
 - Hannes Wyss, Masaomi Hatakeyama
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-02-13 00:00:00.000000000 Z
+date: 1980-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyXL
@@ -121,8 +121,8 @@ files:
 - History.txt
 - LICENSE
 - Manifest.txt
-- Packungen-2016.01.09.xlsx
-- Packungen-2017.09.07.xlsx
+- Packungen-2023.08.08.xlsx
+- Packungen-2023.09.08.xlsx
 - README.txt
 - Rakefile
 - bin/swissmedic-diff
@@ -133,7 +133,7 @@ files:
 homepage: https://github.com/zdavatz/swissmedic-diff
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -148,9 +148,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.4.13
+signing_key:
 specification_version: 4
 summary: Find out what Products have changed on the swiss healthcare market
 test_files: