swissmedic-diff 0.2.0 → 0.2.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    swissmedic-diff (0.2.0)
+    swissmedic-diff (0.2.1)
       nokogiri
       rubyXL (= 3.3.1)
       rubyzip
@@ -12,14 +12,10 @@ GEM
   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)
-    debugger (1.6.8)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.3.5)
-    debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.3.8)
     hoe (3.13.1)
       rake (>= 0.8, < 11.0)
     method_source (0.8.2)
@@ -36,9 +32,12 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-debugger (0.2.3)
-      debugger (~> 1.3)
-      pry (>= 0.9.10, < 0.11.0)
+    pry-byebug (3.1.0)
+      byebug (~> 4.0)
+      pry (~> 0.10)
+    pry-doc (0.8.0)
+      pry (~> 0.9)
+      yard (~> 0.8)
     rake (10.4.2)
     ruby-ole (1.2.11.8)
     ruby-progressbar (1.7.5)
@@ -49,6 +48,7 @@ GEM
     slop (3.6.0)
     spreadsheet (1.0.3)
       ruby-ole (>= 1.0)
+    yard (0.8.7.6)
 
 PLATFORMS
   ruby
@@ -57,7 +57,8 @@ DEPENDENCIES
   hoe
   minitest
   minitest-reporters
-  pry-debugger
+  pry-byebug
+  pry-doc
   rake
   swissmedic-diff!
 

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.2.1 / 06.07.2015
+
+* Fix problems comparing dates (using to_date.start)
+* Assume nothing has changed when comparing nil with an emtpy string
+* Revert nr of paramenters of diff method to previous version, to make oddb.org happy again
+
 === 0.2.0 / 03.07.2015
 
 * Abort if Swissmedic introduces incompatible header lines

data/lib/compatibility.rb

@@ -21,23 +21,6 @@ module Spreadsheet
       end
     end
   end
-  def Spreadsheet.date_cell(row, idx)
-    if row.kind_of?(Spreadsheet::Excel::Row)
-      row.at(idx) && row.date(idx)
-    else
-      data = row[idx]
-      if data.is_a?(RubyXL::Cell)
-        return data.value.respond_to?(:to_i) ? data.value.to_i : data.value
-        return data.value if data.value.is_a?(DateTime)
-        if data.value.class.to_s == 'DateTime'
-          puts "data is_a RubyXL::Cell and value #{data.value.class} is_a? Date #{data.value.is_a?(Date)} DateTime #{data.value.is_a?(DateTime)}"
-          return Date.new(1899,12,30)+data.to_date.value.to_i
-        else
-          return Date.new(1899,12,30)+data.value.to_i if data.is_a?(RubyXL::Cell)
-        end
-      end
-    end
-  end
 end
 
 module RubyXL

data/lib/swissmedic-diff.rb

@@ -148,25 +148,25 @@ class SwissmedicDiff
       tbook = Spreadsheet.open(target)
       idx, prr, prp = nil
       multiples = {}
-      latest_keys = get_column_indices(Spreadsheet.open(latest)).keys
-      target_keys = get_column_indices(tbook).keys
+      @latest_keys = get_column_indices(Spreadsheet.open(latest)).keys
+      @target_keys = get_column_indices(tbook).keys
       each_valid_row(tbook) { |row|
-        iksnr = cell(row, target_keys.index(:iksnr))
-        seqnr = cell(row, target_keys.index(:seqnr))
-        pacnr = cell(row, target_keys.index(:ikscd))
+        iksnr = cell(row, @target_keys.index(:iksnr))
+        seqnr = cell(row, @target_keys.index(:seqnr))
+        pacnr = cell(row, @target_keys.index(:ikscd))
         (multiples[iksnr] ||= {})
         if prr == iksnr && prp == pacnr
           idx += 1
         elsif previous = multiples[iksnr][pacnr]
           prr = iksnr
           prp = pacnr
-          idx = previous[target_keys.size].to_i + 1
+          idx = previous[@target_keys.size].to_i + 1
         else
           prr = iksnr
           prp = pacnr
           idx = 0
         end
-        row[target_keys.size] = idx
+        row[@target_keys.size] = idx
         (newest_rows[iksnr] ||= {})[pacnr] = row
         multiples[iksnr][pacnr] = row
         if(other = known_regs.delete([iksnr]))
@@ -176,12 +176,12 @@ class SwissmedicDiff
         end
         known_seqs.delete([iksnr, seqnr])
         if(other = known_pacs.delete([iksnr, pacnr, idx]))
-          flags = rows_diff(row, target_keys, other, latest_keys, ignore)
+          flags = rows_diff(row, other, ignore)
           (changes[iksnr].concat flags).uniq!
           updates.push row unless flags.empty?
         else
-          replacements.store [ iksnr, seqnr, cell(row, target_keys.index(:size)),
-                                cell(row, target_keys.index(:unit)) ], row
+          replacements.store [ iksnr, seqnr, cell(row, @target_keys.index(:size)),
+                                cell(row, @target_keys.index(:unit)) ], row
           flags = changes[iksnr]
           flags.push(:sequence).uniq! unless(flags.include? :new)
           news.push row
@@ -189,8 +189,8 @@ class SwissmedicDiff
       }
       @diff.replacements = reps = {}
       known_pacs.each { |(iksnr, pacnr), row|
-        key = [iksnr, '%02i' % cell(row, target_keys.index(:seqnr)).to_i,
-                      cell(row, target_keys.index(:size)), cell(row, target_keys.index(:unit))]
+        key = [iksnr, '%02i' % cell(row, @target_keys.index(:seqnr)).to_i,
+                      cell(row, @target_keys.index(:size)), cell(row, @target_keys.index(:unit))]
         if(rep = replacements[key])
           changes[iksnr].push :replaced_package
           reps.store rep, pacnr
@@ -202,7 +202,7 @@ class SwissmedicDiff
         ## the keys in known_pacs don't include the sequence number (which
         #  would prevent us from properly recognizing multi-sequence-Packages),
         #  so we need complete the path to the package now
-        key[1,0] = '%02i' % cell(row, target_keys.index(:seqnr)).to_i
+        key[1,0] = '%02i' % cell(row, @target_keys.index(:seqnr)).to_i
         key
       }
       @diff.sequence_deletions = known_seqs.keys
@@ -225,27 +225,27 @@ class SwissmedicDiff
     end
     def _known_data(latest, known_regs, known_seqs, known_pacs, newest_rows)
       lbook = Spreadsheet.open(latest)
+      @latest_keys = get_column_indices(lbook).keys
       idx, prr, prp = nil
       multiples = {}
-      latest_keys = get_column_indices(lbook).keys
       each_valid_row(lbook) { |row|
-        iksnr = cell(row, latest_keys.index(:iksnr))
-        seqnr = cell(row, latest_keys.index(:seqnr))
-        pacnr = cell(row, latest_keys.index(:ikscd))
+        iksnr = cell(row, @latest_keys.index(:iksnr))
+        seqnr = cell(row, @latest_keys.index(:seqnr))
+        pacnr = cell(row, @latest_keys.index(:ikscd))
         multiples[iksnr] ||= {}
         if prr == iksnr && prp == pacnr
           idx += 1
         elsif previous = multiples[iksnr][pacnr]
           prr = iksnr
           prp = pacnr
-          idx = previous[latest_keys.size].to_i + 1
+          idx = previous[@latest_keys.size].to_i + 1
         else
           prr = iksnr
           prp = pacnr
           idx = 0
         end
         multiples[iksnr][pacnr] = row
-        row[latest_keys.size] = idx
+        row[@latest_keys.size] = idx
         known_regs.store [iksnr], row
         known_seqs.store [iksnr, seqnr], row
         known_pacs.store [iksnr, pacnr, idx], row
@@ -257,15 +257,17 @@ class SwissmedicDiff
       row = rows.sort.first.last
       cell(row, COLUMNS_2014.keys.index(:name_base))
     end
-    def rows_diff(row, row_keys, other, other_keys, ignore = [])
+    def rows_diff(row, other, ignore = [])
       flags = []
       COLUMNS_OLD.each_with_index {
         |key, idx|
         if !ignore.include?(key)
-          left  = _comparable(key, row,   row_keys.index(key))
-          right = _comparable(key, other, other_keys.index(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
           if left != right
-            puts "Pushing key #{key}: '#{left.inspect}' != '#{right.inspect}'" if $VERBOSE
             flags.push key
           end
         end
@@ -318,9 +320,9 @@ class SwissmedicDiff
       if cell = row[idx]
         case key
         when :registration_date, :expiry_date
-          Spreadsheet.date_cell(row, idx)
+          row[idx].value.to_date
         when :seqnr
-          sprintf "%02i", cell.to_i
+          sprintf "%02i", cell(row, idx).to_i
         else
           cell(row, idx).downcase.gsub(/\s+/, "")
         end

data/lib/version.rb

@@ -1,3 +1,3 @@
 class SwissmedicDiff
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/test/test_swissmedic-diff.rb

@@ -23,10 +23,10 @@ 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(2, result.changes.size)
-      assert_equal(1, result.updates.size)
+      assert_equal(1, result.changes.size)
+      assert_equal(0, result.updates.size)
       assert_equal(['65838'], result.news.collect{|x| x[0] if x[0] == '65838'})
-      assert_equal({"65837"=>[:indication_sequence], "65838"=>[:new]}, result.changes)
+      assert_equal({"65838"=>[:new]}, result.changes)
     end
 
     def test_diff_wrong_header
@@ -37,21 +37,11 @@ module ODDB
     end
 
 
-    def test_date_xlsx
-      tbook = Spreadsheet.open(@january_2014)
-      sheet = tbook.worksheet(0)
-      assert_equal(nil, sheet.row(0)[8]) # sequence_date
-      assert_equal(2010, sheet.row(4).date(8).year)
-      assert_equal(26, sheet.row(4).date(8).day)
-      assert_equal(26, Spreadsheet.date_cell(sheet.row(4), 8).day)
-      assert_equal(2010, Spreadsheet.date_cell(sheet.row(4), 8).year)
-    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, :indication_sequence],
+          "00277"=>[:name_base],
           "65040"=>[:sequence, :replaced_package],
           "60125"=>[:new],
           "61367"=>[:new],
@@ -106,14 +96,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), Ablaufdatum der Zulassung (25.04.2020), Anwendungsgebiet Sequenz ()
+> 00277: Coeur-Vaisseaux Sérocytol, Namensänderung; Namensänderung (Coeur-Vaisseaux Sérocytol, Namensänderung)
 > 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), Anwendungsgebiet Sequenz ()
+> 00277: Coeur-Vaisseaux Sérocytol, Namensänderung; Namensänderung (Coeur-Vaisseaux Sérocytol, Namensänderung)
 > 00278: Colon Sérocytol, suppositoire; ATC-Code (J06AA)
 > 00279: Conjonctif Sérocytol, suppositoire; ATC-Code (D03AX04)
 + 61367: Hypericum-Mepha 250, Lactab
@@ -122,7 +112,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), Ablaufdatum der Zulassung (25.04.2020), Anwendungsgebiet Sequenz ()
+> 00277: Coeur-Vaisseaux Sérocytol, Namensänderung; Namensänderung (Coeur-Vaisseaux Sérocytol, Namensänderung)
 > 00278: Colon Sérocytol, suppositoire; ATC-Code (J06AA)
 > 00279: Conjonctif Sérocytol, suppositoire; ATC-Code (D03AX04)
 + 60125: Otriduo Schnupfen, Dosierspray

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swissmedic-diff
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-04 00:00:00.000000000 Z
+date: 2015-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -101,18 +101,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1183980882964765712
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1183980882964765712
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23.2