roo 1.12.0 → 1.12.1

data/CHANGELOG

@@ -1,4 +1,14 @@
-== 1.12.0 (unreleased)
+== 1.12.1 2013-08-18
+
+* 1 enhancement
+  * Support :boolean fields for CSV export via #cell_to_csv. #59
+
+* 2 bugfixes
+  * Fix that Excelx would error on files with gaps in the numbering of their
+  internal sheet#.xml files. #58
+  * Fix that Base#info to preserve the original value of #default_sheet. #44
+
+== 1.12.0 2013-08-18
 
 * 3 deprecations
   * Rename Openoffice -> OpenOffice, Libreoffice -> LibreOffice, Csv -> CSV, and redirect the old names to the new constants
@@ -6,13 +16,13 @@
   * Roo's roo_rails_helper, aka the `spreadsheet` html-generating view method is currently deprecated with no replacement. If you find it helpful, tell http://github.com/Empact or extract it yourself.
 
 * 9 enhancements
-  * Add Roo::Excelx#load_xml so that people can customize to their data, e.g. https://github.com/Empact/roo/pull/23
+  * Add Roo::Excelx#load_xml so that people can customize to their data, e.g. #23
   * Enable passing csv_options to Roo::CSV, which are passed through to the underlying CSV call.
   * Enable passing options through from Roo::Spreadsheet to any Roo type.
-  * Enable passing an :extension option to Roo::Spreadsheet.new, which will override the extension detected on in the path https://github.com/Empact/roo/pull/15
-  * Switch from google-spreadsheet-ruby to google_drive for Roo::Google access https://github.com/Empact/roo/pull/40
+  * Enable passing an :extension option to Roo::Spreadsheet.new, which will override the extension detected on in the path #15
+  * Switch from google-spreadsheet-ruby to google_drive for Roo::Google access #40
   * Make all the classes consistent in that #read_cells is only effective if the sheet has not been read.
-  * Roo::Google supports login via oauth :access_token. https://github.com/Empact/roo/pull/61
+  * Roo::Google supports login via oauth :access_token. #61
   * Roo::Excel now exposes its Spreadsheet workbook via #workbook
   * Pull #load_xml down into Roo::Base, and use it in Excel2003XML and OpenOffice.
 
@@ -21,30 +31,29 @@
   * Base#longest_sheet was moved to Excel, as it only worked under Excel
 
 * 1 bugfix
-  * Fix that Roo::CSV#parse(headers: true) would blow up. https://github.com/Empact/roo/pull/37
+  * Fix that Roo::CSV#parse(headers: true) would blow up. #37
 
 == 1.11.2 2013-04-10
 
 * 4 bugfixes
   * Fix that Roo::Spreadsheet.open wasn't tolerant to case differences.
-  * Fix that Roo::Excel2003XML loading was broken https://github.com/Empact/roo/pull/27
-  * Enable loading Roo::Csv files from uris, just as other file types https://github.com/Empact/roo/pull/31
+  * Fix that Roo::Excel2003XML loading was broken #27
+  * Enable loading Roo::Csv files from uris, just as other file types #31
   * Fix that Excelx "m/d/yy h:mm" was improperly being interpreted as date rather
-    than datetime https://github.com/Empact/roo/pull/29
+    than datetime #29
 
 == 1.11.1 2013-03-18
 
 * 1 bugfix
   * Exclude test/log/roo.log test log file from the gemspec in order to avoid a
-    rubygems warning: https://github.com/Empact/roo/pull/26
+    rubygems warning: #26
 
 == 1.11.0 2013-03-14
 
 * 3 enhancements
-  * Support ruby 2.0.0 by replacing Iconv with String#encode
-    https://github.com/Empact/roo/pull/19
+  * Support ruby 2.0.0 by replacing Iconv with String#encode #19
   * Excelx: Loosen the format detection rules such that more are
-    successfully detected https://github.com/Empact/roo/pull/20
+    successfully detected #20
   * Delete the roo binary, which was useless and not declared in the gemspec
 
 * 1 change
@@ -53,7 +62,7 @@
 == 1.10.3 2013-03-03
 
 * 1 bugfix
-  * Support both nokogiri 1.5.5 and 1.5.6 (Karsten Richter) https://github.com/Empact/roo/pull/18
+  * Support both nokogiri 1.5.5 and 1.5.6 (Karsten Richter) #18
 
 * 1 enhancement
   * Relax our nokogiri dependency back to 1.4.0, as we have no particular reason

data/README.markdown

@@ -26,6 +26,7 @@ While Roo is licensed under the MIT / Expat license, please note that the 'sprea
 
 ## Usage:
 
+```ruby
 require 'roo'
 
 s = Roo::OpenOffice.new("myspreadsheet.ods")      # loads an OpenOffice Spreadsheet
@@ -69,10 +70,6 @@ s.font(1,1).italic?
 s.font(1,1).underline?
 
 
-see http://roo.rubyforge.org for a more complete tutorial
-
-# Fork Changelog / New Features
-
 # Spreadsheet.open can accept both files and paths
 
 xls = Roo::Spreadsheet.open('./new_prices.xls')
@@ -126,4 +123,4 @@ xls.parse(:clean => true)
 # thousands and thousands of blank lines. i got fed up after watching my computer
 # nearly catch fire for 4 hours for a spreadsheet with only 200 ACTUAL lines
 # - located in lib/roo/worksheet.rb
-
+```

data/Rakefile

@@ -10,7 +10,6 @@ Jeweler::Tasks.new do |gem|
   gem.authors = ['Thomas Preymesser', 'Hugh McGowan', 'Ben Woosley']
 
   gem.license = 'MIT'
-  gem.rubyforge_project = 'roo'
   gem.required_ruby_version = '>= 1.9.0'
 
   gem.test_files = FileList["{spec,test}/**/*.*"]

data/VERSION

@@ -1 +1 @@
-1.12.0
+1.12.1

data/lib/roo.rb

@@ -1,6 +1,6 @@
 module Roo
 
-  VERSION = '1.12.0'
+  VERSION = '1.12.1'
 
   def self.const_missing(const_name)
     case const_name

data/lib/roo/base.rb

@@ -310,25 +310,27 @@ class Roo::Base
   # returns information of the spreadsheet document and all sheets within
   # this document.
   def info
-    result = "File: #{File.basename(@filename)}\n"+
-      "Number of sheets: #{sheets.size}\n"+
-      "Sheets: #{sheets.join(', ')}\n"
-    n = 1
-    sheets.each {|sheet|
-      self.default_sheet = sheet
-      result << "Sheet " + n.to_s + ":\n"
-      unless first_row
-        result << "  - empty -"
-      else
-        result << "  First row: #{first_row}\n"
-        result << "  Last row: #{last_row}\n"
-        result << "  First column: #{Roo::Base.number_to_letter(first_column)}\n"
-        result << "  Last column: #{Roo::Base.number_to_letter(last_column)}"
-      end
-      result << "\n" if sheet != sheets.last
-      n += 1
-    }
-    result
+    without_changing_default_sheet do
+      result = "File: #{File.basename(@filename)}\n"+
+        "Number of sheets: #{sheets.size}\n"+
+        "Sheets: #{sheets.join(', ')}\n"
+      n = 1
+      sheets.each {|sheet|
+        self.default_sheet = sheet
+        result << "Sheet " + n.to_s + ":\n"
+        unless first_row
+          result << "  - empty -"
+        else
+          result << "  First row: #{first_row}\n"
+          result << "  Last row: #{last_row}\n"
+          result << "  First column: #{Roo::Base.number_to_letter(first_column)}\n"
+          result << "  Last column: #{Roo::Base.number_to_letter(last_column)}"
+        end
+        result << "\n" if sheet != sheets.last
+        n += 1
+      }
+      result
+    end
   end
 
   # returns an XML representation of all sheets of a spreadsheet file
@@ -539,6 +541,13 @@ class Roo::Base
 
   private
 
+  def without_changing_default_sheet
+    original_default_sheet = default_sheet
+    yield
+  ensure
+    self.default_sheet = original_default_sheet
+  end
+
   def reinitialize
     initialize(@filename)
   end
@@ -732,6 +741,8 @@ class Roo::Base
         unless onecell.empty?
           %{"#{onecell.gsub(/"/,'""')}"}
         end
+      when :boolean
+        %{"#{onecell.gsub(/"/,'""').downcase}"}
       when :float, :percentage
         if onecell == onecell.to_i
           onecell.to_i.to_s

data/lib/roo/excelx.rb

@@ -97,10 +97,10 @@ class Roo::Excelx < Roo::Base
         @styles_doc = load_xml(File.join(tmpdir, 'roo_styles.xml'))
         read_styles(@styles_doc)
       end
-      @sheet_doc = @sheet_files.map do |item|
+      @sheet_doc = @sheet_files.compact.map do |item|
         load_xml(item)
       end
-      @comments_doc = @comments_files.map do |item|
+      @comments_doc = @comments_files.compact.map do |item|
         load_xml(item)
       end
     end

data/roo.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "roo"
-  s.version = "1.12.0"
+  s.version = "1.12.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Preymesser", "Hugh McGowan", "Ben Woosley"]
@@ -72,6 +72,7 @@ Gem::Specification.new do |s|
     "test/files/bbu.xml",
     "test/files/bode-v1.ods.zip",
     "test/files/bode-v1.xls.zip",
+    "test/files/boolean.csv",
     "test/files/boolean.ods",
     "test/files/boolean.xls",
     "test/files/boolean.xlsx",
@@ -80,6 +81,7 @@ Gem::Specification.new do |s|
     "test/files/borders.xls",
     "test/files/borders.xlsx",
     "test/files/borders.xml",
+    "test/files/bug-numbered-sheet-names.xlsx",
     "test/files/bug-row-column-fixnum-float.xls",
     "test/files/bug-row-column-fixnum-float.xml",
     "test/files/comments.ods",
@@ -171,10 +173,9 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.0")
-  s.rubyforge_project = "roo"
   s.rubygems_version = "1.8.24"
   s.summary = "Roo can access the contents of various spreadsheet files."
-  s.test_files = ["spec/fixtures/vcr_cassettes/google_drive.yml", "spec/fixtures/vcr_cassettes/google_drive_access_token.yml", "spec/lib/roo/base_spec.rb", "spec/lib/roo/csv_spec.rb", "spec/lib/roo/excel2003xml_spec.rb", "spec/lib/roo/excel_spec.rb", "spec/lib/roo/excelx/format_spec.rb", "spec/lib/roo/excelx_spec.rb", "spec/lib/roo/google_spec.rb", "spec/lib/roo/libreoffice_spec.rb", "spec/lib/roo/openoffice_spec.rb", "spec/lib/roo/spreadsheet_spec.rb", "spec/spec_helper.rb", "test/all_ss.rb", "test/files/1900_base.xls", "test/files/1900_base.xlsx", "test/files/1904_base.xls", "test/files/1904_base.xlsx", "test/files/bad_excel_date.xls", "test/files/bbu.ods", "test/files/bbu.xls", "test/files/bbu.xlsx", "test/files/bbu.xml", "test/files/Bibelbund.csv", "test/files/Bibelbund.ods", "test/files/Bibelbund.xls", "test/files/Bibelbund.xlsx", "test/files/Bibelbund.xml", "test/files/Bibelbund1.ods", "test/files/bode-v1.ods.zip", "test/files/bode-v1.xls.zip", "test/files/boolean.ods", "test/files/boolean.xls", "test/files/boolean.xlsx", "test/files/boolean.xml", "test/files/borders.ods", "test/files/borders.xls", "test/files/borders.xlsx", "test/files/borders.xml", "test/files/bug-row-column-fixnum-float.xls", "test/files/bug-row-column-fixnum-float.xml", "test/files/comments.ods", "test/files/comments.xls", "test/files/comments.xlsx", "test/files/csvtypes.csv", "test/files/datetime.ods", "test/files/datetime.xls", "test/files/datetime.xlsx", "test/files/datetime.xml", "test/files/datetime_floatconv.xls", "test/files/datetime_floatconv.xml", "test/files/dreimalvier.ods", "test/files/emptysheets.ods", "test/files/emptysheets.xls", "test/files/emptysheets.xlsx", "test/files/emptysheets.xml", "test/files/excel2003.xml", "test/files/false_encoding.xls", "test/files/false_encoding.xml", "test/files/formula.ods", "test/files/formula.xls", "test/files/formula.xlsx", "test/files/formula.xml", "test/files/formula_parse_error.xls", "test/files/formula_parse_error.xml", "test/files/formula_string_error.xlsx", "test/files/html-escape.ods", "test/files/matrix.ods", "test/files/matrix.xls", "test/files/named_cells.ods", "test/files/named_cells.xls", "test/files/named_cells.xlsx", "test/files/no_spreadsheet_file.txt", "test/files/numbers1.csv", "test/files/numbers1.ods", "test/files/numbers1.xls", "test/files/numbers1.xlsx", "test/files/numbers1.xml", "test/files/only_one_sheet.ods", "test/files/only_one_sheet.xls", "test/files/only_one_sheet.xlsx", "test/files/only_one_sheet.xml", "test/files/paragraph.ods", "test/files/paragraph.xls", "test/files/paragraph.xlsx", "test/files/paragraph.xml", "test/files/Pfand_from_windows_phone.xlsx", "test/files/prova.xls", "test/files/ric.ods", "test/files/simple_spreadsheet.ods", "test/files/simple_spreadsheet.xls", "test/files/simple_spreadsheet.xlsx", "test/files/simple_spreadsheet.xml", "test/files/simple_spreadsheet_from_italo.ods", "test/files/simple_spreadsheet_from_italo.xls", "test/files/simple_spreadsheet_from_italo.xml", "test/files/so_datetime.csv", "test/files/style.ods", "test/files/style.xls", "test/files/style.xlsx", "test/files/style.xml", "test/files/time-test.csv", "test/files/time-test.ods", "test/files/time-test.xls", "test/files/time-test.xlsx", "test/files/time-test.xml", "test/files/type_excel.ods", "test/files/type_excel.xlsx", "test/files/type_excelx.ods", "test/files/type_excelx.xls", "test/files/type_openoffice.xls", "test/files/type_openoffice.xlsx", "test/files/whitespace.ods", "test/files/whitespace.xls", "test/files/whitespace.xlsx", "test/files/whitespace.xml", "test/rm_sub_test.rb", "test/rm_test.rb", "test/test_generic_spreadsheet.rb", "test/test_helper.rb", "test/test_roo.rb"]
+  s.test_files = ["spec/fixtures/vcr_cassettes/google_drive.yml", "spec/fixtures/vcr_cassettes/google_drive_access_token.yml", "spec/lib/roo/base_spec.rb", "spec/lib/roo/csv_spec.rb", "spec/lib/roo/excel2003xml_spec.rb", "spec/lib/roo/excel_spec.rb", "spec/lib/roo/excelx/format_spec.rb", "spec/lib/roo/excelx_spec.rb", "spec/lib/roo/google_spec.rb", "spec/lib/roo/libreoffice_spec.rb", "spec/lib/roo/openoffice_spec.rb", "spec/lib/roo/spreadsheet_spec.rb", "spec/spec_helper.rb", "test/all_ss.rb", "test/files/1900_base.xls", "test/files/1900_base.xlsx", "test/files/1904_base.xls", "test/files/1904_base.xlsx", "test/files/bad_excel_date.xls", "test/files/bbu.ods", "test/files/bbu.xls", "test/files/bbu.xlsx", "test/files/bbu.xml", "test/files/Bibelbund.csv", "test/files/Bibelbund.ods", "test/files/Bibelbund.xls", "test/files/Bibelbund.xlsx", "test/files/Bibelbund.xml", "test/files/Bibelbund1.ods", "test/files/bode-v1.ods.zip", "test/files/bode-v1.xls.zip", "test/files/boolean.csv", "test/files/boolean.ods", "test/files/boolean.xls", "test/files/boolean.xlsx", "test/files/boolean.xml", "test/files/borders.ods", "test/files/borders.xls", "test/files/borders.xlsx", "test/files/borders.xml", "test/files/bug-numbered-sheet-names.xlsx", "test/files/bug-row-column-fixnum-float.xls", "test/files/bug-row-column-fixnum-float.xml", "test/files/comments.ods", "test/files/comments.xls", "test/files/comments.xlsx", "test/files/csvtypes.csv", "test/files/datetime.ods", "test/files/datetime.xls", "test/files/datetime.xlsx", "test/files/datetime.xml", "test/files/datetime_floatconv.xls", "test/files/datetime_floatconv.xml", "test/files/dreimalvier.ods", "test/files/emptysheets.ods", "test/files/emptysheets.xls", "test/files/emptysheets.xlsx", "test/files/emptysheets.xml", "test/files/excel2003.xml", "test/files/false_encoding.xls", "test/files/false_encoding.xml", "test/files/formula.ods", "test/files/formula.xls", "test/files/formula.xlsx", "test/files/formula.xml", "test/files/formula_parse_error.xls", "test/files/formula_parse_error.xml", "test/files/formula_string_error.xlsx", "test/files/html-escape.ods", "test/files/matrix.ods", "test/files/matrix.xls", "test/files/named_cells.ods", "test/files/named_cells.xls", "test/files/named_cells.xlsx", "test/files/no_spreadsheet_file.txt", "test/files/numbers1.csv", "test/files/numbers1.ods", "test/files/numbers1.xls", "test/files/numbers1.xlsx", "test/files/numbers1.xml", "test/files/only_one_sheet.ods", "test/files/only_one_sheet.xls", "test/files/only_one_sheet.xlsx", "test/files/only_one_sheet.xml", "test/files/paragraph.ods", "test/files/paragraph.xls", "test/files/paragraph.xlsx", "test/files/paragraph.xml", "test/files/Pfand_from_windows_phone.xlsx", "test/files/prova.xls", "test/files/ric.ods", "test/files/simple_spreadsheet.ods", "test/files/simple_spreadsheet.xls", "test/files/simple_spreadsheet.xlsx", "test/files/simple_spreadsheet.xml", "test/files/simple_spreadsheet_from_italo.ods", "test/files/simple_spreadsheet_from_italo.xls", "test/files/simple_spreadsheet_from_italo.xml", "test/files/so_datetime.csv", "test/files/style.ods", "test/files/style.xls", "test/files/style.xlsx", "test/files/style.xml", "test/files/time-test.csv", "test/files/time-test.ods", "test/files/time-test.xls", "test/files/time-test.xlsx", "test/files/time-test.xml", "test/files/type_excel.ods", "test/files/type_excel.xlsx", "test/files/type_excelx.ods", "test/files/type_excelx.xls", "test/files/type_openoffice.xls", "test/files/type_openoffice.xlsx", "test/files/whitespace.ods", "test/files/whitespace.xls", "test/files/whitespace.xlsx", "test/files/whitespace.xml", "test/rm_sub_test.rb", "test/rm_test.rb", "test/test_generic_spreadsheet.rb", "test/test_helper.rb", "test/test_roo.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/test/files/boolean.csv

@@ -0,0 +1,2 @@
+"true"
+"false"

data/test/test_roo.rb

@@ -943,6 +943,14 @@ class TestRoo < Test::Unit::TestCase
     end
   end
 
+  def test_info_doesnt_set_default_sheet
+    with_each_spreadsheet(:name=>'numbers1') do |oo|
+      oo.default_sheet = 'Sheet3'
+      oo.info
+      assert_equal 'Sheet3', oo.default_sheet
+    end
+  end
+
   def test_bug_excel_numbers1_sheet5_last_row
     with_each_spreadsheet(:name=>'numbers1', :format=>:excel) do |oo|
       oo.default_sheet = "Tabelle1"
@@ -1093,6 +1101,19 @@ Sheet 3:
     end
   end
 
+  def test_boolean_to_csv
+    with_each_spreadsheet(:name=>'boolean') do |oo|
+      Dir.mktmpdir do |tempdir|
+        csv_output = File.join(tempdir,'boolean.csv')
+        assert oo.to_csv(csv_output)
+        assert File.exists?(csv_output)
+        assert_equal "", `diff --strip-trailing-cr #{TESTDIR}/boolean.csv #{csv_output}`
+        # --strip-trailing-cr is needed because the test-file use 0A and
+        # the test on an windows box generates 0D 0A as line endings
+      end
+    end
+  end
+
   def test_date_time_yaml
     with_each_spreadsheet(:name=>'time-test') do |oo|
       expected =
@@ -2236,4 +2257,11 @@ where the expected result is
     parsed = oo.parse(:headers => true)
     assert_equal headers, parsed[1].keys
   end
+
+  def test_bug_numbered_sheet_names
+    with_each_spreadsheet(:name=>'bug-numbered-sheet-names', :format=>:excelx) do |oo|
+      assert_nothing_raised() { oo.each_with_pagename { } }
+    end
+  end
+
 end # class

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roo
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.12.1
   prerelease: 
 platform: ruby
 authors:
@@ -168,6 +168,7 @@ files:
 - test/files/bbu.xml
 - test/files/bode-v1.ods.zip
 - test/files/bode-v1.xls.zip
+- test/files/boolean.csv
 - test/files/boolean.ods
 - test/files/boolean.xls
 - test/files/boolean.xlsx
@@ -176,6 +177,7 @@ files:
 - test/files/borders.xls
 - test/files/borders.xlsx
 - test/files/borders.xml
+- test/files/bug-numbered-sheet-names.xlsx
 - test/files/bug-row-column-fixnum-float.xls
 - test/files/bug-row-column-fixnum-float.xml
 - test/files/comments.ods
@@ -282,7 +284,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: roo
+rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
@@ -319,6 +321,7 @@ test_files:
 - test/files/Bibelbund1.ods
 - test/files/bode-v1.ods.zip
 - test/files/bode-v1.xls.zip
+- test/files/boolean.csv
 - test/files/boolean.ods
 - test/files/boolean.xls
 - test/files/boolean.xlsx
@@ -327,6 +330,7 @@ test_files:
 - test/files/borders.xls
 - test/files/borders.xlsx
 - test/files/borders.xml
+- test/files/bug-numbered-sheet-names.xlsx
 - test/files/bug-row-column-fixnum-float.xls
 - test/files/bug-row-column-fixnum-float.xml
 - test/files/comments.ods