workbook 0.4.11 → 0.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff139530b00ab86d7a7cc2e63329253f15f90959
-  data.tar.gz: 4c82a23c6e61d24f16635033fa721f0b3d46539a
+  metadata.gz: c05c947e639810533b5d77b7f66cca14bf2880b3
+  data.tar.gz: 623d1d9ca5e9bceac0cb0a18bec19d79a869a193
 SHA512:
-  metadata.gz: f06054fa85e28d7eea8f5d97e3a20aeff0294c9b25c310a42080ed021242881abecb3ca802143b12fa2cbac0be13bd8b497cd01e069e3d7a4b0eb9afd76b9d11
-  data.tar.gz: 9d3b19c3ebdee818778c33e88713c1a8c26323f537e66c89f881d187e392511e4a2e55cf8c9827df5e197aedb4eb361444889930dd0233e0f7b88b0bc2bd775a
+  metadata.gz: e972dc3fbcc4d1c29860b5966c4c3d54407b6a24344450279410ee029f163555c00d8b1cec240d224c5d47ffc4d8b4f0a96e23f2b13d2cb0a5a575cb8631380e
+  data.tar.gz: 74538baa3d9d1ce6644a4a35e2aab5aed98b213abd4d6cc89392fcf29a34a77524f9dbdc75d9156377965a39056e06cfc36a5e3738b2320a8a796b4ad596e11e

data/.gitignore

@@ -10,4 +10,5 @@ empty.png
 minus.png
 plus.png
 profile.*
-untitled document.xlsx*
+untitled document.xlsx*
+.DS_Store

data/lib/workbook/modules/cell.rb

@@ -153,9 +153,12 @@ module Workbook
         return @to_sym if @to_sym
         v = nil
         if value
-          ends_with_exclamationmark = (value[-1] == '!')
-          ends_with_questionmark = (value[-1] == '?')
           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 = {
             [/[\(\)\.\?\,\!\=\$\:]/,] => '',

data/lib/workbook/table.rb

@@ -52,8 +52,21 @@ module Workbook
       end
     end
 
+    # Set the header of this table (typically the first row, but can be a different row).
+    # The header row is also used for finding values in a aribrary row.
+    #
+    # @param [Workbook::Row, Integer]
+    # @return [Workbook::Row] The header
     def header= h
-      @header = h
+      if h.is_a? Numeric
+        @header = self[h]
+      else
+        @header = h
+      end
+    end
+
+    def header_row_index(h=nil)
+      self.index(h ? h : self.header)
     end
 
     def define_columns_with_row(r)
@@ -139,7 +152,6 @@ module Workbook
     def clone
       t = self
       c = super
-      header_row_index = t.index(t.header)
       c.delete_all
       t.each{|r| c << r.clone}
       c.header = c[header_row_index] if header_row_index

data/lib/workbook/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Workbook
-  VERSION = '0.4.11'
+  VERSION = '0.4.12'
 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
+                    th_options = build_cell_options cell, options.merge(classnames: [cell.to_sym])
                     unless cell.value.class == Workbook::NilValue
                       doc.th(th_options) do
                         doc.text cell.value
@@ -87,7 +87,9 @@ module Workbook
       end
       private
       def build_cell_options cell, options={}
-        classnames = cell.format.all_names.join(" ").strip
+        classnames = cell.format.all_names
+        classnames = classnames + options[:classnames] if options[:classnames]
+        classnames = classnames.join(" ").strip
         td_options = classnames != "" ? {:class=>classnames} : {}
         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

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

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

data/test/test_modules_cell.rb

@@ -80,7 +80,9 @@ class TestModulesCell < Minitest::Test
       "A - c (B123)!" => :a_c_b123!,
       "A-B?" => :ab?,
       "A-B!" => :ab!,
-      "éåšžÌ?" => :easzi?
+      "éåšžÌ?" => :easzi?,
+      1 => :num1,
+      1.0 => :num10
     }
     examples.each do |k,v|
       assert_equal(v, Workbook::Cell.new(k).to_sym)

data/test/test_readers_xls_reader.rb

@@ -20,8 +20,9 @@ module Readers
       w.open File.join(File.dirname(__FILE__), 'artifacts/complex_types.xls')
       assert_equal(Date.new(2011,11,15), w.sheet.table[2][3].value)
       assert_equal("http://murb.nl", w.sheet.table[3][2].value)
-      assert_equal("sadfasdfsd", w.sheet.table[4][2].value)
-      assert_equal(1.2, w.sheet.table[3][1].value)
+      assert_equal("sadfasdfsd!", w.sheet.table[4][2].value)
+      assert_equal(1.2, w.sheet.table[2][1].value)
+      assert_equal(1, w.sheet.table[3][1].value)
     end
 
     def test_xls_excel_standardized_open

data/test/test_table.rb

@@ -183,7 +183,6 @@ class TestTable< Minitest::Test
     last_line = table.count-1
     first_few_lines = table[12][0].value - table[2][0].value
     last_few_lines = table[last_line][0].value - table[last_line-10][0].value
-    # puts [first_few_lines,last_few_lines].join(" vs ")
     assert_equal(true, first_few_lines*1.20 > last_few_lines) # 10% slower is acceptable
   end
   def test_columns

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>a<\/th>/) ? true : false
+      match = html.match(/<th class=\"a\">a<\/th>/) ? true : false
       assert_equal(true, match)
     end
     def test_to_html_format_names
@@ -24,7 +24,7 @@ module Writers
       c = b[0][0][1][0]
       c.format.name="testname"
       html = b.to_html
-      match = html.match(/<th class=\"testname\">a<\/th>/) ? true : false
+      match = html.match(/<th class=\"testname a\">a<\/th>/) ? true : false
       assert_equal(true, match)
       match = html.match(/<td class=\"testname\">1<\/td>/) ? true : false
       assert_equal(true, match)
@@ -36,7 +36,7 @@ module Writers
       c = b[0][0][1][0]
       c.format[:background]="#ff0"
       html = b.to_html
-      match = html.match(/<th>a<\/th>/) ? true : false
+      match = html.match(/<th class=\"a\">a<\/th>/) ? true : false
       match = html.match(/<td>1<\/td>/) ? true : false
       assert_equal(true, match)
       html = b.to_html({:style_with_inline_css=>true})

data/workbook.gemspec

@@ -15,15 +15,12 @@ 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_dependency('rubyzip', '~>1')
   s.add_dependency('spreadsheet', '~> 1.0')
   s.add_development_dependency('minitest', '~> 5.4')
   s.add_dependency('fastercsv') if RUBY_VERSION < "1.9"
   s.add_dependency("rchardet", "~> 1.3")
   s.add_dependency("rake", '~> 10.0')
   s.add_dependency("json", '~> 1.8')
-  s.add_dependency("zip-zip", '~> 0.2') #actually a hack...
-  #s.add_dependency('rubyXL', '~> 3.3')
   s.add_dependency('roo', '~> 1.13')
   s.add_dependency('axlsx', '~> 2.0.1')
   if RUBY_VERSION < "1.9"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workbook
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.4.12
 platform: ruby
 authors:
 - Maarten Brouwers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-28 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-prof
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.14'
-- !ruby/object:Gem::Dependency
-  name: rubyzip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
 - !ruby/object:Gem::Dependency
   name: spreadsheet
   requirement: !ruby/object:Gem::Requirement
@@ -108,20 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: zip-zip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: roo
   requirement: !ruby/object:Gem::Requirement
@@ -266,6 +238,7 @@ 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
@@ -337,12 +310,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: workbook
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 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
@@ -393,4 +367,3 @@ test_files:
 - test/test_writers_json_writer.rb
 - test/test_writers_xls_writer.rb
 - test/test_writers_xlsx_writer.rb
-has_rdoc: