swissmedic-diff 0.1.6 → 0.1.7

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    N2M2ZjQwMDk0YmZmYmNmNzZjNDZlMWI2ZDc5OTU3MGVlZTJmOWQxZA==
+  data.tar.gz: !binary |-
+    MjI1NTljZGZhMTA2N2I0YmI3MDZlZWJiYWNjNWY5NTNjOGE1NjAxZA==
+SHA512:
+  metadata.gz: !binary |-
+    NWI3ZWYwYjg2NjE1ZDc3Yzk3NDBjMDY4N2RhZTAxMWFjMzJkYWMzNDJjZGU5
+    MmM5ODMwYTBlYTgzZDk3M2MxYTBlMjBkYzQzYjRkOWE4NmE1Y2U2NTk3MDQ0
+    YzMwN2I0NmQ3MjNkMjYxNjc2NjJiNTIxODAzMDc4M2I2MDIxYTc=
+  data.tar.gz: !binary |-
+    MDViOTFhOGFkY2JhYTgxOGE3ZjM0MmNmZmE2Y2I5MzMyZDFkMzI4MTZhM2I3
+    OTU1NzQ5ZTY4MTczMDU3ZjczNTY4ZTdkYWEwZjRmMDlhYmJiNGRiZmE2ZGM4
+    MjViYTU0MWU3ODgyOTY1MmIzOTRlMmEwOTBlZmM5ZmEzZWUzMzk=

data/Gemfile

@@ -5,4 +5,7 @@ gemspec
 group :development do
   gem 'rake',                 :platforms => :ruby_18
 end
-                  
+
+group :debugger do
+  gem 'pry-debugger'
+end

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    swissmedic-diff (0.1.5)
+    swissmedic-diff (0.1.6)
       nokogiri
       rubyXL
-      rubyzip
+      rubyzip (= 0.9.9)
       spreadsheet
 
 GEM
@@ -12,9 +12,18 @@ GEM
   specs:
     ansi (1.4.3)
     builder (3.2.2)
+    coderay (1.1.0)
+    columnize (0.3.6)
+    debugger (1.6.5)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.3.1)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.3.1)
     hashie (2.0.5)
     hoe (3.7.4)
       rake (>= 0.8, < 11.0)
+    method_source (0.8.2)
     mini_portile (0.5.2)
     minitest (5.2.1)
     minitest-reporters (1.0.0)
@@ -27,10 +36,18 @@ GEM
     powerbar (1.0.11)
       ansi (~> 1.4.0)
       hashie (>= 1.1.0)
+    pry (0.9.12.4)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    pry-debugger (0.2.2)
+      debugger (~> 1.3)
+      pry (~> 0.9.10)
     rake (10.1.1)
     ruby-ole (1.2.11.7)
     rubyXL (1.2.10)
     rubyzip (0.9.9)
+    slop (3.4.7)
     spreadsheet (0.9.6)
       ruby-ole (>= 1.0)
 
@@ -41,5 +58,6 @@ DEPENDENCIES
   hoe
   minitest
   minitest-reporters
+  pry-debugger
   rake
   swissmedic-diff!

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.1.7 / 15.01.2014
+
+* Support comparing xls and xslx files
+* Must use rubyzip 0.9.9 to support all ruby versions
+* Added debugger to Gemfile
+
 === 0.1.6 / 14.01.2014
 
 * Added test/data/Packungen-2014.xlsx

data/Manifest.txt

@@ -8,14 +8,16 @@ Manifest.txt
 README.txt
 Rakefile
 bin/swissmedic-diff
+lib/compatibility.rb
 lib/swissmedic-diff.rb
 lib/version.rb
 setup.rb
 swissmedic-diff.gemspec
 test/data/Packungen-2013.10.14.xls
-test/data/Packungen-2014.xlsx
 test/data/Packungen.older.xls
 test/data/Packungen.xls
+test/data/Packungen_2013_small.xls
+test/data/Packungen_2014_small.xlsx
 test/data/Packungen_error_column.xls
 test/data/Packungen_error_missing1.xls
 test/data/Packungen_error_missing2.xls

data/lib/compatibility.rb

@@ -0,0 +1,59 @@
+#!/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
+  def Spreadsheet.date_cell(row, idx)
+    if row.kind_of?(Spreadsheet::Excel::Row)
+      row.at(idx) && row.date(idx)
+    else
+      data = row[idx]
+      return Date.new(1899,12,30)+data.value.to_i if data.is_a?(RubyXL::Cell)
+    end
+  end
+end
+
+module RubyXL
+  class Worksheet < PrivateClass
+    def row(row_index)
+      x = @sheet_data[row_index]
+      def x.date(column_index)
+        data = self[column_index]
+        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 Cell
+    def to_i
+      self.value.to_i
+    end
+    def to_s
+      self.value.to_s
+    end
+  end
+end
+

data/lib/swissmedic-diff.rb

@@ -5,6 +5,10 @@
 require 'ostruct'
 require 'spreadsheet'
 require 'rubyXL'
+require 'pp'
+
+# add some monkey patches for Spreadsheet and rubyXL
+require File.join(File.dirname(__FILE__), 'compatibility.rb')
 
 #= diff command (compare two xls fles) for swissmedic xls file.
 #
@@ -96,11 +100,7 @@ class SwissmedicDiff
       @diff.changes = changes = {}
       @diff.newest_rows = newest_rows
       Spreadsheet.client_encoding = 'UTF-8'
-      if File.extname(target).eql?('.xlsx')
-        tbook = RubyXL::Parser.parse(File.expand_path(target))
-      else
-        tbook = Spreadsheet.open(target)
-      end
+      tbook = Spreadsheet.open(target)
       sheet = tbook.worksheet(0)
       if new_column = cell(sheet.row(2), COLUMNS.size)
         raise "New column #{COLUMNS.size} (#{new_column})"
@@ -181,11 +181,7 @@ class SwissmedicDiff
       [known_regs, known_seqs, known_pacs, newest_rows]
     end
     def _known_data(latest, known_regs, known_seqs, known_pacs, newest_rows)
-      if File.extname(latest).eql?('.xlsx')
-        lbook = RubyXL::Parser.parse(File.expand_path(latest)).worksheets[0]
-      else
-        lbook = Spreadsheet.open(latest)
-      end
+      lbook = Spreadsheet.open(latest)
       idx, prr, prp = nil
       multiples = {}
       each_valid_row(lbook) { |row|
@@ -222,6 +218,8 @@ class SwissmedicDiff
       COLUMNS.each_with_index { |key, idx|
         if(!ignore.include?(key) \
            && _comparable(key, row, idx) != _comparable(key, other, idx))
+          # binding.pry if key == :expiry_date
+
           flags.push key
         end
       }
@@ -273,7 +271,7 @@ class SwissmedicDiff
       if cell = row[idx]
         case key
         when :registration_date, :expiry_date
-          row[idx]
+          Spreadsheet.date_cell(row, idx)
         when :seqnr
           sprintf "%02i", cell.to_i
         else
@@ -297,11 +295,7 @@ class SwissmedicDiff
     #return  ::
     def each_valid_row(spreadsheet)
       skipRows = rows_to_skip(spreadsheet)
-      if spreadsheet.class.eql?(RubyXL::Worksheet)
-        worksheet = spreadsheet
-      else
-        worksheet = spreadsheet.worksheet(0)
-      end
+      worksheet = spreadsheet.worksheet(0)
       row_nr = 0
       worksheet.each() {
         |row|
@@ -323,11 +317,7 @@ class SwissmedicDiff
       # Packungen.xls of swissmedic before October 2013 had  3 leading rows
       # Packungen.xls of swissmedic after  October 2013 have 4 leading rows
       j = 0
-      if spreadsheet.class.eql?(RubyXL::Worksheet)
-        j += 1 while spreadsheet[j][0] and spreadsheet[j][0].value.to_i == 0
-      else
-        j += 1 while spreadsheet.worksheet(0).row(j)[0].to_i == 0
-      end
+      j += 1 while spreadsheet.worksheet(0).row(j)[0].to_i == 0
       j
     end
     

data/lib/version.rb

@@ -1,3 +1,3 @@
 class SwissmedicDiff
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

data/swissmedic-diff.gemspec

@@ -17,7 +17,7 @@ spec = Gem::Specification.new do |s|
    s.executables << 'swissmedic-diff'
    s.add_dependency('rubyXL')
    s.add_dependency('nokogiri')
-   s.add_dependency('rubyzip')
+   s.add_dependency('rubyzip', '0.9.9')
    s.add_dependency('spreadsheet')
    s.add_development_dependency "hoe"
    s.add_development_dependency "minitest"

data/test/test_swissmedic-diff.rb

@@ -26,19 +26,67 @@ module ODDB
                                 File.dirname(__FILE__)
       @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_diff_xls_and_xlsx
       @diff = SwissmedicDiff.new
-      last_month = File.expand_path 'data/Packungen.xls',  File.dirname(__FILE__)
-      this_month = File.expand_path 'data/Packungen-2014.xlsx',  File.dirname(__FILE__)
+      last_month = File.expand_path 'data/Packungen_2013_small.xls',  File.dirname(__FILE__)
+      this_month = File.expand_path 'data/Packungen_2014_small.xlsx',  File.dirname(__FILE__)
       result = @diff.diff last_month, this_month, [:atc_class, :sequence_date]
       assert(result.changes.flatten.index('Zulassungs-Nummer') == nil, "Should not find Zulassungs-Nummer in changes")
-      assert(result.news.first.index('00275'), "Should find 00275 in news")
-      assert(result.news.first.index('00277') == nil, "Should not find 00277 in news")
+      # puts "Got #{result.news.size} news, #{result.changes.size} changes, #{result.updates.size} updates."
+      assert_equal(8, result.news.size)
+      assert_equal(3, result.changes.size)
+      assert_equal(1, result.updates.size)
+      assert(result.news.first.index('00280'), "Should find 00280 in news")
+      assert(result.news.flatten.index('65034'), "Should find 65034 in news")
+      assert(result.news.flatten.index('00277') == nil, "Should not find 00277 in news")
       assert(result.news.flatten.index('Zulassungs-Nummer') == nil, "Should not find Zulassungs-Nummer in changes")
     end
+
+    def test_date_xls
+      tbook = Spreadsheet.open(File.expand_path('data/Packungen.xls',  File.dirname(__FILE__)))
+      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))
+      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_date_xlsx
+      tbook = Spreadsheet.open(File.expand_path('data/Packungen_2014_small.xlsx',  File.dirname(__FILE__)))
+      sheet = tbook.worksheet(0)
+      # sheet = RubyXL::Parser.parse(File.expand_path(File.expand_path 'data/Packungen_2014_small.xlsx',  File.dirname(__FILE__)))[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_xls
+      @diff = SwissmedicDiff.new
+      last_month = File.expand_path 'data/Packungen_2014_small.xlsx',  File.dirname(__FILE__)
+      this_month = File.expand_path 'data/Packungen.xls',  File.dirname(__FILE__)
+      result = @diff.diff last_month, this_month, [:atc_class, :sequence_date]
+      assert_equal(7, result.news.size)
+      assert_equal(2, result.updates.size)
+      assert_equal(10, result.changes.size)
+      assert(result.changes.flatten.index('00275'), "Should find 00275 in changes")
+      assert(result.changes.flatten.index('00277'), "Should find 00277 in changes")
+      assert(result.news.flatten.index('Zulassungs-Nummer') == nil, "Should not find Zulassungs-Nummer in changes")
+    end
+    def test_diff_xlsx_and_xlsx
+      @diff = SwissmedicDiff.new
+      last_month = File.expand_path 'data/Packungen_2014_small.xlsx',  File.dirname(__FILE__)
+      this_month = File.expand_path 'data/Packungen_2014_small.xlsx',  File.dirname(__FILE__)
+      result = @diff.diff last_month, this_month, [:atc_class, :sequence_date]
+      assert_equal({}, result.changes)
+      assert_equal([], result.news)
+      assert_equal([], result.updates)
+    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

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: swissmedic-diff
 version: !ruby/object:Gem::Version
-  version: 0.1.6
-  prerelease: 
+  version: 0.1.7
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -65,6 +60,7 @@ extra_rdoc_files:
 - Manifest.txt
 - README.txt
 files:
+- .gemtest
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -75,21 +71,23 @@ files:
 - README.txt
 - Rakefile
 - bin/swissmedic-diff
+- lib/compatibility.rb
 - lib/swissmedic-diff.rb
 - lib/version.rb
 - setup.rb
 - swissmedic-diff.gemspec
 - test/data/Packungen-2013.10.14.xls
-- test/data/Packungen-2014.xlsx
 - test/data/Packungen.older.xls
 - test/data/Packungen.xls
+- test/data/Packungen_2013_small.xls
+- test/data/Packungen_2014_small.xlsx
 - test/data/Packungen_error_column.xls
 - test/data/Packungen_error_missing1.xls
 - test/data/Packungen_error_missing2.xls
 - test/test_swissmedic-diff.rb
-- .gemtest
 homepage: https://github.com/zdavatz/swissmedic-diff
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -97,22 +95,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: swissmedic-diff
-rubygems_version: 1.8.25
+rubygems_version: 2.2.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ! '* Compares two Excel Documents provided by Swissmedic and displays the
   salient differences'
 test_files: