simple-spreadsheet-extractor 0.15.2 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d5778f8560ad75f755806d432dd39f6581557d5
-  data.tar.gz: 61b034bc127799233f39764f6e4d7f4a9b4dcbf4
+  metadata.gz: 2f28b562ed84e674ad6279c9f3ddea76f120a3ca
+  data.tar.gz: 2a3597b460f7866aea45b080ce00d368990d261f
 SHA512:
-  metadata.gz: 52ff2ea1c855c2f7872a6613683b31351bafcc14a629bb6c7b301753fb670d2c0b8e0d82fc1b12d25c7b6c194cad2f448ecd1cc798d9dd5c592d70bdfa5c7a0c
-  data.tar.gz: 7f4aaf20aacc911242348fee3a8ea21685b4d0be98a454c5a28bb84abac3ba15a884210620af1ea1271c5dd763a4fe90128ba18fb4dd9421717b725605d70787
+  metadata.gz: a551347822b07f8d9d2243089940227e5526fb428e9a6f19002f92f598fdb1dc81767cd746747a05aa97619197a547d2213f737c1741765b26edfa76e83dd077
+  data.tar.gz: 3001e98aaef97217e2abd8c2c4201723d8bef943cf0b5125e4509563bddb0545655ad74d25487cb48c58e0d7ab49e29b320506f7111625f507003c5e1e491376

data/.gitignore

@@ -0,0 +1,6 @@
+*.gem
+.project
+.loadpath
+.idea/
+Gemfile.lock
+pkg/

data/.ruby-version

@@ -1 +1 @@
-ruby-2.1.5
+ruby-2.2.8

data/.travis.yml

@@ -1,8 +1,13 @@
 language: ruby
 
 rvm:
-  - 2.1.5
-  - 1.9.3
+  - 2.2.8
+  - 2.4
+
+jdk:
+  - openjdk7
+  - oraclejdk8
+  - openjdk8
 
 sudo: false
 

data/Gemfile

@@ -1,10 +1,4 @@
 source 'https://rubygems.org'
-source 'http://gems.github.com'
 
-gem "libxml-ruby","~>2.6"
-gem "open4","1.3.0"
-
-gem "rdoc",:group=>:development
-gem "jeweler",:group=>:development
-gem "rubocop", :group=>:development,:require=>false
-gem "rubycritic", :group=>:development,:require=>false
+# Specify your gem's dependencies in sample-template-generator-gem.gemspec
+gemspec

data/Rakefile

@@ -1,38 +1,10 @@
-require 'rake'
-require 'rake/testtask'
-require 'rdoc/task'
-require 'rubygems'
+require "bundler/gem_tasks"
+require "rake/testtask"
 
-require 'rubygems/package_task'
-
-task :default => [:test]
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "simple-spreadsheet-extractor"
-    gemspec.summary = "Basic spreadsheet content extraction using Apache POI"
-    gemspec.description = "Takes a stream to a spreadsheet file and produces an XML or CSV representation of its contents"
-    gemspec.email = "stuart.owen@manchester.ac.uk"
-    gemspec.homepage = "http://github.com/myGrid/simple-spreadsheet-extractor-gem"
-    gemspec.authors = ["Stuart Owen","Finn Bacall", "Quyen Nguyen"]
-    gemspec.license = "BSD-3-Clause" # https://spdx.org/licenses/BSD-3-Clause.html#licenseText
-
-
-    gemspec.has_rdoc = true
-    gemspec.files.include %w(jars)
-    gemspec.extra_rdoc_files = ["README.rdoc", "LICENCE"]
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: gem install jeweler"
-end
-
-task:test do
-  Rake::TestTask.new do |t|
-    t.libs << "test"
-    t.test_files = FileList['test/test*.rb']
-    t.verbose = true
-  end
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList['test/**/*_test.rb']
 end
 
-#end
+task :default => :test

data/lib/sysmodb/extractor.rb

@@ -7,7 +7,7 @@ module SysMODB
   #handles the delegation to java, and executes the extraction passing the
   #input file through STDIN, and reading the results through STDOUT.
   class Extractor
-    JAR_VERSION="0.15.1"
+    JAR_VERSION="0.16.0".freeze
     DEFAULT_PATH = File.dirname(__FILE__) + "/../../jars/simple-spreadsheet-extractor-#{JAR_VERSION}.jar"
     BUFFER_SIZE=250000 # 1/4 a megabyte
 

data/lib/sysmodb/version.rb

@@ -0,0 +1,4 @@
+module SysMODB
+  VERSION = "0.16.0".freeze
+
+end

data/simple-spreadsheet-extractor.gemspec

@@ -1,85 +1,30 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-# stub: simple-spreadsheet-extractor 0.15.2 ruby lib
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'sysmodb/version'
 
-Gem::Specification.new do |s|
-  s.name = "simple-spreadsheet-extractor"
-  s.version = "0.15.2"
+Gem::Specification.new do |spec|
+  spec.name          = 'simple-spreadsheet-extractor'
+  spec.version       = SysMODB::VERSION
+  spec.authors       = ["Stuart Owen","Finn Bacall", "Quyen Nguyen"]
+  spec.email         = ['stuart.owen@manchester.ac.uk']
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Stuart Owen", "Finn Bacall", "Quyen Nguyen"]
-  s.date = "2016-08-31"
-  s.description = "Takes a stream to a spreadsheet file and produces an XML or CSV representation of its contents"
-  s.email = "stuart.owen@manchester.ac.uk"
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    ".ruby-gemspec",
-    ".ruby-version",
-    ".travis.yml",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "doc/schema-v1.xsd",
-    "examples/example.rb",
-    "jars/lib/dom4j-1.6.1.jar",
-    "jars/lib/log4j-1.2.17.jar",
-    "jars/lib/poi-3.11.jar",
-    "jars/lib/poi-ooxml-3.11.jar",
-    "jars/lib/poi-ooxml-schemas-3.11.jar",
-    "jars/lib/xercesImpl-2.6.2.jar",
-    "jars/lib/xmlbeans-2.6.0.jar",
-    "jars/simple-spreadsheet-extractor-0.15.1.jar",
-    "lib/simple-spreadsheet-extractor.rb",
-    "lib/sysmodb/extractor.rb",
-    "lib/sysmodb/simple-spreadsheet-extractor.rb",
-    "simple-spreadsheet-extractor.gemspec",
-    "test/files/not-a-spreadsheet.xls",
-    "test/files/problem_with_dv.xls",
-    "test/files/test-csv-output1-trimmed.csv",
-    "test/files/test-csv-output1.csv",
-    "test/files/test-spreadsheet.xls",
-    "test/files/test-spreadsheet.xlsx",
-    "test/files/xml-unfriendly-chars.xlsx",
-    "test/test_extraction.rb"
-  ]
-  s.homepage = "http://github.com/myGrid/simple-spreadsheet-extractor-gem"
-  s.licenses = ["BSD-3-Clause"]
-  s.rubygems_version = "2.4.8"
-  s.summary = "Basic spreadsheet content extraction using Apache POI"
+  spec.summary       = 'Basic spreadsheet content extraction using Apache POI'
+  spec.description   = 'Takes a stream to a spreadsheet file and produces an XML or CSV representation of its contents'
+  spec.homepage      = 'http://github.com/myGrid/simple-spreadsheet-extractor-gem'
+  spec.license       = 'BSD-3-Clause'
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<libxml-ruby>, ["~> 2.6"])
-      s.add_runtime_dependency(%q<open4>, ["= 1.3.0"])
-      s.add_development_dependency(%q<rdoc>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rubocop>, [">= 0"])
-      s.add_development_dependency(%q<rubycritic>, [">= 0"])
-    else
-      s.add_dependency(%q<libxml-ruby>, ["~> 2.6"])
-      s.add_dependency(%q<open4>, ["= 1.3.0"])
-      s.add_dependency(%q<rdoc>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rubocop>, [">= 0"])
-      s.add_dependency(%q<rubycritic>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<libxml-ruby>, ["~> 2.6"])
-    s.add_dependency(%q<open4>, ["= 1.3.0"])
-    s.add_dependency(%q<rdoc>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rubocop>, [">= 0"])
-    s.add_dependency(%q<rubycritic>, [">= 0"])
-  end
-end
+  spec.add_dependency('libxml-ruby', ['~> 2.9'])
+  spec.add_dependency('open4', ['1.3.0'])
 
+  spec.add_development_dependency('rubocop', ['~> 0.48'])
+  spec.add_development_dependency('rubycritic', ['~> 3.2'])
+  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'minitest', '~> 5.0'
+end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: simple-spreadsheet-extractor
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.16.0
 platform: ruby
 authors:
 - Stuart Owen
 - Finn Bacall
 - Quyen Nguyen
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2016-08-31 00:00:00.000000000 Z
+date: 2018-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libxml-ruby
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: open4
   requirement: !ruby/object:Gem::Requirement
@@ -41,100 +41,111 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.48'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.48'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: rubycritic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: rubycritic
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 description: Takes a stream to a spreadsheet file and produces an XML or CSV representation
   of its contents
-email: stuart.owen@manchester.ac.uk
+email:
+- stuart.owen@manchester.ac.uk
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.rdoc
+extra_rdoc_files: []
 files:
+- ".gitignore"
 - ".ruby-gemspec"
 - ".ruby-version"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
 - doc/schema-v1.xsd
 - examples/example.rb
+- jars/lib/commons-codec-1.10.jar
+- jars/lib/commons-collections4-4.1.jar
+- jars/lib/curvesapi-1.04.jar
 - jars/lib/dom4j-1.6.1.jar
 - jars/lib/log4j-1.2.17.jar
-- jars/lib/poi-3.11.jar
-- jars/lib/poi-ooxml-3.11.jar
-- jars/lib/poi-ooxml-schemas-3.11.jar
-- jars/lib/xercesImpl-2.6.2.jar
+- jars/lib/poi-3.17.jar
+- jars/lib/poi-ooxml-3.17.jar
+- jars/lib/poi-ooxml-schemas-3.17.jar
+- jars/lib/xercesImpl-2.11.0.jar
+- jars/lib/xml-apis-1.4.01.jar
 - jars/lib/xmlbeans-2.6.0.jar
-- jars/simple-spreadsheet-extractor-0.15.1.jar
+- jars/simple-spreadsheet-extractor-0.16.0.jar
 - lib/simple-spreadsheet-extractor.rb
 - lib/sysmodb/extractor.rb
 - lib/sysmodb/simple-spreadsheet-extractor.rb
+- lib/sysmodb/version.rb
 - simple-spreadsheet-extractor.gemspec
-- test/files/not-a-spreadsheet.xls
-- test/files/problem_with_dv.xls
-- test/files/test-csv-output1-trimmed.csv
-- test/files/test-csv-output1.csv
-- test/files/test-spreadsheet.xls
-- test/files/test-spreadsheet.xlsx
-- test/files/xml-unfriendly-chars.xlsx
-- test/test_extraction.rb
 homepage: http://github.com/myGrid/simple-spreadsheet-extractor-gem
 licenses:
 - BSD-3-Clause
@@ -155,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Basic spreadsheet content extraction using Apache POI

data/Gemfile.lock

@@ -1,127 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  remote: http://gems.github.com/
-  specs:
-    abstract_type (0.0.7)
-    adamantium (0.2.0)
-      ice_nine (~> 0.11.0)
-      memoizable (~> 0.4.0)
-    addressable (2.3.5)
-    ast (2.0.0)
-    astrolabe (1.3.0)
-      parser (>= 2.2.0.pre.3, < 3.0)
-    axiom-types (0.1.1)
-      descendants_tracker (~> 0.0.4)
-      ice_nine (~> 0.11.0)
-      thread_safe (~> 0.3, >= 0.3.1)
-    builder (3.2.2)
-    coercible (1.0.0)
-      descendants_tracker (~> 0.0.1)
-    concord (0.1.5)
-      adamantium (~> 0.2.0)
-      equalizer (~> 0.0.9)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.2.5)
-    equalizer (0.0.9)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    flay (2.4.0)
-      ruby_parser (~> 3.0)
-      sexp_processor (~> 4.0)
-    flog (4.2.1)
-      ruby_parser (~> 3.1, > 3.1.0)
-      sexp_processor (~> 4.4)
-    git (1.2.6)
-    github_api (0.10.1)
-      addressable
-      faraday (~> 0.8.1)
-      hashie (>= 1.2)
-      multi_json (~> 1.4)
-      nokogiri (~> 1.5.2)
-      oauth2
-    hashie (2.0.5)
-    highline (1.6.20)
-    httpauth (0.2.0)
-    ice_nine (0.11.1)
-    jeweler (1.8.8)
-      builder
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      github_api (= 0.10.1)
-      highline (>= 1.6.15)
-      nokogiri (= 1.5.10)
-      rake
-      rdoc
-    json (1.8.1)
-    jwt (0.1.8)
-      multi_json (>= 1.5)
-    libxml-ruby (2.6.0)
-    memoizable (0.4.2)
-      thread_safe (~> 0.3, >= 0.3.1)
-    multi_json (1.8.2)
-    multi_xml (0.5.5)
-    multipart-post (1.2.0)
-    nokogiri (1.5.10)
-    oauth2 (0.9.2)
-      faraday (~> 0.8)
-      httpauth (~> 0.2)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
-      multi_xml (~> 0.5)
-      rack (~> 1.2)
-    open4 (1.3.0)
-    parser (2.2.0.3)
-      ast (>= 1.1, < 3.0)
-    powerpack (0.1.0)
-    procto (0.0.2)
-    rack (1.5.2)
-    rainbow (2.0.0)
-    rake (10.1.0)
-    rdoc (4.0.1)
-      json (~> 1.4)
-    reek (1.6.5)
-      parser (~> 2.2.0.pre.7)
-      rainbow (>= 1.99, < 3.0)
-      unparser (~> 0.2.2)
-    rubocop (0.29.1)
-      astrolabe (~> 1.3)
-      parser (>= 2.2.0.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.4)
-    ruby-progressbar (1.7.1)
-    ruby_parser (3.6.4)
-      sexp_processor (~> 4.1)
-    rubycritic (1.3.0)
-      flay (= 2.4.0)
-      flog (= 4.2.1)
-      parser (>= 2.2.0, < 3.0)
-      reek (= 1.6.5)
-      virtus (~> 1.0)
-    sexp_processor (4.4.5)
-    thread_safe (0.3.4)
-    unparser (0.2.2)
-      abstract_type (~> 0.0.7)
-      adamantium (~> 0.2.0)
-      concord (~> 0.1.5)
-      diff-lcs (~> 1.2.5)
-      equalizer (~> 0.0.9)
-      parser (~> 2.2.0.2)
-      procto (~> 0.0.2)
-    virtus (1.0.4)
-      axiom-types (~> 0.1)
-      coercible (~> 1.0)
-      descendants_tracker (~> 0.0, >= 0.0.3)
-      equalizer (~> 0.0, >= 0.0.9)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  jeweler
-  libxml-ruby (~> 2.6)
-  open4 (= 1.3.0)
-  rdoc
-  rubocop
-  rubycritic

data/test/files/not-a-spreadsheet.xls

@@ -1 +0,0 @@
-this is not a spreadsheet

data/test/files/test-csv-output1-trimmed.csv

@@ -1,2 +0,0 @@
-"a",2.0,TRUE,,"b,c"
-,"d",4.2,FALSE,

data/test/files/test-csv-output1.csv

@@ -1,4 +0,0 @@
-,,,,,
-,,,,,
-,"a",2,TRUE,,"b,c"
-,,"d",4.2,FALSE,

data/test/test_extraction.rb

@@ -1,99 +0,0 @@
-require 'test/unit'
-require 'simple-spreadsheet-extractor'
-require 'libxml'
-
-class TestExtraction < Test::Unit::TestCase
-  
-  SCHEMA_FILE_PATH = File.dirname(__FILE__) + "/../doc/schema-v1.xsd"
-  
-  include SysMODB::SpreadsheetExtractor
-
-  def test_from_non_file_io_object
-    test_sheet = File.dirname(__FILE__) + "/files/test-spreadsheet.xls"
-    contents = open(test_sheet, "rb") {|io| io.read }
-    io=StringIO.new contents
-    xml = spreadsheet_to_xml(io)
-  end
-  
-  def test_validate_xml
-    test_sheet = File.dirname(__FILE__) + "/files/test-spreadsheet.xls"
-    f=open(test_sheet,"rb")
-    xml = spreadsheet_to_xml(f)
-    validate_against_schema(xml)
-  end
-
-  def test_validate_xml_xlsx
-    test_sheet = File.dirname(__FILE__) + "/files/test-spreadsheet.xlsx"
-    f=open(test_sheet,"rb")
-    xml = spreadsheet_to_xml(f)
-    validate_against_schema(xml)
-  end
-
-  def test_failure
-    test_sheet = File.dirname(__FILE__) + "/files/not-a-spreadsheet.xls"
-    f=open(test_sheet,"rb")
-    assert_raise SysMODB::SpreadsheetExtractionException do
-      spreadsheet_to_xml(f)
-    end
-  end
-
-  def test_problem_with_dv
-    test_sheet = File.dirname(__FILE__) + "/files/problem_with_dv.xls"
-    f=open(test_sheet,"rb")
-    xml = spreadsheet_to_xml(f)
-    validate_against_schema(xml)
-  end
-
-  def test_invalid_xml_chars
-    test_sheet = File.dirname(__FILE__) + "/files/xml-unfriendly-chars.xlsx"
-    f=open(test_sheet,"rb")
-    xml = spreadsheet_to_xml(f)
-    validate_against_schema(xml)
-  end
-
-  def validate_against_schema xml
-    document = LibXML::XML::Document.string(xml)
-    schema = LibXML::XML::Schema.new(SCHEMA_FILE_PATH)
-    begin
-      document.validate_schema(schema)
-    rescue LibXML::XML::Error => e
-      puts xml
-      assert false,"Error validating against schema: #{e.message}"
-    end
-  end
-
-  def test_csv_output
-    test_sheet = File.dirname(__FILE__) + "/files/test-spreadsheet.xls"
-    expected_file = File.dirname(__FILE__) + "/files/test-csv-output1.csv"
-    expected = open(expected_file,"rb").read.strip
-
-    f=open(test_sheet,"rb")
-    csv = spreadsheet_to_csv(f,2)
-    assert_equal expected,csv
-
-    #try sheet as a string
-    f=open(test_sheet,"rb")
-    csv = spreadsheet_to_csv(f,"2")
-    assert_equal expected,csv
-  end
-
-#  def test_csv_output_trimmed
-#    test_sheet = File.dirname(__FILE__) + "/files/test-spreadsheet.xls"
-#    expected_file = File.dirname(__FILE__) + "/files/test-csv-output1-trimmed.csv"
-#    expected = open(expected_file,"rb").read
-#
-#    f=open(test_sheet,"rb")
-#    csv = spreadsheet_to_csv(f,2,true)
-#    assert_equal expected,csv
-#  end
-
-  def test_for_segfault
-    test_sheet = File.dirname(__FILE__) + "/files/test-spreadsheet.xls"
-    5.times do |x|
-      f=open(test_sheet,"rb")
-      xml = spreadsheet_to_xml(f)
-    end
-    true
-  end
-  
-end