workbook 0.4.12 → 0.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c05c947e639810533b5d77b7f66cca14bf2880b3
-  data.tar.gz: 623d1d9ca5e9bceac0cb0a18bec19d79a869a193
+  metadata.gz: 6f84a8f4041814e019f83cb05d05de9f91ad003d
+  data.tar.gz: 385307619e4061a0c44966bf73665b612b203ae3
 SHA512:
-  metadata.gz: e972dc3fbcc4d1c29860b5966c4c3d54407b6a24344450279410ee029f163555c00d8b1cec240d224c5d47ffc4d8b4f0a96e23f2b13d2cb0a5a575cb8631380e
-  data.tar.gz: 74538baa3d9d1ce6644a4a35e2aab5aed98b213abd4d6cc89392fcf29a34a77524f9dbdc75d9156377965a39056e06cfc36a5e3738b2320a8a796b4ad596e11e
+  metadata.gz: 4e3403db816bde3fa82f590081a0d29064d6d797ee8d6eea27419263e257f19c4c12af542cbfc7dbc453252138c43e29462d7cdb21f7de04d15708ee0e64ce6f
+  data.tar.gz: 896a09df2b1ed2e26562c70116caa0158d6e4519e034e6034581edd51dd9400523727135fd0c660089ca328d56fe2c7b1cf2c46ad33866b9504dccc52dad8994

data/.travis.yml

@@ -1,6 +1,9 @@
+sudo: false
 language: ruby
 rvm:
   - 2.0.0
   - 2.1.0
   - 2.2.0
-#  - jruby-19mode
+  - 2.3.0
+before_install:
+  - gem install bundler

data/lib/workbook/book.rb

@@ -115,12 +115,12 @@ module Workbook
     # @param [String] filename   a string with a reference to the file to be opened
     # @param [String] extension  an optional string enforcing a certain parser (based on the file extension, e.g. 'txt', 'csv' or 'xls')
     # @return [Workbook::Book] A new instance, based on the filename
-    def open filename, extension=nil
+    def open filename, extension=nil, options={}
       extension = file_extension(filename) unless extension
       if ['txt','csv','xml'].include?(extension)
-        open_text filename, extension
+        open_text filename, extension, options
       else
-        open_binary filename, extension
+        open_binary filename, extension, options
       end
     end
 
@@ -129,22 +129,22 @@ module Workbook
     # @param [String] filename a string with a reference to the file to be opened
     # @param [String] extension an optional string enforcing a certain parser (based on the file extension, e.g. 'txt', 'csv' or 'xls')
     # @return [Workbook::Book] A new instance, based on the filename
-    def open_binary filename, extension=nil
+    def open_binary filename, extension=nil, options={}
       extension = file_extension(filename) unless extension
       f = File.open(filename,'rb')
-      send("load_#{extension}".to_sym,f)
+      send("load_#{extension}".to_sym, f, options)
     end
 
     # Open the file in non-binary, read-only mode, read it and parse it to UTF-8
     #
     # @param [String] filename   a string with a reference to the file to be opened
     # @param [String] extension  an optional string enforcing a certain parser (based on the file extension, e.g. 'txt', 'csv' or 'xls')
-    def open_text filename, extension=nil
+    def open_text filename, extension=nil, options={}
       extension = file_extension(filename) unless extension
       f = File.open(filename,'r')
       t = f.read
       t = text_to_utf8(t)
-      send("load_#{extension}".to_sym,t)
+      send("load_#{extension}".to_sym, t, options)
     end
 
     # Writes the book to a file. Filetype is based on the extension, but can be overridden
@@ -190,11 +190,11 @@ module Workbook
     #
     # @param [StringIO] stringio_or_string StringIO stream or String object, with data in CSV format
     # @param [Symbol] filetype (currently only :csv or :txt), indicating the format of the first parameter
-    def read(stringio_or_string, filetype)
+    def read(stringio_or_string, filetype, options={})
       raise ArgumentError.new("The filetype parameter should be either :csv or :txt") unless [:csv, :txt].include?(filetype)
       t = stringio_or_string.respond_to?(:read) ? stringio_or_string.read : stringio_or_string.to_s
       t = text_to_utf8(t)
-      send(:"parse_#{filetype}", t)
+      send(:"parse_#{filetype}", t, options)
     end
 
     # Create or open the existing sheet at an index value
@@ -224,9 +224,9 @@ module Workbook
       # @param [StringIO] stringio_or_string StringIO stream or String object, with data in CSV or TXT format
       # @param [Symbol] filetype (currently only :csv or :txt), indicating the format of the first parameter
       # @return [Workbook::Book] A new instance
-      def read(stringio_or_string, filetype)
+      def read stringio_or_string, filetype, options={}
         wb = self.new
-        wb.read(stringio_or_string, filetype)
+        wb.read(stringio_or_string, filetype, options)
         wb
       end
 

data/lib/workbook/readers/csv_reader.rb

@@ -3,9 +3,9 @@
 module Workbook
   module Readers
     module CsvReader
-      def load_csv text
+      def load_csv text, options={}
         csv = text
-        parse_csv csv
+        parse_csv csv, options
       end
 
       def csv_lib
@@ -17,19 +17,22 @@ module Workbook
         end
       end
 
-      def parse_csv csv_raw
+      def parse_csv csv_raw, options={}
         custom_date_converter = Workbook::Cell.new.string_optimistic_date_converter
-        converters = [:float,:integer,:date,:date_time,custom_date_converter]
+        options = {
+          converters: [:float,:integer,:date,:date_time,custom_date_converter]
+        }.merge(options)
+
         csv=nil
         #begin
-        csv = csv_lib.parse(csv_raw,{:converters=>converters})
+        csv = csv_lib.parse(csv_raw,options)
 
         #rescue
         # we're going to have another shot at it...
         #end
 
         if csv==nil or csv[0].count == 1
-          csv_excel = csv_lib.parse(csv_raw,{:converters=>converters,:col_sep=>';'})
+          csv_excel = csv_lib.parse(csv_raw,options.merge({:col_sep=>';'}))
           csv = csv_excel if csv_excel[0].count > 1
         end
 

data/lib/workbook/readers/ods_reader.rb

@@ -6,7 +6,7 @@ module Workbook
       # reads self with and ods-type content.xml
       # @param [String,File] file_obj a file or file reference
       # @return [Workbook::Book] self
-      def load_ods file_obj
+      def load_ods file_obj, options={}
         file_obj = file_obj.path if file_obj.is_a? File
         content = ""
         styles = ""
@@ -20,7 +20,7 @@ module Workbook
         styles = Nokogiri.XML(styles)
         template.add_raw content
         parse_ods_style styles
-        parse_ods content
+        parse_ods content, options
         return self
       end
 

data/lib/workbook/readers/txt_reader.rb

@@ -2,12 +2,12 @@
 module Workbook
   module Readers
     module TxtReader
-      def load_txt text
+      def load_txt text, options={}
         csv = text
-        parse_txt csv
+        parse_txt csv, options
       end
 
-      def parse_txt csv_raw
+      def parse_txt csv_raw, options={}
         csv = []
         csv_raw.split("\n").each {|l| csv << csv_lib.parse_line(l,{:col_sep=>"\t"});nil}
         self[0]=Workbook::Sheet.new(csv,self,{:parse_cells_on_batch_creation=>true, :cell_parse_options=>{:detect_date=>true}}) unless sheet.has_contents?

data/lib/workbook/readers/xls_reader.rb

@@ -8,11 +8,11 @@ module Workbook
     module XlsReader
       include Workbook::Readers::XlsShared
 
-      def load_xls file_obj
+      def load_xls file_obj, options
         begin
           sp = Spreadsheet.open(file_obj, 'rb')
           template.add_raw sp
-          parse_xls sp
+          parse_xls sp, options
         rescue Ole::Storage::FormatError => e
           begin
             # Assuming it is a tab separated txt inside .xls

data/lib/workbook/readers/xlsx_reader.rb

@@ -11,10 +11,10 @@ module Workbook
       # Load method for .xlsm files, an office open file format, hence compatible with .xlsx (it emphasizes that it contains macros)
       #
       # @param [String, File] file_obj   a string with a reference to the file to be written to
-      def load_xlsm file_obj
-        self.load_xlsx file_obj
+      def load_xlsm file_obj, options={}
+        self.load_xlsx file_obj, options
       end
-      def load_xlsx file_obj
+      def load_xlsx file_obj, options={}
         file_obj = file_obj.path if file_obj.is_a? File
         # file_obj = file_obj.match(/^\/(.*)/) ? file_obj : "./#{file_obj}"
         # p "opening #{file_obj}"

data/lib/workbook/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Workbook
-  VERSION = '0.4.12'
+  VERSION = '0.4.13'
 end

data/lib/workbook/writers/html_writer.rb

@@ -55,7 +55,7 @@ module Workbook
               if header
                 doc.tr do
                   header.each do |cell|
-                    th_options = build_cell_options cell, options.merge(classnames: [cell.to_sym])
+                    th_options = build_cell_options cell, options.merge(classnames: [cell.to_sym], data: {key: cell.to_sym})
                     unless cell.value.class == Workbook::NilValue
                       doc.th(th_options) do
                         doc.text cell.value
@@ -85,12 +85,17 @@ module Workbook
         end
         return builder.doc.to_xhtml
       end
-      private
+
       def build_cell_options cell, options={}
         classnames = cell.format.all_names
         classnames = classnames + options[:classnames] if options[:classnames]
         classnames = classnames.join(" ").strip
         td_options = classnames != "" ? {:class=>classnames} : {}
+        if options[:data]
+          options[:data].each do |key, value|
+            td_options = td_options.merge({("data-#{key}".to_sym) => value})
+          end
+        end
         td_options = td_options.merge({:style=>cell.format.to_css}) if options[:style_with_inline_css] and cell.format.to_css != ""
         td_options = td_options.merge({:colspan=>cell.colspan}) if cell.colspan
         td_options = td_options.merge({:rowspan=>cell.rowspan}) if cell.rowspan

data/test/test_readers_csv_reader.rb

@@ -95,5 +95,9 @@ module Readers
       assert_equal("asdf",w.sheet.table[3][:a].value)
       assert_equal(Date.new(2001,2,2),w.sheet.table[3][:d].value)
     end
+    def test_from_string
+      w = Workbook::Book.read("2013-03-19,JV,211,032,1,DBG A,,13,0147,\n", :csv, {converters: []})
+      assert_equal("2013-03-19,JV,211,032,1,DBG A,,13,0147,\n",w.sheet.table.to_csv)
+    end
   end
 end

data/test/test_readers_xls_reader.rb

@@ -65,5 +65,10 @@ module Readers
       assert_equal(["Diff_10", "Diff_9", "Diff_8", "Diff_7", "Diff_6", "Diff_5", "Diff_4", "Diff_3", "Diff_2", "Diff_1"], b.collect{|a| a.name})
       assert_equal([10, 9, 8, 7, 6, 5, 4, 3, 2, 1], b.collect{|a| a.table[1][0].value})
     end
+    def test_float_problem
+      w = Workbook::Book.new
+      w.open File.join(File.dirname(__FILE__), 'artifacts/floats_problem.xls')
+      # puts w.first.first.to_csv
+    end
   end
 end

data/test/test_writers_html_writer.rb

@@ -14,7 +14,7 @@ module Writers
       assert_equal(false, match)
       match = html.match(/<td>1<\/td>/) ? true : false
       assert_equal(true, match)
-      match = html.match(/<th class=\"a\">a<\/th>/) ? true : false
+      match = html.match(/<th class=\"a\" data-key=\"a\">a<\/th>/) ? true : false
       assert_equal(true, match)
     end
     def test_to_html_format_names
@@ -24,11 +24,16 @@ module Writers
       c = b[0][0][1][0]
       c.format.name="testname"
       html = b.to_html
-      match = html.match(/<th class=\"testname a\">a<\/th>/) ? true : false
+      match = html.match(/<th class=\"testname a\" data-key=\"a\">a<\/th>/) ? true : false
       assert_equal(true, match)
       match = html.match(/<td class=\"testname\">1<\/td>/) ? true : false
       assert_equal(true, match)
     end
+    def test_build_cell_options
+      b = Workbook::Book.new([['a','b'],[1,2],[3,4]])
+      result = b.sheet.table.build_cell_options(b.sheet.table.first.first,{data: {a:"a"}})
+      assert("a",result["data-a"])
+    end
     def test_to_html_css
       b = Workbook::Book.new([['a','b'],[1,2],[3,4]])
       c = b[0][0][0][0]
@@ -36,13 +41,14 @@ module Writers
       c = b[0][0][1][0]
       c.format[:background]="#ff0"
       html = b.to_html
-      match = html.match(/<th class=\"a\">a<\/th>/) ? true : false
+      match = html.match(/<th class=\"a\" data-key=\"a\">a<\/th>/) ? true : false
+      assert_equal(true, match)
       match = html.match(/<td>1<\/td>/) ? true : false
       assert_equal(true, match)
       html = b.to_html({:style_with_inline_css=>true})
-      match = html.match(/<th style="background: #f00">a<\/th>/) ? true : false
+      match = html.match(/<th class=\"a\" data-key=\"a\" style=\"background: #f00\">a<\/th>/) ? true : false
+      assert_equal(true, match)
       match = html.match(/<td style="background: #ff0">1<\/td>/) ? true : false
-
       assert_equal(true, match)
     end
     def test_sheet_and_table_names

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: workbook
 version: !ruby/object:Gem::Version
-  version: 0.4.12
+  version: 0.4.13
 platform: ruby
 authors:
 - Maarten Brouwers
@@ -238,7 +238,6 @@ files:
 - lib/workbook/writers/xls_writer.rb
 - lib/workbook/writers/xlsx_writer.rb
 - rbeautify.rb
-- test/artifacts/.~lock.complex_types.xls#
 - test/artifacts/bigtable.xls
 - test/artifacts/bigtable.xlsx
 - test/artifacts/book_with_colspans.ods
@@ -253,6 +252,7 @@ files:
 - test/artifacts/excel_different_types.xls
 - test/artifacts/excel_different_types.xlsx
 - test/artifacts/failing_import1.xls
+- test/artifacts/floats_problem.xls
 - test/artifacts/heavy.xlsx
 - test/artifacts/native_xlsx.xlsx
 - test/artifacts/sheet_with_combined_cells.ods
@@ -310,13 +310,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: workbook
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Workbook is a datastructure to contain books of tables (an anlogy used in
   e.g. Excel)
 test_files:
-- test/artifacts/.~lock.complex_types.xls#
 - test/artifacts/bigtable.xls
 - test/artifacts/bigtable.xlsx
 - test/artifacts/book_with_colspans.ods
@@ -331,6 +330,7 @@ test_files:
 - test/artifacts/excel_different_types.xls
 - test/artifacts/excel_different_types.xlsx
 - test/artifacts/failing_import1.xls
+- test/artifacts/floats_problem.xls
 - test/artifacts/heavy.xlsx
 - test/artifacts/native_xlsx.xlsx
 - test/artifacts/sheet_with_combined_cells.ods

data/test/artifacts/.~lock.complex_types.xls#

@@ -1 +0,0 @@
-,murb,murb-top.local,03.02.2016 16:38,file:///Users/murb/Library/Application%20Support/LibreOffice/4;