spreadsheet 1.1.5 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4298c03c72488e63b8b50878bd59340c92a6bfb2
-  data.tar.gz: 787718140dccee75ea9407a298b1700c147f08f4
+  metadata.gz: 153daf0819e113f6da9726a43b23494e30497ae3
+  data.tar.gz: 811ecec4ac2a63d3c431ed6dc324ff69c9a189ca
 SHA512:
-  metadata.gz: 2ec69c70be8583640e6ff7bb04d5e84e3cd18bd93e0a456dbf99fb45f0ed4119cdd2653954df4d30f0d22ac6b949c8601fc225998d1caca387a578e353c84f31
-  data.tar.gz: 720b8a57e50de2ca682364f718309ed45f19d9fc2dc54e5ad4c534b4284b3bb6441bc5e79d5b8538c9b8c460b1e4ab43155f54042e0b77cb8a595b5fcc0fdf97
+  metadata.gz: 3bc43a69c6d5817d2132f05a9544546b070e5512c19c002aa7280ab2879a8b3f0297890f9bea890efe6a082b69a59a226313f4df47e4b5e65e7a08fb81ed894b
+  data.tar.gz: 2ea734d18f429276707f0823f2703cda52fcc057d6aa04eea4b065db1f08299c3f2a94fc4fb1b61fde2080d5a63fe479ecf857bc14d47d92fa7b1a1331537c02

data/.travis.yml

@@ -2,7 +2,7 @@ language: ruby
 sudo: false
 cache: bundler
 before_install:
-  - gem install bundler
+  - gem install bundler -v 1.17.3 --no-document
 bundler_args: --binstubs
 script: "bundle exec ruby test/suite.rb"
 rvm:

data/Gemfile.lock

@@ -1,12 +1,12 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    hoe (3.14.2)
-      rake (>= 0.8, < 11.0)
+    hoe (3.17.1)
+      rake (>= 0.8, < 13.0)
     minitest (5.8.2)
     power_assert (0.2.4)
-    rake (10.4.2)
-    ruby-ole (1.2.11.8)
+    rake (10.5.0)
+    ruby-ole (1.2.12.1)
     test-unit (3.1.5)
       power_assert
 
@@ -20,4 +20,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   1.12.5
+   1.17.2

data/History.md

@@ -1,3 +1,44 @@
+### 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
+
+* Cancel :lazy usage
+* Use lazy select to speed up a little
+* Omit rails :try usage
+* stub for :postread_worksheet method
+* sometimes it selects empty array..
+
+Author: 545ch4 <s@rprojekt.org>
+Date:   Wed Mar 28 15:33:04 2018 +0200
+
+* [ruby-2.4] Fix weird first line of spreadsheet.gemspec
+* Doesn't seem to be a valid .gemspec command/field.
+
+### 1.1.7 / 15.03.2018
+
+Author: Maarten Brouwers <github@murb.nl>
+Date:   Thu Mar 15 15:10:23 2018 +0100
+
+* shadowing outer local variable - i
+    
+* Running rake resulted in the following warning: `lib/spreadsheet/worksheet.rb:345: warning: shadowing outer local variable - i`; this patch fixes that.
+
+### 1.1.6 / 12.03.2018
+
+Author: Todd Hambley <thambley@travelleaders.com>
+Date:   Mon Mar 12 14:20:39 2018 -0400
+
+* fix reject for ruby 1.8.7
+* fix using invalid code pages when writing workbook
+
 ### 1.1.5 / 20.11.2017
 
 Author: Paco Guzmán <pacoguzman@users.noreply.github.com>

data/Rakefile

@@ -13,7 +13,7 @@ ENV['RDOCOPT'] = '-c utf8'
 Hoe.plugin :git
 
 Hoe.spec('spreadsheet') do |p|
-   p.developer('Masaomi Hatakeyama, Zeno R.R. Davatz','mhatakeyama@ywesee.com, zdavatz@ywesee.com')
+  p.developer('Hannes F. Wyss, Masaomi Hatakeyama, Zeno R.R. Davatz','hannes.wyss@gmail.com, mhatakeyama@ywesee.com, zdavatz@ywesee.com')
    p.remote_rdoc_dir = 'spreadsheet'
    p.extra_deps << ['ruby-ole', '>=1.0']
    p.email = "zdavatz@ywesee.com"

data/bin/xlsopcodes

@@ -1,17 +1,18 @@
 #!/usr/bin/env ruby
-# frozen_string_literal: true
-#
-# This file was generated by Bundler.
-#
-# The application 'xlsopcodes' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
 
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+require 'spreadsheet'
 
-require "rubygems"
-require "bundler/setup"
+source, target = ARGV
 
-load Gem.bin_path("spreadsheet", "xlsopcodes")
+if source.nil?
+  puts "Usage: #{$0} <source> [<target>]"
+  exit -1
+end
+
+target = target ? File.open(target, 'w') : STDOUT
+
+reader = Spreadsheet::Excel::Reader.new :print_opcodes => target
+reader.setup File.open(source)
+
+while tuple = reader.get_next_chunk
+end

data/lib/spreadsheet/excel/internals.rb

@@ -54,7 +54,7 @@ module Internals
     32768 => "MACROMAN",
     32769 => "WINDOWS-1252", #(Latin I) (BIFF2-BIFF3)
   }
-  SEGAPEDOC = CODEPAGES.invert
+  SEGAPEDOC = CODEPAGES.reject { |k, _v| k >= 21010 }.invert
   # color_codes according to http://support.softartisans.com/kbview_1205.aspx
   # synonyms are in comments when reverse lookup
   COLOR_CODES = {

data/lib/spreadsheet/excel/reader.rb

@@ -125,11 +125,12 @@ class Reader
      #So link the noteObject(text) to the note (with author, position)
      #TODO
      @noteList.each do |i|
-        matching_obj = @noteObjList.select {|j| j.objID == i.objID}
-        if matching_obj.length > 1
+        matching_objs = @noteObjList.select { |j| j.objID == i.objID }
+        if matching_objs.length > 1
            puts "ERROR - more than one matching object ID!"
         end
-        i.text = matching_obj.first.text
+        matching_obj = matching_objs.first
+        i.text = matching_obj.nil? ? '' : matching_obj.text
         worksheet.add_note i.row, i.col, i.text
      end
   end
@@ -398,10 +399,10 @@ class Reader
       end
       formula.value = value
     elsif rtype == 0
-      pos, op, len, work = get_next_chunk
+      pos, op, _len, work = get_next_chunk
       if op == :sharedfmla
         ## TODO: formula-support in 0.8.0
-        pos, op, len, work = get_next_chunk
+        pos, op, _len, work = get_next_chunk
       end
       if op == :string
         formula.value = client read_string(work, 2), @workbook.encoding
@@ -851,6 +852,7 @@ class Reader
     @detected_rows = {}
     @noteObjList = []
     @noteList = []
+    @noteObject = nil
     previous = nil
     while tuple = get_next_chunk
       pos, op, len, work = tuple

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|
@@ -325,19 +329,19 @@ module Spreadsheet
 
       # 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
+        row_size = @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
+        while(row_size - @dimensions[1] > 1) do
+          if row(row_size).empty? || row(row_size).compact.join('').empty?
+            row_size = @dimensions[1] + (((row_size - @dimensions[1]) + 1) / 2).to_i
           else
-            _i = ((i - @dimensions[1]) / 2).to_i + 1
-            @dimensions[1] = i
-            i = i + _i
+            _i = ((row_size - @dimensions[1]) / 2).to_i + 1
+            @dimensions[1] = row_size
+            row_size = row_size + _i
           end
         end
-        @dimensions[1] = i + 1
+        @dimensions[1] = row_size + 1
       end
 
       # detect first non-empty non-nil column if first column is empty or nil

data/lib/spreadsheet.rb

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

data/spreadsheet.gemspec

@@ -3,14 +3,14 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'spreadsheet'
 
-spec = Gem::Specification.new do |spec|
+Gem::Specification.new do |spec|
    spec.name        = "spreadsheet"
    spec.version     =  Spreadsheet::VERSION
    spec.homepage    = "https://github.com/zdavatz/spreadsheet"
    spec.summary     = "The Spreadsheet Library is designed to read and write Spreadsheet Documents"
    spec.description = "As of version 0.6.0, only Microsoft Excel compatible spreadsheets are supported"
-   spec.author      = "Masaomi Hatakeyama, Zeno R.R. Davatz"
-   spec.email       = "mhatakeyama@ywesee.com, zdavatz@ywesee.com"
+   spec.author      = "Hannes F. Wyss, Masaomi Hatakeyama, Zeno R.R. Davatz"
+   spec.email       = "hannes.wyss@gmail.com, mhatakeyama@ywesee.com, zdavatz@ywesee.com"
    spec.platform    = Gem::Platform::RUBY
    spec.license     = "GPL-3.0"
    spec.files       = Dir.glob("{bin,lib,test}/**/*") + Dir.glob("*.txt")
@@ -22,4 +22,3 @@ spec = Gem::Specification.new do |spec|
 
    spec.homepage    = 'https://github.com/zdavatz/spreadsheet/'
 end
-

data/test/integration.rb

@@ -70,7 +70,7 @@ module Spreadsheet
     def test_missing_format
       path = File.join @data, 'test_missing_format.xls'
       assert_nothing_thrown do
-        workbook = Spreadsheet.open(path, "rb")
+        Spreadsheet.open(path, "rb")
       end
     end
     def test_version_excel97__excel2010__utf16
@@ -749,7 +749,7 @@ module Spreadsheet
       sheet1 = book.create_worksheet
       str1 = 'My Shared String'
       str2 = 'Another Shared String'
-      assert_equal 1, (str1.size + str2.size) % 2, 
+      assert_equal 1, (str1.size + str2.size) % 2,
         "str3 should start at an odd offset to test splitting of wide strings"
       str3 = '–––––––––– ' * 1000
       str4 = '1234567890 ' * 1000
@@ -1211,8 +1211,8 @@ module Spreadsheet
       book = Spreadsheet::Workbook.new
       sheet = book.create_worksheet
       (0..200).each { |i| sheet.row(i).push "ëçáéíóú" }
-      assert_nothing_raised do 
-        book.write StringIO.new("", "w+") 
+      assert_nothing_raised do
+        book.write StringIO.new("", "w+")
       end
     end
 
@@ -1257,7 +1257,7 @@ module Spreadsheet
       str1 = "Frozen String.".freeze
       sheet1[0,0] = str1
       sheet1.row(0).push str1
-      assert_nothing_raised do 
+      assert_nothing_raised do
         book.write path
       end
     end
@@ -1290,7 +1290,7 @@ module Spreadsheet
       sheet1 = book.create_worksheet
       (sheet1.row(0).format 0).border = :hair
       (sheet1.row(0).format 0).border_color = :brown
-      assert_nothing_raised do 
+      assert_nothing_raised do
         book.write path
       end
       book2 = Spreadsheet.open path
@@ -1391,7 +1391,7 @@ module Spreadsheet
       path = File.join @var, 'test_write_worksheet_visibility.xls'
       sheet1 = book.create_worksheet
       sheet1.visibility = :hidden
-      sheet2 = book.create_worksheet
+      _sheet2 = book.create_worksheet
       assert_nothing_raised do
         book.write path
       end

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.5
+  version: 1.2.0
 platform: ruby
 authors:
-- Masaomi Hatakeyama, Zeno R.R. Davatz
+- Hannes F. Wyss, Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-20 00:00:00.000000000 Z
+date: 2019-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-ole
@@ -28,30 +28,36 @@ dependencies:
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.17'
 description: |-
   The Spreadsheet Library is designed to read and write Spreadsheet Documents.
   As of version 0.6.0, only Microsoft Excel compatible spreadsheets are