spreadsheet 0.7.8 → 0.7.9

data/History.txt

@@ -1,3 +1,12 @@
+=== 0.7.9 / 06.02.2013
+
+Author: Eugeniy Belyaev (zhekanax)
+
+* You can merge if you are interested in perl-like Workbook.set_custom_color
+  implementation. I know it is not really a proper way to deal with custom colors, but
+  nevertheless it makes it possible.
+* https://github.com/zdavatz/spreadsheet/pull/27
+
 === 0.7.8 / 06.02.2013
 
 Author: Kenichi Kamiya <kachick1@gmail.com>

data/lib/spreadsheet.rb

@@ -42,7 +42,7 @@ module Spreadsheet
 
   ##
   # The version of Spreadsheet you are using.
-  VERSION = '0.7.8'
+  VERSION = '0.7.9'
 
   ##
   # Default client Encoding. Change this value if your application uses a

data/lib/spreadsheet/excel/writer/workbook.rb

@@ -434,6 +434,7 @@ class Workbook < Spreadsheet::Writer
     # ●● STYLE ➜ 5.103
     write_styles workbook, buffer1
     # ○  PALETTE ➜ 5.74
+    write_palette workbook, buffer1
     # ○  USESELFS ➜ 5.106
     buffer1.rewind
     # ●● BOUNDSHEET ➜ 5.95
@@ -588,6 +589,18 @@ class Workbook < Spreadsheet::Writer
     ]
     write_op writer, 0x0293, data.pack('vC2')
   end
+  def write_palette workbook, writer
+    data = default_palette
+
+    workbook.palette.each do |idx, color|
+      idx = SEDOC_ROLOC[idx] - 8 if idx.kind_of? Symbol
+      raise "Undefined color index: #{idx}" unless data[idx]
+      data[idx] = color
+    end
+
+    writer.write [opcode(:palette), 2 + 4 * data.size, data.size].pack('v3')
+    writer.write data.collect { |c| c.push(0).pack('C4') }.join
+  end
   def write_tabid workbook, writer
     write_op writer, 0x013d, [1].pack('v')
   end
@@ -653,6 +666,68 @@ class Workbook < Spreadsheet::Writer
   def xf_index workbook, format
     @formats[workbook][:xf_indexes][format] || 0
   end
+  ##
+  # Returns Excel 97+ default colour palette.
+  def default_palette
+    [
+      [0x00, 0x00, 0x00],
+      [0xff, 0xff, 0xff],
+      [0xff, 0x00, 0x00],
+      [0x00, 0xff, 0x00],
+      [0x00, 0x00, 0xff],
+      [0xff, 0xff, 0x00],
+      [0xff, 0x00, 0xff],
+      [0x00, 0xff, 0xff],
+      [0x80, 0x00, 0x00],
+      [0x00, 0x80, 0x00],
+      [0x00, 0x00, 0x80],
+      [0x80, 0x80, 0x00],
+      [0x80, 0x00, 0x80],
+      [0x00, 0x80, 0x80],
+      [0xc0, 0xc0, 0xc0],
+      [0x80, 0x80, 0x80],
+      [0x99, 0x99, 0xff],
+      [0x99, 0x33, 0x66],
+      [0xff, 0xff, 0xcc],
+      [0xcc, 0xff, 0xff],
+      [0x66, 0x00, 0x66],
+      [0xff, 0x80, 0x80],
+      [0x00, 0x66, 0xcc],
+      [0xcc, 0xcc, 0xff],
+      [0x00, 0x00, 0x80],
+      [0xff, 0x00, 0xff],
+      [0xff, 0xff, 0x00],
+      [0x00, 0xff, 0xff],
+      [0x80, 0x00, 0x80],
+      [0x80, 0x00, 0x00],
+      [0x00, 0x80, 0x80],
+      [0x00, 0x00, 0xff],
+      [0x00, 0xcc, 0xff],
+      [0xcc, 0xff, 0xff],
+      [0xcc, 0xff, 0xcc],
+      [0xff, 0xff, 0x99],
+      [0x99, 0xcc, 0xff],
+      [0xff, 0x99, 0xcc],
+      [0xcc, 0x99, 0xff],
+      [0xff, 0xcc, 0x99],
+      [0x33, 0x66, 0xff],
+      [0x33, 0xcc, 0xcc],
+      [0x99, 0xcc, 0x00],
+      [0xff, 0xcc, 0x00],
+      [0xff, 0x99, 0x00],
+      [0xff, 0x66, 0x00],
+      [0x66, 0x66, 0x99],
+      [0x96, 0x96, 0x96],
+      [0x00, 0x33, 0x66],
+      [0x33, 0x99, 0x66],
+      [0x00, 0x33, 0x00],
+      [0x33, 0x33, 0x00],
+      [0x99, 0x33, 0x00],
+      [0x99, 0x33, 0x66],
+      [0x33, 0x33, 0x99],
+      [0x33, 0x33, 0x33]
+    ]
+  end
 end
     end
   end

data/lib/spreadsheet/workbook.rb

@@ -12,12 +12,13 @@ module Spreadsheet
   #                   Row#default_format or Worksheet#default_format.
   class Workbook
     include Spreadsheet::Encodings
-    attr_reader :io, :worksheets, :formats, :fonts
+    attr_reader :io, :worksheets, :formats, :fonts, :palette
     attr_accessor :active_worksheet, :encoding, :default_format, :version
     def initialize io = nil, opts={:default_format => Format.new}
       @worksheets = []
       @io = io
       @fonts = []
+      @palette = {}
       @formats = []
       @formats_set = {}
       if @default_format = opts[:default_format]
@@ -49,6 +50,13 @@ module Spreadsheet
       worksheet
     end
     ##
+    # Change the RGB components of the elements in the colour palette.
+    def set_custom_color idx, red, green, blue
+      raise 'Invalid format' if [red, green, blue].find { |c| ! (0..255).include?(c) }
+
+      @palette[idx] = [red, green, blue]
+    end
+    ##
     # Create a new Worksheet in this Workbook.
     # Used without options this creates a Worksheet with the name 'WorksheetN'
     # where the new Worksheet is the Nth Worksheet in this Workbook.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spreadsheet
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.7.9
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-ole
-  requirement: &23099500 !ruby/object:Gem::Requirement
+  requirement: &23604080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *23099500
+  version_requirements: *23604080
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &23099000 !ruby/object:Gem::Requirement
+  requirement: &23603660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *23099000
+  version_requirements: *23603660
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &23098580 !ruby/object:Gem::Requirement
+  requirement: &23603200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *23098580
+  version_requirements: *23603200
 description: ! 'The Spreadsheet Library is designed to read and write Spreadsheet
   Documents.