simple_xlsx_reader 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c495d2161ffcb0fb72029aa65b3030b01761030
-  data.tar.gz: 3064fcfd2ea46a5ede489cc32faff627740b569d
+  metadata.gz: 592fa09e1f66127581441dcee23a2ec10481a08f
+  data.tar.gz: 2165196985a70b2f594828e43523c237600f7c08
 SHA512:
-  metadata.gz: 9468df9742e49b5d7c8eb830f724702b6e145dd50dc0f62e2330561091c7587364085ae850938e5853bb3ab5de744e2e87049d722e64d4989da06b5e9d0de09a
-  data.tar.gz: 029b31bff2274d01d43ff8498e76b6bdd7839621ed052af63c5348ec85fec90ce842831e5d739b39951a5807cf9ac6ff938343263709a17f826190afdc45d11d
+  metadata.gz: 4ef8fe7df99b9bea2742c49663aa899421e5d4b6a145c62ee15afef9a8938ba1bfe0c5bf4b9d0999e2cffc6189436fd4f3b1a59af8a796a05c1dc4d6d9f7de77
+  data.tar.gz: d1a2cb30e2dce280b529f6b877745cfbfa1f7cc8bbcacd506b268ca624da74d637e9e47bff8602f53d0c33ebd38055750c6eda88bbeaedd34d8eeb5e891e8b2e

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.9.8
+
+* Rubyzip 1.0 compatability
+
 ### 0.9.7
 
 * Fix cell parsing where cells have a type, but no content

data/lib/simple_xlsx_reader.rb

@@ -1,9 +1,21 @@
 require "simple_xlsx_reader/version"
 require 'nokogiri'
-require 'zip/zip'
-require 'zip/zipfilesystem'
 require 'date'
 
+# Rubyzip 1.0 only has different naming, everything else is the same, so let's
+# be flexible so we don't force people into a dependency hell w/ other gems.
+begin
+  # Try loading rubyzip < 1.0
+  require 'zip/zip'
+  require 'zip/zipfilesystem'
+  SimpleXlsxReader::Zip = Zip::ZipFile
+rescue LoadError
+  # Try loading rubyzip >= 1.0
+  require 'zip'
+  require 'zip/filesystem'
+  SimpleXlsxReader::Zip = Zip::File
+end
+
 module SimpleXlsxReader
   class CellLoadError < StandardError; end
 
@@ -61,7 +73,7 @@ module SimpleXlsxReader
 
       def self.load(file_path)
         self.new.tap do |xml|
-          Zip::ZipFile.open(file_path) do |zip|
+          SimpleXlsxReader::Zip.open(file_path) do |zip|
             xml.workbook       = Nokogiri::XML(zip.read('xl/workbook.xml'))
             xml.styles         = Nokogiri::XML(zip.read('xl/styles.xml'))
 

data/lib/simple_xlsx_reader/version.rb

@@ -1,3 +1,3 @@
 module SimpleXlsxReader
-  VERSION = "0.9.7"
+  VERSION = "0.9.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_xlsx_reader
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Woody Peterson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-30 00:00:00.000000000 Z
+date: 2013-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri