spreadsheet 0.9.6 → 0.9.9

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZDU5YTVlMjhjOGMxMTRjYmI3NmFmZjFhZTJjM2M2OWJhNTA2NmNlZQ==
+  data.tar.gz: !binary |-
+    NTQ4OGI0Y2VhNTdiNGNjMzdmYzdiMmJhNDJkNGE3OTRhOTk5MjNmMw==
+SHA512:
+  metadata.gz: !binary |-
+    NmNkOTA1ZDk4MjJjMjRmMzY2YmY5NjAyZGU4OTk4NGJjNzJlZTUyZDBiZjBm
+    ZmIwN2Y0ZDQ2YjUyZjI1YjNkMjEwZTU2YjQwZDk1OThiNjVkMzdkODBkNDkw
+    MzBmMGE3ODQ4ZTNlY2RkNWQwYzM3NTgxNzgyNzk0NjUzNGM3NjQ=
+  data.tar.gz: !binary |-
+    NmViNzExZjEwMzgxOWE4MzRiZTJmNjdmZTNiNzY2OWQxODliZGQ5N2U1M2Zl
+    YTM2MDUwMDZiNTFjNTViZDg0MjI1YmMxMjZiMDg4NzZjZTgyODMzYTZjZDcy
+    MzgyNzA2YjllNmE5MmU3ZjAwNThlNzZhNTRjZWM5MmFiNGI2Zjg=

data/.travis.yml

@@ -6,6 +6,7 @@ script: "ruby -w ./test/suite.rb"
 rvm:
   - ruby-head
   - 2.0.0
+  - 2.1.1
   - 1.9.3
   - 1.9.2
   - 1.8.7

data/GUIDE.md

@@ -169,6 +169,12 @@ end
 book.write '/path/to/output/excel-file.xls'
 ```
 
+Or you can directly access the cell that you want and add your text on it:
+
+```ruby
+sheet.rows[2][1] = "X"
+```
+
 ## Date and DateTime
 Excel does not know a separate Datatype for Dates. Instead it encodes Dates
 into standard floating-point numbers and recognizes a Date-Cell by its
@@ -317,7 +323,7 @@ Again, you will have to manually uninstall the spreadsheet-excel library.
 
 If you perform fancy formatting, you may run into trouble as the
 Format implementation has changed considerably. If that is the case, please
-drop me a line at hannes.wyss@gmail.com and I will try to help you. Don't
+drop me a line at "zdavatz at ywesee dot com" and I will try to help you. Don't
 forget to include the offending code-snippet!
 
 All compatibility code is deprecated and will be removed in version 1.0.0

data/Gemfile

@@ -1,9 +1,6 @@
 source "https://rubygems.org"
 gem 'ruby-ole'
-gem 'spreadsheet'
 
 group :development do
-  gem 'ruby-ole'
   gem 'hoe', '>= 3.4'
-  gem 'spreadsheet'
 end

data/Gemfile.lock

@@ -5,8 +5,6 @@ GEM
       rake (>= 0.8, < 11.0)
     rake (10.1.0)
     ruby-ole (1.2.11.7)
-    spreadsheet (0.8.9)
-      ruby-ole (>= 1.0)
 
 PLATFORMS
   ruby
@@ -14,4 +12,3 @@ PLATFORMS
 DEPENDENCIES
   hoe (>= 3.4)
   ruby-ole
-  spreadsheet

data/History.md

@@ -1,3 +1,26 @@
+### 0.9.9 / 28.08.2014
+
+Author: PikachuEXE <pikachuexe@gmail.com>
+Date:   Wed Aug 27 09:55:41 2014 +0800
+
+* Add custom error classes
+* Raise custom error for unknown code page or unsupported encoding
+
+### 0.9.8 / 19.08.2014
+
+Author: PikachuEXE <pikachuexe@gmail.com>
+Date:   Tue Aug 19 09:54:30 2014 +0800
+
+* Fix Encoding for MRI 2.1.0
+
+### 0.9.7 / 04.02.2014
+
+* Avoid exception when reading text objects
+* Add test for drawings with text (currenty broken)
+* Restore xlsopcodes script which had been mangled in previous commits
+* Remove ruby 1.9 from roadmap, it's already working fine
+* Fix excel file format documentation which had been mangled in previous commits
+
 ### 0.9.6 / 02.12.2013
 
 Author: Malcolm Blyth <trashbat@co.ck>

data/Manifest.txt

@@ -66,6 +66,7 @@ test/data/test_merged_and_protected.xls
 test/data/test_merged_cells.xls
 test/data/test_missing_row.xls
 test/data/test_pagesetup.xls
+test/data/test_text_drawing.xls
 test/data/test_version_excel5.xls
 test/data/test_version_excel95.xls
 test/data/test_version_excel97.xls

data/README.md

@@ -1,10 +1,7 @@
-Forked to continue comment extraction based on andrewinkelmann's fork
-
-
-Last Update: 31.05.2013 - Zeno R.R. Davatz
-
 # Spreadsheet
 
+[![Build Status](https://secure.travis-ci.org/zdavatz/spreadsheet.png)](http://travis-ci.org/zdavatz/spreadsheet)
+
 https://github.com/zdavatz/spreadsheet
 
 The Mailing List can be found here:
@@ -60,7 +57,6 @@ Floats returned for any number.
 * Formula Support
 * Document Modification: Formulas
 * Write-Support: BIFF5
-* Ruby 1.9 Support;
 * Remove backward compatibility code
 
 Note: Spreadsheet supports Ruby 1.8.6, 1.8.7, 1.9.2, 1.9.3
@@ -70,7 +66,6 @@ You will get a deprecated warning about iconv when using spreadsheet with Ruby
 
 ## Dependencies
 
-* ruby 1.8
 * [ruby-ole](http://code.google.com/p/ruby-ole/)
 
 

data/lib/spreadsheet/excel/internals.rb

@@ -34,10 +34,10 @@ module Internals
     866 => "IBM866", #(Cyrillic (Russian))
     869 => "IBM869", #(Greek (Modern))
     874 => "WINDOWS-874", #(Thai)
-    932 => "WINDOWS-932", #(Japanese Shift-JIS)
-    936 => "WINDOWS-936", #(Chinese Simplified GBK)
-    949 => "WINDOWS-949", #(Korean (Wansung))
-    950 => "WINDOWS-950", #(Chinese Traditional BIG5)
+    932 => "Windows-31J", #(Japanese Shift-JIS)
+    936 => "GBK", #(Chinese Simplified GBK)
+    949 => "CP949", #(Korean (Wansung))
+    950 => "CP950", #(Chinese Traditional BIG5)
     1200 => "UTF-16LE", #(BIFF8)
     1250 => "WINDOWS-1250", #(Latin II) (Central European)
     1251 => "WINDOWS-1251", #(Cyrillic)
@@ -380,9 +380,9 @@ module Internals
     :wsbool       => 0x0081, # ○  WSBOOL ➜ 6.113
     :defcolwidth  => 0x0055, # ○  DEFCOLWIDTH ➜ 6.29
     :sort         => 0x0090, # ○  SORT ➜ 6.95
-    :note         => 0x001c,                                                                                                      
-    :obj          => 0x005d,                                                                                                      
-    :drawing      => 0x00EC,                                                                                                      
+    :note         => 0x001c,
+    :obj          => 0x005d,
+    :drawing      => 0x00EC,
     :txo          => 0x01B6,
   }
 =begin ## unknown opcodes
@@ -441,7 +441,7 @@ module Internals
 		0x0d	=>	:slanted_medium_dash_dotted
 	}
 # ensure reader always gets a valid line style
-	XF_BORDER_LINE_STYLES.default = :none 
+	XF_BORDER_LINE_STYLES.default = :none
 	SELYTS_ENIL_REDROB_FX = XF_BORDER_LINE_STYLES.invert
 	SELYTS_ENIL_REDROB_FX.default = 0x00
   OPCODE_SIZE = 4

data/lib/spreadsheet/excel/reader.rb

@@ -71,10 +71,16 @@ class Reader
     value
   end
   def encoding codepage_id
-    name = CODEPAGES.fetch(codepage_id) {
-      raise "Unknown Codepage 0x%04x" % codepage_id }
+    name = CODEPAGES.fetch(codepage_id) do
+      raise Spreadsheet::Errors::UnknownCodepage, "Unknown Codepage 0x%04x" % codepage_id
+    end
+
     if RUBY_VERSION >= '1.9'
-      Encoding.find name
+      begin
+        Encoding.find name
+      rescue ArgumentError
+        raise Spreadsheet::Errors::UnsupportedEncoding, "Unsupported encoding with name '#{name}'"
+      end
     else
       name
     end
@@ -903,7 +909,7 @@ class Reader
           #p work
         end
       when :continue # this contains the actual note text
-        if previous == :txo
+        if previous == :txo && @noteObject
           #puts "\nDEBUG: found Continue record"
           continueFmt = work.unpack('C')
           if (continueFmt.first == 0)
@@ -933,7 +939,7 @@ class Reader
           set_missing_row_address worksheet, work, pos, len
         end
       end
-      previous = op 
+      previous = op
       #previous = op unless op == :continue
     end
   end

data/lib/spreadsheet/excel/writer/workbook.rb

@@ -273,7 +273,9 @@ class Workbook < Spreadsheet::Writer
     if RUBY_VERSION >= '1.9' && enc.is_a?(Encoding)
       enc = enc.name.upcase
     end
-    cp = SEGAPEDOC[enc] or raise "Invalid or Unknown Codepage '#{enc}'"
+    cp = SEGAPEDOC.fetch(enc) do
+      raise Spreadsheet::Errors::UnknownCodepage, "Invalid or Unknown Codepage '#{enc}'"
+    end
     write_op writer, 0x0042, [cp].pack('v')
   end
   def write_eof workbook, writer

data/lib/spreadsheet.rb

@@ -24,6 +24,8 @@
 #             8006 Zürich
 ###           Switzerland
 
+require 'spreadsheet/errors'
+
 require 'spreadsheet/excel/workbook'
 require 'spreadsheet/excel/reader'
 require 'spreadsheet/excel/rgb'
@@ -43,7 +45,7 @@ module Spreadsheet
 
   ##
   # The version of Spreadsheet you are using.
-  VERSION = '0.9.6'
+  VERSION = '0.9.9'
 
   ##
   # Default client Encoding. Change this value if your application uses a

data/spreadsheet.gemspec

@@ -1,6 +1,8 @@
+require File.join(File.dirname(__FILE__), 'lib', 'spreadsheet')
+
 spec = Gem::Specification.new do |s|
    s.name        = "spreadsheet"
-   s.version     = "0.9.5"
+   s.version     =  Spreadsheet::VERSION
    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"

data/test/integration.rb

@@ -1365,6 +1365,13 @@ module Spreadsheet
       assert_equal(:visible, book2.worksheet(1).visibility)
     end
 
+    def test_text_drawing
+      path = File.join @data, 'test_text_drawing.xls'
+      book = Spreadsheet.open path
+      assert_nothing_raised do
+        book.worksheet(0).row(0)
+      end
+    end
     private
 
     # Validates the workbook's SST

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: spreadsheet
 version: !ruby/object:Gem::Version
-  version: 0.9.6
-  prerelease: 
+  version: 0.9.9
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-02 00:00:00.000000000 Z
+date: 2014-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-ole
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +62,7 @@ extra_rdoc_files:
 - LICENSE.txt
 - Manifest.txt
 files:
+- .gemtest
 - .gitignore
 - .travis.yml
 - Excel97-2007BinaryFileFormatSpecification.pdf
@@ -137,6 +131,7 @@ files:
 - test/data/test_merged_cells.xls
 - test/data/test_missing_row.xls
 - test/data/test_pagesetup.xls
+- test/data/test_text_drawing.xls
 - test/data/test_version_excel5.xls
 - test/data/test_version_excel95.xls
 - test/data/test_version_excel97.xls
@@ -154,9 +149,9 @@ files:
 - test/workbook.rb
 - test/workbook_protection.rb
 - test/worksheet.rb
-- .gemtest
 homepage: 
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -164,21 +159,19 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: spreadsheet
-rubygems_version: 1.8.25
+rubygems_version: 2.3.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ''
 test_files: []