spreadsheet 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1e48d570b32fccdb3506529962985f80e5316cf
-  data.tar.gz: 281786dfb442b0fa51b6500a5df295e1fe50cd4f
+  metadata.gz: 2b637195c40422ea73262b933a7a62d3b7c50883
+  data.tar.gz: 61510bfe1d8aa2eaebcd087b8d479e9f073efebd
 SHA512:
-  metadata.gz: df1b90fb481afa22d9178115aa84b8a9861fa2869630ecb0e78b1035c2575bcf55e900a763bda76f433e49a66b6c4eb730a47bf705ba9ca7ae4cf015afd1e245
-  data.tar.gz: 77cf849f576d390997b2341e8d2064d9b6d2c3bd0e0828e2bf63718169e4d2ea3d4fb14526c730f14c0aa6730eaf96bdb944a8ebd27de87f0530d2b2da294e01
+  metadata.gz: ddafa532308bdffe930e4fe1f2d94aa8b38bef32850953b266432804a9d32c8829cd6a63e6143e222d47dc08186f001343e2fb556317ec62787a77b2815322ed
+  data.tar.gz: 53ce917e4db7f5730726bbb1a36f6e0befa24cd7c5ae890731809e6b93cb89d5e3ffc5b1c47125e89a15d135681bcb573e7b9d1ed6bc2b85dcd30ce05f5de51b

data/History.md

@@ -1,3 +1,9 @@
+### 1.1.2 / 29.03.2016
+Author: Aleksandr Boykov <aleksandr.boykov@parelio.com>
+Date:   Mon Mar 28 14:07:35 2016 -0400
+
+fixes compact! method when the excel document has dates
+
 ### 1.1.1 / 03.01.2016
 
 Author: ChouAndy <chouandy@ecoworkinc.com>

data/lib/spreadsheet.rb

@@ -45,7 +45,7 @@ module Spreadsheet
 
   ##
   # The version of Spreadsheet you are using.
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 
   ##
   # Default client Encoding. Change this value if your application uses a

data/lib/spreadsheet/worksheet.rb

@@ -343,7 +343,7 @@ module Spreadsheet
       # detect first non-empty non-nil column if first column is empty or nil
       if (@dimensions[0]..@dimensions[1]).inject(true){|t, j| t && row(j)[@dimensions[2]].nil?}
         (@dimensions[2]..@dimensions[3]).each do |i|
-          break unless (@dimensions[0]..@dimensions[1]).inject(true){|t, j| t && (row(j)[i].nil? || row(j)[i].empty?)}
+          break unless (@dimensions[0]..@dimensions[1]).inject(true){|t, j| t && row(j)[i].to_s.empty?}
           @dimensions[2] = i
         end
       end
@@ -351,7 +351,7 @@ module Spreadsheet
       # detect last non-empty non-nil column if last column is empty or nil
       if (@dimensions[0]..@dimensions[1]).inject(true){|t, j| t && row(j)[@dimensions[3]].nil?}
         (@dimensions[2]..@dimensions[3]).reverse_each do |i|
-          break unless (@dimensions[0]..@dimensions[1]).inject(true){|t, j| t && (row(j)[i].nil? || row(j)[i].empty?)}
+          break unless (@dimensions[0]..@dimensions[1]).inject(true){|t, j| t && row(j)[i].to_s.empty?}
           @dimensions[3] = i
         end
         @dimensions[3] = @dimensions[3]

data/test/integration.rb

@@ -1437,6 +1437,13 @@ module Spreadsheet
       assert_equal sheet.dimensions, [0, 4, 0, 4]
       sheet.compact!
       assert_equal sheet.dimensions, [0, 2, 0, 2]
+      path = File.join @data, 'test_compact_format_date.xls'
+      book = Spreadsheet.open path
+      sheet = book.worksheet 0
+      assert_instance_of Excel::Worksheet, sheet
+      assert_nothing_raised do
+        sheet.compact!
+      end
     end
 
     private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spreadsheet
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-03 00:00:00.000000000 Z
+date: 2016-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-ole