spreadsheet 0.9.8 → 0.9.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjJhMDIxNjBlNzdiZGI4YWYzMTdkODVjMGRlOTI5ZjdhNGM1ZDAxNA==
+    ZDU5YTVlMjhjOGMxMTRjYmI3NmFmZjFhZTJjM2M2OWJhNTA2NmNlZQ==
   data.tar.gz: !binary |-
-    NjAzZTBhMmM5OWJiOWRjZDQ0ZGNkNTdhM2JkNWI0NWM0NWExYzM3OA==
+    NTQ4OGI0Y2VhNTdiNGNjMzdmYzdiMmJhNDJkNGE3OTRhOTk5MjNmMw==
 SHA512:
   metadata.gz: !binary |-
-    MDMxZjE5YTllNDlmODlkMGFhZmYzNDZiZjY5ZmMwNTkyODczNTU3ZTcwZTlm
-    NjQ2MjlkY2QzYjc4MmRkMDY2YjBmN2QzZmU1MDc0MDlhNTQ1YTE4MTJiY2Ew
-    MTNkOGI0YTlkZDQyMDM1NzAyYzYwNDk0ODZjNWFmYjNiNTAyMDM=
+    NmNkOTA1ZDk4MjJjMjRmMzY2YmY5NjAyZGU4OTk4NGJjNzJlZTUyZDBiZjBm
+    ZmIwN2Y0ZDQ2YjUyZjI1YjNkMjEwZTU2YjQwZDk1OThiNjVkMzdkODBkNDkw
+    MzBmMGE3ODQ4ZTNlY2RkNWQwYzM3NTgxNzgyNzk0NjUzNGM3NjQ=
   data.tar.gz: !binary |-
-    YmIzMTE4NzY1NGIwN2E1NDdiOGEyMWFjODU2NTg4ZGI3ZjBjMTljZTZmYTY2
-    MDIxOGE1ZjcyMTdlNWEwZDVkN2EyMmEzZTc2MjVmY2JkYTgyZGVlNzNiOTAy
-    NzI2MDE1OTMyMWJlZmNkMTA2Y2ViMjM5NmU5MDFiMTgwNTgxYjQ=
+    NmViNzExZjEwMzgxOWE4MzRiZTJmNjdmZTNiNzY2OWQxODliZGQ5N2U1M2Zl
+    YTM2MDUwMDZiNTFjNTViZDg0MjI1YmMxMjZiMDg4NzZjZTgyODMzYTZjZDcy
+    MzgyNzA2YjllNmE5MmU3ZjAwNThlNzZhNTRjZWM5MmFiNGI2Zjg=

data/History.md

@@ -1,3 +1,11 @@
+### 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>
@@ -5,7 +13,6 @@ 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

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.8'
+  VERSION = '0.9.9'
 
   ##
   # Default client Encoding. Change this value if your application uses a

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
@@ -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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spreadsheet
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-19 00:00:00.000000000 Z
+date: 2014-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-ole