spreadsheet 0.6.5.0 → 0.6.5.1

data/Manifest.txt

@@ -4,6 +4,7 @@ LICENSE.txt
 Manifest.txt
 README.txt
 Rakefile
+spreadsheet.gemspec
 bin/xlsopcodes
 lib/parseexcel.rb
 lib/parseexcel/parseexcel.rb
@@ -46,6 +47,7 @@ test/data/test_datetime.xls
 test/data/test_empty.xls
 test/data/test_formula.xls
 test/data/test_missing_row.xls
+test/data/test_long_sst_record.xls
 test/data/test_version_excel5.xls
 test/data/test_version_excel95.xls
 test/data/test_version_excel97.xls

data/Rakefile

@@ -8,11 +8,10 @@ require './lib/spreadsheet.rb'
 
 ENV['RDOCOPT'] = '-c utf8'
 
-Hoe.new('spreadsheet', Spreadsheet::VERSION) do |p|
-  # p.rubyforge_name = 'spreadsheetx' # if different than lowercase project name
+Hoe.spec('spreadsheet') do |p|
    p.developer('Masaomi Hatakeyama, Zeno R.R. Davatz','mhatakeyama@ywesee.com, zdavatz@ywesee.com')
-   p.remote_rdoc_dir = ''
-   p.extra_deps << 'ruby-ole'
+   p.remote_rdoc_dir = 'spreadsheet'
+   p.extra_deps << ['ruby-ole', '>=1.0']
 end
 
 # vim: syntax=Ruby

data/lib/spreadsheet.rb

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

data/lib/spreadsheet/excel/reader/biff8.rb

@@ -39,11 +39,15 @@ module Biff8
     owing = @incomplete_sst.continued_chars
     size = [work.size, owing * (1 + wide) + 1].min
     chars = (size - 1) / (1 + wide)
+    skip = size
     @incomplete_sst.continue oppos + OPCODE_SIZE, size, chars
     unless @incomplete_sst.continued?
+      @workbook.add_shared_string @incomplete_sst
+      skip += @incomplete_skip
       @incomplete_sst = nil
+      @incomplete_skip = nil
     end
-    size
+    skip
   end
   ##
   # Read more data into the Shared String Table. (see also: #read_sst)
@@ -52,13 +56,16 @@ module Biff8
     pos = 0
     if @incomplete_sst
       pos = continue_string_header work, oppos
+    elsif !@incomplete_skip.nil?
+      pos =  @incomplete_skip
+      @incomplete_skip = nil
     end
     @sst_offset[1] += len
     _read_sst work, oppos, pos
   end
   def postread_workbook # :nodoc:
     super
-    @incomplete_string, @sst_size, @sst_offset, @incomplete_sst = nil
+    @incomplete_string, @sst_size, @sst_offset, @incomplete_sst = nil, @incomplete_skip = nil
   end
   ##
   # Store the offset of extsst, so we can write a new extsst when the
@@ -175,9 +182,15 @@ module Biff8
       sst.wide = wide > 0
       if sst.continued?
         @incomplete_sst = sst
+        @incomplete_skip = skip
+        pos += sst.available
+      else
+        @workbook.add_shared_string sst
+        pos += sst.available + skip
+        if pos > worksize
+          @incomplete_skip = pos - worksize
+        end
       end
-      @workbook.add_shared_string sst
-      pos += sst.available + skip
     end
   end
 end

data/spreadsheet.gemspec

@@ -0,0 +1,22 @@
+require "rubygems"
+require "rake"
+
+spec = Gem::Specification.new do |s|
+   s.name        = "spreadsheet"
+   s.version     = "0.6.5"
+   s.summary     = "The Spreadsheet Library is designed to read and write Spreadsheet Documents"
+   s.description = "As of version 0.6.0, only Microsoft Excel compatible spreadsheets are supported"
+   s.author      = "Masaomi Hatakeyama, Zeno R.R. Davatz"
+   s.email       = "mhatakeyama@ywesee.com, zdavatz@ywesee.com"
+   s.platform    = Gem::Platform::RUBY
+   s.files       = Dir.glob("{bin,lib,test}/**/*") + Dir.glob("*.txt")
+   s.test_file   = "test/suite.rb"
+   s.executables << 'xlsopcodes'
+   s.add_dependency('ruby-ole')
+   s.homepage	 = "http://scm.ywesee.com/?p=spreadsheet/.git;a=summary"
+end
+
+if $0 == __FILE__
+   Gem.manage_gems
+   Gem::Builder.new(spec).build
+end

data/test/integration.rb

@@ -1271,11 +1271,20 @@ module Spreadsheet
       target = File.join @var, 'test_changes.xls'
       assert_nothing_raised do book.write target end
     end
+    def test_long_sst_record
+      path = File.join @data, 'test_long_sst_record.xls'
+      book = Spreadsheet.open path
+      sheet = book.worksheet(0)
+      expected_result = 'A1,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385,386,387,388,389,390,391,392,393,394,395,396,397,398,399,400,401,402,403,404,405,406,407,408,409,410,411,412,413,414,415,416,417,418,419,420,421,422,423,424,425,426,427,428,429,430,431,432,433,434,435,436,437,438,439,440,441,442,443,444,445,446,447,448,449,450,451,452,453,454,455,456,457,458,459,460,461,462,463,464,465,466,467,468,469,470,471,472,473,474,475,476,477,478,479,480,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507,508,509,510,511,512,513,514,515,516,517,518,519,520,521,522,523,524,525,526,527,528,529,530,531,532,533,534,535,536,537,538,539,540,541,542,543,544,545,546,547,548,549,550,551,552,553,554,555,556,557,558,559,560,561,562,563,564,565,566,567,568,569,570,571,572,573,574,575,576,577,578,579,580,581,582,583,584,585,586,587,588,589,590,591,592,593,594,595,596,597,598,599,600,601,602,603,604,605,606,607,608,609,610,611,612,613,614,615,616,617,618,619,620,621,622,623,624,625,626,627,628,629,630,631,632,633,634,635,636,637,638,639,640,641,642,643,644,645,646,647,648,649,650,651,652,653,654,655,656,657,658,659,660,661,662,663,664,665,666,667,668,669,670,671,672,673,674,675,676,677,678,679,680,681,682,683,684,685,686,687,688,689,690,691,692,693,694,695,696,697,698,699,700,701,702,703,704,705,706,707,708,709,710,711,712,713,714,715,716,717,718,719,720,721,722,723,724,725,726,727,728,729,730,731,732,733,734,735,736,737,738,739,740,741,742,743,744,745,746,747,748,749,750,751,752,753,754,755,756,757,758,759,760,761,762,763,764,765,766,767,768,769,770,771,772,773,774,775,776,777,778,779,780,781,782,783,784,785,786,787,788,789,790,791,792,793,794,795,796,797,798,799,800,801,802,803,804,805,806,807,808,809,810,811,812,813,814,815,816,817,818,819,820,821,822,823,824,825,826,827,828,829,830,831,832,833,834,835,836,837,838,839,840,841,842,843,844,845,846,847,848,849,850,851,852,853,854,855,856,857,858,859,860,861,862,863,864,865,866,867,868,869,870,871,872,873,874,875,876,877,878,879,880,881,882,883,884,885,886,887,888,889,890,891,892,893,894,895,896,897,898,899,900,901,902,903,904,905,906,907,908,909,910,911,912,913,914,915,916,917,918,919,920,921,922,923,924,925,926,927,928,929,930,931,932,933,934,935,936,937,938,939,940,941,942,943,944,945,946,947,948,949,950,951,952,953,954,955,956,957,958,959,960,961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,976,977,978,979,980,981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998'
+      assert_equal(expected_result, sheet[0,0])
+    end
+=begin
     def test_read_baltic
       path = File.join @data, 'test_baltic.xls'
       assert_nothing_raised do
         Spreadsheet.open path
       end
     end
+=end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: spreadsheet
 version: !ruby/object:Gem::Version 
-  hash: 107
+  hash: 105
   prerelease: false
   segments: 
   - 0
   - 6
   - 5
-  - 0
-  version: 0.6.5.0
+  - 1
+  version: 0.6.5.1
 platform: ruby
 authors: 
 - Masaomi Hatakeyama, Zeno R.R. Davatz
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-13 00:00:00 +01:00
+date: 2011-01-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,10 +27,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
+        - 1
         - 0
-        version: "0"
+        version: "1.0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -74,6 +75,7 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
+- spreadsheet.gemspec
 - bin/xlsopcodes
 - lib/parseexcel.rb
 - lib/parseexcel/parseexcel.rb
@@ -116,6 +118,7 @@ files:
 - test/data/test_empty.xls
 - test/data/test_formula.xls
 - test/data/test_missing_row.xls
+- test/data/test_long_sst_record.xls
 - test/data/test_version_excel5.xls
 - test/data/test_version_excel95.xls
 - test/data/test_version_excel97.xls