xlsxtream 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87c2d49e093ad55cc8136a6dcdee6102f40a354dfb5302c31261bf88175081d3
-  data.tar.gz: 38d8dc8a4b114eff3ff1b9a72066ba8a9a18f1cd368a0d6e203e5d9e36d529dd
+  metadata.gz: aa056909b0dd743240cb8b4ddb85a86fd1110042110cd49731e9e8d13e7df5d9
+  data.tar.gz: 6726cf3a9d3f52bfe690551124d2d9cd769fd6c1b20d96893a0b336536a09c44
 SHA512:
-  metadata.gz: 6232e84980e429c99d1635a649e348d30cdaa1c91d7b452af476fd8658e5c09cc16d0578bb0eedcdf6f014981e0a958bf31aae7e8997db5e3b2adfab278bdc0b
-  data.tar.gz: a674d3d09a69ef48aa5e4b351f331ed17a00b26142b53e0251733db1bebeac1956ec7a7dc603dcfe0155e31cf15c708bf9a3af30a285dc47c8a324b902aa7a26
+  metadata.gz: 27292c56f60cf20c186af8bba0d52a1c799a0c1f6a76de49660d3c591986375df39b59e5752042aa1c5bf1016e17ce81ef28ceefdf3a6f59fc34a3f7d6a5d981
+  data.tar.gz: 743ea2bcdac011ac472f146222c5f20e63cb4bc38304ae470f80d6cf5660a65071556d3c61afd421e4c5933a0b6c705331348bd44a20641c77a92f1c736c0ee0

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.3.0 (2019-11-27)
+
+- Speed up date / time conversion to OA format (#39)
+
 ## 2.2.0 (2019-11-27)
 
 - Allow usage with zip\_tricks 5.x gem (#38)

data/lib/xlsxtream/row.rb

@@ -43,10 +43,12 @@ module Xlsxtream
           xml << %Q{<c r="#{cid}" t="n"><v>#{value}</v></c>}
         when TrueClass, FalseClass
           xml << %Q{<c r="#{cid}" t="b"><v>#{value ? 1 : 0}</v></c>}
-        when Time, DateTime
+        when Time
           xml << %Q{<c r="#{cid}" s="#{TIME_STYLE}"><v>#{time_to_oa_date(value)}</v></c>}
+        when DateTime
+          xml << %Q{<c r="#{cid}" s="#{TIME_STYLE}"><v>#{datetime_to_oa_date(value)}</v></c>}
         when Date
-          xml << %Q{<c r="#{cid}" s="#{DATE_STYLE}"><v>#{time_to_oa_date(value)}</v></c>}
+          xml << %Q{<c r="#{cid}" s="#{DATE_STYLE}"><v>#{date_to_oa_date(value)}</v></c>}
         else
           value = value.to_s
 
@@ -85,14 +87,29 @@ module Xlsxtream
       end
     end
 
-    # Converts Time objects to OLE Automation Date
+    # Converts Time instance to OLE Automation Date
     def time_to_oa_date(time)
-      time = time.to_time if time.respond_to?(:to_time)
-
       # Local dates are stored as UTC by truncating the offset:
       # 1970-01-01 00:00:00 +0200 => 1970-01-01 00:00:00 UTC
       # This is done because SpreadsheetML is not timezone aware.
-      (time + time.utc_offset).utc.to_f / 24 / 3600 + 25569
+      (time.to_f + time.utc_offset) / 86400 + 25569
+    end
+
+    # Converts DateTime instance to OLE Automation Date
+    if RUBY_ENGINE == 'ruby'
+      def datetime_to_oa_date(date)
+        _, jd, df, sf, of = date.marshal_dump
+        jd - 2415019 + (df + of + sf / 1e9) / 86400
+      end
+    else
+      def datetime_to_oa_date(date)
+        date.jd - 2415019 + (date.hour * 3600 + date.sec + date.sec_fraction.to_f) / 86400
+      end
+    end
+
+    # Converts Date instance to OLE Automation Date
+    def date_to_oa_date(date)
+      (date.jd - 2415019).to_f
     end
   end
 end

data/lib/xlsxtream/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Xlsxtream
-  VERSION = '2.2.0'.freeze
+  VERSION = '2.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xlsxtream
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Felix Bünemann
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-27 00:00:00.000000000 Z
+date: 2019-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip_tricks