simple-spreadsheet-extractor 0.12.3 → 0.13.0

data/Gemfile

@@ -1,3 +1,7 @@
-source :gemcutter
+source 'https://rubygems.org'
+source 'http://gems.github.com'
+
 gem "libxml-ruby","2.6.0"
 gem "open4","1.3.0"
+gem "rdoc"
+gem "jeweler"

data/Gemfile.lock

@@ -1,12 +1,57 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
+  remote: http://gems.github.com/
   specs:
+    addressable (2.3.5)
+    builder (3.2.2)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
+    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)
+    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)
+    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)
+    rack (1.5.2)
+    rake (10.1.0)
+    rdoc (4.0.1)
+      json (~> 1.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  jeweler
   libxml-ruby (= 2.6.0)
   open4 (= 1.3.0)
+  rdoc

data/Rakefile

@@ -19,7 +19,6 @@ begin
 
     gemspec.has_rdoc = true
     gemspec.files.include %w(jars)
-    gemspec.files.exclude "test/*"
     gemspec.extra_rdoc_files = ["README.rdoc", "LICENCE"]
     gemspec.add_dependency("libxml-ruby","2.6.0")
     gemspec.add_dependency("open4","1.3.0")

data/VERSION

@@ -1 +1 @@
-0.12.3
+0.13.0

data/lib/simple-spreadsheet-extractor.rb

@@ -8,7 +8,7 @@ module SysMODB
   end
   
   module SpreadsheetExtractor
-    JAR_VERSION="0.12.1"
+    JAR_VERSION="0.13.0"
     DEFAULT_PATH = File.dirname(__FILE__) + "/../jars/simple-spreadsheet-extractor-#{JAR_VERSION}.jar"
     
     def spreadsheet_to_xml spreadsheet_data      

data/simple-spreadsheet-extractor.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "simple-spreadsheet-extractor"
-  s.version = "0.12.3"
+  s.version = "0.13.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Stuart Owen", "Finn Bacall"]
-  s.date = "2013-06-17"
+  s.date = "2013-11-13"
   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 = [
@@ -26,18 +26,19 @@ Gem::Specification.new do |s|
     "doc/schema-v1.xsd",
     "examples/example.rb",
     "jars/lib/dom4j-1.6.1.jar",
-    "jars/lib/poi-ooxml-3.8.jar",
-    "jars/lib/poi-ooxml-schemas-3.8.jar",
-    "jars/lib/rightfield-poi-3.8.jar",
+    "jars/lib/poi-ooxml-3.9.jar",
+    "jars/lib/poi-ooxml-schemas-3.9.jar",
+    "jars/lib/rightfield-poi-3.9.jar",
     "jars/lib/xmlbeans-2.3.0.jar",
-    "jars/simple-spreadsheet-extractor-0.12.1.jar",
+    "jars/simple-spreadsheet-extractor-0.13.0.jar",
     "lib/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.xls",
+    "test/test_extraction.rb"
   ]
   s.homepage = "http://github.com/myGrid/simple-spreadsheet-extractor-gem"
   s.require_paths = ["lib"]
@@ -50,17 +51,23 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<libxml-ruby>, ["= 2.6.0"])
       s.add_runtime_dependency(%q<open4>, ["= 1.3.0"])
+      s.add_runtime_dependency(%q<rdoc>, [">= 0"])
+      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
       s.add_runtime_dependency(%q<libxml-ruby>, ["= 2.6.0"])
       s.add_runtime_dependency(%q<open4>, ["= 1.3.0"])
     else
       s.add_dependency(%q<libxml-ruby>, ["= 2.6.0"])
       s.add_dependency(%q<open4>, ["= 1.3.0"])
+      s.add_dependency(%q<rdoc>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<libxml-ruby>, ["= 2.6.0"])
       s.add_dependency(%q<open4>, ["= 1.3.0"])
     end
   else
     s.add_dependency(%q<libxml-ruby>, ["= 2.6.0"])
     s.add_dependency(%q<open4>, ["= 1.3.0"])
+    s.add_dependency(%q<rdoc>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<libxml-ruby>, ["= 2.6.0"])
     s.add_dependency(%q<open4>, ["= 1.3.0"])
   end

data/test/test_extraction.rb

@@ -0,0 +1,93 @@
+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_file_object
+    test_sheet = File.dirname(__FILE__) + "/files/test-spreadsheet.xls"
+    f=open(test_sheet,"rb")
+    xml = spreadsheet_to_xml(f)
+    assert_not_nil xml
+  end
+
+  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
+    assert_nil io.path
+    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_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 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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple-spreadsheet-extractor
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 43
   prerelease: 
   segments: 
   - 0
-  - 12
-  - 3
-  version: 0.12.3
+  - 13
+  - 0
+  version: 0.13.0
 platform: ruby
 authors: 
 - Stuart Owen
@@ -16,11 +16,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-17 00:00:00 Z
+date: 2013-11-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -31,12 +31,12 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  version_requirements: *id001
-  name: libxml-ruby
+  requirement: *id001
   prerelease: false
+  name: libxml-ruby
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -47,12 +47,40 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
-  version_requirements: *id002
+  requirement: *id002
+  prerelease: false
   name: open4
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id003
   prerelease: false
+  name: rdoc
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id004
+  prerelease: false
+  name: jeweler
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -63,12 +91,12 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  version_requirements: *id003
-  name: libxml-ruby
+  requirement: *id005
   prerelease: false
+  name: libxml-ruby
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -79,9 +107,9 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
-  version_requirements: *id004
-  name: open4
+  requirement: *id006
   prerelease: false
+  name: open4
 description: Takes a stream to a spreadsheet file and produces an XML or CSV representation of its contents
 email: stuart.owen@manchester.ac.uk
 executables: []
@@ -101,11 +129,11 @@ files:
 - doc/schema-v1.xsd
 - examples/example.rb
 - jars/lib/dom4j-1.6.1.jar
-- jars/lib/poi-ooxml-3.8.jar
-- jars/lib/poi-ooxml-schemas-3.8.jar
-- jars/lib/rightfield-poi-3.8.jar
+- jars/lib/poi-ooxml-3.9.jar
+- jars/lib/poi-ooxml-schemas-3.9.jar
+- jars/lib/rightfield-poi-3.9.jar
 - jars/lib/xmlbeans-2.3.0.jar
-- jars/simple-spreadsheet-extractor-0.12.1.jar
+- jars/simple-spreadsheet-extractor-0.13.0.jar
 - lib/simple-spreadsheet-extractor.rb
 - simple-spreadsheet-extractor.gemspec
 - test/files/not-a-spreadsheet.xls
@@ -113,6 +141,7 @@ files:
 - test/files/test-csv-output1-trimmed.csv
 - test/files/test-csv-output1.csv
 - test/files/test-spreadsheet.xls
+- test/test_extraction.rb
 homepage: http://github.com/myGrid/simple-spreadsheet-extractor-gem
 licenses: []