spreadsheet 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efb204081ff8ae0e590f3c0537917c622c49f8b4
-  data.tar.gz: 7b43d12d03e7c40866f63dd86868a1cd29126456
+  metadata.gz: f644ff72e11b9264344a7fa3b882bfc2cc36c67c
+  data.tar.gz: 9c76a7e5f862ca3a2706f3ec95f891225acfd1bb
 SHA512:
-  metadata.gz: 0314b39548f389e90a5441260a591b15038ff43f8c7df34491bc0d6d0c9b89640ace9f52374aa5d5ad52a14211932d53ecc368951221f5839d14bd24a64d4663
-  data.tar.gz: ce05bc3b15029a77df3fb51d3f5fb4187bd1d12fc0ee4a15fe9c47d546ad50b50c2290bc6f94606a4b96207be02b95c5ddbd0b326a8d2822868ca0918b6aab65
+  metadata.gz: 1cc27fc0a6b649df6eb051d086a847b56374c029223552da6027f1515fa72c5f22a97f7f3de2d4b8f6e92a812cfa1dc4e415e6f0fb108ea134714a5fc5d9d20c
+  data.tar.gz: 128c01ac9eced267751deffdaaa9b50bf7b5a635cea7656a64d05a821c1120377463dc80366092d25940a3f82a7dd64725ad275c0c10b0ec9855b4bfa295e28d

data/.travis.yml

@@ -1,12 +1,15 @@
 language: ruby
+sudo: false
+cache: bundler
 before_install:
   - gem install bundler
 bundler_args: --binstubs
-script: "ruby -w ./test/suite.rb"
+script: "bundle exec ruby test/suite.rb"
 rvm:
   - ruby-head
   - 2.0.0
-  - 2.1.1
+  - 2.2.3
+  - 2.1.7
   - 1.9.3
   - 1.9.2
   - 1.8.7

data/GUIDE.md

@@ -2,16 +2,17 @@
 This guide is meant to get you started using Spreadsheet. By the end of it,
 you should be able to read and write Spreadsheets.
 
-
-## Reading is easy!
-First, make sure all that code is loaded:
+Before you can do anything, you first need to make sure all that code is
+loaded:
 
 ```ruby
 require 'spreadsheet'
 ```
 
-Worksheets come in various Encodings. You need to tell Spreadsheet which
-Encoding you want to deal with. The Default is UTF-8
+## Reading is easy!
+
+Worksheets come in various encodings. You need to tell Spreadsheet which
+encoding you want to deal with. The default is UTF-8
 
 ```ruby
 Spreadsheet.client_encoding = 'UTF-8'
@@ -23,13 +24,13 @@ Let's open a workbook:
 book = Spreadsheet.open '/path/to/an/excel-file.xls'
 ```
 
-We can either access all the Worksheets in a Workbook...
+We can either access all the worksheets in a workbook...
 
 ```ruby
 book.worksheets
 ```
 
-...or access them by index or name (encoded in your client_encoding)
+...or access them by index or name (encoded in your `client_encoding`).
 
 ```ruby
 sheet1 = book.worksheet 0
@@ -37,8 +38,8 @@ sheet2 = book.worksheet 'Sheet1'
 ```
 
 Now you can either iterate over all rows that contain some data. A call to
-Worksheet.each without argument will omit empty rows at the beginning of the
-Worksheet:
+`Worksheet.each` without arguments will omit empty rows at the beginning of the
+worksheet:
 
 ```ruby
 sheet1.each do |row|
@@ -46,7 +47,7 @@ sheet1.each do |row|
 end
 ```
 
-Or you can tell Worksheet how many rows should be omitted at the beginning.
+Or you can tell a worksheet how many rows should be omitted at the beginning.
 The following starts at the 3rd row, regardless of whether or not it or the
 preceding rows contain any data:
 
@@ -62,17 +63,17 @@ Or you can access rows directly, by their index (0-based):
 row = sheet1.row(3)
 ```
 
-To access the values stored in a Row, treat the Row like an Array.
+To access the values stored in a row, treat the row like an array.
 
 ```ruby
 row[0]
 ```
 
--> this will return a String, a Float, an Integer, a Formula, a Link or a Date
-or DateTime object - or nil if the cell is empty.
+This will return a `String`, a `Float`, an `Integer`, a `Formula`, a `Link` or a `Date`
+or `DateTime` object - or `nil` if the cell is empty.
 
-More information about the formatting of a cell can be found in the Format
-with the equivalent index
+More information about the formatting of a cell can be found in the format
+with the equivalent index:
 
 ```ruby
 row.format 2

data/Gemfile

@@ -1,6 +1,10 @@
 source "https://rubygems.org"
 gem 'ruby-ole'
 
+if RUBY_VERSION.to_f > 2.0
+  gem 'test-unit'
+  gem 'minitest'
+end
 group :development do
   gem 'hoe', '>= 3.4'
 end

data/Gemfile.lock

@@ -1,14 +1,23 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    hoe (3.7.1)
+    hoe (3.14.2)
       rake (>= 0.8, < 11.0)
-    rake (10.1.0)
+    minitest (5.8.2)
+    power_assert (0.2.4)
+    rake (10.4.2)
     ruby-ole (1.2.11.8)
+    test-unit (3.1.5)
+      power_assert
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   hoe (>= 3.4)
+  minitest
   ruby-ole
+  test-unit
+
+BUNDLED WITH
+   1.10.6

data/History.md

@@ -1,3 +1,11 @@
+### 1.0.9 / 18.11.2015
+
+Author: 545ch4 <s@rprojekt.org>
+Date:   Mon Nov 16 10:26:27 2015 +0100
+
+* Add smart method compact! to worksheet
+* Use compact! to reduce the number of rows and columns by striping empty one at both ends.
+
 ### 1.0.8 / 20.10.2015
 
 commit e9bd1dd34998803b63460f4951e9aa34e569bd8f

data/lib/spreadsheet.rb

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

data/lib/spreadsheet/worksheet.rb

@@ -311,6 +311,53 @@ module Spreadsheet
       # FIXME enlarge or dup check
       @merged_cells.push [start_row, end_row, start_col, end_col]
     end
+
+    def compact!
+      recalculate_dimensions
+      
+      # detect first non-nil non-empty row if given first row is empty or nil
+      if row(@dimensions[0]).empty? || row(@dimensions[0]).compact.join('').empty?
+        (@dimensions[0]...@dimensions[1]).each do |i|
+          break unless row(i).empty? || row(i).compact.join('').empty?
+          @dimensions[0] = i
+        end
+      end
+
+      # detect last non-nil non-empty row if given last row is empty or nil
+      if row(@dimensions[1] - 1).empty? || row(@dimensions[1] - 1).compact.join('').empty?
+        i = @dimensions[1] - 1
+        @dimensions[1] = @dimensions[0]
+        # divide and conquer
+        while(i - @dimensions[1] > 1) do
+          if row(i).empty? || row(i).compact.join('').empty?
+            i = @dimensions[1] + (((i - @dimensions[1]) + 1) / 2).to_i
+          else
+            _i = ((i - @dimensions[1]) / 2).to_i + 1
+            @dimensions[1] = i
+            i = i + _i
+          end
+        end
+        @dimensions[1] = i + 1
+      end
+
+      # 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?)}
+          @dimensions[2] = i
+        end
+      end
+
+      # 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?)}
+          @dimensions[3] = i
+        end
+        @dimensions[3] = @dimensions[3]
+      end
+    end
+
     private
     def index_of_first ary # :nodoc:
       return unless ary

data/test/integration.rb

@@ -1408,6 +1408,37 @@ module Spreadsheet
         book.worksheet(0).row(0)
       end
     end
+
+    def test_compact
+      path = File.join @data, 'test_compact_many_rows.xls'
+      book = Spreadsheet.open path
+      sheets = book.worksheets
+      assert_equal 1, sheets.size
+      sheet = book.worksheet 0
+      assert_instance_of Excel::Worksheet, sheet
+      assert_equal sheet, book.worksheet('Planilha1')
+      assert_equal sheet.dimensions, [0, 65534, 0, 25]
+      sheet.compact!
+      assert_equal sheet.dimensions, [0, 502, 0, 1]
+      path = File.join @data, 'test_sizes.xls'
+      book = Spreadsheet.open path
+      sheet = book.worksheet 0
+      assert_instance_of Excel::Worksheet, sheet
+      assert_equal sheet.dimensions, [1, 38, 1, 15]
+      sheet.compact!
+      assert_equal sheet.dimensions, [1, 3, 1, 3]
+      sheet = book.worksheet 1
+      assert_instance_of Excel::Worksheet, sheet
+      assert_equal sheet.dimensions, [1, 3, 1, 3]
+      sheet.compact!
+      assert_equal sheet.dimensions, [1, 3, 1, 3]
+      sheet = book.worksheet 2
+      assert_instance_of Excel::Worksheet, sheet
+      assert_equal sheet.dimensions, [0, 4, 0, 4]
+      sheet.compact!
+      assert_equal sheet.dimensions, [0, 2, 0, 2]
+    end
+
     private
 
     # Validates the workbook's SST

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spreadsheet
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-ole