workbook 0.7.6 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 56d83b87195be3cc4e75e0dc506b83ea006340f0
-  data.tar.gz: 2f2611f84ff878b209b224d7976b3a753930f8e6
+SHA256:
+  metadata.gz: 2d11f35120106855bbb5905a7f2611b138293157e135f86b0d8f5248c90f5f83
+  data.tar.gz: ced9b91f1f1f69bbe90151ef78f61885a1ced541c5d3392e46dcb4e7770b58da
 SHA512:
-  metadata.gz: 612e20add890b9acc8d709816de0a50e43ef0ff7801091c9210f70ced0ef2effca9313a506a3beb003855b23f68bbc4d71cd0a342b71e15b028fc53c13a5e4e8
-  data.tar.gz: 922031e7a87f9bfd919b4ef549f9a076de4f58747657ce8cd02bbbe771c06471be71edbd1b1c8be4cfdffbcd01b5c17a5089384df2d163f7dd63edf804f74133
+  metadata.gz: 1abccd53682ea4a4718153f0409e43925108740004dfbbba78419d4f80dd7a23add4677c7430812253a6e5559322b1919fb0f2c8f4450575804c8aae68056db6
+  data.tar.gz: 6eb31d092e13c909e6d96d78a594bd3c1e9abd01d88a8cb76fc133c128035786d7f06651123e4c2f0798fa7d8b275f6914ed21152a0eab94efbb80e03083cb95

data/.ruby-version

@@ -0,0 +1 @@
+2.6.0

data/.travis.yml

@@ -4,11 +4,10 @@ env:
 sudo: false
 language: ruby
 rvm:
-  - 2.1.0
-  - 2.2.0
   - 2.3.0
   - 2.4.0
   - 2.5.0
+  - 2.6.0
 before_install:
   - gem install bundler
 before_script:

data/lib/workbook/cell.rb

@@ -5,5 +5,14 @@ require 'workbook/modules/cell'
 module Workbook
   class Cell
      include Workbook::Modules::Cell
+
+     # @param [Numeric,String,Time,Date,TrueClass,FalseClass,NilClass] value a valid value
+     # @param [Hash] options a reference to :format (Workbook::Format) can be specified
+     def initialize value=nil, options={}
+       self.format = options[:format] if options[:format]
+       self.row = options[:row]
+       self.value = value
+       @to_sym = nil
+     end
   end
 end

data/lib/workbook/modules/cell.rb

@@ -81,15 +81,6 @@ module Workbook
         @row= r
       end
 
-      # @param [Numeric,String,Time,Date,TrueClass,FalseClass,NilClass] value a valid value
-      # @param [Hash] options a reference to :format (Workbook::Format) can be specified
-      def initialize value=nil, options={}
-        self.format = options[:format] if options[:format]
-        self.row = options[:row]
-        self.value = value
-        @to_sym = nil
-      end
-
       # Change the current value
       #
       # @param [Numeric,String,Time,Date,TrueClass,FalseClass,NilClass,Symbol] value a valid value
@@ -196,8 +187,7 @@ module Workbook
           elsif cell_type == :float
             v = "num#{value}".sub(".","_").to_sym
           else
-            v = value_to_s
-
+            v = value_to_s.strip
             ends_with_exclamationmark = (v[-1] == '!')
             ends_with_questionmark = (v[-1] == '?')
 

data/lib/workbook/modules/type_parser.rb

@@ -78,30 +78,55 @@ module Workbook
 
       def string_optimistic_date_converter
         proc do |v|
-          rv = v
-          starts_with_nr = v.chars.first.to_i.to_s == v.chars.first #it should at least start with a number...
-          no_spaced_dash = v.to_s.match(" - ") ? false : true
-          min_two_dashes = v.to_s.scan("-").count > 1 ? true : false
-          min_two_dashes = v.to_s.scan("/").count > 1 ? true : false if min_two_dashes == false
+          if v
+            rv = v
+            starts_with_nr = v.chars.first.to_i.to_s == v.chars.first #it should at least start with a number...
+            no_spaced_dash = v.to_s.match(" - ") ? false : true
+            min_two_dashes = v.to_s.scan("-").count > 1 ? true : false
+            min_two_dashes = v.to_s.scan("/").count > 1 ? true : false if min_two_dashes == false
 
-          normal_date_length = v.to_s.length <= 25
-          if no_spaced_dash and starts_with_nr and normal_date_length and min_two_dashes
-            begin
-              rv = (v.length > 10) ? DateTime.parse(v) : Date.parse(v)
-            rescue ArgumentError
-              rv = v
-            end
-            begin
-              rv = Date.parse(v.to_i.to_s) == rv ? v : rv # disqualify if it is only based on the first number
-            rescue ArgumentError
+            normal_date_length = v.to_s.length <= 25
+            if no_spaced_dash and starts_with_nr and normal_date_length and min_two_dashes
+              begin
+                rv = (v.length > 10) ? DateTime.parse(v) : Date.parse(v)
+              rescue ArgumentError
+                rv = v
+              end
+              begin
+                rv = Date.parse(v.to_i.to_s) == rv ? v : rv # disqualify if it is only based on the first number
+              rescue ArgumentError
+              end
             end
+            rv
+          end
+        end
+      end
+
+      def string_american_date_converter
+        proc do |v|
+          if v
+            rv = v
             # try strptime with format 'mm/dd/yyyy'
-            if rv == v && /^\d{1,2}[\/-]\d{1,2}[\/-]\d{4}/ =~ v
+            if rv.is_a?(String) && /^\d{1,2}[\/-]\d{1,2}[\/-]\d{4}/ =~ v
               begin
                 rv = Date.strptime(v, "%m/%d/%Y")
               rescue ArgumentError
               end
             end
+            rv
+          end
+        end
+      end
+
+      def string_non_american_date_converter
+        proc do |v|
+          rv = v
+          # try strptime with format 'mm/dd/yyyy'
+          if rv.is_a?(String) && /^\d{1,2}[\/\-\.]\d{1,2}[\/\-\.]\d{4}/ =~ v
+            begin
+              rv = Date.strptime(v, "%m/%d/%Y")
+            rescue ArgumentError
+            end
           end
           rv
         end

data/lib/workbook/readers/csv_reader.rb

@@ -14,19 +14,18 @@ module Workbook
       end
 
       def parse_csv csv_raw, options={}
-        custom_date_converter = Workbook::Cell.new.string_optimistic_date_converter
+        optimistic_date_converter = Workbook::Cell.new.string_optimistic_date_converter
         options = {
-          converters: [:all,custom_date_converter]
+          converters: [optimistic_date_converter, :all]
         }.merge(options)
 
-        csv=nil
-        begin
-          csv = CSV.parse(csv_raw,options)
+        csv = nil
 
+        begin
+          csv = CSV.parse(csv_raw, options)
         rescue CSV::MalformedCSVError
           csv_excel = CSV.parse(csv_raw,options.merge({:col_sep=>';'}))
           csv = csv_excel if csv_excel[0].count > 1
-
         end
 
         if csv==nil or csv[0].count == 1
@@ -34,7 +33,7 @@ module Workbook
           csv = csv_excel if csv_excel[0].count > 1
         end
 
-        self[0]=Workbook::Sheet.new(csv,self) unless sheet.has_contents?
+        self[0] = Workbook::Sheet.new(csv, self) unless sheet.has_contents?
       end
 
     end

data/lib/workbook/readers/xlsx_reader.rb

@@ -188,6 +188,12 @@ module Workbook
           elsif type == "n"
             value = value.match(/\./) ? value.to_f : value.to_i
           end
+        elsif type == "b"
+          if value.to_s == "0"
+            value = false
+          elsif value.to_s == "1"
+            value = true
+          end
         elsif type == "s"
           value = @shared_strings[value.to_i]
         end

data/lib/workbook/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
 # frozen_string_literal: true
 module Workbook
-  VERSION = '0.7.6'
+  VERSION = '0.8.0'
 end

data/test/test_modules_cell.rb

@@ -88,7 +88,10 @@ class TestModulesCell < Minitest::Test
       "A-B!" => :ab!,
       "éåšžÌ?" => :easzi?,
       1 => :num1,
-      1.0 => :num1_0
+      1.0 => :num1_0,
+      'test   ' => :test,
+      'test ' => :test
+
     }
     examples.each do |k,v|
       assert_equal(v, Workbook::Cell.new(k).to_sym)

data/test/test_modules_type_parser.rb

@@ -12,7 +12,7 @@ module Modules
         "20-2-2012 20:52"=>DateTime.new(2012,2,20,20,52),
         "1-11-2011"=>Date.new(2011,11,1),
         "12/12/2012"=>Date.new(2012,12,12),
-        "12/23/1980"=>Date.new(1980,12,23), #TODO: should probably depend on locale, see: http://bugs.ruby-lang.org/issues/634#note-10
+        # "12/23/1980"=>Date.new(1980,12,23), #TODO: should probably depend on locale, see: http://bugs.ruby-lang.org/issues/634#note-10
         "jA"=>"jA",
         "n"=>"n",
         ""=>nil,
@@ -27,7 +27,11 @@ module Modules
 
     def test_parse
       examples.each do |k,v|
-        assert(v == Workbook::Cell.new(k).parse({:detect_date => true}))
+        if v == nil
+          assert_nil(Workbook::Cell.new(k).parse({:detect_date => true}))
+        else
+          assert_equal(v, Workbook::Cell.new(k).parse({:detect_date => true}))
+        end
       end
     end
 

data/test/test_readers_xlsx_reader.rb

@@ -48,6 +48,14 @@ module Readers
       assert(t["A2"].value.is_a?(Date))
       assert((Date.new(2012,2,22)-t["A2"].value) < 0.00001)
       assert((Date.new(2014,12,27)-t["B2"].value) < 0.00001)
+      assert_equal(false,t["E2"].value)
+      assert_equal(true,t["E3"].value)
+      assert_equal(true,t["E4"].value)
+    end
+    def test_skipping_cells
+      w = Workbook::Book.open File.join(File.dirname(__FILE__), 'artifacts/skippingcells.xlsx')
+      t = w.sheet.table
+      assert_equal("a,b,c,d,e,f,g,h,i,j,k,l,m,n\n1,,,,,,,,,,,,,\n,2,,,,,,,,,,,,\n,,3,,,,,,,,,,,\n,,,4,,,,,,,,,,\n,,,,5,,,,,,,,,\n,,,,,6,,,,,,,,\n,,,,,,7,,,,,,,\n,,,,,,,8,,,,,,\n,,,,,,,,9,,,,,\n,,,,,,,,,10,,,,\n,,,,,,,,,,11,,,\n,,,,,,,,,,,12,,\n,,,,,,,,,,,,13,\n,,,,,,,,,,,,,14\na,,,,,,,,,,,,,\n,b,,,,,,,,,,,,\n,,c,,,,,,,,,,,\n,,,d,,,,,,,,,,\n,,,,e,,,,,,,,,\n,,,,,f,,,,,,,,\n,,,,,,g,,,,,,,\n,,,,,,,h,,,,,,\n,,,,,,,,i,,,,,\n,,,,,,,,,j,,,,\n,,,,,,,,,,k,,,\n,,,,,,,,,,,l,,\n,,,,,,,,,,,,m,\n,,,,,,,,,,,,,n\n", t.to_csv)
     end
     def test_bit_table_xlsx
       b = Workbook::Book.open File.join(File.dirname(__FILE__), 'artifacts/bigtable.xlsx')

data/test/test_table.rb

@@ -125,6 +125,7 @@ class TestTable< Minitest::Test
     w2.sheet.table = t[2..3]
     assert_equal("1,2\n3,4\n", w2.sheet.table.to_csv)
   end
+
   def test_array_style_assignment
     w = Workbook::Book.new [["a","b"],[1,2],[3,4]]
     t = w.sheet.table
@@ -133,12 +134,14 @@ class TestTable< Minitest::Test
     t[2] = r
     assert_equal(t, r.table)
   end
+
   def test_delete_at
     w = Workbook::Book.new [["a","b"],[1,2],[3,4]]
     t = w.sheet.table
     t.delete_at 2
     assert_equal(1, t.last.first.value)
   end
+
   def test_trim!
     t = Workbook::Table.new
     t << [1,2,3]

data/workbook.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.description = "Workbook contains workbooks, as in a table, contains rows, contains cells, reads/writes excel, ods and csv and tab separated files, and offers basic diffing and sorting capabilities."
   s.authors     = ["Maarten Brouwers"]
   s.add_development_dependency 'ruby-prof', '~> 0.14'
-  s.add_development_dependency("rake", '~> 10.0')
+  s.add_development_dependency("rake", '~> 12.0')
   s.add_development_dependency('minitest', '~> 5.4')
   s.add_dependency('spreadsheet', '~> 1.1')
   s.add_dependency("rchardet", "~> 1.3")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workbook
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.8.0
 platform: ruby
 authors:
 - Maarten Brouwers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-03 00:00:00.000000000 Z
+date: 2019-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-prof
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -133,6 +133,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
 - ".yardoc/checksums"
 - ".yardoc/object_types"
@@ -208,6 +209,7 @@ files:
 - test/artifacts/simple_sheet.xls
 - test/artifacts/simple_sheet.xlsx
 - test/artifacts/simple_sheet_many_sheets.xls
+- test/artifacts/skippingcells.xlsx
 - test/artifacts/txt_in_xls.xls
 - test/artifacts/xls_with_txt_extension.txt
 - test/artifacts/xlsx_with_empty_start.xlsx
@@ -256,8 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: workbook
-rubygems_version: 2.6.11
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Workbook is a datastructure to contain books of tables (an anlogy used in
@@ -289,6 +290,7 @@ test_files:
 - test/artifacts/simple_sheet.xls
 - test/artifacts/simple_sheet.xlsx
 - test/artifacts/simple_sheet_many_sheets.xls
+- test/artifacts/skippingcells.xlsx
 - test/artifacts/txt_in_xls.xls
 - test/artifacts/xls_with_txt_extension.txt
 - test/artifacts/xlsx_with_empty_start.xlsx