spreadsheet 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b637195c40422ea73262b933a7a62d3b7c50883
-  data.tar.gz: 61510bfe1d8aa2eaebcd087b8d479e9f073efebd
+  metadata.gz: d963aae672b717dc7a279a1e14efec5cce64a272
+  data.tar.gz: 18009a3af345b0051e4ad6efe2f85739ec87dda3
 SHA512:
-  metadata.gz: ddafa532308bdffe930e4fe1f2d94aa8b38bef32850953b266432804a9d32c8829cd6a63e6143e222d47dc08186f001343e2fb556317ec62787a77b2815322ed
-  data.tar.gz: 53ce917e4db7f5730726bbb1a36f6e0befa24cd7c5ae890731809e6b93cb89d5e3ffc5b1c47125e89a15d135681bcb573e7b9d1ed6bc2b85dcd30ce05f5de51b
+  metadata.gz: e22611671910b290869e586f214b92d00beb40d486b1b830face971f8dc35fdeb60e064fa44c7e0e27393eab5217890fcf595d990597ef1e324be2565048fc93
+  data.tar.gz: 253242666e44ffcc7ef180c542e2f7ee30183db5d00d4277de99e2a2736d519af1a61f4b36404c0a6173ab2883e197c699a96d90cdb02013619691fe07ee81d4

data/History.md

@@ -1,3 +1,13 @@
+### 1.1.3 / 06.08.2016
+
+Author: Alexandre Balon-Perin <abalonperin@gilt.jp>
+Date:   Fri Aug 5 17:19:29 2016 +0900
+
+* Fix issue with iconv on Ubuntu 12.04
+* This fix is related to a bug in the iconv implementation packaged in libc6 on Ubuntu 12.04
+* For some reasons, the encoding options //TRANSLIT//IGNORE are improperly applied.
+* When //TRANSLIT is specified, instead of rescuing errors related to //TRANSLIT and checking if the //IGNORE is set, the code simply crashes.
+
 ### 1.1.2 / 29.03.2016
 Author: Aleksandr Boykov <aleksandr.boykov@parelio.com>
 Date:   Mon Mar 28 14:07:35 2016 -0400

data/lib/spreadsheet.rb

@@ -45,17 +45,19 @@ module Spreadsheet
 
   ##
   # The version of Spreadsheet you are using.
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 
   ##
   # Default client Encoding. Change this value if your application uses a
   # different Encoding:
   # Spreadsheet.client_encoding = 'ISO-LATIN-1//TRANSLIT//IGNORE'
   @client_encoding = 'UTF-8'
+  @enc_translit = 'TRANSLIT'
+  @enc_ignore = 'IGNORE'
 
   class << self
 
-    attr_accessor :client_encoding
+    attr_accessor :client_encoding, :enc_translit, :enc_ignore
 
     ##
     # Parses a Spreadsheet Document and returns a Workbook object. At present,

data/lib/spreadsheet/encodings.rb

@@ -26,22 +26,27 @@ module Spreadsheet
     else
       require 'iconv'
       @@iconvs = {}
+
+      def build_output_encoding(to_encoding)
+        [to_encoding, Spreadsheet.enc_translit, Spreadsheet.enc_ignore].compact.join('//')
+      end
+
       def client string, internal='UTF-16LE'
         string = string.dup
         key = [Spreadsheet.client_encoding, internal]
         iconv = @@iconvs[key] ||= Iconv.new(Spreadsheet.client_encoding, internal)
         iconv.iconv string
       end
-      def internal string, client=Spreadsheet.client_encoding
+      def internal string, client=Spreadsheet.client_encoding, to_encoding = 'UTF-16LE'
         string = string.dup
-        key = ['UTF-16LE', client]
-        iconv = @@iconvs[key] ||= Iconv.new('UTF-16LE//TRANSLIT//IGNORE', client)
+        key = [to_encoding, client]
+        iconv = @@iconvs[key] ||= Iconv.new(build_output_encoding(to_encoding), client)
         iconv.iconv string
       end
-      def utf8 string, client=Spreadsheet.client_encoding
+      def utf8 string, client=Spreadsheet.client_encoding, to_encoding = 'UTF-8'
         string = string.dup
-        key = ['UTF-8', client]
-        iconv = @@iconvs[key] ||= Iconv.new('UTF-8//TRANSLIT//IGNORE', client)
+        key = [to_encoding, client]
+        iconv = @@iconvs[key] ||= Iconv.new(build_output_encoding(to_encoding), client)
         iconv.iconv string
       end
     end
@@ -55,3 +60,4 @@ module Spreadsheet
     end
   end
 end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spreadsheet
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-ole
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.14'
 description: |-
   The Spreadsheet Library is designed to read and write Spreadsheet Documents.
   As of version 0.6.0, only Microsoft Excel compatible spreadsheets are
@@ -70,7 +70,6 @@ extra_rdoc_files:
 - Manifest.txt
 - README.md
 files:
-- ".gemtest"
 - ".gitignore"
 - ".travis.yml"
 - Excel97-2007BinaryFileFormatSpecification.pdf
@@ -179,8 +178,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: spreadsheet
-rubygems_version: 2.4.5
+rubyforge_project: 
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: The Spreadsheet Library is designed to read and write Spreadsheet Documents