creek 2.2 → 2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb0d6a61d66ec224d6ba6c72c9b38d3e0124c2cd
-  data.tar.gz: a83ca8e43dd4c249721fa9b4d975d03759b7c9ba
+  metadata.gz: fb5f52bba0a71fddfc27213389475ad881b61e33
+  data.tar.gz: bad18bc3dadfb9412f354a2f527ede8cb16f8828
 SHA512:
-  metadata.gz: 4cbcb53f104729bdf0469604dccb617b6ad499e629a0f7a66e6581be9671f27490e870be99676df31ceb18991566dcfe38fd36e01327e94e36ba9d6dfd3ec938
-  data.tar.gz: babee3e6abd610fa2274c80a5f9fa00dd2cff7d4eec9c7cb79f23fdcb1794f4227e88d675ed31980846a485ff65778a0d0447be44d7fad36b8f8fb47acd32e26
+  metadata.gz: becc2db698fdc35b68279ec7df03c95c9b2d12920e2de4e34c83a724116174dfa81b4730152d5ef72b517b7cb26c4c3b5d6b89887a32f6e61bf62d2364344363
+  data.tar.gz: c3164d65efb54c5d14d31fcd91fc865db85ae1b032015076a7b80e3b329248148c62b8ec907c9098fef3f34c964bca8b650021b8bfad37062a0c58d7b8f3b4b7

data/creek.gemspec

@@ -27,5 +27,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'nokogiri', '>= 1.7.0'
   spec.add_dependency 'rubyzip', '>= 1.0.0'
-  spec.add_dependency 'http', '~> 3.0.0'
+  spec.add_dependency 'http', '~> 3.0'
 end

data/lib/creek/styles/converter.rb

@@ -60,8 +60,10 @@ module Creek
           value.to_i
         when :float, :percentage
           value.to_f
-        when :date, :time, :date_time
+        when :date
           convert_date(value, options)
+        when :time, :date_time
+          convert_datetime(value, options)
         when :bignum
           convert_bignum(value)
 
@@ -71,22 +73,17 @@ module Creek
         end
       end
 
-      # the trickiest. note that  all these formats can vary on
-      # whether they actually contain a date, time, or datetime.
       def self.convert_date(value, options)
-        value                        = value.to_f
-        days_since_date_system_start = value.to_i
-        fraction_of_24               = value - days_since_date_system_start
+        date = base_date(options) + value.to_i
+        yyyy, mm, dd = date.strftime('%Y-%m-%d').split('-')
 
-        # http://stackoverflow.com/questions/10559767/how-to-convert-ms-excel-date-from-float-to-date-format-in-ruby
-        date = options.fetch(:base_date, Date.new(1899, 12, 30)) + days_since_date_system_start
+        ::Date.new(yyyy.to_i, mm.to_i, dd.to_i)
+      end
 
-        if fraction_of_24 > 0 # there is a time associated
-          seconds = (fraction_of_24 * 86400).round
-          return Time.utc(date.year, date.month, date.day) + seconds
-        else
-          return date
-        end
+      def self.convert_datetime(value, options)
+        date = base_date(options) + value.to_f.round(6)
+
+        round_datetime(date.strftime('%Y-%m-%d %H:%M:%S.%N'))
       end
 
       def self.convert_bignum(value)
@@ -96,6 +93,18 @@ module Creek
           value.to_f
         end
       end
+
+      private
+
+        def self.base_date(options)
+          options.fetch(:base_date, Date.new(1899, 12, 30))
+        end
+
+        def self.round_datetime(datetime_string)
+          /(?<yyyy>\d+)-(?<mm>\d+)-(?<dd>\d+) (?<hh>\d+):(?<mi>\d+):(?<ss>\d+.\d+)/ =~ datetime_string
+
+          ::Time.new(yyyy.to_i, mm.to_i, dd.to_i, hh.to_i, mi.to_i, ss.to_r).round(0)
+        end
     end
   end
 end

data/lib/creek/version.rb

@@ -1,3 +1,3 @@
 module Creek
-  VERSION = "2.2"
+  VERSION = "2.3"
 end

data/spec/styles/converter_spec.rb

@@ -3,13 +3,20 @@ require './spec/spec_helper'
 describe Creek::Styles::Converter do
 
   describe :call do
+
     def convert(value, type, style)
       Creek::Styles::Converter.call(value, type, style)
     end
 
+    describe :date do
+      it "works" do
+        expect(convert('41275', 'n', :date)).to eq(Date.new(2013,01,01))
+      end
+    end
+
     describe :date_time do
       it "works" do
-        expect(convert('41275', 'n', :date_time)).to eq(Date.new(2013,01,01))
+        expect(convert('41275', 'n', :date_time)).to eq(Time.new(2013,01,01))
       end
     end
   end

data/spec/test_spec.rb

@@ -26,6 +26,34 @@ describe 'Creek trying to parsing an invalid file.' do
   end
 end
 
+describe 'Creek parsing dates on a sample XLSX file' do
+  before(:all) do
+    @creek = Creek::Book.new 'spec/fixtures/sample_dates.xlsx'
+
+    @expected_datetime_rows = [
+      {'A3' => 'Date',              'B3' => Date.parse('2018-01-01')},
+      {'A4' => 'Datetime 00:00:00', 'B4' => Time.parse('2018-01-01 00:00:00')},
+      {'A5' => 'Datetime',          'B5' => Time.parse('2018-01-01 23:59:59')}]
+  end
+
+  after(:all) do
+    @creek.close
+  end
+
+  it 'parses dates successfully' do
+    rows = Array.new
+    row_count = 0
+    @creek.sheets[0].rows.each do |row|
+      rows << row
+      row_count += 1
+    end
+
+    (2..5).each do |number|
+      expect(rows[number]).to eq(@expected_datetime_rows[number-2])
+    end
+  end
+end
+
 describe 'Creek parsing a sample XLSX file' do
   before(:all) do
     @creek = Creek::Book.new 'spec/fixtures/sample.xlsx'
@@ -63,15 +91,9 @@ describe 'Creek parsing a sample XLSX file' do
       row_count += 1
     end
 
-    expect(rows[0]).to eq(@expected_rows[0])
-    expect(rows[1]).to eq(@expected_rows[1])
-    expect(rows[2]).to eq(@expected_rows[2])
-    expect(rows[3]).to eq(@expected_rows[3])
-    expect(rows[4]).to eq(@expected_rows[4])
-    expect(rows[5]).to eq(@expected_rows[5])
-    expect(rows[6]).to eq(@expected_rows[6])
-    expect(rows[7]).to eq(@expected_rows[7])
-    expect(rows[8]).to eq(@expected_rows[8])
+    (0..8).each do |number|
+      expect(rows[number]).to eq(@expected_rows[number])
+    end
     expect(row_count).to eq(9)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: creek
 version: !ruby/object:Gem::Version
-  version: '2.2'
+  version: '2.3'
 platform: ruby
 authors:
 - pythonicrubyist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-23 00:00:00.000000000 Z
+date: 2018-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
 description: A Ruby gem that streams and parses large Excel(xlsx and xlsm) files fast
   and efficiently.
 email:
@@ -138,7 +138,10 @@ files:
 - spec/fixtures/sample-as-zip.zip
 - spec/fixtures/sample-with-images.xlsx
 - spec/fixtures/sample.xlsx
+- spec/fixtures/sample_dates.xlsx
+- spec/fixtures/sheets/sample_dates.xlsx
 - spec/fixtures/sheets/sheet1.xml
+- spec/fixtures/sheets/single_data_programme.xlsx
 - spec/fixtures/sst.xml
 - spec/fixtures/styles/first.xml
 - spec/fixtures/temp_string_io_file_path_with_no_extension
@@ -168,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A Ruby gem for parsing large Excel(xlsx and xlsm) files.
@@ -178,7 +181,10 @@ test_files:
 - spec/fixtures/sample-as-zip.zip
 - spec/fixtures/sample-with-images.xlsx
 - spec/fixtures/sample.xlsx
+- spec/fixtures/sample_dates.xlsx
+- spec/fixtures/sheets/sample_dates.xlsx
 - spec/fixtures/sheets/sheet1.xml
+- spec/fixtures/sheets/single_data_programme.xlsx
 - spec/fixtures/sst.xml
 - spec/fixtures/styles/first.xml
 - spec/fixtures/temp_string_io_file_path_with_no_extension