spreadsheet 0.6.1 → 0.6.1.1

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.6.1.1 / 2008-10-20
+
+* 1 Bugfix
+
+  * Corrected the Manifest - included column.rb
+
 === 0.6.1 / 2008-10-17
 
 * 3 minor enhancements

data/Manifest.txt

@@ -8,6 +8,7 @@ lib/parseexcel.rb
 lib/parseexcel/parseexcel.rb
 lib/parseexcel/parser.rb
 lib/spreadsheet.rb
+lib/spreadsheet/column.rb
 lib/spreadsheet/datatypes.rb
 lib/spreadsheet/encodings.rb
 lib/spreadsheet/excel.rb

data/lib/spreadsheet.rb

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

data/lib/spreadsheet/column.rb

@@ -0,0 +1,53 @@
+require 'spreadsheet/datatypes'
+
+module Spreadsheet
+  ##
+  # The Column class. Encapsulates column-formatting and width, and provides a
+  # means to iterate over all cells in a column.
+  #
+  # Useful Attributes:
+  # #width::          The width in characters (in respect to the '0' character
+  #                   of the Worksheet's default Font). Float values are
+  #                   permitted, for Excel the available Precision is at 1/256
+  #                   characters.
+  # #default_format:: The default Format for cells in this column (applied if
+  #                   there is no explicit Cell Format and no default Row format
+  #                   for the Cell).
+  # #hidden::         The Column is hidden.
+  # #collapsed::      The Column is collapsed.
+  # #outline_level::  Outline level of the column.
+  class Column
+    include Datatypes
+    include Enumerable
+    attr_accessor :width, :worksheet
+    attr_reader :default_format, :idx
+    boolean :hidden, :collapsed
+    enum :outline_level, 0, Integer
+    def initialize idx, format, opts={}
+      @idx = idx
+      opts[:width] ||= 10
+      opts.each do |key, value|
+        self.send "#{key}=", value
+      end
+      self.default_format = format
+    end
+    ##
+    # Set the default Format for Cells in this Column.
+    def default_format= format
+      @worksheet.add_format format if @worksheet
+      @default_format = format
+    end
+    ##
+    # Iterate over all cells in this column.
+    def each
+      @worksheet.each do |row|
+        yield row[idx]
+      end
+    end
+    def == other # :nodoc:
+      other.is_a?(Column) && default_format == other.default_format \
+        && width == other.width && hidden == other.hidden \
+        && collapsed == other.collapsed && outline_level == other.outline_level
+    end
+  end
+end

data/lib/spreadsheet/excel/internals.rb

@@ -197,6 +197,8 @@ module Internals
   }
   LEAP_ERROR = Date.new 1900, 2, 28
   OPCODES = {
+    :annotation   => 0x01b6, #    Details unknown
+    :note         => 0x001c, #    Details unknown
     :blank        => 0x0201, #    BLANK ➜ 6.7
     :boolerr      => 0x0205, #    BOOLERR ➜ 6.10
     :boundsheet   => 0x0085, # ●● BOUNDSHEET ➜ 6.12

data/lib/spreadsheet/excel/reader.rb

@@ -13,8 +13,8 @@ module Spreadsheet
 # Excel-Record/Opcode. You should not need to call any of its methods
 # directly. If you think you do, look at #read
 class Reader
-  include Encodings
-  include Internals
+  include Spreadsheet::Encodings
+  include Spreadsheet::Excel::Internals
   OPCODE_SIZE = 4
   ROW_BLOCK_OPS = [
     :blank, :boolerr, :dbcell, :formula, :label, :labelsst, :mulblank, :mulrk,
@@ -853,7 +853,7 @@ class Reader
       @pos += len
       code = SEDOCPO.fetch(op, op)
       #puts "0x%04x/%-16s (0x%08x) %5i: %s" % [op, code.inspect, pos, len, work[0,16].inspect]
-      #puts "0x%04x/%-16s %5i: %s" % [op, code.inspect, len, work[0,32].inspect]
+      puts "0x%04x/%-16s %5i: %s" % [op, code.inspect, len, work[0,32].inspect]
       [ pos, code, len + OPCODE_SIZE, work]
     end
   end

data/lib/spreadsheet/excel/row.rb

@@ -5,7 +5,7 @@ module Spreadsheet
   module Excel
 ##
 # Excel-specific Row methods
-class Row < Row
+class Row < Spreadsheet::Row
   ##
   # The Excel date calculation erroneously assumes that 1900 is a leap-year. All
   # Dates after 28.2.1900 are off by one.

data/lib/spreadsheet/excel/sst_entry.rb

@@ -5,7 +5,7 @@ module Spreadsheet
 ##
 # Shared String Table Entry
 class SstEntry
-  include Encodings
+  include Spreadsheet::Encodings
   attr_accessor :chars, :phonetic, :richtext, :flags, :available,
                 :continued_chars, :wide
   def initialize opts = {}

data/lib/spreadsheet/excel/workbook.rb

@@ -9,8 +9,8 @@ module Spreadsheet
 # Excel-specific Workbook methods. These are mostly pertinent to the Excel
 # reader. You should have no reason to use any of these.
 class Workbook < Spreadsheet::Workbook
-  include Encodings
-  include Offset
+  include Spreadsheet::Encodings
+  include Spreadsheet::Excel::Offset
   BIFF_VERSIONS = {
     0x000 => 2,
     0x007 => 2,

data/lib/spreadsheet/excel/worksheet.rb

@@ -9,7 +9,7 @@ module Spreadsheet
 # reader, and to recording changes to the Worksheet. You should have no reason
 # to use any of these.
 class Worksheet < Spreadsheet::Worksheet
-  include Offset
+  include Spreadsheet::Excel::Offset
   offset :dimensions
   attr_reader :offset, :ole
   def initialize opts = {}

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

@@ -8,7 +8,7 @@ module Spreadsheet
 # to Biff8. This Module is likely to be expanded as Support for older Versions
 # of Excel grows and methods get moved here for disambiguation.
 module Biff8
-  include Encodings
+  include Spreadsheet::Encodings
   ##
   # Check whether the string _data_ can be compressed (i.e. every second byte
   # is a Null-byte) and perform compression.

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

@@ -7,8 +7,8 @@ module Spreadsheet
     module Writer
 ##
 # This class encapsulates everything that is needed to write an XF record.
-class Format < DelegateClass(Format)
-  include Internals
+class Format < DelegateClass Spreadsheet::Format
+  include Spreadsheet::Excel::Internals
   def Format.boolean *args
     args.each do |key|
       define_method key do

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

@@ -15,8 +15,8 @@ module Spreadsheet
 # doesn't mean it shouldn't be possible ;). You should not need to call any of
 # its methods directly. If you think you do, look at #write_workbook
 class Workbook < Spreadsheet::Writer
-  include Biff8
-  include Internals
+  include Spreadsheet::Excel::Writer::Biff8
+  include Spreadsheet::Excel::Internals
   attr_reader :fonts
   def initialize *args
     super

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

@@ -10,9 +10,9 @@ module Spreadsheet
 # Excel-Record/Opcode. You should not need to call any of its methods directly.
 # If you think you do, look at #write_worksheet
 class Worksheet
-  include Biff8
-  include Internals
-  include Internals::Biff8
+  include Spreadsheet::Excel::Writer::Biff8
+  include Spreadsheet::Excel::Internals
+  include Spreadsheet::Excel::Internals::Biff8
   attr_reader :worksheet
   def initialize workbook, worksheet
     @workbook = workbook

data/lib/spreadsheet/font.rb

@@ -5,8 +5,8 @@ module Spreadsheet
   ##
   # Font formatting data
   class Font
-    include Datatypes
-    include Encodings
+    include Spreadsheet::Datatypes
+    include Spreadsheet::Encodings
     attr_accessor :name
     ##
     # You can set the following boolean Font attributes

data/lib/spreadsheet/format.rb

@@ -6,8 +6,8 @@ module Spreadsheet
   ##
   # Formatting data
   class Format
-    include Encodings
-    include Datatypes
+    include Spreadsheet::Datatypes
+    include Spreadsheet::Encodings
     ##
     # You can set the following boolean attributes:
     # #cross_down::       Draws a Line from the top-left to the bottom-right

data/lib/spreadsheet/workbook.rb

@@ -11,7 +11,7 @@ module Spreadsheet
   #                   that have no format set explicitly or in
   #                   Row#default_format or Worksheet#default_format.
   class Workbook
-    include Encodings
+    include Spreadsheet::Encodings
     attr_reader :io, :worksheets, :formats, :fonts
     attr_accessor :encoding, :version, :default_format
     def initialize io = nil, opts={:default_format => Format.new}

data/lib/spreadsheet/worksheet.rb

@@ -20,7 +20,7 @@ module Spreadsheet
   #                   If you modify a Column directly, your changes will be
   #                   reflected in all those positions.
   class Worksheet
-    include Encodings
+    include Spreadsheet::Encodings
     include Enumerable
     attr_accessor :name, :workbook
     attr_reader :rows, :columns

data/test/integration.rb

@@ -1030,5 +1030,19 @@ module Spreadsheet
                    sheet.name
       assert_not_nil sheet.offset
     end
+    def test_file_comment
+      source = File.expand_path 'data/test_comment.xls', File.dirname(__FILE__)
+      book = Spreadsheet.open source
+      sheet = book.worksheet 0
+      row = sheet.row 0
+      ann = row.annotation 0
+      assert_equal 'cellcontent', row.cell(0)
+      assert_equal 'cellcomment', ann
+      assert_equal 'HW', ann.author
+      row = sheet.row 1
+      ann = row.annotation 1
+      assert_equal 'cellcontent', row.cell(1)
+      assert_equal 'annotation', ann
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spreadsheet
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.1.1
 platform: ruby
 authors: 
 - Hannes Wyss
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-17 00:00:00 +02:00
+date: 2008-10-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,6 +56,7 @@ files:
 - lib/parseexcel/parseexcel.rb
 - lib/parseexcel/parser.rb
 - lib/spreadsheet.rb
+- lib/spreadsheet/column.rb
 - lib/spreadsheet/datatypes.rb
 - lib/spreadsheet/encodings.rb
 - lib/spreadsheet/excel.rb