simple_xlsx_reader 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 678c3b84bff4d9f51cd634adbd662cef1a9b52f2
-  data.tar.gz: 74e1e4b8c143317c9c035e129ead61b9d5e00bf8
+  metadata.gz: 94422da0193805c579ba37c7c3e58b35a996dfbc
+  data.tar.gz: a9c5e1f01acc0c60165a13adc1af087743a60935
 SHA512:
-  metadata.gz: 9c62b675e776bce168a0897cb40415afd1ddfb5812c25f011590195b4d6b391774ecb326f709aa0500a87c6d22de742e0b7b9952689339e42b28e8ff0452a5c7
-  data.tar.gz: c641c17501d4947205ba1498c6a4955eab28c960afe961c088b214365add2ed396713ab114dcbd72e28e0536224ea819e589d7a108dd06a6927dcba8c5a3429e
+  metadata.gz: 33338f8fcf3c180ea346548061598953842358a21acd6d97bf451c07d8655f179af0cf7b7791f7c9de1a8411578e3623faab178b3cd74893aaf6d040a7abde96
+  data.tar.gz: 50035b920f6811eed88c318c17b47bf8823aa1ac4bf114af3bc29174edcf08ebd5d16902177aa6a48b70f8e70a745249bb8494101f9f310f24d5f5d5bbc13f27

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 1.0.1
+
+* Add support for the 1904 date system [zilverline]
+
 ### 1.0.0
 
 No changes since 1.0.0.pre. Releasing 1.0.0 since the project has seen a

data/lib/simple_xlsx_reader.rb

@@ -100,6 +100,9 @@ module SimpleXlsxReader
     ##
     # For internal use; translates source xml to Sheet objects.
     class Mapper < Struct.new(:xml)
+      DATE_SYSTEM_1900 = Date.new(1899, 12, 30)
+      DATE_SYSTEM_1904 = Date.new(1904, 1, 1)
+
       def load_sheets
         sheet_toc.each_with_index.map do |(sheet_name, _sheet_number), i|
           parse_sheet(sheet_name, xml.sheets[i])  # sheet_number is *not* the index into xml.sheets
@@ -149,7 +152,8 @@ module SimpleXlsxReader
 
           cell = begin
             self.class.cast(xvalue && xvalue.text.strip, type, style,
-                            :shared_strings => shared_strings)
+                            :shared_strings => shared_strings,
+                            :base_date => base_date)
           rescue => e
             if !SimpleXlsxReader.configuration.catch_cell_load_errors
               error = CellLoadError.new(
@@ -343,10 +347,10 @@ module SimpleXlsxReader
         # the trickiest. note that  all these formats can vary on
         # whether they actually contain a date, time, or datetime.
         when :date, :time, :date_time
-          days_since_1900, fraction_of_24 = value.split('.')
+          days_since_date_system_start, fraction_of_24 = value.split('.')
 
           # http://stackoverflow.com/questions/10559767/how-to-convert-ms-excel-date-from-float-to-date-format-in-ruby
-          date = Date.new(1899, 12, 30) + Integer(days_since_1900)
+          date = options.fetch(:base_date, DATE_SYSTEM_1900) + Integer(days_since_date_system_start)
 
           if fraction_of_24 # there is a time associated
             fraction_of_24 = "0.#{fraction_of_24}".to_f
@@ -372,6 +376,21 @@ module SimpleXlsxReader
         end
       end
 
+      ## Returns the base_date from which to calculate dates.
+      # Defaults to 1900 (minus two days due to excel quirk), but use 1904 if
+      # it's set in the Workbook's workbookPr.
+      # http://msdn.microsoft.com/en-us/library/ff530155(v=office.12).aspx
+      def base_date
+        @base_date ||=
+          begin
+            return DATE_SYSTEM_1900 if xml.workbook == nil
+            xml.workbook.xpath("//workbook/workbookPr[@date1904]").each do |workbookPr|
+              return DATE_SYSTEM_1904 if workbookPr["date1904"] =~ /true|1/i
+            end
+            DATE_SYSTEM_1900
+          end
+      end
+
       # Map of non-custom numFmtId to casting symbol
       NumFmtMap = {
         0  => :string,         # General

data/lib/simple_xlsx_reader/version.rb

@@ -1,3 +1,3 @@
 module SimpleXlsxReader
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/test/date1904_test.rb

@@ -0,0 +1,13 @@
+require 'test_helper'
+
+describe SimpleXlsxReader do
+  let(:date1904_file) { File.join(File.dirname(__FILE__), 'date1904.xlsx') }
+  let(:subject) { SimpleXlsxReader::Document.new(date1904_file) }
+
+  it 'supports converting dates with the 1904 date system' do
+    subject.to_hash.must_equal({
+      "date1904" => [[Date.parse("2014-05-01")]]
+    })
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_xlsx_reader
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Woody Peterson
@@ -82,6 +82,8 @@ files:
 - lib/simple_xlsx_reader.rb
 - lib/simple_xlsx_reader/version.rb
 - simple_xlsx_reader.gemspec
+- test/date1904.xlsx
+- test/date1904_test.rb
 - test/datetime_test.rb
 - test/datetimes.xlsx
 - test/performance_test.rb
@@ -114,6 +116,8 @@ signing_key:
 specification_version: 4
 summary: Read xlsx data the Ruby way
 test_files:
+- test/date1904.xlsx
+- test/date1904_test.rb
 - test/datetime_test.rb
 - test/datetimes.xlsx
 - test/performance_test.rb