to_xl 0.0.2 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6eaa03197b4a275939279ddeb4364dc2f6c51f03
-  data.tar.gz: 6649b5c871623880547eb58edbf4c951d2d8457c
+  metadata.gz: 7beb140aa852858d8ec9ea0fc274d0541442ca0b
+  data.tar.gz: 1b7f7a42403050e4642ff031df9c3b2099c453fe
 SHA512:
-  metadata.gz: 2c2f63c4c72a80be87cae9d2618aa2730c1d85838b415e954874cb529d97fa2036f089adee839f5c593170bb5402a58d6262390b07925c98eed3e7058bd80191
-  data.tar.gz: 8772c7c755661dde49f8b777af5041ec0fbf3d318d1d91fb0300c63992ad75bb7d025a2254d83ed92414be914e57dc6a1ff304d2d9d512552b1137e46151036d
+  metadata.gz: 54d87268d2891bf03b28aa4e965de3fb5ee52f3c873f3e0083ce90ca60f5d7a6fbb0071c5bfaae88f6720f0bd8ae54ba8e2b7c1a9c7cbcc567aac9d9ef3fdd92
+  data.tar.gz: 283db88e21fda0465567834c114362f5189eb6d992e20494906d73b8279e3866360fa57fa6fd3818b7333b18def1e80bc78aa1d90f4d049a6fe186048e9c7d6c

data/lib/from_xl.rb

@@ -0,0 +1,42 @@
+require 'time' unless defined? Time 
+require 'date' unless defined? Date 
+require 'datetime' unless defined? DateTime
+
+class Float
+
+  def from_excel
+    seconds_in_day ||= 24.0 * 60.0 * 60.0
+    excel_days_offset ||= 25569.0
+    gmt_offset = (((Time.now.hour.to_f - Time.now.gmtime.hour.to_f)/24.0) * -1) + (0.5 / seconds_in_day) # Have to compensate for GMT offsets since Excel does by default, and then we add half a second to make sure it has the correct day (and not 23:59:59 of the previous day)
+    val = self
+    val += gmt_offset
+    new_date = Time.at((val - excel_days_offset) * seconds_in_day)
+  end
+  alias_method :from_xl, :from_excel
+
+end
+
+
+# if defined?(Date)
+  class Integer
+
+    def from_excel
+      self.to_f.from_excel
+    end
+    alias_method :from_xl, :from_excel
+
+  end
+# end
+
+
+# if defined?(DateTime)
+  class Fixnum
+
+    def from_excel
+      self.to_f.from_excel
+    end
+    alias_method :from_xl, :from_excel
+    
+  end
+# end
+

data/lib/to_xl.rb

@@ -1,40 +1,40 @@
-require 'time'
-
-class Time
-
-  def to_excel
-    @seconds_in_day ||= 24 * 60 * 60
-    @excel_days_offset ||= 25569
-    @offset_gmt = (self.hour > self.gmtime.hour) ? true : false  # Excel dates are on GMT time, so we have to go back a day if this is calculated on one day in our time zone and another on GMT.
-    excel_date = (self.to_i/@seconds_in_day) + @excel_days_offset
-    excel_date -= 1 if @offset_gmt # Excel dates are on GMT time, so we have to go back a day if this is calculated on one day in our time zone and another on GMT.
-    excel_date
-  end
-  alias_method :to_xl, :to_excel
-
-end
-
-
-if defined?(Date)
-  class Date
-
-    def to_excel
-      self.to_time.to_excel
-    end
-    alias_method :to_xl, :to_excel
-
-  end
-end
-
-
-if defined?(DateTime)
-  class DateTime
-
-    def to_excel
-      self.to_time.to_excel
-    end
-    alias_method :to_xl, :to_excel
-    
-  end
-end
-
+require 'time'
+
+class Time
+
+  def to_excel
+    @seconds_in_day ||= 24 * 60 * 60
+    @excel_days_offset ||= 25569
+    @offset_gmt = (self.hour > self.gmtime.hour) ? true : false  # Excel dates are on GMT time, so we have to go back a day if this is calculated on one day in our time zone and another on GMT.
+    excel_date = (self.to_i/@seconds_in_day) + @excel_days_offset
+    excel_date -= 1 if @offset_gmt # Excel dates are on GMT time, so we have to go back a day if this is calculated on one day in our time zone and another on GMT.
+    excel_date
+  end
+  alias_method :to_xl, :to_excel
+
+end
+
+
+if defined?(Date)
+  class Date
+
+    def to_excel
+      self.to_time.to_excel
+    end
+    alias_method :to_xl, :to_excel
+
+  end
+end
+
+
+if defined?(DateTime)
+  class DateTime
+
+    def to_excel
+      self.to_time.to_excel
+    end
+    alias_method :to_xl, :to_excel
+    
+  end
+end
+

metadata

@@ -1,22 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: to_xl
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: '2.0'
 platform: ruby
 authors:
 - Brian Egan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2017-05-16 00:00:00.000000000 Z
 dependencies: []
 description: A simple gem to convert Time, Date, and DateTime instances to Excel date
-  integers.
+  integers. And to convert Excel date integers/decimals to Ruby dates.
 email: brianegan@outlook.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/from_xl.rb
 - lib/to_xl.rb
 homepage: https://github.com/Brian-Egan/to_xl
 licenses:
@@ -38,7 +39,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: To Excel