swissmedic-diff 0.1.4 → 0.1.5

data/Gemfile.lock

@@ -10,20 +10,20 @@ GEM
     ansi (1.4.3)
     builder (3.2.2)
     hashie (2.0.5)
-    hoe (3.7.1)
+    hoe (3.7.2)
       rake (>= 0.8, < 11.0)
-    minitest (4.7.5)
-    minitest-reporters (0.14.23)
+    minitest (5.1.0)
+    minitest-reporters (1.0.0)
       ansi
       builder
-      minitest (>= 2.12, < 5.0)
+      minitest (>= 5.0)
       powerbar
     powerbar (1.0.11)
       ansi (~> 1.4.0)
       hashie (>= 1.1.0)
     rake (10.1.0)
     ruby-ole (1.2.11.7)
-    spreadsheet (0.9.0)
+    spreadsheet (0.9.6)
       ruby-ole (>= 1.0)
 
 PLATFORMS

data/History.txt

@@ -1,3 +1,11 @@
+=== 0.1.5 / 11.12.2010
+
+* Updated tests as we no longer raise an error
+* Update to spreadsheet 0.9.6
+* Just display unhandled line instead of raising an exception
+* daily_travis_ci.rb on 20131124
+* updated Manifest.txt
+
 === 0.1.4 / 22.10.2010
 
 * Add utility proc rows_to_skip

data/lib/swissmedic-diff.rb

@@ -17,7 +17,7 @@ require 'spreadsheet'
 #License::   GPLv2.0 Compliance 
 #Source::    http://scm.ywesee.com/?p=swissmedic-diff/.git;a=summary
 class SwissmedicDiff
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 
   module Diff
     COLUMNS = [ :iksnr, :seqnr, :name_base, :company, 
@@ -294,7 +294,8 @@ class SwissmedicDiff
       worksheet.each(skipRows) {
         |row|
         if row.size < COLUMNS.size/2 || row.select{|val| val==nil}.size > COLUMNS.size/2
-          raise "Data missing in \n(line " + (row.idx+1).to_s + "): " + row.join(", ").to_s + "\n"
+          $stdout.puts "Data missing in \n(line " + (row.idx+1).to_s + "): " + row.join(", ").to_s + "\n"
+          next
         end
         next if (cell(row, column(:production_science)) == 'Tierarzneimittel')
         row[column(:iksnr)] = "%05i" % cell(row, column(:iksnr)).to_i

data/test/test_swissmedic-diff.rb

@@ -4,11 +4,11 @@
 
 $: << File.expand_path("../lib", File.dirname(__FILE__))
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'swissmedic-diff'
 
 module ODDB
-  class SwissmedicPluginTest < Test::Unit::TestCase
+  class SwissmedicPluginTest < Minitest::Test
     def setup
       @diff = SwissmedicDiff.new
       @data = File.expand_path 'data/Packungen.xls',
@@ -26,6 +26,26 @@ module ODDB
       @workbook = Spreadsheet.open(@data)
     end
 
+    # This is not a unit test as it takes way too long (> 1 minute)
+    # Instead it might just tell you how to test with real data
+    def test_real_diff
+      require 'pp'  
+      @diff = SwissmedicDiff.new
+      last_month = File.expand_path 'data/Packungen-2013.08.16.xls',  File.dirname(__FILE__)
+      this_month = File.expand_path 'data/Packungen-2013.11.04.xls',  File.dirname(__FILE__)
+      result = @diff.diff last_month, this_month, [:atc_class, :sequence_date]
+      pp result.news.first
+      pp result.news.last
+      pp result.updates.first
+      pp result.replacements.first
+#      assert(result.changes.flatten.index('Zulassungs-Nummer') == nil, "Should not find Zulassungs-Nummer in changes")
+#      assert(result.news.flatten.index('Zulassungs-Nummer') == nil, "Should not find Zulassungs-Nummer in changes")
+#      assert(result.news.flatten.index('00277') == nil, "Should not find 00277 in news")
+      pp result.news.size
+      pp result.updates.size
+      pp result.replacements.size
+    end if false
+    
     def test_iterate
       diff = SwissmedicDiff.new
       strings = []
@@ -51,7 +71,9 @@ module ODDB
 
     def test_diff_pre_2013_to_2013
       result = @diff.diff(@data_2013, @data)
-      assert(result.changes.flatten.index('Zulassungs-Nummer') == nil, "Should not find Zulassungs-Nummer in difference")
+      assert(result.changes.flatten.index('Zulassungs-Nummer') == nil, "Should not find Zulassungs-Nummer in changes")
+      assert(result.news.flatten.index('Zulassungs-Nummer') == nil, "Should not find Zulassungs-Nummer in changes")
+      assert(result.news.flatten.index('00277') == nil, "Should not find 00277 in news")
       assert_equal 6, result.news.size
       expected = {
 "00277"=>[:company, :sequence_date, :substances, :composition, :name_base],
@@ -112,23 +134,21 @@ module ODDB
       assert_equal '005', result.replacements.values.first
     end
     def test_diff_error_column
-      assert_raise(RuntimeError) { 
+      assert_raises(RuntimeError) { 
         @diff.diff(@data_error_column, @older)
       }
     end
 
     # if row.size < COLUMNS.size/2
+    # as per december 2013 does no longer raise an error, but outputs the problematic line
     def test_diff_error_missing_case1
-      assert_raise(RuntimeError) {
-        @diff.diff(@data_error_missing_case1, @older)
-      }
+      @diff.diff(@data_error_missing_case1, @older)
     end
 
     # if row.select{|val| val==nil}.size > COLUMNS.size/2
+    # as per december 2013 does no longer raise an error, but outputs the problematic line
     def test_diff_error_missing_case2
-      assert_raise(RuntimeError) {
-        @diff.diff(@data_error_missing_case2, @older)
-      }
+      @diff.diff(@data_error_missing_case2, @older)
     end
     def test_diff__ignore
       ignore = [:company, :atc_class]
@@ -162,9 +182,7 @@ module ODDB
       assert_equal '005', result.replacements.values.first
     end
     def test_to_s
-      assert_nothing_raised {
-        @diff.to_s
-      }
+      @diff.to_s
       @diff.diff(@data, @older)
       assert_equal <<-EOS.strip, @diff.to_s
 + 00275: Cardio-Pulmo-Rénal Sérocytol, suppositoire

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swissmedic-diff
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
+date: 2013-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '3.6'
 description: ! '* Compares two Excel Documents provided by Swissmedic and displays
   the