spreadsheet 0.9.0 → 0.9.1

data/History.md

@@ -1,3 +1,10 @@
+### 0.9.1 / 24.10.2013
+
+* Author: Matti Lehtonen <matti.lehtonen@puujaa.com>
+Date:   Thu Oct 24 09:41:50 2013 +0300
+
+* Add support for worksheet visibility
+
 ### 0.9.0 / 16.09.2013
 
 * Author: Pavel <pavel.evst@gmail.com>

data/README.md

@@ -69,7 +69,7 @@ You will get a deprecated warning about iconv when using spreadsheet with Ruby
 
 ## Examples
 
-* Have a look at the GUIDE: https://github.com/zdavatz/spreadsheet/blob/master/GUIDE.txt
+* Have a look at the GUIDE: https://github.com/zdavatz/spreadsheet/blob/master/GUIDE.md
 * Also look at: https://gist.github.com/phollyer/1214475
 
 ## Installation

data/lib/spreadsheet.rb

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

data/lib/spreadsheet/excel/internals.rb

@@ -262,6 +262,12 @@ module Internals
     :bold   => 700,
     :normal => 400,
   }
+  WORKSHEET_VISIBILITIES = {
+    0x00 => :visible,
+    0x01 => :hidden,
+    0x02 => :strong_hidden
+  }
+  SEITILIBISIV_TEEHSKROW = WORKSHEET_VISIBILITIES.invert
   LEAP_ERROR = Date.new 1900, 2, 28
   OPCODES = {
     :blank        => 0x0201, #    BLANK ➜ 6.7

data/lib/spreadsheet/excel/reader.rb

@@ -178,7 +178,7 @@ class Reader
     #      6  var.  Sheet name: BIFF5/BIFF7: Byte string,
     #                           8-bit string length (➜ 3.3)
     #                           BIFF8: Unicode string, 8-bit string length (➜ 3.4)
-    offset, _, _ = work.unpack("VC2")
+    offset, visibility, _ = work.unpack("VC2")
     name = client read_string(work[6..-1]), @workbook.encoding
     if @boundsheets
       @boundsheets[0] += 1
@@ -190,7 +190,8 @@ class Reader
     @workbook.add_worksheet Worksheet.new(:name     => name,
                                           :ole      => @book,
                                           :offset   => offset,
-                                          :reader   => self)
+                                          :reader   => self,
+                                          :visibility => WORKSHEET_VISIBILITIES[visibility])
   end
   def read_codepage work, pos, len
     codepage, _ = work.unpack 'v'

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

@@ -147,11 +147,12 @@ class Workbook < Spreadsheet::Writer
       offset += worksheet.boundsheet_size
     end
     worksheets.each do |worksheet|
+      visibility = SEITILIBISIV_TEEHSKROW[worksheet.worksheet.visibility]
       data = [
         offset,   # Absolute stream position of the BOF record of the sheet
                   # represented by this record. This field is never encrypted
                   # in protected files.
-        0x00,     # Visibility: 0x00 = Visible
+        visibility,     # Visibility: 0x00 = Visible
                   #             0x01 = Hidden
                   #             0x02 = Strong hidden (see below)
         0x00,     # Sheet type: 0x00 = Worksheet

data/lib/spreadsheet/worksheet.rb

@@ -26,9 +26,11 @@ module Spreadsheet
   #                   default.
   class Worksheet
     include Spreadsheet::Encodings
+    include Spreadsheet::Datatypes
     include Enumerable
     attr_accessor :name, :selected, :workbook, :password_hash
     attr_reader :rows, :columns, :merged_cells, :margins, :pagesetup
+    enum :visibility, :visible, :hidden, :strong_hidden
     def initialize opts={}
       @default_format = nil
       @selected = opts[:selected]
@@ -52,6 +54,7 @@ module Spreadsheet
       @merged_cells = []
       @protected = false
       @password_hash = 0
+      @visibility = opts[:visibility]
     end
     def active # :nodoc:
       warn "Worksheet#active is deprecated. Please use Worksheet#selected instead."

data/test/integration.rb

@@ -1327,6 +1327,29 @@ module Spreadsheet
       assert_equal(3.0, sheet2.margins[:left])
     end
 
+    def test_read_worksheet_visibility
+      path = File.join @data, 'test_worksheet_visibility.xls'
+      book = Spreadsheet.open path
+      assert_instance_of Excel::Workbook, book
+      assert_equal(:visible, book.worksheet(0).visibility)
+      assert_equal(:hidden, book.worksheet(1).visibility)
+    end
+
+    def test_write_worksheet_visibility
+      book = Spreadsheet::Workbook.new
+      path = File.join @var, 'test_write_worksheet_visibility.xls'
+      sheet1 = book.create_worksheet
+      sheet1.visibility = :hidden
+      sheet2 = book.create_worksheet
+      assert_nothing_raised do
+        book.write path
+      end
+      book2 = Spreadsheet.open path
+      assert_instance_of Excel::Workbook, book2
+      assert_equal(:hidden, book2.worksheet(0).visibility)
+      assert_equal(:visible, book2.worksheet(1).visibility)
+    end
+
     private
 
     # Validates the workbook's SST

metadata

@@ -1,86 +1,74 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: spreadsheet
-version: !ruby/object:Gem::Version 
-  hash: 59
+version: !ruby/object:Gem::Version
+  version: 0.9.1
   prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 0
-  version: 0.9.0
 platform: ruby
-authors: 
+authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-09-16 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
-  requirement: *id001
-  prerelease: false
+date: 2013-10-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ruby-ole
-- !ruby/object:Gem::Dependency 
-  type: :development
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 4
-        - 0
-        version: "4.0"
-  requirement: *id002
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
   name: rdoc
-- !ruby/object:Gem::Dependency 
-  type: :development
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 3
-        - 6
-        version: "3.6"
-  requirement: *id003
+      - !ruby/object:Gem::Version
+        version: '3.10'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
+- !ruby/object:Gem::Dependency
   name: hoe
-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: 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.13'
+description: ''
+email:
 - mhatakeyama@ywesee.com, zdavatz@ywesee.com
-executables: 
+executables:
 - xlsopcodes
 extensions: []
-
-extra_rdoc_files: 
-- GUIDE.md
-- History.md
+extra_rdoc_files:
 - LICENSE.txt
 - Manifest.txt
-- README.md
-files: 
+files:
 - .gitignore
 - .travis.yml
 - GUIDE.md
@@ -161,39 +149,30 @@ files:
 - test/workbook_protection.rb
 - test/worksheet.rb
 - .gemtest
-homepage: https://github.com/zdavatz/spreadsheet
+homepage: 
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
-- README.md
-require_paths: 
+- README.txt
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: spreadsheet
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: The Spreadsheet Library is designed to read and write Spreadsheet Documents
+summary: ''
 test_files: []
-