swissmedic-diff 0.1.7 → 0.1.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2M2ZjQwMDk0YmZmYmNmNzZjNDZlMWI2ZDc5OTU3MGVlZTJmOWQxZA==
+    ZjYzOTlmOTY3NjE1MTVkOGZhN2I5YzViMWQyYzYxMjU4NmZhZDg5MQ==
   data.tar.gz: !binary |-
-    MjI1NTljZGZhMTA2N2I0YmI3MDZlZWJiYWNjNWY5NTNjOGE1NjAxZA==
+    YWUxY2U2MTRjOWFiNjEwNTNhMWQ1ZGI0ZDVjNGQ3NzRkNzA0MjViNQ==
 SHA512:
   metadata.gz: !binary |-
-    NWI3ZWYwYjg2NjE1ZDc3Yzk3NDBjMDY4N2RhZTAxMWFjMzJkYWMzNDJjZGU5
-    MmM5ODMwYTBlYTgzZDk3M2MxYTBlMjBkYzQzYjRkOWE4NmE1Y2U2NTk3MDQ0
-    YzMwN2I0NmQ3MjNkMjYxNjc2NjJiNTIxODAzMDc4M2I2MDIxYTc=
+    MTJiY2QwMThmMDU1ZGJlZGI4YzljYTA3YjIwNjU1OThhZGJiYTBhN2RhMGQ3
+    ZWM0MTdhMjNiYTM2M2ZjOGM2MzQ5YzYwMjExMTcxN2I4YjhmMDZmZDMyMTk4
+    NDg2NjRhNWY0NTZlMDM0MDdiYzZlYzMwMTQ1MTQ1ZTFmYmIzMTQ=
   data.tar.gz: !binary |-
-    MDViOTFhOGFkY2JhYTgxOGE3ZjM0MmNmZmE2Y2I5MzMyZDFkMzI4MTZhM2I3
-    OTU1NzQ5ZTY4MTczMDU3ZjczNTY4ZTdkYWEwZjRmMDlhYmJiNGRiZmE2ZGM4
-    MjViYTU0MWU3ODgyOTY1MmIzOTRlMmEwOTBlZmM5ZmEzZWUzMzk=
+    NTdjNWQ4ZDFkZWNiYTI4NTllYWRhOGVjYTk1MThmZDY2YTc5NWM5MjQ5MTg4
+    OWYxZDFlNGM3NmZjY2Q4OGZjNWQyODFmYTIzYWI4ZGYwMmU0ZDAyMTI4NDhh
+    NTYzYjk0OGUzM2MwYTk3ZjdiOGVlYzFiNTRkMDY5ZDhjNDk5OWE=

data/.travis.yml

@@ -8,11 +8,10 @@ notifications:
   - zdavatz@ywesee.com
 rvm:
   - ruby-head
+  - 2.1.2
   - 2.0.0
   - 1.9.3
   - 1.8.7
 matrix:
   allow_failures:
     - rvm: ruby-head
-    - rvm: 2.0.0
-    - rvm: 1.8.7

data/Gemfile

@@ -8,4 +8,4 @@ end
 
 group :debugger do
   gem 'pry-debugger'
-end
+end unless RUBY_VERSION =~ /^1\.8/

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    swissmedic-diff (0.1.6)
+    swissmedic-diff (0.1.8)
       nokogiri
       rubyXL
-      rubyzip (= 0.9.9)
+      rubyzip
       spreadsheet
 
 GEM
@@ -13,42 +13,41 @@ GEM
     ansi (1.4.3)
     builder (3.2.2)
     coderay (1.1.0)
-    columnize (0.3.6)
-    debugger (1.6.5)
+    columnize (0.8.9)
+    debugger (1.6.8)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.3.1)
+      debugger-ruby_core_source (~> 1.3.5)
     debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.3.1)
-    hashie (2.0.5)
-    hoe (3.7.4)
+    debugger-ruby_core_source (1.3.5)
+    hoe (3.12.0)
       rake (>= 0.8, < 11.0)
     method_source (0.8.2)
-    mini_portile (0.5.2)
-    minitest (5.2.1)
-    minitest-reporters (1.0.0)
+    mini_portile (0.6.0)
+    minitest (5.3.5)
+    minitest-reporters (1.0.5)
       ansi
       builder
       minitest (>= 5.0)
-      powerbar
-    nokogiri (1.6.0)
-      mini_portile (~> 0.5.0)
-    powerbar (1.0.11)
-      ansi (~> 1.4.0)
-      hashie (>= 1.1.0)
-    pry (0.9.12.4)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+      ruby-progressbar
+    nokogiri (1.6.2.1)
+      mini_portile (= 0.6.0)
+    pry (0.10.0)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-debugger (0.2.2)
+    pry-debugger (0.2.3)
       debugger (~> 1.3)
-      pry (~> 0.9.10)
-    rake (10.1.1)
+      pry (>= 0.9.10, < 0.11.0)
+    rake (10.3.2)
     ruby-ole (1.2.11.7)
-    rubyXL (1.2.10)
-    rubyzip (0.9.9)
-    slop (3.4.7)
-    spreadsheet (0.9.6)
+    ruby-progressbar (1.5.1)
+    rubyXL (3.1.2)
+      nokogiri (>= 1.4.4)
+      rubyzip (>= 1.1.6)
+    rubyzip (1.1.6)
+    slop (3.5.0)
+    spreadsheet (0.9.7)
       ruby-ole (>= 1.0)
 
 PLATFORMS

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.1.8 / 07.07.2014
+
+* Support parsing xlsx of Swissmedic July
+
 === 0.1.7 / 15.01.2014
 
 * Support comparing xls and xslx files

data/lib/compatibility.rb

@@ -26,18 +26,28 @@ module Spreadsheet
       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)
+      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
-  class Worksheet < PrivateClass
+  class Worksheet
     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)
+        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
@@ -47,9 +57,14 @@ module RubyXL
       self[idx]
     end
   end
+  class Row < OOXMLObject
+    def []=(ind, value)
+      cells[ind] = value
+    end
+  end
   class Cell
     def to_i
-      self.value.to_i
+      self.value.respond_to?(:to_i) ? self.value.to_i : self.value
     end
     def to_s
       self.value.to_s

data/lib/swissmedic-diff.rb

@@ -301,7 +301,7 @@ class SwissmedicDiff
         |row|
         row_nr += 1
         next if row_nr <= skipRows
-        if row.size < COLUMNS.size/2 || row.select{|val| val==nil}.size > COLUMNS.size/2
+        if row.size < COLUMNS.size/2
           $stdout.puts "Data missing in \n(line " + (row_nr).to_s + "): " + row.join(", ").to_s + "\n"
           next
         end
@@ -317,7 +317,12 @@ 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
-      j += 1 while spreadsheet.worksheet(0).row(j)[0].to_i == 0
+      while true
+        cell = spreadsheet.worksheet(0).row(j)[0]
+        cell = cell.value if cell.is_a?(RubyXL::Cell)
+        break if cell.respond_to?(:to_i) and cell.to_i != 0
+        j += 1
+      end
       j
     end
     

data/lib/version.rb

@@ -1,3 +1,3 @@
 class SwissmedicDiff
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 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', '0.9.9')
+   s.add_dependency('rubyzip')
    s.add_dependency('spreadsheet')
    s.add_development_dependency "hoe"
    s.add_development_dependency "minitest"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swissmedic-diff
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-15 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc