spreadsheet 0.6.9 → 0.7.0

data/History.txt

@@ -1,3 +1,13 @@
+=== 0.7.0 / 07.05.2012
+
+* Author: Artem Ignatiev <zazubrik@gmail.com>
+* use both ruby 1.8 and 1.9 compatible way of getting character code when hashing
+* Fix syntax for ruby-1.9
+* return gemspec so that bundler can find it
+  When bundler loads gemspec, it evaluates it, and if the return value is 
+  not a gem specification built, refuses to load the gem.
+* Testing worksheet protection
+
 === 0.6.9 / 28.04.2012
 
 * Yield is more simple here too.

data/lib/spreadsheet.rb

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

data/lib/spreadsheet/excel/reader.rb

@@ -866,6 +866,8 @@ class Reader
         read_window2 worksheet, work, pos, len
       when :mergedcells # ○○ MERGEDCELLS	➜ 5.67
         read_merged_cells worksheet, work, pos, len
+      when :protect, :password
+        read_sheet_protection worksheet, op, work
       else
         if ROW_BLOCK_OPS.include?(op)
           set_missing_row_address worksheet, work, pos, len
@@ -1063,6 +1065,14 @@ class Reader
     fmt.pattern_bg_color = COLOR_CODES[xf_pattern & 0x3f80] || :pattern_bg
     @workbook.add_format fmt
   end
+  def read_sheet_protection worksheet, op, data
+    case op
+    when :protect
+      worksheet.protect! if data.unpack('v').first == 1
+    when :password
+      worksheet.password_hash = data.unpack('v').first
+    end
+  end
   def set_cell worksheet, row, column, xf, value=nil
     cells = @current_row_block[[worksheet, row]] ||= Row.new(nil, row)
     cells.formats[column] = @workbook.format(xf) unless xf == 0

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

@@ -471,6 +471,7 @@ and minimal code that generates this warning. Thanks!
     write_wsbool
     # ○  Page Settings Block ➜ 4.4
     # ○  Worksheet Protection Block ➜ 4.18
+    write_proctection
     # ○  DEFCOLWIDTH ➜ 5.32
     write_defcolwidth
     # ○○ COLINFO ➜ 5.18
@@ -856,6 +857,16 @@ and minimal code that generates this warning. Thanks!
     end
   end
 
+  def write_proctection
+    return unless @worksheet.protected?
+    # ○ PROTECT Worksheet contents: 1 = protected (➜ 5.82)
+    write_op opcode(:protect), [1].pack('v')
+    # ○ OBJECTPROTECT Embedded objects: 1 = protected (➜ 5.72)
+    # ○ SCENPROTECT Scenarios: 1 = protected (➜ 5.91)
+    # ○ PASSWORD Hash value of the password; 0 = no password (➜ 5.76)
+    write_op opcode(:password), [@worksheet.password_hash].pack('v')
+  end
+
   def write_wsbool
     bits = [
          #   Bit  Mask    Contents

data/lib/spreadsheet/worksheet.rb

@@ -2,6 +2,7 @@ require 'date'
 require 'spreadsheet/column'
 require 'spreadsheet/encodings'
 require 'spreadsheet/row'
+require 'spreadsheet/excel/password_hash'
 
 module Spreadsheet
   ##
@@ -26,7 +27,7 @@ module Spreadsheet
   class Worksheet
     include Spreadsheet::Encodings
     include Enumerable
-    attr_accessor :name, :selected, :workbook
+    attr_accessor :name, :selected, :workbook, :password_hash
     attr_reader :rows, :columns, :merged_cells
     def initialize opts={}
       @default_format = nil
@@ -38,6 +39,8 @@ module Spreadsheet
       @columns = []
       @links = {}
       @merged_cells = []
+      @protected = false
+      @password_hash = 0
     end
     def active # :nodoc:
       warn "Worksheet#active is deprecated. Please use Worksheet#selected instead."
@@ -92,6 +95,23 @@ module Spreadsheet
       add_format format
       format
     end
+    ##
+    # Is the worksheet protected?
+    def protected?
+      @protected
+    end
+    ##
+    # Set worklist protection
+    def protect! password = ''
+      @protected = true
+      password = password.to_s
+      if password.size == 0
+        @password_hash = 0
+      else
+        @password_hash = Excel::Password.password_hash password
+      end
+    end
+
     ##
     # Dimensions:: [ first used row, first unused row,
     #              first used column, first unused column ]

data/spreadsheet.gemspec

@@ -3,7 +3,7 @@ require "rake"
 
 spec = Gem::Specification.new do |s|
    s.name        = "spreadsheet"
-   s.version     = "0.6.7"
+   s.version     = "0.7.0"
    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"
@@ -19,4 +19,6 @@ end
 if $0 == __FILE__
    Gem.manage_gems
    Gem::Builder.new(spec).build
+else
+  spec
 end

data/test/integration.rb

@@ -1310,6 +1310,32 @@ module Spreadsheet
         book.write StringIO.new("", "w+") 
       end
     end
+
+    def test_read_protected_sheet
+      path = File.join @data, "test_merged_and_protected.xls"
+      book = Spreadsheet.open path
+      sheet = book.worksheet(0)
+      sheet.ensure_rows_read # FIXME HACK
+      assert sheet.protected?, "Expected sheet to be protected"
+      assert_equal Spreadsheet::Excel::Password.password_hash('testing'), sheet.password_hash
+    end
+
+    def test_write_protected_sheet
+      path = File.join @var, 'test_protected.xls'
+      book = Spreadsheet::Workbook.new
+      sheet = book.create_worksheet
+      sheet.protect! 'secret'
+      assert_nothing_raised do
+        book.write path
+      end
+
+      read_back = Spreadsheet.open path
+      sheet = read_back.worksheet(0)
+      sheet.ensure_rows_read # FIXME HACK
+      assert sheet.protected?, "Expected sheet to be proteced"
+      assert_equal Spreadsheet::Excel::Password.password_hash('secret'), sheet.password_hash
+    end
+
 =begin
     def test_read_baltic
       path = File.join @data, 'test_baltic.xls'

metadata

@@ -1,86 +1,71 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: spreadsheet
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 0.7.0
   prerelease: 
-  segments: 
-  - 0
-  - 6
-  - 9
-  version: 0.6.9
 platform: ruby
-authors: 
+authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-28 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ruby-ole
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &11528100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *11528100
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &11525080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 10
-        version: "3.10"
+      - !ruby/object:Gem::Version
+        version: '3.10'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *11525080
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &11523960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 2
-        - 13
-        version: "2.13"
+      - !ruby/object:Gem::Version
+        version: '2.13'
   type: :development
-  version_requirements: *id003
-description: |-
-  The Spreadsheet Library is designed to read and write Spreadsheet Documents.
+  prerelease: false
+  version_requirements: *11523960
+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
@@ -150,37 +135,28 @@ files:
 - .gemtest
 homepage: http://spreadsheet.rubyforge.org
 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 
-      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.15
 signing_key: 
 specification_version: 3
 summary: The Spreadsheet Library is designed to read and write Spreadsheet Documents
 test_files: []
-