spreadsheet 0.7.2 → 0.7.3

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.7.3 / 26.06.2012
+
+* Fix Format borders
+* see https://github.com/zdavatz/spreadsheet/pull/6 for full details.
+* patches by uraki66@gmail.com
+
 === 0.7.2 / 14.06.2012
 
 * many changes by Mina Naguib <mina.git@naguib.ca>

data/README.txt

@@ -1,8 +1,8 @@
-Last Update: 07.05.2011 - Zeno R.R. Davatz
+Last Update: 26.06.2012 - Zeno R.R. Davatz
 
 = Spreadsheet
 
-http://spreadsheet.rubyforge.org
+https://github.com/zdavatz/spreadsheet
 
 The Mailing List can be found here:
 
@@ -10,7 +10,7 @@ http://groups.google.com/group/rubyspreadsheet
 
 The code can be found here:
 
-http://spreadsheet.rubyforge.org
+https://github.com/zdavatz/spreadsheet
 
 For a viewable directory of all recent changes, please see:
 
@@ -24,7 +24,6 @@ For Non-GPLv3 commercial licencing, please see:
 
 http://www.spreadsheet.ch
 
-
 == Description
 
 The Spreadsheet Library is designed to read and write Spreadsheet Documents.

data/lib/spreadsheet.rb

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

data/lib/spreadsheet/excel/internals.rb

@@ -411,6 +411,28 @@ module Internals
     :distributed => 4,
   }
   NGILA_V_FX = XF_V_ALIGN.invert
+# border line styles taken from http://www.openoffice.org/sc/excelfileformat.pdf
+	XF_BORDER_LINE_STYLES = {
+		0x00	=>	:none,
+		0x01	=>	:thin,
+		0x02	=>	:medium,
+		0x03	=>	:dashed,
+		0x04	=>	:dotted,
+		0x05	=>	:thick,
+		0x06	=>	:double,
+		0x07	=>	:hair,
+# the following are only valid for BIFF8 and higher:
+		0x08	=>	:medium_dashed,
+		0x09	=>	:thin_dash_dotted,
+		0x0a	=>	:medium_dash_dotted,
+		0x0b	=>	:thin_dash_dot_dotted,
+		0x0c	=>	:medium_dash_dot_dotted,
+		0x0d	=>	:slanted_medium_dash_dotted
+	}
+# ensure reader always gets a valid line style
+	XF_BORDER_LINE_STYLES.default = :none 
+	SELYTS_ENIL_REDROB_FX = XF_BORDER_LINE_STYLES.invert
+	SELYTS_ENIL_REDROB_FX.default = 0x00
   OPCODE_SIZE = 4
   ROW_HEIGHT = 12.1
   SST_CHUNKSIZE = 20

data/lib/spreadsheet/excel/reader.rb

@@ -1048,21 +1048,23 @@ class Reader
     fmt.indent_level = xf_indent & 0x0f
     fmt.shrink = xf_indent & 0x10 > 0
     fmt.text_direction = NOITCERID_TXET_FX[xf_indent & 0xc0]
-    fmt.left   = xf_borders & 0x0000000f > 0
-    fmt.right  = xf_borders & 0x000000f0 > 0
-    fmt.top    = xf_borders & 0x00000f00 > 0
-    fmt.bottom = xf_borders & 0x0000f000 > 0
-    fmt.left_color     = COLOR_CODES[xf_borders & 0x007f0000] || :border
-    fmt.right_color    = COLOR_CODES[xf_borders & 0x3f800000] || :border
+    fmt.left           = XF_BORDER_LINE_STYLES[xf_borders & 0x0000000f]
+    fmt.right          = XF_BORDER_LINE_STYLES[(xf_borders & 0x000000f0) >>  4]
+    fmt.top            = XF_BORDER_LINE_STYLES[(xf_borders & 0x00000f00) >>  8]
+    fmt.bottom         = XF_BORDER_LINE_STYLES[(xf_borders & 0x0000f000) >> 12]
+    fmt.left_color     = COLOR_CODES[(xf_borders & 0x007f0000) >> 16] || :black
+    fmt.right_color    = COLOR_CODES[(xf_borders & 0x3f800000) >> 23] || :black
     fmt.cross_down     = xf_borders & 0x40000000 > 0
     fmt.cross_up       = xf_borders & 0x80000000 > 0
-    fmt.top_color      = COLOR_CODES[xf_brdcolors & 0x0000007f] || :border
-    fmt.bottom_color   = COLOR_CODES[xf_brdcolors & 0x00003f80] || :border
-    fmt.diagonal_color = COLOR_CODES[xf_brdcolors & 0x001fc000] || :border
-    #fmt.diagonal_style = COLOR_CODES[xf_brdcolors & 0x01e00000]
-    fmt.pattern = xf_brdcolors & 0xfc000000
+		if xf_brdcolors
+    	fmt.top_color      = COLOR_CODES[xf_brdcolors & 0x0000007f] || :black
+    	fmt.bottom_color   = COLOR_CODES[(xf_brdcolors & 0x00003f80) >> 7] || :black
+    	fmt.diagonal_color = COLOR_CODES[(xf_brdcolors & 0x001fc000) >> 14] || :black
+    	#fmt.diagonal_style = COLOR_CODES[xf_brdcolors & 0x01e00000]
+    	fmt.pattern        = (xf_brdcolors & 0xfc000000) >> 26
+		end
     fmt.pattern_fg_color = COLOR_CODES[xf_pattern & 0x007f] || :border
-    fmt.pattern_bg_color = COLOR_CODES[xf_pattern & 0x3f80] || :pattern_bg
+    fmt.pattern_bg_color = COLOR_CODES[(xf_pattern & 0x3f80) >> 7] || :pattern_bg
     @workbook.add_format fmt
   end
   def read_sheet_protection worksheet, op, data

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

@@ -21,13 +21,22 @@ class Format < DelegateClass Spreadsheet::Format
       color_code(@format.send(key) || default)
     end
   end
+  def Format.line_style key, default
+    define_method key do
+      style_code(@format.send(key) || default)
+    end
+  end
   boolean :hidden, :locked, :merge_range, :shrink, :text_justlast, :text_wrap,
-          :cross_down, :cross_up, :left, :right, :top, :bottom
-  color :left_color,       :border
-  color :right_color,      :border
-  color :top_color,        :border
-  color :bottom_color,     :border
-  color :diagonal_color,   :border
+          :cross_down, :cross_up
+	line_style	:left, 			 :none
+	line_style	:right,			 :none
+	line_style	:top, 			 :none
+	line_style	:bottom,		 :none
+  color :left_color,       :black
+  color :right_color,      :black
+  color :top_color,        :black
+  color :bottom_color,     :black
+  color :diagonal_color,   :black
   color :pattern_fg_color, :pattern_bg
   color :pattern_bg_color, :pattern_bg
   attr_reader :format
@@ -41,6 +50,9 @@ class Format < DelegateClass Spreadsheet::Format
   def color_code color
     SEDOC_ROLOC[color]
   end
+  def style_code style
+    SELYTS_ENIL_REDROB_FX[style]
+  end
   def font_index
     @writer.font_index @workbook, font.key
   end
@@ -212,7 +224,7 @@ class Format < DelegateClass Spreadsheet::Format
     rot
   end
   def xf_type_prot type
-    type = type.to_s.downcase == 'style' ? 0xfff5 : 0x0000
+    type = type.to_s.downcase == 'style' ? 0xfff4 : 0x0000
     type |= locked
     type |= hidden << 1
     type
@@ -229,7 +241,7 @@ class Format < DelegateClass Spreadsheet::Format
     then
       atr_alc = 1
     end
-    atr_bdr = [top, bottom, left, right, cross_up, cross_down].max
+    atr_bdr = 1 
     atr_pat = 0
     if  @format.pattern_fg_color != :border \
       || @format.pattern_bg_color != :pattern_bg \

data/lib/spreadsheet/format.rb

@@ -21,16 +21,32 @@ module Spreadsheet
     # #shrink::           Shrink the contents to fit the cell.
     # #text_justlast::    Force the last line of a cell to be justified. This
     #                     probably makes sense if horizontal_align = :justify
-    # #left::             Draw a border to the left of the cell.
-    # #right::            Draw a border to the right of the cell.
-    # #top::              Draw a border at the top of the cell.
-    # #bottom::           Draw a border at the bottom of the cell.
+    # #left::             Apply a border style to the left of the cell.
+    # #right::            Apply a border style to the right of the cell.
+    # #top::              Apply a border style at the top of the cell.
+    # #bottom::           Apply a border style at the bottom of the cell.
     # #rotation_stacked:: Characters in the cell are stacked on top of each
     #                     other. Excel will ignore other rotation values if
     #                     this is set.
     boolean :cross_down, :cross_up, :hidden, :locked,
-            :merge_range, :shrink, :text_justlast, :text_wrap, :left, :right,
-            :top, :bottom, :rotation_stacked
+            :merge_range, :shrink, :text_justlast, :text_wrap,
+						:rotation_stacked
+    ##
+    # Border line styles
+    # Valid values: :none, :thin, :medium, :dashed, :dotted, :thick, 
+		#               :double, :hair, :medium_dashed, :thin_dash_dotted,
+		#               :medium_dash_dotted, :thin_dash_dot_dotted,
+		#               :medium_dash_dot_dotted, :slanted_medium_dash_dotted
+    # Default:			:none
+		styles = [ :thin, :medium, :dashed, :dotted, :thick, 
+							 :double, :hair, :medium_dashed, :thin_dash_dotted,
+							 :medium_dash_dotted, :thin_dash_dot_dotted,
+							 :medium_dash_dot_dotted, :slanted_medium_dash_dotted ]
+		enum :left,		:none, *styles
+		enum :right,	:none, *styles
+		enum :top,		:none, *styles
+		enum :bottom,	:none, *styles
+
     ##
     # Color attributes
     colors  :bottom_color, :top_color, :left_color, :right_color,
@@ -77,11 +93,11 @@ module Spreadsheet
       @number_format    = client 'GENERAL', 'UTF-8'
       @rotation         = 0
       @pattern          = 0
-      @bottom_color     = :builtin_black
-      @top_color        = :builtin_black
-      @left_color       = :builtin_black
-      @right_color      = :builtin_black
-      @diagonal_color   = :builtin_black
+      @bottom_color     = :black
+      @top_color        = :black
+      @left_color       = :black
+      @right_color      = :black
+      @diagonal_color   = :black
       @pattern_fg_color = :border
       @pattern_bg_color = :pattern_bg
       @regexes = {
@@ -116,21 +132,21 @@ module Spreadsheet
       self.vertical_align = location rescue ArgumentError
     end
     ##
-    # Returns an Array containing the status of the four borders:
+    # Returns an Array containing the line styles of the four borders:
     # bottom, top, right, left
     def border
-      [bottom,top,right,left]
+      [bottom, top, right, left]
     end
     ##
-    # Activate or deactivate all four borders (left, right, top, bottom)
-    def border=(boolean)
-      [:bottom=, :top=, :right=, :left=].each do |writer| send writer, boolean end
+    # Set same line style on all four borders at once (left, right, top, bottom)
+    def border=(style)
+      [:bottom=, :top=, :right=, :left=].each do |writer| send writer, style end
     end
     ##
     # Returns an Array containing the colors of the four borders:
     # bottom, top, right, left
     def border_color
-      [@bottom_color,@top_color,@left_color,@right_color]
+      [@bottom_color,@top_color,@right_color,@left_color]
     end
     ##
     # Set all four border colors to _color_ (left, right, top, bottom)

data/lib/spreadsheet/row.rb

@@ -65,6 +65,12 @@ module Spreadsheet
       @height = 12.1
     end
     ##
+    # The default Format of this Row, if you have set one.
+    # Returns the Worksheet's default or the Workbook's default Format otherwise.
+    def default_format
+      @default_format || @worksheet.default_format || @workbook.default_format
+    end
+    ##
     # Set the default Format used when writing a Cell if no explicit Format is
     # stored for the cell.
     def default_format= format

data/spreadsheet.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
    s.name        = "spreadsheet"
-   s.version     = "0.7.0"
+   s.version     = "0.7.3"
    s.summary     = "The Spreadsheet Library is designed to read and write Spreadsheet Documents"
    s.description = "As of version 0.6.0, only Microsoft Excel compatible spreadsheets are supported"
    s.author      = "Masaomi Hatakeyama, Zeno R.R. Davatz"

metadata

@@ -1,71 +1,86 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: spreadsheet
-version: !ruby/object:Gem::Version
-  version: 0.7.2
+version: !ruby/object:Gem::Version 
+  hash: 5
   prerelease: 
+  segments: 
+  - 0
+  - 7
+  - 3
+  version: 0.7.3
 platform: ruby
-authors:
+authors: 
 - Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-14 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-06-26 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: ruby-ole
-  requirement: &8107060 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :runtime
-  prerelease: false
-  version_requirements: *8107060
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: &8106340 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 3
+        - 10
+        version: "3.10"
   type: :development
-  prerelease: false
-  version_requirements: *8106340
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: hoe
-  requirement: &8105620 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.13'
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 2
+        - 13
+        version: "2.13"
   type: :development
-  prerelease: false
-  version_requirements: *8105620
-description: ! 'The Spreadsheet Library is designed to read and write Spreadsheet
-  Documents.
-
+  version_requirements: *id003
+description: |-
+  The Spreadsheet Library is designed to read and write Spreadsheet Documents.
   As of version 0.6.0, only Microsoft Excel compatible spreadsheets are
-
   supported. Spreadsheet is a combination/complete rewrite of the
-
   Spreadsheet::Excel Library by Daniel J. Berger and the ParseExcel Library by
-
-  Hannes Wyss. Spreadsheet can read, write and modify Spreadsheet Documents.'
-email:
+  Hannes Wyss. Spreadsheet can read, write and modify Spreadsheet Documents.
+email: 
 - mhatakeyama@ywesee.com, zdavatz@ywesee.com
-executables:
+executables: 
 - xlsopcodes
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - GUIDE.txt
 - History.txt
 - LICENSE.txt
 - Manifest.txt
 - README.txt
-files:
+files: 
 - .gitignore
 - GUIDE.txt
 - History.txt
@@ -136,30 +151,39 @@ files:
 - test/worksheet.rb
 - test/workbook_protection.rb
 - .gemtest
-homepage: http://spreadsheet.rubyforge.org
+homepage: https://github.com/zdavatz/spreadsheet
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --main
 - README.txt
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: spreadsheet
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: The Spreadsheet Library is designed to read and write Spreadsheet Documents
 test_files: []
+