spreadsheet 1.1.9 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd771f6375c227ea8e847dd9baa0b8c594ee094b
-  data.tar.gz: d9ddedd561cfd67ab9784326aaad2bb0fd5877f7
+  metadata.gz: 153daf0819e113f6da9726a43b23494e30497ae3
+  data.tar.gz: 811ecec4ac2a63d3c431ed6dc324ff69c9a189ca
 SHA512:
-  metadata.gz: faf0102464aa6c38ed4c62052777e2acfdd2d463764a4d20a1aa51f7de3937685dc242f202e267a4e26ea52c9eb37b9cacc0a53e394323a16391ecce3da0e0fe
-  data.tar.gz: cdfa1580f3f6d47adb8bbe70c9d505660cf213b5d632526455de14d76c4ba5041e56aae2b755e3f5781a3464bc709b698fe44f46ef686a5b34612272467fa291
+  metadata.gz: 3bc43a69c6d5817d2132f05a9544546b070e5512c19c002aa7280ab2879a8b3f0297890f9bea890efe6a082b69a59a226313f4df47e4b5e65e7a08fb81ed894b
+  data.tar.gz: 2ea734d18f429276707f0823f2703cda52fcc057d6aa04eea4b065db1f08299c3f2a94fc4fb1b61fde2080d5a63fe479ecf857bc14d47d92fa7b1a1331537c02

data/History.md

@@ -1,3 +1,11 @@
+### 1.2.0 17.2.2019
+Author: James McLaren <jamesmclaren555@gmail.com>
+* spreadsheet-1.2.0.gem released
+
+### 1.1.9 26.1.2019
+Author: Nick Weiland <nickweiland@gmail.com>
+* spreadsheet-1.1.9.gem released.
+
 ### 1.1.8 / 20.08.2018
 Author: VitaliyAdamkov <adamkov@tex.ua>
 Date:   Mon Aug 20 09:48:31 2018 +0300

data/lib/spreadsheet.rb

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

data/lib/spreadsheet/worksheet.rb

@@ -153,9 +153,13 @@ module Spreadsheet
     # If the argument skip is given, #each iterates from that row until but
     # omitting the first unused Row, effectively skipping the first _skip_ Rows
     # from the top of the Worksheet.
-    def each skip=dimensions[0]
-      skip.upto(dimensions[1] - 1) do |idx|
-        yield row(idx)
+    def each(skip=dimensions[0], &block)
+      rows = skip.upto(dimensions[1] - 1).map { |index| row(index) }.to_enum
+
+      if block_given?
+        rows.each(&block)
+      else
+        rows
       end
     end
     def encoding # :nodoc:
@@ -314,7 +318,7 @@ module Spreadsheet
 
     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|

data/test/worksheet.rb

@@ -108,18 +108,35 @@ module Spreadsheet
       assert_equal 6, @book.formats.length
 
     end
-    
+
     def test_freeze_panel!
       assert_equal 0, @sheet.froze_top
       assert_equal 0, @sheet.froze_left
       assert_equal false, @sheet.has_frozen_panel?
-      
+
       @sheet.freeze!(2, 3)
       assert_equal 2, @sheet.froze_top
       assert_equal 3, @sheet.froze_left
       assert_equal true, @sheet.has_frozen_panel?
-      
+
+    end
+
+    def test_each_with_skip
+      @sheet[0, 0] = 'foo'
+      @sheet[1, 0] = 'bar'
+
+      assert_equal @sheet.each(1).count, 1
+      assert_equal @sheet.each(1).first[0], 'bar'
     end
-    
+
+    def test_each_with_index
+      @sheet[0, 0] = 'foo'
+      @sheet[1, 0] = 'bar'
+
+      @sheet.each.with_index do |row, index|
+        assert_equal row[0], @sheet[index, 0]
+      end
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spreadsheet
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.2.0
 platform: ruby
 authors:
 - Hannes F. Wyss, Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-26 00:00:00.000000000 Z
+date: 2019-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-ole