spreadsheet 0.8.9 → 0.9.0

data/{README.txt → README.md}

@@ -1,6 +1,6 @@
 Last Update: 31.05.2013 - Zeno R.R. Davatz
 
-= Spreadsheet
+# Spreadsheet
 
 https://github.com/zdavatz/spreadsheet
 
@@ -24,7 +24,7 @@ For Non-GPLv3 commercial licencing, please see:
 
 http://www.spreadsheet.ch
 
-== Description
+## Description
 
 The Spreadsheet Library is designed to read and write Spreadsheet Documents.
 As of version 0.6.0, only Microsoft Excel compatible spreadsheets are
@@ -32,13 +32,13 @@ 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.
 
-== Notes from Users
+## Notes from Users
 
 Alfred: a@boxbot.org: I think it should be noted in the README file that the library doesn't
 recognize cell formats in Excel created documents, which results in
 Floats returned for any number.
 
-== What's new?
+## What's new?
 
 * Supported outline (grouping) functions
 * Significantly improved memory-efficiency when reading large Excel Files
@@ -46,7 +46,7 @@ Floats returned for any number.
 * Improved handling of String Encodings
 
 
-== On the Roadmap
+## On the Roadmap
 
 * Improved Format support/Styles
 * Document Modification: Formats/Styles
@@ -61,22 +61,22 @@ Note: Spreadsheet supports Ruby 1.8.6, 1.8.7, 1.9.2, 1.9.3
 You will get a deprecated warning about iconv when using spreadsheet with Ruby
 1.9.3. So replacing iconv is on the Roadmap as well ;).
 
-== Dependencies
+## Dependencies
 
 * ruby 1.8
 * ruby-ole [ http://code.google.com/p/ruby-ole/ ]
 
 
-== Examples
+## Examples
 
-Have a look at the GUIDE[link://files/GUIDE_txt.html].
-Also look at: https://gist.github.com/phollyer/1214475
+* Have a look at the GUIDE: https://github.com/zdavatz/spreadsheet/blob/master/GUIDE.txt
+* Also look at: https://gist.github.com/phollyer/1214475
 
-== Installation
+## Installation
 
 Using RubyGems [ http://www.rubygems.org ]:
 
-* sudo gem install spreadsheet
+* `sudo gem install spreadsheet`
 
 If you don't like RubyGems[http://www.rubygems.org], let me know which
 installation solution you prefer and I'll include it in the future.
@@ -84,22 +84,22 @@ installation solution you prefer and I'll include it in the future.
 If you can use 'rake' and 'hoe' library is also installed, you can 
 build a gem package as follows:
 
-* rake gem 
+* `rake gem`
 
 The gem package is built in pkg directory.
 
-== Testing
+## Testing
 
 Bundler support added.
 Running tests:
-* bundle install
+* `bundle install`
 * ./test/suite.rb
 
-== Code Status
+## TravisCI 
 
-* TravisCI [ https://travis-ci.org/zdavatz/spreadsheet ]
+* https://travis-ci.org/zdavatz/spreadsheet
 
-== Authors
+## Authors
 
 Original Code:
 
@@ -113,7 +113,7 @@ New Code:
 Copyright (c) 2010 ywesee GmbH (mhatakeyama@ywesee.com, zdavatz@ywesee.com)
 
 
-== License
+## License
 
 This library is distributed under the GPLv3.
 Please see the LICENSE[link://files/LICENSE_txt.html] file.

data/bin/xlsopcodes

@@ -1,18 +1,16 @@
 #!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'xlsopcodes' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
 
-require 'spreadsheet'
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
 
-source, target = ARGV
+require 'rubygems'
+require 'bundler/setup'
 
-if source.nil?
-  puts "Usage: #{$0} <source> [<target>]"
-  exit -1
-end
-
-target = target ? File.open(target, 'w') : STDOUT
-
-reader = Spreadsheet::Excel::Reader.new :print_opcodes => target
-reader.setup File.open(source)
-
-while tuple = reader.get_next_chunk
-end
+load Gem.bin_path('spreadsheet', 'xlsopcodes')

data/lib/spreadsheet.rb

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

data/lib/spreadsheet/excel/internals.rb

@@ -162,6 +162,7 @@ module Internals
     :labelsst   => 'v3V',
     :number     => "v3#{EIGHT_BYTE_DOUBLE}",
     :pagesetup  => "v8#{EIGHT_BYTE_DOUBLE}2v",
+    :margin     => "#{EIGHT_BYTE_DOUBLE}",
     :rk         => 'v3V',
     :row        => 'v4x4V',
     :window2    => 'v4x2v2x4',

data/lib/spreadsheet/excel/reader.rb

@@ -866,6 +866,16 @@ class Reader
         read_merged_cells worksheet, work, pos, len
       when :protect, :password
         read_sheet_protection worksheet, op, work
+      when :pagesetup
+        read_pagesetup(worksheet, work, pos, len)
+      when :leftmargin
+        worksheet.margins[:left] = work.unpack(binfmt(:margin))[0]
+      when :rightmargin
+        worksheet.margins[:right] = work.unpack(binfmt(:margin))[0]
+      when :topmargin
+        worksheet.margins[:top] = work.unpack(binfmt(:margin))[0]
+      when :bottommargin
+        worksheet.margins[:bottom] = work.unpack(binfmt(:margin))[0]
       else
         if ROW_BLOCK_OPS.include?(op)
           set_missing_row_address worksheet, work, pos, len
@@ -874,6 +884,17 @@ class Reader
       previous = op
     end
   end
+
+  def read_pagesetup(worksheet, work, pos, len)
+    worksheet.pagesetup.delete_if { true }
+    data = work.unpack(binfmt(:pagesetup))
+    worksheet.pagesetup[:orientation] = data[5] == 0 ? :landscape : :portrait
+    worksheet.pagesetup[:adjust_to] = data[1]
+
+    worksheet.pagesetup[:orig_data] = data
+    # TODO: add options acording to specification
+  end
+
   def read_guts worksheet, work, pos, len
     # Offset Size Contents
     #      0    2 Width of the area to display row outlines (left of the sheet), in pixel

data/lib/spreadsheet/excel/worksheet.rb

@@ -30,6 +30,14 @@ class Worksheet < Spreadsheet::Worksheet
   def date_base
     @workbook.date_base
   end
+  def margins
+    ensure_rows_read
+    super
+  end
+  def pagesetup
+    ensure_rows_read
+    super
+  end
   def each *args
     ensure_rows_read
     super

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

@@ -313,6 +313,8 @@ and minimal code that generates this warning. Thanks!
     # but these below are not necessary to run
     # if [Row|Column]#hidden? = false and [Row|Column]#outline_level == 0
     write_merged_cells
+    write_pagesetup
+    write_margins
     write_colinfos
     write_guts
 
@@ -498,6 +500,8 @@ and minimal code that generates this warning. Thanks!
     # ○  PHONETIC ➜ 5.77
     # ○  Conditional Formatting Table ➜ 4.12
     # ○  Hyperlink Table ➜ 4.13
+    write_pagesetup
+    write_margins
     write_hyperlink_table
     # ○  Data Validity Table ➜ 4.14
     # ○  SHEETLAYOUT ➜ 5.96 (BIFF8X only)
@@ -860,6 +864,27 @@ and minimal code that generates this warning. Thanks!
     end
   end
 
+  def write_pagesetup
+    return unless @worksheet.pagesetup
+    data = @worksheet.pagesetup[:orig_data].dup
+    if @worksheet.pagesetup[:orientation]
+      data[5] = @worksheet.pagesetup[:orientation] == :landscape ? 0 : 2
+    end
+
+    if @worksheet.pagesetup[:adjust_to]
+      data[1] = @worksheet.pagesetup[:adjust_to]
+    end
+
+    write_op opcode(:pagesetup), data.pack(binfmt(:pagesetup))
+  end
+
+  def write_margins
+    @worksheet.margins.each do |key, value|
+      next unless [:left, :top, :right, :bottom].include?(key)
+      write_op opcode(:"#{key}margin"), [value].pack(binfmt(:margin))
+    end
+  end
+
   def write_proctection
     return unless @worksheet.protected?
     # ○ PROTECT Worksheet contents: 1 = protected (➜ 5.82)

data/lib/spreadsheet/workbook.rb

@@ -50,6 +50,11 @@ module Spreadsheet
       worksheet
     end
     ##
+    # Delete a Worksheet from Workbook by it's index
+    def delete_worksheet worksheet_index
+      @worksheets.delete_at worksheet_index
+    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) }

data/lib/spreadsheet/worksheet.rb

@@ -28,11 +28,22 @@ module Spreadsheet
     include Spreadsheet::Encodings
     include Enumerable
     attr_accessor :name, :selected, :workbook, :password_hash
-    attr_reader :rows, :columns, :merged_cells
+    attr_reader :rows, :columns, :merged_cells, :margins, :pagesetup
     def initialize opts={}
       @default_format = nil
       @selected = opts[:selected]
       @dimensions = [0,0,0,0]
+      @pagesetup = {
+        :orig_data => [9, 100, 1, 1, 1, 0, 300, 300, 0.5, 0.5, 1],
+        :orientation => :portrait,
+        :adjust_to => 100
+      }
+      @margins = {
+        :top => 1,
+        :left => 0.75,
+        :right => 0.75,
+        :bottom => 1
+      }
       @name = opts[:name] || 'Worksheet'
       @workbook = opts[:workbook]
       @rows = []

data/spreadsheet.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
    s.name        = "spreadsheet"
-   s.version     = "0.8.6"
+   s.version     = "0.8.9"
    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"
@@ -14,6 +14,6 @@ spec = Gem::Specification.new do |s|
    s.add_dependency "ruby-ole"
    s.add_development_dependency "hoe"
 
-   s.homepage	 = "http://scm.ywesee.com/?p=spreadsheet/.git;a=summary"
+   s.homepage	 = "https://github.com/zdavatz/spreadsheet/"
 end
 

data/test/integration.rb

@@ -1280,6 +1280,53 @@ module Spreadsheet
       temp_file.unlink
     end
 
+    def test_read_pagesetup
+      path = File.join @data, 'test_pagesetup.xls'
+      book = Spreadsheet.open path
+      assert_instance_of Excel::Workbook, book
+      sheet = book.worksheet(0)
+      assert_equal(:landscape, sheet.pagesetup[:orientation])
+      assert_equal(130, sheet.pagesetup[:adjust_to])
+    end
+
+    def test_write_pagesetup
+      book = Spreadsheet::Workbook.new
+      path = File.join @var, 'test_write_pagesetup.xls'
+      sheet1 = book.create_worksheet
+      sheet1.pagesetup[:orientation] = :landscape
+      sheet1.pagesetup[:adjust_to] = 93
+      assert_nothing_raised do
+        book.write path
+      end
+      book2 = Spreadsheet.open path
+      assert_instance_of Excel::Workbook, book2
+      sheet2 = book2.worksheet(0)
+      assert_equal(:landscape, sheet2.pagesetup[:orientation])
+      assert_equal(93, sheet2.pagesetup[:adjust_to])
+    end
+
+    def test_read_margins
+      path = File.join @data, 'test_margin.xls'
+      book = Spreadsheet.open path
+      assert_instance_of Excel::Workbook, book
+      sheet = book.worksheet(0)
+      assert_equal(2.0, sheet.margins[:left])
+    end
+
+    def test_write_margins
+      book = Spreadsheet::Workbook.new
+      path = File.join @var, 'test_write_margins.xls'
+      sheet1 = book.create_worksheet
+      sheet1.margins[:left] = 3
+      assert_nothing_raised do
+        book.write path
+      end
+      book2 = Spreadsheet.open path
+      assert_instance_of Excel::Workbook, book2
+      sheet2 = book2.worksheet(0)
+      assert_equal(3.0, sheet2.margins[:left])
+    end
+
     private
 
     # Validates the workbook's SST

data/test/workbook.rb

@@ -40,5 +40,16 @@ module Spreadsheet
       @book.add_format f2
       assert_equal 3, @book.formats.length # Rejected duplicate insertion
     end
+
+    def test_delete_worksheet
+      original_count = @book.sheet_count
+      @sheet = @book.create_worksheet
+      changed_count = @book.sheet_count
+      @book.delete_worksheet(@book.sheet_count - 1)
+
+      assert_equal(changed_count, original_count + 1)
+      assert_equal(original_count, @book.sheet_count)
+    end
+
   end
 end

metadata

@@ -1,95 +1,95 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: spreadsheet
-version: !ruby/object:Gem::Version
-  version: 0.8.9
+version: !ruby/object:Gem::Version 
+  hash: 59
   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-08-24 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: ruby-ole
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.0'
+
+date: 2013-09-16 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  requirement: *id001
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
-- !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: !ruby/object:Gem::Requirement
+  name: ruby-ole
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.13'
-  type: :development
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 4
+        - 0
+        version: "4.0"
+  requirement: *id002
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  name: rdoc
+- !ruby/object:Gem::Dependency 
+  type: :development
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.13'
-description: ! 'The Spreadsheet Library is designed to read and write Spreadsheet
-  Documents.
-
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 3
+        - 6
+        version: "3.6"
+  requirement: *id003
+  prerelease: false
+  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:
+  Hannes Wyss. Spreadsheet can read, write and modify Spreadsheet Documents.
+email: 
 - mhatakeyama@ywesee.com, zdavatz@ywesee.com
-executables:
+executables: 
 - xlsopcodes
 extensions: []
-extra_rdoc_files:
-- GUIDE.txt
-- History.txt
+
+extra_rdoc_files: 
+- GUIDE.md
+- History.md
 - LICENSE.txt
 - Manifest.txt
-- README.txt
-files:
+- README.md
+files: 
 - .gitignore
 - .travis.yml
-- GUIDE.txt
+- GUIDE.md
 - Gemfile
 - Gemfile.lock
-- History.txt
+- History.md
 - LICENSE.txt
 - Manifest.txt
-- README.txt
+- README.md
 - Rakefile
 - bin/xlsopcodes
 - lib/parseexcel.rb
@@ -139,9 +139,11 @@ files:
 - test/data/test_empty.xls
 - test/data/test_formula.xls
 - test/data/test_long_sst_record.xls
+- test/data/test_margin.xls
 - test/data/test_merged_and_protected.xls
 - test/data/test_merged_cells.xls
 - test/data/test_missing_row.xls
+- test/data/test_pagesetup.xls
 - test/data/test_version_excel5.xls
 - test/data/test_version_excel95.xls
 - test/data/test_version_excel97.xls
@@ -161,28 +163,37 @@ files:
 - .gemtest
 homepage: https://github.com/zdavatz/spreadsheet
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --main
-- README.txt
-require_paths:
+- README.md
+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.25
 signing_key: 
 specification_version: 3
 summary: The Spreadsheet Library is designed to read and write Spreadsheet Documents
 test_files: []
+