swissmedic-diff 0.2.4 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 26c1b2ae5e7c5715217e3e077a1d9b7d92847964
-  data.tar.gz: 0e419155ef09ed8644fdf33b8f8074cf0f2c49f7
+SHA256:
+  metadata.gz: b3e653dc43ed5f34c4a8c0d074de92e12153963ea047acea5b0c7e1f9948d8e7
+  data.tar.gz: 429bdb424bc0b3df7d5b47da74d68a5815aab4aab5f7ba1f5590d8cb4bdf83b1
 SHA512:
-  metadata.gz: db303825649d60d416d1983f2f96c4ab0b1f484edf3285c2d9a5af2af4bf03eb4c9f94a61755a3c5bb708d9df58497c09fc16dcd1cbaf4c923a9b7c183930776
-  data.tar.gz: d9943467f6e700c4df0913d1b8bbc9ec96f9af0e2c15cfe872a91eac08f90ab9430c1d0cbb1b7cf458d6efb087abac68446838fdea2d1a91b48eb1eb03cf7f43
+  metadata.gz: 38184c2634cc1328941bd850442ee2ac4fbe74ae383c20ac8f1261c72c27d0795f6b3955ad400d5eb8e5af105faa1c929b1a0ce37f86cc74ccdde3352e21060b
+  data.tar.gz: 7b7004e06ac569a7a5722821c0169e0addd52a1e7284ceefeb306290c8402dc7bd41c462d9f34521fe64550fc746fdc021b27ad8e1d9cc4bb17833e43514d971

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    swissmedic-diff (0.2.4)
+    swissmedic-diff (0.2.6)
       nokogiri
       rubyXL (>= 3.3.1)
       rubyzip
@@ -15,15 +15,15 @@ GEM
     byebug (9.1.0)
     coderay (1.1.2)
     method_source (0.8.2)
-    mini_portile2 (2.3.0)
+    mini_portile2 (2.4.0)
     minitest (5.10.3)
     minitest-reporters (1.1.18)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    nokogiri (1.8.1)
-      mini_portile2 (~> 2.3.0)
+    nokogiri (1.10.1)
+      mini_portile2 (~> 2.4.0)
     pry (0.11.0)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -36,11 +36,11 @@ GEM
     rake (12.3.0)
     ruby-ole (1.2.12.1)
     ruby-progressbar (1.8.3)
-    rubyXL (3.3.26)
+    rubyXL (3.3.33)
       nokogiri (>= 1.4.4)
       rubyzip (>= 1.1.6)
-    rubyzip (1.2.1)
-    spreadsheet (1.1.4)
+    rubyzip (1.2.2)
+    spreadsheet (1.1.9)
       ruby-ole (>= 1.0)
     yard (0.9.9)
 
@@ -56,4 +56,4 @@ DEPENDENCIES
   swissmedic-diff!
 
 BUNDLED WITH
-   1.16.1
+   1.17.2

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.2.6 / 13.02.2019
+
+* Adapt to swissmedic new XLSX files
+
 === 0.2.5 / 05.02.2018
 
 * Adapte to swissmedic fixing a typo for betäubunsmittel

data/lib/swissmedic-diff.rb

@@ -53,7 +53,7 @@ class SwissmedicDiff
 
     COLUMNS_JULY_2015 = {
         :iksnr => /Zulassungs-Nummer/i,                  # column-nr: 0
-        :seqnr => /Dosisstärke-nummer/i,
+        :seqnr => /Dosis+tärke-nummer/i,
         :name_base => /Präparatebezeichnung/i,
         :company => /Zulassungsinhaberin/i,
         :production_science => /Heilmittelcode/i,
@@ -78,6 +78,33 @@ class SwissmedicDiff
         :drug_index       => /Verz. bei betäubun.*smittel-haltigen Präparaten/i,
     }
 
+    COLUMNS_FEBRUARY_2019= {
+      :iksnr => /Zulassungs-Nummer/i,                  # column-nr: 0
+      :seqnr => /Dosisstärke-nummer/i,
+      :name_base => /Bezeichnung des Arzneimittels/i,
+      :company => /Zulassungsinhaberin/i,
+      :production_science => /Heilmittelcode/i,
+      :index_therapeuticus => /IT-Nummer/i,            # column-nr: 5
+      :atc_class => /ATC-Code/i,
+      :registration_date => /Erstzul.datum Arzneimittel/i,
+      :sequence_date => /Zul.datum Dosisstärke/i,
+      :expiry_date => /Gültigkeitsdauer der Zulassung/i,
+      :ikscd => /Packungscode/i,                 # column-nr: 10
+      :size => /Packungsgrösse/i,
+      :unit => /Einheit/i,
+      :ikscat => /Abgabekategorie Packung/i,
+      :ikscat_seq => /Abgabekategorie Dosisstärke/i,
+      :ikscat_preparation => /Abgabekategorie Arzneimittel/i, # column-nr: 15
+      :substances => /Wirkstoff/i,
+      :composition => /Zusammensetzung/i,
+      :composition_AMZV => /Volldeklaration rev. AMZV umgesetzt/i,
+      :indication_registration => /Anwendungsgebiet Arzneimittel/i,
+      :indication_sequence => /Anwendungsgebiet Dosisstärke/i, # column-nr 20
+      :gen_production => /Gentechnisch hergestellte Wirkstoffe/i,
+      :insulin_category => /Kategorie bei Insulinen/i,
+      # swissmedi corrected in february 2018 the typo  betäubunsmittel to  betäubungsmittel-
+        :drug_index       => /Verz. bei betäubungsmittel-haltigen Arzneimittel/i,
+    }
     FLAGS = {
       :new                      =>  'Neues Produkt',
       :name_base                =>  'Namensänderung',
@@ -366,7 +393,33 @@ class SwissmedicDiff
         end
         return COLUMNS_JULY_2015
       end
-      raise "#{error_2015}\n#{error_2014}"
+      row = spreadsheet.worksheet(0)[5] # Headers are found at row 5 since February 5
+      error_2019 = nil
+      if spreadsheet.worksheet(0)[5].size != COLUMNS_FEBRUARY_2019.size
+        raise "#{error_2015}\n#{error_2014}"
+      else
+        0.upto((COLUMNS_FEBRUARY_2019.size) -1).each{ |idx| puts "#{idx}: #{row[idx].value}" }  if $VERBOSE
+        COLUMNS_FEBRUARY_2019.each{
+          |key, value|
+          header_name = row[COLUMNS_FEBRUARY_2019.keys.index(key)].value.to_s
+          unless value.match(header_name)
+            puts "#{__LINE__}: #{key} ->  #{COLUMNS_FEBRUARY_2019.keys.index(key)} #{value}\nbut was  #{header_name}" if $VERBOSE
+            error_2019 = "Packungen.xlslx_has_unexpected_column_#{COLUMNS_FEBRUARY_2019.keys.index(key)}_#{key}_#{value.to_s}_but_was_#{header_name}"
+            require 'pry'; binding.pry
+          break
+          end
+        }
+        unless error_2015
+          idx14 = COLUMNS_2014.keys.index(:name_base)
+          idx15 = COLUMNS_2014.keys.index(:name_base)
+          if (idx14 != idx15)
+            raise ":name_base must be same index in COLUMNS_JULY_2015 and COLUMNS_2014. Is #{idx14} and #{idx15}"
+          end
+          return COLUMNS_FEBRUARY_2019
+        end
+        raise "#{error_2019}" if error_2019
+     end
+     COLUMNS_FEBRUARY_2019
     end
     #=== iterate over all valid rows of a swissmedic Packungen.xls
     #

data/lib/version.rb

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

data/test/test_swissmedic-diff.rb

@@ -42,6 +42,55 @@ module ODDB
       assert_equal(expected, result.changes)
     end
 
+
+    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__)
+      expected =  {"00277"=>[:name_base, :expiry_date, :production_science],
+        "15219"=>[:new],
+        "16105"=>[:new],
+        "16598"=>[:new],
+        "28486"=>[:new],
+        "30015"=>[:new],
+        "31644"=>[:new],
+        "32475"=>[:new],
+        "35366"=>[:new],
+        "43454"=>[:new],
+        "44625"=>[:new],
+        "45882"=>[:new],
+        "53290"=>[:new],
+        "53662"=>[:new],
+        "54015"=>[:new],
+        "54534"=>[:new],
+        "55558"=>[:new],
+        "66297"=>[:new],
+        "55594"=>[:new],
+        "55674"=>[:new],
+        "56352"=>[:new],
+        "58943"=>[:new],
+        "59267"=>[:new],
+        "61186"=>[:new],
+        "62069"=>[:new],
+        "62132"=>[:new],
+        "65856"=>[:new],
+        "65857"=>[:new],
+        "58734"=>[:new],
+        "55561"=>[:new],
+        "65160"=>[:new],
+        "58158"=>[:new],
+        "44447"=>[:new],
+        "39252"=>[:new],
+        "00278"=>[:delete],
+        "00279"=>[:delete],
+        "65837"=>[:delete],
+        "65838"=>[:delete]
+      }
+
+      result = @diff.diff this_month, last_month
+      assert_equal(expected, result.changes)
+    end
+
     def test_diff_wrong_header
       @diff = SwissmedicDiff.new
       last_month = File.expand_path 'data/Packungen-2015.06.04.xlsx',  File.dirname(__FILE__)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swissmedic-diff
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
 platform: ruby
 authors:
 - Hannes Wyss, Masaomi Hatakeyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-05 00:00:00.000000000 Z
+date: 2019-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyXL
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Find out what Products have changed on the swiss healthcare market