workbook 0.7.3 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 846bbc1bb424740727e3c5e98266f94d68b573df
-  data.tar.gz: 1c693585981610ce41e7e1116e3e1a6a039cd72a
+  metadata.gz: 11e8d0a279d7da324133ad5d1451518716049334
+  data.tar.gz: d0501d220b67ce8cd0161a2fdf600fe7834504f9
 SHA512:
-  metadata.gz: d63c0365b55650a33608b21282b0b7ebb2ad7dcb37ec9e0eda0e2c72eec093923c136dc82ebd48a4a077ed333734f6ac2dbda65ca0228a5d6b672d034eb4fce6
-  data.tar.gz: 57c222deddfbb73a3027aa185f94f23e4bd1978e7f9d49a02e3b017a599682ab266a5bd3302983ab7610c3695dd2b3b87a108094ee45baafea92112aec78e602
+  metadata.gz: eeec53fc99efc09a2aebd0a0b7a2429dabaa20fd9efd33e878c63a5b6948ffc8762741e89ec68dbea4232d3b932f21b4422d3cfa190d29c82847a786ce9eeb17
+  data.tar.gz: e983e2a8e83bec46581240c4a1645ff2c181bf01a7541d7f530a83897e9d8c8191a98253651a6108076c7747b34aba92d8d358416ad3f50c1367fc7dbfc83da6

data/.travis.yml

@@ -1,10 +1,19 @@
+env:
+  global:
+    - CC_TEST_REPORTER_ID=f208db3cda3089cf4020651d7500fe34389b97d65ccb5b23b674a2f828fa5abb
 sudo: false
 language: ruby
 rvm:
-  - 2.0.0
   - 2.1.0
   - 2.2.0
   - 2.3.0
   - 2.4.0
+  - 2.5.0
 before_install:
   - gem install bundler
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

data/lib/workbook.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
-$KCODE="u" if RUBY_VERSION < "1.9"
+# frozen_string_literal: true
 require_relative 'workbook/modules/cache'
 require_relative 'workbook/modules/cell'
 require_relative 'workbook/types/date'

data/lib/workbook/book.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 require 'open-uri'
 require 'workbook/writers/xls_writer'
 require 'workbook/writers/xlsx_writer'
@@ -160,22 +161,13 @@ module Workbook
     #
     # @param [String] text a string to convert
     def text_to_utf8 text
-      if RUBY_VERSION < '1.9'
-        require 'rchardet'
-        require 'iconv'
-        detected_encoding = CharDet.detect(text)
-        detected_encoding = detected_encoding['encoding']
-        text = Iconv.conv("UTF-8//TRANSLIT//IGNORE",detected_encoding,text)
-        text = text.gsub("\xEF\xBB\xBF", '') # removing the BOM...
-      else
-        unless text.valid_encoding? and text.encoding == "UTF-8"
-          # TODO: had some ruby 1.9 problems with rchardet ... but ideally it or a similar functionality will be reintroduced
-          source_encoding = text.valid_encoding? ? text.encoding : "US-ASCII"
-          text = text.encode('UTF-8', source_encoding, {:invalid=>:replace, :undef=>:replace, :replace=>""})
-          text = text.gsub("\u0000","") # TODO: this cleanup of nil values isn't supposed to be needed...
-        end
+      unless text.valid_encoding? and text.encoding == "UTF-8"
+        # TODO: had some ruby 1.9 problems with rchardet ... but ideally it or a similar functionality will be reintroduced
+        source_encoding = text.valid_encoding? ? text.encoding : "US-ASCII"
+        text = text.encode('UTF-8', source_encoding, {:invalid=>:replace, :undef=>:replace, :replace=>""})
+        text = text.gsub("\u0000","") # TODO: this cleanup of nil values isn't supposed to be needed...
       end
-      return text
+      text
     end
 
     # @param [String, File] filename   The full filename, or path

data/lib/workbook/cell.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
-
+# frozen_string_literal: true
 require 'workbook/modules/cell'
 
 module Workbook

data/lib/workbook/column.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 module Workbook
 
   # Column helps us to store general properties of a column, and lets us easily perform operations on values within a column
@@ -17,10 +18,12 @@ module Workbook
       table[1..500].each do |row|
         if row[ind] and row[ind].cell_type
           cel_column_type = row[ind].cell_type
-          if !defined?(@column_type) or @column_type.nil? or cel_column_type == @column_type
+          if !defined?(@column_type) or @column_type.nil?
             @column_type = cel_column_type
+          elsif cel_column_type == @column_type or cel_column_type == :nil
           else
             @column_type = :string
+            break
           end
         end
       end

data/lib/workbook/format.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 require 'workbook/modules/raw_objects_storage'
 
 module Workbook
@@ -34,8 +35,12 @@ module Workbook
 
     # Does the current format feature a background *color*? (not black or white or transparant).
     def has_background_color? color=:any
-      if flattened[:background_color]
-        return (flattened[:background_color].downcase==color.to_s.downcase or (!(flattened[:background_color]==nil or (flattened[:background_color].is_a? String and (flattened[:background_color].downcase=='#ffffff' or flattened[:background_color]=='#000000'))) and color==:any))
+      bg_color = flattened[:background_color] ? flattened[:background_color].to_s.downcase : nil
+
+      if color != :any and bg_color
+        return bg_color == color.to_s.downcase
+      elsif bg_color
+        return !(flattened[:background_color].downcase=='#ffffff' or flattened[:background_color]=='#000000')
       else
         return false
       end

data/lib/workbook/generatetypes.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ["Numeric","String","Time","Date","TrueClass","FalseClass","NilClass"].each do |type|
   f = File.open(File.join(File.dirname(__FILE__),"types","#{type}.rb"),'w+')
   puts f.inspect

data/lib/workbook/modules/cache.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 module Workbook
   module Modules
     # Adds simple caching

data/lib/workbook/modules/cell.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 require 'workbook/modules/type_parser'
 require 'workbook/nil_value'
 require 'date'
@@ -8,19 +9,59 @@ module Workbook
     module Cell
       include Workbook::Modules::TypeParser
 
-
-
+      CHARACTER_REPACEMENTS = {
+        [/[\(\)\.\?\,\!\=\$\:]/,] => '',
+        [/\&/] => 'amp',
+        [/\+/] => '_plus_',
+        [/\s/,'/_','/',"\\"] => '_',
+        ['–_','-_','+_','-'] => '',
+        ['__']=>'_',
+        ['>']=>'gt',
+        ['<']=>'lt',
+        ['á','à','â','ä','ã','å'] => 'a',
+        ['Ã','Ä','Â','À','�?','Å'] => 'A',
+        ['é','è','ê','ë'] => 'e',
+        ['Ë','É','È','Ê'] => 'E',
+        ['í','ì','î','ï'] => 'i',
+        ['�?','Î','Ì','�?'] => 'I',
+        ['ó','ò','ô','ö','õ'] => 'o',
+        ['Õ','Ö','Ô','Ò','Ó'] => 'O',
+        ['ú','ù','û','ü'] => 'u',
+        ['Ú','Û','Ù','Ü'] => 'U',
+        ['ç'] => 'c',
+        ['Ç'] => 'C',
+        ['š', 'ś'] => 's',
+        ['Š', 'Ś'] => 'S',
+        ['ž','ź'] => 'z',
+        ['Ž','Ź'] => 'Z',
+        ['ñ'] => 'n',
+        ['Ñ'] => 'N',
+        ['#'] => 'hash',
+        ['*'] => 'asterisk'
+      }
+      CLASS_CELLTYPE_MAPPING = {
+       'Numeric' => :integer,
+       'Integer' => :integer,
+       'Fixnum' => :integer,
+       'Float' => :float,
+       'String' => :string,
+       'Symbol' => :string,
+       'Time' => :time,
+       'Date' => :date,
+       'DateTime' => :datetime,
+       'TrueClass' => :boolean,
+       'FalseClass' => :boolean,
+       'NilClass' => :nil,
+       'Workbook::NilValue' => :nil
+      }
       # Note that these types are sorted by 'importance'
-      VALID_TYPES = [Numeric,String,Time,Date,TrueClass,FalseClass,NilClass,Workbook::NilValue,Symbol]
 
       # Evaluates a value for class-validity
       #
       # @param [Numeric,String,Time,Date,TrueClass,FalseClass,NilClass,Object] value the value to evaluate
       # @return [Boolean] returns true when the value is a valid cell value
       def valid_value? value
-        valid_type = false
-        VALID_TYPES.each {|t| return true if value.is_a? t}
-        valid_type
+        !CLASS_CELLTYPE_MAPPING[value.class.to_s].nil?
       end
 
       def formula
@@ -64,22 +105,9 @@ module Workbook
       #
       # @return [Symbol] the type of cell, compatible with Workbook::Column'types
       def cell_type
-        case value.class.to_s
-        when "String" then :string
-        when "FalseClass" then :boolean
-        when "TrueClass" then :boolean
-        when 'Time' then :time
-        when "Date" then :date
-        when "DateTime" then :datetime
-        when "Float" then :float
-        when "Integer" then :integer
-        when "Numeric" then :integer
-        when "Fixnum" then :integer
-        when "Symbol" then :string
-        end
+        CLASS_CELLTYPE_MAPPING[value.class.to_s]
       end
 
-
       # Returns the current value
       #
       # @return [Numeric,String,Time,Date,TrueClass,FalseClass,NilClass] a valid value
@@ -142,7 +170,15 @@ module Workbook
       # returns true when the value of the cell is nil.
       # @return [Boolean]
       def nil?
-        return value.nil?
+        value.nil?
+      end
+
+      def nil_or_empty?
+        value.nil? || value.to_s == ""
+      end
+
+      def value_to_s
+        value.to_s.downcase
       end
 
       # returns a symbol representation of the cell's value
@@ -153,59 +189,25 @@ module Workbook
       def to_sym
         return @to_sym if @to_sym
         v = nil
-        if value
-          v = value.to_s.downcase
-          if v.to_i != 0
-            v = "num#{v}"
-          end
-          ends_with_exclamationmark = (v[-1] == '!')
-          ends_with_questionmark = (v[-1] == '?')
-
-          replacements = {
-            [/[\(\)\.\?\,\!\=\$\:]/,] => '',
-            [/\&/] => 'amp',
-            [/\+/] => '_plus_',
-            [/\s/,'/_','/',"\\"] => '_',
-            ['–_','-_','+_','-'] => '',
-            ['__']=>'_',
-            ['>']=>'gt',
-            ['<']=>'lt',
-            ['á','à','â','ä','ã','å'] => 'a',
-            ['Ã','Ä','Â','À','�?','Å'] => 'A',
-            ['é','è','ê','ë'] => 'e',
-            ['Ë','É','È','Ê'] => 'E',
-            ['í','ì','î','ï'] => 'i',
-            ['�?','Î','Ì','�?'] => 'I',
-            ['ó','ò','ô','ö','õ'] => 'o',
-            ['Õ','Ö','Ô','Ò','Ó'] => 'O',
-            ['ú','ù','û','ü'] => 'u',
-            ['Ú','Û','Ù','Ü'] => 'U',
-            ['ç'] => 'c',
-            ['Ç'] => 'C',
-            ['š', 'ś'] => 's',
-            ['Š', 'Ś'] => 'S',
-            ['ž','ź'] => 'z',
-            ['Ž','Ź'] => 'Z',
-            ['ñ'] => 'n',
-            ['Ñ'] => 'N',
-            ['#'] => 'hash',
-            ['*'] => 'asterisk'
-          }
-          replacements.each do |ac,rep|
-            ac.each do |s|
-              v = v.gsub(s, rep)
-            end
-          end
-          if RUBY_VERSION < '1.9'
-            v = v.gsub(/[^\x00-\x7F]/n,'')
+        unless nil_or_empty?
+          if cell_type == :integer
+            v = "num#{value}".to_sym
+          elsif cell_type == :float
+            v = "num#{value}".sub(".","_").to_sym
           else
-            # See String#encode
-            encoding_options = {:invalid => :replace, :undef => :replace, :replace => ''}
-            v = v.encode(Encoding.find('ASCII'), encoding_options)
+            v = value_to_s
+
+            ends_with_exclamationmark = (v[-1] == '!')
+            ends_with_questionmark = (v[-1] == '?')
+
+            v = _replace_possibly_problematic_characters_from_string(v)
+
+            v = v.encode(Encoding.find('ASCII'), {:invalid => :replace, :undef => :replace, :replace => ''})
+
+            v = "#{v}!" if ends_with_exclamationmark
+            v = "#{v}?" if ends_with_questionmark
+            v = v.downcase.to_sym
           end
-          v = "#{v}!" if ends_with_exclamationmark
-          v = "#{v}?" if ends_with_questionmark
-          v = v.downcase.to_sym
         end
         @to_sym = v
         return @to_sym
@@ -243,10 +245,7 @@ module Workbook
       #
       # @param value a potential value for a cell
       def importance_of_class value
-        VALID_TYPES.each_with_index do |c,i|
-          return i if value.is_a? c
-        end
-        return nil
+        CLASS_CELLTYPE_MAPPING.keys.index value.class.to_s
       end
 
       # Returns whether special formatting is present on this cell
@@ -302,6 +301,17 @@ module Workbook
       def rowspan
         @rowspan.to_i if defined?(@rowspan) and @rowspan.to_i > 1
       end
+
+      private
+
+      def _replace_possibly_problematic_characters_from_string(string)
+        Workbook::Modules::Cell::CHARACTER_REPACEMENTS.each do |ac,rep|
+          ac.each do |s|
+            string = string.gsub(s, rep)
+          end
+        end
+        string
+      end
     end
   end
 end

data/lib/workbook/modules/diff_sort.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 module Workbook
   module Modules
     # Adds essential diffing and comparing support, as well as diffing entire books

data/lib/workbook/modules/raw_objects_storage.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 module Workbook
   module Modules
     # Adds support for storing raw objects, used in e.g. Format and Template

data/lib/workbook/modules/type_parser.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 module Workbook
   module Modules
     # Adds type parsing capabilities to e.g. a Cell.

data/lib/workbook/nil_value.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Workbook
 
   # Used in cases col or rowspans are used

data/lib/workbook/readers/csv_reader.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # -*- encoding : utf-8 -*-
 
 module Workbook
@@ -9,12 +10,7 @@ module Workbook
       end
 
       def csv_lib
-        if RUBY_VERSION < '1.9'
-          require 'faster_csv'
-          return FasterCSV
-        else
-          return CSV
-        end
+        return CSV
       end
 
       def parse_csv csv_raw, options={}
@@ -25,16 +21,16 @@ module Workbook
 
         csv=nil
         begin
-          csv = csv_lib.parse(csv_raw,options)
+          csv = CSV.parse(csv_raw,options)
 
         rescue CSV::MalformedCSVError
-          csv_excel = csv_lib.parse(csv_raw,options.merge({:col_sep=>';'}))
+          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
-          csv_excel = csv_lib.parse(csv_raw,options.merge({:col_sep=>';'}))
+          csv_excel = CSV.parse(csv_raw,options.merge({:col_sep=>';'}))
           csv = csv_excel if csv_excel[0].count > 1
         end
 

data/lib/workbook/readers/ods_reader.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
-
+# frozen_string_literal: true
 module Workbook
   module Readers
     module OdsReader

data/lib/workbook/readers/txt_reader.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 module Workbook
   module Readers
     module TxtReader
@@ -9,7 +10,7 @@ module Workbook
 
       def parse_txt csv_raw, options={}
         csv = []
-        csv_raw.split("\n").each {|l| csv << csv_lib.parse_line(l,{:col_sep=>"\t"});nil}
+        csv_raw.split("\n").each {|l| csv << CSV.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?
       end
     end

data/lib/workbook/readers/xls_reader.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 require 'spreadsheet'
 require 'workbook/readers/xls_shared'
 
@@ -24,67 +25,79 @@ module Workbook
 
       end
 
+      def parse_xls_cell xls_cell, xls_row, ci
+        rv = Workbook::Cell.new nil
+        begin
+          rv = Workbook::Cell.new xls_cell
+          rv.parse!
+        rescue ArgumentError => e
+          if e.message.match('not a Spreadsheet::Formula')
+            v = xls_cell.value
+            if v.class == Float and xls_row.format(ci).date?
+              xls_row[ci] = v
+              v = xls_row.datetime(ci)
+            end
+            if v.is_a? Spreadsheet::Excel::Error
+              v = "----!"
+            end
+            rv = Workbook::Cell.new v
+          elsif e.message.match('not a Spreadsheet::Link')
+            rv = Workbook::Cell.new xls_cell.to_s
+          elsif e.message.match('not a Spreadsheet::Link')
+            rv = Workbook::Cell.new xls_cell.to_s
+          elsif e.message.match('not a Spreadsheet::Excel::Error')
+            rv = "._."
+          else
+            rv = "._."  # raise e (we're going to be silent for now)
+          end
+        end
+        rv
+      end
+
+      def parse_xls_format xls_row, ci, ri, col_widths
+        xls_format = xls_row.format(ci)
+        col_width = nil
+
+        if ri == 0
+          col_width = col_widths[ci]
+        end
+
+        f = template.create_or_find_format_by "object_id_#{xls_format.object_id}",col_width
+        f[:width]= col_width
+        f[:rotation] = xls_format.rotation if xls_format.rotation
+        f[:background_color] = xls_color_to_html_hex(xls_format.pattern_fg_color)
+        f[:number_format] = ms_formatting_to_strftime(xls_format.number_format)
+        f[:text_direction] = xls_format.text_direction
+        f[:font_family] = "#{xls_format.font.name}, #{xls_format.font.family}"
+        f[:font_weight] = xls_format.font.weight
+        f[:color] = xls_color_to_html_hex(xls_format.font.color)
+
+        f.add_raw xls_format
+        f
+      end
+
+      def parse_xls_row ri, s, xls_sheet
+        xls_row = xls_sheet.row(ri)
+        r = s.table.create_or_open_row_at(ri)
+        col_widths = xls_sheet.columns.collect{|c| c.width if c}
+        xls_row.each_with_index do |xls_cell,ci|
+          r[ci] = parse_xls_cell xls_cell, xls_row, ci
+          r[ci].format = parse_xls_format xls_row, ci, ri, col_widths
+        end
+      end
 
       def parse_xls xls_spreadsheet=template.raws[Spreadsheet::Excel::Workbook], options={}
         options = {:additional_type_parsing=>true}.merge options
         number_of_worksheets = xls_spreadsheet.worksheets.count
-        (0..number_of_worksheets-1).each do |si|
+        number_of_worksheets.times do |si|
           xls_sheet = xls_spreadsheet.worksheets[si]
           if [:visible, :hidden, nil].include? xls_sheet.visibility # don't read :strong_hidden sheets, symmetrical to the writer
             begin
               number_of_rows = xls_sheet.count
               s = create_or_open_sheet_at(si)
               s.name = xls_sheet.name
-              (0..number_of_rows-1).each do |ri|
-                xls_row = xls_sheet.row(ri)
-                r = s.table.create_or_open_row_at(ri)
-                col_widths = xls_sheet.columns.collect{|c| c.width if c}
-                xls_row.each_with_index do |xls_cell,ci|
-
-                  begin
-                    r[ci] = Workbook::Cell.new xls_cell
-                    r[ci].parse!
-                  rescue ArgumentError => e
-                    if e.message.match('not a Spreadsheet::Formula')
-                      v = xls_cell.value
-                      if v.class == Float and xls_row.format(ci).date?
-                        xls_row[ci] = v
-                        v = xls_row.datetime(ci)
-                      end
-                      if v.is_a? Spreadsheet::Excel::Error
-                        v = "----!"
-                      end
-                      r[ci] = Workbook::Cell.new v
-                    elsif e.message.match('not a Spreadsheet::Link')
-                      r[ci] = Workbook::Cell.new xls_cell.to_s
-                    elsif e.message.match('not a Spreadsheet::Link')
-                      r[ci] = Workbook::Cell.new xls_cell.to_s
-                    elsif e.message.match('not a Spreadsheet::Excel::Error')
-                      r[ci] = "._."
-                    else
-                      r[ci] = "._."  # raise e (we're going to be silent for now)
-                    end
-                  end
-                  xls_format = xls_row.format(ci)
-                  col_width = nil
-
-                  if ri == 0
-                    col_width = col_widths[ci]
-                  end
-                  f = template.create_or_find_format_by "object_id_#{xls_format.object_id}",col_width
-                  f[:width]= col_width
-                  f[:rotation] = xls_format.rotation if xls_format.rotation
-                  f[:background_color] = xls_color_to_html_hex(xls_format.pattern_fg_color)
-                  f[:number_format] = ms_formatting_to_strftime(xls_format.number_format)
-                  f[:text_direction] = xls_format.text_direction
-                  f[:font_family] = "#{xls_format.font.name}, #{xls_format.font.family}"
-                  f[:font_weight] = xls_format.font.weight
-                  f[:color] = xls_color_to_html_hex(xls_format.font.color)
-
-                  f.add_raw xls_format
-
-                  r[ci].format = f
-                end
+              number_of_rows.times do |ri|
+                parse_xls_row ri, s, xls_sheet
               end
             rescue TypeError
               puts "WARNING: Failed at worksheet (#{si})... ignored"

data/lib/workbook/readers/xls_shared.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
-
+# frozen_string_literal: true
 require 'date'
 
 module Workbook

data/lib/workbook/readers/xlsx_reader.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 require 'workbook/readers/xls_shared'
 
 module Workbook

data/lib/workbook/row.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
-
+# frozen_string_literal: true
 module Workbook
   class Row < Array
     include Workbook::Modules::Cache

data/lib/workbook/sheet.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 module Workbook
   # A Sheet is a container of tables
   class Sheet < Array

data/lib/workbook/table.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 require 'workbook/modules/diff_sort'
 require 'workbook/writers/csv_table_writer'
 require 'workbook/writers/json_table_writer'

data/lib/workbook/template.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 require 'workbook/modules/raw_objects_storage'
 
 module Workbook

data/lib/workbook/types/date.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Workbook
   module Types
     class Date < Date

data/lib/workbook/types/false.rb

@@ -0,0 +1 @@
+# frozen_string_literal: true

data/lib/workbook/types/false_class.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Workbook
   module Types
     class FalseClass < FalseClass

data/lib/workbook/types/nil.rb

@@ -0,0 +1 @@
+# frozen_string_literal: true

data/lib/workbook/types/nil_class.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'workbook/cell'
 
 module Workbook

data/lib/workbook/types/numeric.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'workbook/cell'
 
 module Workbook

data/lib/workbook/types/string.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'workbook/cell'
 
 module Workbook

data/lib/workbook/types/time.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'workbook/cell'
 
 module Workbook

data/lib/workbook/types/true.rb

@@ -0,0 +1 @@
+# frozen_string_literal: true

data/lib/workbook/types/true_class.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'workbook/cell'
 
 module Workbook

data/lib/workbook/version.rb

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

data/lib/workbook/writers/csv_table_writer.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 require 'csv'
 
 module Workbook

data/lib/workbook/writers/html_writer.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 require 'spreadsheet'
 
 module Workbook

data/lib/workbook/writers/json_table_writer.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 require 'json'
 
 module Workbook
@@ -6,21 +7,21 @@ module Workbook
     module JsonTableWriter
       # Output the current workbook to JSON format
       #
-      # @param [Hash] options  
+      # @param [Hash] options
       # @return [String] json string
       def to_json options={}
         JSON.generate(to_array_of_hashes_with_values(options))
       end
-      
+
       # Output the current workbook to an array_of_hashes_with_values format
       #
-      # @param [Hash] options  
+      # @param [Hash] options
       # @return [Array<Hash>] array with hashes (comma separated values in a string)
       def to_array_of_hashes_with_values options={}
         array_of_hashes = self.collect{|a| a.to_hash_with_values unless a.header?}.compact
         return array_of_hashes
       end
-      
+
       # Write the current workbook to JSON format
       #
       # @param [String] filename

data/lib/workbook/writers/xls_writer.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 require 'spreadsheet'
 
 module Workbook

data/lib/workbook/writers/xlsx_writer.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+# frozen_string_literal: true
 require 'axlsx'
 require 'workbook/readers/xls_shared'
 

data/test/test_modules_cell.rb

@@ -33,6 +33,12 @@ class TestModulesCell < Minitest::Test
     assert_equal(Float,w.value.class)
   end
 
+  def test_importance_of_class
+    a = Workbook::Cell.new
+    assert_equal(4, a.importance_of_class("a"))
+    assert_equal(5, a.importance_of_class(:a))
+  end
+
   def test_comp
     a = Workbook::Cell.new 1
     b = Workbook::Cell.new 2
@@ -82,7 +88,7 @@ class TestModulesCell < Minitest::Test
       "A-B!" => :ab!,
       "éåšžÌ?" => :easzi?,
       1 => :num1,
-      1.0 => :num10
+      1.0 => :num1_0
     }
     examples.each do |k,v|
       assert_equal(v, Workbook::Cell.new(k).to_sym)

data/workbook.gemspec

@@ -18,16 +18,12 @@ Gem::Specification.new do |s|
   s.add_development_dependency("rake", '~> 10.0')
   s.add_development_dependency('minitest', '~> 5.4')
   s.add_dependency('spreadsheet', '~> 1.1')
-  s.add_dependency('fastercsv') if RUBY_VERSION < "1.9"
   s.add_dependency("rchardet", "~> 1.3")
   s.add_dependency("json", '~> 2.1')
   # s.add_dependency("rubyzip", '~> 1.2', '>= 1.2.1')
   s.add_dependency('axlsx', '~> 3.0.0.pre')
-  if RUBY_VERSION < "1.9"
-    s.add_dependency('nokogiri', "~> 1.5.10")
-  else
-    s.add_dependency('nokogiri', '~> 1.6')
-  end
+  s.add_dependency('nokogiri', '~> 1.8')
+
   s.platform    = Gem::Platform::RUBY
   s.files         = `git ls-files`.split($/)
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: workbook
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.5
 platform: ruby
 authors:
 - Maarten Brouwers
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
 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.