swissmedic-diff 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3e653dc43ed5f34c4a8c0d074de92e12153963ea047acea5b0c7e1f9948d8e7
-  data.tar.gz: 429bdb424bc0b3df7d5b47da74d68a5815aab4aab5f7ba1f5590d8cb4bdf83b1
+  metadata.gz: 925c71a322a4c7cd09d8c9424abd81a789e6e1f4a7873d1a57bfc00b5c8d94eb
+  data.tar.gz: 1e7dc182db7f46ceadfc140ee5e4d1ea10297ea9670533ba65ed6fefbf937182
 SHA512:
-  metadata.gz: 38184c2634cc1328941bd850442ee2ac4fbe74ae383c20ac8f1261c72c27d0795f6b3955ad400d5eb8e5af105faa1c929b1a0ce37f86cc74ccdde3352e21060b
-  data.tar.gz: 7b7004e06ac569a7a5722821c0169e0addd52a1e7284ceefeb306290c8402dc7bd41c462d9f34521fe64550fc746fdc021b27ad8e1d9cc4bb17833e43514d971
+  metadata.gz: 2c780ba3d8556a397b65e32bea5ceff473f7f0ced14872a02231e30d15ec4f508d495e943878346a1354e739a6292d37b07c03d8efe2e4fe480e293e33e83b6c
+  data.tar.gz: 3fa78fda4e35364769e91cc9c1ae41b78cd46d3b37cbf8aad5223fdc03920ef136c9470d0c201b587b40c1ffe870a5b1daec0abd9e4cfe0cddcac60ad883cacb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    swissmedic-diff (0.2.6)
+    swissmedic-diff (0.2.7)
       nokogiri
       rubyXL (>= 3.3.1)
       rubyzip
@@ -36,11 +36,11 @@ GEM
     rake (12.3.0)
     ruby-ole (1.2.12.1)
     ruby-progressbar (1.8.3)
-    rubyXL (3.3.33)
+    rubyXL (3.4.2)
       nokogiri (>= 1.4.4)
       rubyzip (>= 1.1.6)
     rubyzip (1.2.2)
-    spreadsheet (1.1.9)
+    spreadsheet (1.2.2)
       ruby-ole (>= 1.0)
     yard (0.9.9)
 

data/History.txt

@@ -1,3 +1,7 @@
+=== 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
@@ -350,7 +353,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.7'
 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.7
 platform: ruby
 authors:
 - Hannes Wyss, Masaomi Hatakeyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-13 00:00:00.000000000 Z
+date: 2019-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyXL
@@ -121,6 +121,7 @@ files:
 - History.txt
 - LICENSE
 - Manifest.txt
+- Packungen-2015.07.02.xlsx
 - Packungen-2016.01.09.xlsx
 - Packungen-2017.09.07.xlsx
 - README.txt
@@ -149,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Find out what Products have changed on the swiss healthcare market