swissmedic-diff 0.2.8 → 0.3.0

data/test/test_swissmedic-diff.rb

@@ -1,186 +1,66 @@
 #!/usr/bin/env ruby
-# -*- encoding: utf-8 -*-
+
 # SwissmedicPluginTest -- oddb.org -- 18.03.2008 -- hwyss@ywesee.com
 
 $: << File.expand_path("../lib", File.dirname(__FILE__))
 
-require 'minitest/autorun'
-require 'swissmedic-diff'
-require 'pp'
+require "minitest/autorun"
+require "swissmedic-diff"
+require "pp"
 
 module ODDB
   class SwissmedicPluginTest < Minitest::Test
     def setup
       @diff = SwissmedicDiff.new
-      @january_2014 = File.expand_path 'data/Packungen-2014.01.01.xlsx',  File.dirname(__FILE__)
-      @february_2014 = File.expand_path 'data/Packungen-2014.02.01.xlsx',  File.dirname(__FILE__)
-    end
-
-    def test_diff_new_format_july_2015
-      @diff = SwissmedicDiff.new
-      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__)
-      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(2, result.news.size)
-      assert_equal(4, result.changes.size)
-      assert_equal(4, result.updates.size)
-      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
-      @diff = SwissmedicDiff.new
-      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],
-          "15219"=>[:new]
-      }
-      result = @diff.diff this_month, last_month
-      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.03.06.xlsx',  File.dirname(__FILE__)
-      expected =  {"00277"=>[:name_base, :expiry_date, :production_science],
-        "15219"=>[:expiry_date, :indication_registration, :indication_sequence, :sequence],
-        "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
+      last_month = File.expand_path "data/Packungen-2019.03.06.xlsx", File.dirname(__FILE__)
+      this_month = File.expand_path "data/Packungen-2025.07.01.xlsx", File.dirname(__FILE__)
+      expected = {"00450" => [:new],
+                  "00278" => [:new],
+                  "00279" => [:new],
+                  "44447" => [:name_base, :production_science, :expiry_date, :substances, :composition],
+                  "65837" => [:new],
+                  "65838" => [:new],
+                  "15219" => [:expiry_date],
+                  "00000" => [:new],
+                  "00277" => [:delete],
+                  "16105" => [:delete],
+                  "16598" => [:delete],
+                  "28486" => [:delete],
+                  "30015" => [:delete],
+                  "31644" => [:delete],
+                  "32475" => [:delete],
+                  "35366" => [:delete],
+                  "43454" => [:delete],
+                  "44625" => [:delete],
+                  "45882" => [:delete],
+                  "53290" => [:delete],
+                  "53662" => [:delete],
+                  "54015" => [:delete],
+                  "54534" => [:delete],
+                  "55558" => [:delete],
+                  "66297" => [:delete],
+                  "55594" => [:delete],
+                  "55674" => [:delete],
+                  "56352" => [:delete],
+                  "58943" => [:delete],
+                  "59267" => [:delete],
+                  "61186" => [:delete],
+                  "62069" => [:delete],
+                  "62132" => [:delete],
+                  "65856" => [:delete],
+                  "65857" => [:delete],
+                  "58734" => [:delete],
+                  "55561" => [:delete],
+                  "65160" => [:delete],
+                  "58158" => [:delete],
+                  "39252" => [:delete]}
 
-    def test_diff_wrong_header
-      @diff = SwissmedicDiff.new
-      last_month = File.expand_path 'data/Packungen-2015.06.04.xlsx',  File.dirname(__FILE__)
-      this_month = File.expand_path 'data/Packungen-wrong-header.xlsx',  File.dirname(__FILE__)
-      assert_raises(RuntimeError) { @diff.diff this_month, last_month, [:atc_class, :sequence_date]}
-    end
-
-
-    def test_diff_xlsx_and_xlsx
-      result = @diff.diff @february_2014, @january_2014, [:atc_class, :sequence_date]
-      assert_equal 4, result.news.size
-      expected = {
-          "00277"=>[:name_base, :expiry_date],
-          "65040"=>[:sequence, :replaced_package],
-          "60125"=>[:new],
-          "61367"=>[:new],
-          "00274"=>[:delete]
-      }
-      assert_equal(expected, result.changes)
-      assert_equal 1, result.updates.size
-      assert_equal 5, result.changes.size
-      assert_equal 3, result.package_deletions.size
-      assert_equal 4, result.package_deletions.first.size
-      iksnrs = result.package_deletions.collect { |row| row.at(0) }.sort
-      ikscds = result.package_deletions.collect { |row| row.at(2) }.sort
-      assert_equal ["00274", "00274", "65040"], iksnrs
-      assert_equal ["001", "001", "002"], ikscds
-      assert_equal 1, result.sequence_deletions.size
-      assert_equal ["00274", "01"], result.sequence_deletions.at(0)
-      assert_equal 1, result.registration_deletions.size
-      assert_equal ["00274"], result.registration_deletions.at(0)
-      assert_equal 1, result.replacements.size
-      assert_equal '001', result.replacements.values.first
-
-      assert_equal 'Panthoben, Salbe', result.news.first[2].value
-      assert_equal 'Coeur-Vaisseaux Sérocytol, Namensänderung', result.updates.first[2].value
-    end
-
-    def test_diff_error_column
-      res = @diff.diff(@february_2014, @january_2014)
-      assert_equal(OpenStruct, res.class)
-    end
-
-    def test_diff__ignore
-      ignore = [:company, :name_base, :expiry_date, :indication_sequence]
-      result = @diff.diff(@february_2014, @january_2014, ignore)
-      expected = {
-        "00278"=>[:atc_class],
-        "00279"=>[:atc_class],
-        "65040"=>[:sequence, :replaced_package],
-        "60125"=>[:new],
-        "61367"=>[:new],
-        "00274"=>[:delete]
-      }
+      result = @diff.diff this_month, last_month
       assert_equal(expected, result.changes)
-      assert_equal 4, result.news.size
-      assert_equal 3, result.updates.size
-      assert_equal 6, result.changes.size
-      assert_equal 3, result.package_deletions.size
-    end
-    def test_to_s
-      @diff.to_s
-      @diff.diff(@february_2014, @january_2014)
-      assert_equal <<-EOS.strip, @diff.to_s
-+ 60125: Otriduo Schnupfen, Dosierspray
-+ 61367: Hypericum-Mepha 250, Lactab
-- 00274: Cardio-Pulmo-Rénal Sérocytol, suppositoire
-> 00277: Coeur-Vaisseaux Sérocytol, Namensänderung; Namensänderung (Coeur-Vaisseaux Sérocytol, Namensänderung), Ablaufdatum der Zulassung (25.04.2020)
-> 00278: Colon Sérocytol, suppositoire; ATC-Code (J06AA)
-> 00279: Conjonctif Sérocytol, suppositoire; ATC-Code (D03AX04)
-> 65040: Panthoben, Salbe; Packungs-Nummer (001 -> 003)
-      EOS
-      assert_equal <<-EOS.strip, @diff.to_s(:name)
-- 00274: Cardio-Pulmo-Rénal Sérocytol, suppositoire
-> 00277: Coeur-Vaisseaux Sérocytol, Namensänderung; Namensänderung (Coeur-Vaisseaux Sérocytol, Namensänderung), Ablaufdatum der Zulassung (25.04.2020)
-> 00278: Colon Sérocytol, suppositoire; ATC-Code (J06AA)
-> 00279: Conjonctif Sérocytol, suppositoire; ATC-Code (D03AX04)
-+ 61367: Hypericum-Mepha 250, Lactab
-+ 60125: Otriduo Schnupfen, Dosierspray
-> 65040: Panthoben, Salbe; Packungs-Nummer (001 -> 003)
-    EOS
-      assert_equal <<-EOS.strip, @diff.to_s(:registration)
-- 00274: Cardio-Pulmo-Rénal Sérocytol, suppositoire
-> 00277: Coeur-Vaisseaux Sérocytol, Namensänderung; Namensänderung (Coeur-Vaisseaux Sérocytol, Namensänderung), Ablaufdatum der Zulassung (25.04.2020)
-> 00278: Colon Sérocytol, suppositoire; ATC-Code (J06AA)
-> 00279: Conjonctif Sérocytol, suppositoire; ATC-Code (D03AX04)
-+ 60125: Otriduo Schnupfen, Dosierspray
-+ 61367: Hypericum-Mepha 250, Lactab
-> 65040: Panthoben, Salbe; Packungs-Nummer (001 -> 003)
-      EOS
     end
   end
 end

metadata

@@ -1,29 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: swissmedic-diff
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors:
 - Hannes Wyss, Masaomi Hatakeyama
-autorequire:
 bindir: bin
 cert_chain: []
 date: 1980-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rubyXL
+  name: simple_xlsx_reader
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +52,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: spreadsheet
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ostruct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -80,6 +93,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: standard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: debug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -118,22 +159,22 @@ extra_rdoc_files: []
 files:
 - Gemfile
 - Gemfile.lock
-- History.txt
+- History.md
 - LICENSE
 - Manifest.txt
 - Packungen-2023.08.08.xlsx
 - Packungen-2023.09.08.xlsx
-- README.txt
+- README.md
 - Rakefile
 - bin/swissmedic-diff
-- lib/compatibility.rb
 - lib/swissmedic-diff.rb
 - lib/version.rb
 - test/test_swissmedic-diff.rb
 homepage: https://github.com/zdavatz/swissmedic-diff
-licenses: []
-metadata: {}
-post_install_message:
+licenses:
+- GNU GPL version 2
+metadata:
+  changelog_uri: https://github.com/zdavatz/swissmedic-diff/blob/master/History.md
 rdoc_options: []
 require_paths:
 - lib
@@ -141,15 +182,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Find out what Products have changed on the swiss healthcare market
 test_files:

data/lib/compatibility.rb

@@ -1,57 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: utf-8
-require 'spreadsheet'
-require 'rubyXL'
-
-module Spreadsheet
-  class << self
-    def open io_or_path, mode="rb+"
-      if File.extname(io_or_path).downcase == '.xlsx'
-        RubyXL::Parser.parse(io_or_path)
-      else
-        if io_or_path.respond_to? :seek
-          Excel::Workbook.open(io_or_path)
-        elsif block_given?
-          File.open(io_or_path, mode) do |fh|
-            yield open(fh)
-          end
-        else
-          open File.open(io_or_path, mode)
-        end
-      end
-    end
-  end
-end
-
-module RubyXL
-  class Worksheet
-    def row(row_index)
-      x = @sheet_data[row_index]
-      def x.date(column_index)
-        data = self[column_index]
-        return data.value.respond_to?(:to_i) ? data.value.to_i : data.value
-        # return Date.new(1899,12,30)+data.value.to_i if data.is_a?(RubyXL::Cell)
-      end unless defined?(x.date)
-      x
-    end
-  end
-  class Workbook
-    def worksheet(idx)
-      self[idx]
-    end
-  end
-  class Row < OOXMLObject
-    def []=(ind, value)
-      cells[ind] = value
-    end
-  end
-  class Cell
-    def to_i
-      self.value.respond_to?(:to_i) ? self.value.to_i : self.value
-    end
-    def to_s
-      self.value.to_s
-    end
-  end
-end
-