workbook 0.4.14 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f6ea32e52658ea5e81c6b5f813819cb26e93feb
-  data.tar.gz: 98eb9d696796975874734c0b2d11cb606e7e4412
+  metadata.gz: bc0e6be07c59fd70553ab1c6e7be1b47259d44fc
+  data.tar.gz: 2c38be86478a4e7af84cdcd2b44b9df3353d6fa1
 SHA512:
-  metadata.gz: ff1c86015a4122be0a32981efe4a2857021173d8cb54c6691e4bbfb4e3bc1f8e515c8c7c1ef382aa098209cadb113b0b1d80a88704c52fd19168d6d4e4eef148
-  data.tar.gz: e84103eb4921c7e2f41059fb232b5d5ba1c86a9fb4a84274a747f33af5331425cbe74aeca287d7d38a557882fc23b02d9520c2a5a2143ad9e5592e077db2e809
+  metadata.gz: 122ccd6febc910869615018a44e2e34323c5d870e417013b0a33777005c78e94afc0b174bea6c88b1ab9a5d53dc2e01ac6edf9927f4d2f2da673577bbc949a20
+  data.tar.gz: 58ab99448e24d2207c5412c67370dc10232d55a5a97eaf78f090c150db5d09eb39297d2c80e4daf95fad33412e54f2f1fe8b02f6e5a5a994164b5be749e8aa5f

data/.yardoc/checksums

@@ -1,22 +1,38 @@
-lib/workbook.rb 32bc69df4e3b8ce2c9268de044456cac6a0bee40
-lib/workbook/row.rb 2ebac27abd51f4858c99c20eaaa51c146820edaf
-lib/workbook/cell.rb e9e8375f8ca39b2d48087d362a894ab41768ea77
-lib/workbook/book.rb 4975414f7982cf0cc30494e209886057c9d4c750
-lib/workbook/sheet.rb 6e4dd25a20aa38932a202bc108de9c4fe99a1d2b
-lib/workbook/table.rb f09a6978e9aeb990b66117906de83fc1c10d1f0c
-lib/workbook/format.rb 2c851e82a2c6b3b7c165d005824d9c0b6eadfa7c
-lib/workbook/version.rb 96df0e31463de68e584e54d3a568988045c08e32
-lib/workbook/template.rb 17d4443a02dab1e7373e0d4ee5d5bb598afbb2f2
-lib/workbook/nil_value.rb 6dd69760293023adf43fb0a8b6cef65f48b0662f
-lib/workbook/readers/csv_reader.rb b04c6dc423a30a87ae957a01229778543840654f
-lib/workbook/readers/xls_reader.rb a42b30bc31731c01c23367450306f849b7b36791
-lib/workbook/readers/ods_reader.rb 8094776c94e46dfb0fb1f293f3e8618692b61e59
-lib/workbook/writers/xls_writer.rb ca52cf9c5c11d1768a96ec33ca48b1f68a59b559
-lib/workbook/readers/txt_reader.rb d954decd6be2b2c7ab7ad60fe68398c428d077cd
-lib/workbook/readers/xls_shared.rb 67da0f89a3b387b6d575df42a3e49f8a53fae49d
-lib/workbook/readers/xlsx_reader.rb 562e664987a4936d9abf89ecb8098744fbb81cf3
+lib/workbook.rb 6438570227f4d8db697a8f875c80e4c1334e99c7
+lib/workbook/row.rb f10c777f11bcf7a03f76615f794ee5730991b097
+lib/workbook/book.rb 0ce5e14b5fabe87cf92a2e09a30779edd5dc2248
+lib/workbook/cell.rb cac1d4b1e42b44059b938ca8b0e521d8fdd002be
+lib/workbook/sheet.rb 5e43246f9fec4db953d6053af8e5b8b16af8ca50
+lib/workbook/table.rb 41cd6aded7748689e9de425e2afd5bc8635c0a5a
+lib/workbook/format.rb 8e8f8c5bd0c9a44d03dd6f4bd787aeb19759688c
+lib/workbook/column.rb 78a5da45e87afea1c489a4fb666e8d923179570b
+lib/workbook/version.rb 020f173233dcaadd7a6f90753bcbc6ab5b8b25cc
+lib/workbook/template.rb 714cf57b0ac43fc020f9bf123d11b5d870851deb
+lib/workbook/types/nil.rb da39a3ee5e6b4b0d3255bfef95601890afd80709
+lib/workbook/nil_value.rb e773e3b95466dc0ef907ea187e692a82f9752764
+lib/workbook/types/date.rb 1f6cd471a88c6a03b02dda54bfa86e70c914d612
+lib/workbook/types/time.rb b7a4c25a9236ff9bfea79334c8c7b126ad98177a
+lib/workbook/types/true.rb da39a3ee5e6b4b0d3255bfef95601890afd80709
+lib/workbook/types/false.rb da39a3ee5e6b4b0d3255bfef95601890afd80709
+lib/workbook/types/string.rb 7d9138192f5b597027a1e6039d0e4d24732b32c5
+lib/workbook/modules/cell.rb 336687a768edc50e5dcf056c775cd052b7257220
+lib/workbook/generatetypes.rb ed30aeac0037757d9fd170962440b4c31ea35ba5
+lib/workbook/types/numeric.rb cc3b3c332d3fd714aac2f61cd1b297461a177121
+lib/workbook/modules/cache.rb 4f493b5da9725b1dba8b0d4c5e50f260cbe71846
+lib/workbook/types/nil_class.rb bde80579120dda2ea26006ebd213a9f5806b34fe
+lib/workbook/types/true_class.rb 58426c452b1146f9c7f466817c5a34c5d87bf8bf
+lib/workbook/types/false_class.rb b462a69a094c0ad7a694de1c3ca8868486a10f24
+lib/workbook/modules/diff_sort.rb 2d634c089d2dd98cca57a90e62fa6d8b5adf876d
+lib/workbook/readers/xls_reader.rb 9993723162e63a372f44fbdffeadf779a7c99ec5
+lib/workbook/readers/ods_reader.rb 15d6203b19c86dd735d46f7f2e98e3d1cbaaacfc
+lib/workbook/readers/csv_reader.rb faa57ea04511f22d2e111f358aac9291dbe17acd
+lib/workbook/writers/xls_writer.rb cca4a524506e04dfe23d60fb364e7878a8f5120f
+lib/workbook/readers/txt_reader.rb 65a16f46aac4debcfe4aab45494de87d785f5ae2
+lib/workbook/readers/xls_shared.rb 4cb1a5cc897a2578bb5ba02eaceccda01627dc34
 lib/workbook/modules/type_parser.rb a933dd8ba9566c13cd61999ada9ffb431c402444
-lib/workbook/writers/html_writer.rb 0671601948122a46e9ea7cd0888378256560f6f9
-lib/workbook/modules/table_diff_sort.rb cffe0ffc3cd71d79ea8fcd67fad363b63292c005
-lib/workbook/writers/csv_table_writer.rb 9ea2161c399c37a172b6a4a95dcaefc95ab47ece
-lib/workbook/modules/raw_objects_storage.rb 3b9a499c170f1e82a2750dbfa247b4a1c2eb0e20
+lib/workbook/writers/html_writer.rb 44adc88d7faa0e09d3684d005473069149503d0e
+lib/workbook/readers/xlsx_reader.rb 632564692d893df9968828380bcab15a0a90ea47
+lib/workbook/writers/xlsx_writer.rb ea165031771b18e48c34863a48de05a667546d3a
+lib/workbook/writers/csv_table_writer.rb 76018a0d9ed6140ee2a639edbc821c9754a8accc
+lib/workbook/writers/json_table_writer.rb 5b3f503afd1a1a5dd410ba12f66ad66711621cb2
+lib/workbook/modules/raw_objects_storage.rb edc0d117f776f1d05c81bdd0fe7c22bdee247596

data/lib/workbook/format.rb

@@ -3,14 +3,26 @@ require 'workbook/modules/raw_objects_storage'
 
 module Workbook
   # Format is an object used for maintinaing a cell's formatting. It can belong to many cells. It maintains a relation to the raw template's equivalent, to preserve attributes Workbook cannot modify/access.
+  # The keys in the Hash are intended to closely mimick the CSS-style options:
+  #
+  #     {
+  #       background_color: '#ff000',
+  #       color: '#ffff00',
+  #       font_weight: :bold,
+  #       text_decoration: :underline,
+  #     }
+  #
+  # Note that as we speak, not all exporters support all properties properly. Consider it WIP.
   class Format < Hash
     include Workbook::Modules::RawObjectsStorage
     alias_method :merge_hash, :merge
     alias_method :merge_hash!, :merge!
     attr_accessor :name, :parent
 
-    # Initialize
-    # @param [Workbook::Format, Hash] options (e.g. :background, :color
+    # Initializes Workbook::Format with a hash. The keys in the Hash are intended to closely mimick the CSS-style options (see above)
+    #
+    # @param [Workbook::Format, Hash] options (e.g. :background, :color, :background_color, :font_weight (integer or css-type labels)
+    # @return [String] the name of the format, default: nil
     def initialize options={}, name=nil
       options.each {|k,v| self[k]=v}
       self.name = name

data/lib/workbook/modules/cell.rb

@@ -102,7 +102,7 @@ module Workbook
 
       # Change the current format
       #
-      # @param [Workbook::Format, Hash] f set the formatting properties of this Cell
+      # @param [Workbook::Format, Hash] f set the formatting properties of this Cell, see Workbook::Format#initialize
       def format= f
         if f.is_a? Workbook::Format
           @workbook_format = f
@@ -115,7 +115,7 @@ module Workbook
 
       # Returns current format
       #
-      # @returns [Workbook::Format] the current format
+      # @return [Workbook::Format] the current format
       def format
         # return @workbook_format if @workbook_format
         if row and template and row.header? and !@workbook_format
@@ -211,8 +211,9 @@ module Workbook
       end
 
       # Compare
+      #
       # @param [Workbook::Cell] other cell to compare against (based on value), can compare different value-types using #compare_on_class
-      # @returns [Fixnum] -1, 0, 1
+      # @return [Fixnum] -1, 0, 1
       def <=> other
         rv = nil
         begin
@@ -224,7 +225,6 @@ module Workbook
           rv = compare_on_class other
         end
         return rv
-
       end
 
       # Compare on class level
@@ -248,22 +248,32 @@ module Workbook
         return nil
       end
 
+      # Returns whether special formatting is present on this cell
+      #
+      # @return [Boolean] index of the cell
+      def format?
+        format and format.keys.count > 0
+      end
+
       # Returns the index of the cell within the row, returns nil if no row is present
       #
-      # @returns [Integer, NilClass] index of the cell
+      # @return [Integer, NilClass] index of the cell
       def index
         row.index self if row
       end
 
       # Returns the key (a Symbol) of the cell, based on its table's header
       #
-      # @returns [Symbol, NilClass] key of the cell, returns nil if the cell doesn't belong to a table
+      # @return [Symbol, NilClass] key of the cell, returns nil if the cell doesn't belong to a table
       def key
         table.header[index].to_sym if table
       end
 
       def inspect
-        "<Workbook::Cell @value=#{value}>"
+        txt = "<Workbook::Cell @value=#{value}"
+        txt += " @format=#{format}" if format?
+        txt += ">"
+        txt
       end
 
       # convert value to string, and in case of a Date or Time value, apply formatting

data/lib/workbook/modules/raw_objects_storage.rb

@@ -28,7 +28,7 @@ module Workbook
       end
 
       # Lists the classes for which raws are available
-      # @return Array<Object> array with the classes available
+      # @return [Array<Object>] array with the classes available
       def available_raws
         raws.keys
       end

data/lib/workbook/nil_value.rb

@@ -4,7 +4,7 @@ module Workbook
   class NilValue
 
     # initialize this special nilvalue with a reason
-    # @params [String] reason (currently only :covered, in case this cell is coverd because an adjecant cell spans over it)
+    # @param [String] reason (currently only :covered, in case this cell is coverd because an adjecant cell spans over it)
     def initialize reason
       self.reason= reason
     end

data/lib/workbook/readers/xls_shared.rb

@@ -5,7 +5,7 @@ module Workbook
 
       # Converts standard (ruby/C++/unix/...) strftime formatting to MS's formatting
       #
-      # @param [String, nil] numberformat (nil returns nil)
+      # @param [String, nil] ms_nr_format (nil returns nil)
       # @return [String, nil]
       def ms_formatting_to_strftime ms_nr_format
         if ms_nr_format

data/lib/workbook/sheet.rb

@@ -36,7 +36,7 @@ module Workbook
 
     # Returns the name of this sheet
     #
-    # @return [String] the name, defaulting to "Sheet {index}" when none is set
+    # @return [String] the name, defaulting to sheet#index when none is set
     def name
       @name ||= "Sheet #{book.index(self)+1}"
     end

data/lib/workbook/table.rb

@@ -55,7 +55,7 @@ module Workbook
     # 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]
+    # @param [Workbook::Row, Integer] h should be the row or the index of this table's row
     # @return [Workbook::Row] The header
     def header= h
       if h.is_a? Numeric
@@ -65,8 +65,11 @@ module Workbook
       end
     end
 
-    def header_row_index(h=nil)
-      self.index(h ? h : self.header)
+    # Returns the index of the header row
+    #
+    # @return [Integer] The index of the header row (typically 0)
+    def header_row_index
+      self.index(self.header)
     end
 
     def define_columns_with_row(r)
@@ -76,6 +79,9 @@ module Workbook
     end
 
     # Generates a new row, with optionally predefined cell-values, that is already connected to this table.
+    #
+    # @param [Array, Workbook::Row] cell_values is an array or row of cell values
+    # @return [Workbook::Row] the newly created row
     def new_row cell_values=[]
       r = Workbook::Row.new(cell_values,self)
       return r

data/lib/workbook/version.rb

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

data/lib/workbook/writers/csv_table_writer.rb

@@ -6,7 +6,6 @@ module Workbook
     module CsvTableWriter
       # Output the current workbook to CSV format
       #
-      # @param [String] filename
       # @param [Hash] options (not used)
       # @return [String] csv (comma separated values in a string)
       def to_csv options={}
@@ -23,7 +22,7 @@ module Workbook
         end
         csv
       end
-      
+
       # Write the current workbook to CSV format
       #
       # @param [String] filename

data/lib/workbook/writers/xlsx_writer.rb

@@ -25,7 +25,10 @@ module Workbook
               xlsx_row.add_cell(c.value) unless xlsx_row_a[ci]
               xlsx_cell = xlsx_row_a[ci]
               xlsx_cell.value = c.value
-              xlsx_cell.style = c.format.raws[Fixnum] if c.format.raws[Fixnum]
+              if c.format?
+                format_to_xlsx_format(c.format) unless c.format.raws[Fixnum]
+                xlsx_cell.style = c.format.raws[Fixnum]
+              end
             end
             xlsx_sheet.send(:update_column_info, xlsx_row.cells, [])
           end
@@ -86,25 +89,26 @@ module Workbook
         end
       end
 
+      def make_sure_f_is_a_workbook_format f
+        f.is_a?(Workbook::Format) ? f : Workbook::Format.new(f)
+      end
+
       def format_to_xlsx_format f
-        xlsfmt = nil
-        unless f.is_a? Workbook::Format
-          f = Workbook::Format.new f
-        end
+        f = make_sure_f_is_a_workbook_format f
 
         xlsfmt={}
-        xlsfmt[:fg_color] = "#{f[:color]}00" if f[:color]
-        xlsfmt[:b] = true if f[:font_weight] == "bold" or f[:font_weight].to_i >= 600 or f[:"font_style"].to_s.match "oblique"
-        xlsfmt[:i] = true if f[:font_style] == "italic"
+        xlsfmt[:fg_color] = "FF#{f[:color].to_s.upcase}".gsub("#",'') if f[:color]
+        xlsfmt[:b] = true if f[:font_weight].to_s == "bold" or f[:font_weight].to_i >= 600 or f[:"font_style"].to_s.match "oblique"
+        xlsfmt[:i] = true if f[:font_style].to_s == "italic"
         xlsfmt[:u] = true if f[:text_decoration].to_s.match("underline")
         xlsfmt[:bg_color] = f[:background_color] if f[:background_color]
         xlsfmt[:format_code] = strftime_to_ms_format(f[:number_format]) if f[:number_format]
         xlsfmt[:font_name] = f[:font_family].split.first if f[:font_family]
         xlsfmt[:family] = parse_font_family(f) if f[:font_family]
-        f.add_raw init_xlsx_spreadsheet_template.workbook.styles.add_style(xlsfmt)
-        # wb.styles{|a| p a.add_style({}).class }
 
+        f.add_raw init_xlsx_spreadsheet_template.workbook.styles.add_style(xlsfmt)
         f.add_raw xlsfmt
+
         return xlsfmt
       end
     end

data/test/test_readers_xlsx_reader.rb

@@ -29,5 +29,10 @@ module Readers
       assert_equal(nil,w.ms_formatting_to_strftime(nil));
       assert_equal(nil,w.ms_formatting_to_strftime(""));
     end
+    def test_open_integer_xlsx
+      w = Workbook::Book.open File.join(File.dirname(__FILE__), 'artifacts/integer_test.xlsx')
+
+      assert_equal("2",w.sheet.table[1][1].value.to_s)
+    end
   end
 end

data/test/test_writers_xlsx_writer.rb

@@ -94,7 +94,7 @@ module Writers
       b = Workbook::Book.new
       xlsx_format = b.format_to_xlsx_format(Workbook::Format.new({font_weight: "bold", color: "#FF0000"}))
       assert_equal(true,xlsx_format[:b])
-      assert_equal("#FF000000",xlsx_format[:fg_color])
+      assert_equal("FFFF0000",xlsx_format[:fg_color])
     end
 
     def test_formats_to_xlsx_format
@@ -104,5 +104,14 @@ module Writers
       assert_equal(false,b.template.create_or_find_format_by(:header).raws[Fixnum].nil?)
     end
 
+    def test_format_to_xlsx_integrated
+      b = Workbook::Book.new [[:a,:b],[1,2],[3,4]]
+      c2 = b.sheet.table[2][1]
+      c2.format = Workbook::Format.new({font_weight: "bold", color: "#CC5500", font_style: :italic, text_decoration: :underline})
+      # Can't test this for real yet... :/ but the examples here seem to work     b.write_to_xlsx("untitled document.xlsx")
+      # c = Workbook::Book.open("untitled document.xlsx")
+      # p c.inspect
+    end
+
   end
 end

data/workbook.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |s|
   s.add_dependency("rchardet", "~> 1.3")
   s.add_dependency("rake", '~> 10.0')
   s.add_dependency("json", '~> 1.8')
-  s.add_dependency('roo', '~> 1.13')
-  s.add_dependency('axlsx', '~> 2.0.1')
+  s.add_dependency('roo', '~> 2.3')
+  s.add_dependency('axlsx', '~> 2.1.0.pre')
   if RUBY_VERSION < "1.9"
     s.add_dependency('nokogiri', "~> 1.5.10")
   else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workbook
 version: !ruby/object:Gem::Version
-  version: 0.4.14
+  version: '0.5'
 platform: ruby
 authors:
 - Maarten Brouwers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-prof
@@ -100,28 +100,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: axlsx
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.0.pre
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -212,6 +212,7 @@ files:
 - test/artifacts/excel_different_types.xlsx
 - test/artifacts/failing_import1.xls
 - test/artifacts/heavy.xlsx
+- test/artifacts/integer_test.xlsx
 - test/artifacts/native_xlsx.xlsx
 - test/artifacts/sheet_with_combined_cells.ods
 - test/artifacts/sheetduplication.xls
@@ -268,7 +269,7 @@ 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
@@ -289,6 +290,7 @@ test_files:
 - test/artifacts/excel_different_types.xlsx
 - test/artifacts/failing_import1.xls
 - test/artifacts/heavy.xlsx
+- test/artifacts/integer_test.xlsx
 - test/artifacts/native_xlsx.xlsx
 - test/artifacts/sheet_with_combined_cells.ods
 - test/artifacts/sheetduplication.xls