swissmedic-diff 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03883d51e63ce4b274373d9524e82bb55b406e4b
-  data.tar.gz: 6fcaaf92a126ae180b71c0e693c1ed9908fd3cf3
+  metadata.gz: ddb4d15cde4a334e2681bf63ffbf70802101b8e3
+  data.tar.gz: d61b0259447991ed94b439ec1560209fc0fbd2bc
 SHA512:
-  metadata.gz: 1ba066e94fbcf0ecad22682c18cf72feea6cf264875ccfde3b974b62e533a292490446d8d5b721ca80e29bbaa18e2088d2882b3b7dd2bc79f7ca503e0553de78
-  data.tar.gz: 30c7cce1476073047735584c2c61215f928ac7948bc6feb64b6d024d7906398276010db28cb586fb19925f2aae860f73bd04cc951cedbe0612655f221049648c
+  metadata.gz: da1008ec679d4e3171b22a2caf4e9089d509f38c64e06ba117ad1915a75fcf7e6ffe4530dd990360676394109b060ed7fd52e734e7740563f543a1ff2fbf68cd
+  data.tar.gz: e86df5b45b01f8161f09833838b722ce32accc79155cef9ac575ad58172db1230d785c4d8b36f8357e372e18024ee44b0899765faf6a86dfbe62cd7dff1f3a24

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    swissmedic-diff (0.2.2)
+    swissmedic-diff (0.2.3)
       nokogiri
-      rubyXL (= 3.3.1)
+      rubyXL (>= 3.3.1)
       rubyzip
       spreadsheet
 
@@ -11,50 +11,43 @@ GEM
   remote: https://rubygems.org/
   specs:
     ansi (1.5.0)
-    builder (3.2.2)
-    byebug (4.0.5)
-      columnize (= 0.9.0)
-    coderay (1.1.0)
-    columnize (0.9.0)
-    hoe (3.13.1)
-      rake (>= 0.8, < 11.0)
+    builder (3.2.3)
+    byebug (9.1.0)
+    coderay (1.1.2)
     method_source (0.8.2)
-    mini_portile2 (2.0.0)
-    minitest (5.7.0)
-    minitest-reporters (1.0.17)
+    mini_portile2 (2.3.0)
+    minitest (5.10.3)
+    minitest-reporters (1.1.18)
       ansi
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    nokogiri (1.6.7)
-      mini_portile2 (~> 2.0.0.rc2)
-    pry (0.10.1)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
+    pry (0.11.0)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (3.1.0)
-      byebug (~> 4.0)
+    pry-byebug (3.5.0)
+      byebug (~> 9.1)
       pry (~> 0.10)
-    pry-doc (0.8.0)
+    pry-doc (0.11.1)
       pry (~> 0.9)
-      yard (~> 0.8)
-    rake (10.4.2)
-    ruby-ole (1.2.11.8)
-    ruby-progressbar (1.7.5)
-    rubyXL (3.3.1)
+      yard (~> 0.9)
+    rake (12.1.0)
+    ruby-ole (1.2.12.1)
+    ruby-progressbar (1.8.3)
+    rubyXL (3.3.26)
       nokogiri (>= 1.4.4)
       rubyzip (>= 1.1.6)
-    rubyzip (1.1.7)
-    slop (3.6.0)
-    spreadsheet (1.1.0)
+    rubyzip (1.2.1)
+    spreadsheet (1.1.4)
       ruby-ole (>= 1.0)
-    yard (0.8.7.6)
+    yard (0.9.9)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  hoe
   minitest
   minitest-reporters
   pry-byebug
@@ -63,4 +56,4 @@ DEPENDENCIES
   swissmedic-diff!
 
 BUNDLED WITH
-   1.11.2
+   1.15.4

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.2.3 / 25.09.2017
+
+* Fix comparing Date cells
+* Run travis tests for ruby 2.3 and 2.4
+
 === 0.2.2 / 11.01.2016
 
 * Don't fail if date cells are nil

data/Rakefile

@@ -1,24 +1,7 @@
 # -*- ruby -*-
 
 require 'rubygems'
-require 'hoe'
+require "bundler/gem_tasks"
 
-# Hoe.plugin :compiler
-# Hoe.plugin :gem_prelude_sucks
-# Hoe.plugin :inline
-# Hoe.plugin :inline
-# Hoe.plugin :racc
-# Hoe.plugin :rubyforge
-# Hoe.plugin :rubyforge
-
-Hoe.spec 'swissmedic-diff' do
-  # HEY! If you fill these out in ~/.hoe_template/Rakefile.erb then
-  # you'll never have to touch them again!
-  # (delete this comment too, of course)
-
-developer('Masaomi Hatakeyama, Zeno R.R. Davatz', 'mhatakeyama@ywesee.com, zdavatz@ywesee.com')
-
-  # self.rubyforge_name = 'swissmswissmedic-diffx' # if different than 'swissmedic-diff'
-end
-
-# vim: syntax=ruby
+require 'rake/clean'
+CLEAN.include FileList['*.log']

data/lib/swissmedic-diff.rb

@@ -6,6 +6,7 @@ require 'ostruct'
 require 'spreadsheet'
 require 'rubyXL'
 require 'pp'
+require File.join(File.dirname(__FILE__), 'version.rb')
 
 # add some monkey patches for Spreadsheet and rubyXL
 require File.join(File.dirname(__FILE__), 'compatibility.rb')
@@ -97,6 +98,7 @@ class SwissmedicDiff
       :atc_class                =>  'ATC-Code',
     }
     GALFORM_P = %r{excipiens\s+(ad|pro)\s+(?<galform>((?!\bpro\b)[^.])+)}
+    DATE_FORMAT = '%Y:%m:%d'
 
     def capitalize(string)
       string.split(/\s+/).collect { |word| word.capitalize }.join(' ')
@@ -264,9 +266,9 @@ class SwissmedicDiff
         if !ignore.include?(key)
           left  = _comparable(key, row,   @target_keys.index(key))
           right = _comparable(key, other, @latest_keys.index(key))
-          next if left.is_a?(Date) and right.is_a?(Date) and left.start.eql?(right.start)
-          next if left.is_a?(String) and left.empty? and not right
-          next if right.is_a?(String) and right.empty? and not left
+          next if left.is_a?(Date) && right.is_a?(Date) && left.strftime(DATE_FORMAT).eql?(right.strftime(DATE_FORMAT))
+          next if left.is_a?(String) && left.empty? && !right
+          next if right.is_a?(String) && right.empty? && !left
           if left != right
             flags.push key
           end
@@ -331,7 +333,7 @@ class SwissmedicDiff
 
     def get_column_indices(spreadsheet)
       error_2014 = nil
-      filename = spreadsheet.root.filepath
+      filename = spreadsheet.root.respond_to?(:filepath) ? spreadsheet.root.filepath : 'unknown'
       headerRowId = rows_to_skip(spreadsheet)-1
       row = spreadsheet.worksheet(0)[headerRowId]
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 class SwissmedicDiff
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/test/test_swissmedic-diff.rb

@@ -23,10 +23,23 @@ module ODDB
       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(1, result.changes.size)
-      assert_equal(0, result.updates.size)
+      assert_equal(3, result.changes.size)
+      assert_equal(4, result.updates.size)
       assert_equal(['65838'], result.news.collect{|x| x[0] if x[0] == '65838'})
-      assert_equal({"65838"=>[:new]}, result.changes)
+      assert_equal({"00277"=>[:name_base, :expiry_date], "00279"=>[:expiry_date], "65838"=>[: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]
+      }
+      result = @diff.diff this_month, last_month
+      assert_equal(expected, result.changes)
     end
 
     def test_diff_wrong_header
@@ -41,7 +54,7 @@ module ODDB
       result = @diff.diff @february_2014, @january_2014, [:atc_class, :sequence_date]
       assert_equal 4, result.news.size
       expected = {
-          "00277"=>[:name_base],
+          "00277"=>[:name_base, :expiry_date],
           "65040"=>[:sequence, :replaced_package],
           "60125"=>[:new],
           "61367"=>[:new],
@@ -96,14 +109,14 @@ module ODDB
 + 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)
+> 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)
+> 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
@@ -112,7 +125,7 @@ module ODDB
     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)
+> 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

metadata

@@ -1,90 +1,140 @@
 --- !ruby/object:Gem::Specification
 name: swissmedic-diff
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
-- Masaomi Hatakeyama, Zeno R.R. Davatz
+- Hannes Wyss, Masaomi Hatakeyama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2017-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rubyXL
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 3.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.1
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  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: rubyzip
+  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: spreadsheet
+  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: rake
+  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
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: hoe
+  name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.7'
-description: |-
-  * Compares two Excel Documents provided by Swissmedic and displays the
-  salient differences. Also: Find out what Products have changed on the
-  swiss healthcare market.
-
-  Up-To-Date file:
-
-  * http://www.swissmedic.ch//daten/00080/00251/index.html
-email:
-- mhatakeyama@ywesee.com, zdavatz@ywesee.com
+        version: '0'
+description: Compares two Excel Documents provided by Swissmedic and displays the
+  salient differences
+email: hwyss@ywesee.com, mhatakeyama@ywesee.com
 executables:
 - swissmedic-diff
 extensions: []
-extra_rdoc_files:
-- History.txt
-- Manifest.txt
-- README.txt
+extra_rdoc_files: []
 files:
-- ".gemtest"
-- ".gitignore"
-- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - History.txt
 - LICENSE
 - Manifest.txt
+- Packungen-2016.01.09.xlsx
+- Packungen-2017.09.07.xlsx
 - README.txt
 - Rakefile
 - bin/swissmedic-diff
 - lib/compatibility.rb
 - lib/swissmedic-diff.rb
 - lib/version.rb
-- setup.rb
-- swissmedic-diff.gemspec
-- test/data/Packungen-2014.01.01.xlsx
-- test/data/Packungen-2014.02.01.xlsx
-- test/data/Packungen-2015.06.04.xlsx
-- test/data/Packungen-2015.07.02.xlsx
 - test/test_swissmedic-diff.rb
 homepage: https://github.com/zdavatz/swissmedic-diff
-licenses:
-- MIT
+licenses: []
 metadata: {}
 post_install_message: 
-rdoc_options:
-- "--main"
-- README.txt
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -98,11 +148,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: swissmedic-diff
-rubygems_version: 2.4.5
+rubyforge_project: 
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: "* Compares two Excel Documents provided by Swissmedic and displays the salient
-  differences"
+summary: Find out what Products have changed on the swiss healthcare market
 test_files:
 - test/test_swissmedic-diff.rb