roo 1.12.1 → 1.12.2

Sign up to get free protection for your applications and to get access to all the features.
data/CHANGELOG CHANGED
@@ -1,3 +1,8 @@
1
+ == 1.12.2 2013-09-11
2
+
3
+ * 1 enhancement
4
+ * Support rubyzip >= 1.0.0. #65
5
+
1
6
  == 1.12.1 2013-08-18
2
7
 
3
8
  * 1 enhancement
data/Gemfile.lock CHANGED
@@ -1,8 +1,9 @@
1
1
  GEM
2
2
  remote: http://rubygems.org/
3
3
  specs:
4
- addressable (2.3.2)
5
- crack (0.3.1)
4
+ addressable (2.3.5)
5
+ crack (0.4.1)
6
+ safe_yaml (~> 0.9.0)
6
7
  diff-lcs (1.2.1)
7
8
  faraday (0.8.7)
8
9
  multipart-post (~> 1.1)
@@ -47,7 +48,8 @@ GEM
47
48
  diff-lcs (>= 1.1.3, < 2.0)
48
49
  rspec-mocks (2.13.0)
49
50
  ruby-ole (1.2.11.6)
50
- rubyzip (0.9.9)
51
+ rubyzip (1.0.0)
52
+ safe_yaml (0.9.4)
51
53
  shoulda (3.0.1)
52
54
  shoulda-context (~> 1.0.0)
53
55
  shoulda-matchers (~> 1.0.0)
@@ -56,9 +58,9 @@ GEM
56
58
  spreadsheet (0.8.2)
57
59
  ruby-ole (>= 1.0)
58
60
  vcr (2.5.0)
59
- webmock (1.9.0)
61
+ webmock (1.13.0)
60
62
  addressable (>= 2.2.7)
61
- crack (>= 0.1.7)
63
+ crack (>= 0.3.2)
62
64
 
63
65
  PLATFORMS
64
66
  java
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.12.1
1
+ 1.12.2
data/lib/roo/base.rb CHANGED
@@ -2,7 +2,15 @@
2
2
 
3
3
  require 'tmpdir'
4
4
  require 'stringio'
5
- require 'zip/zipfilesystem'
5
+
6
+ begin
7
+ require 'zip/zipfilesystem'
8
+ Roo::ZipFile = Zip::ZipFile
9
+ rescue LoadError
10
+ # For rubyzip >= 1.0.0
11
+ require 'zip/filesystem'
12
+ Roo::ZipFile = Zip::File
13
+ end
6
14
 
7
15
  # Base class for all other types of spreadsheets
8
16
  class Roo::Base
@@ -674,7 +682,7 @@ class Roo::Base
674
682
  end
675
683
 
676
684
  def unzip(filename, tmpdir)
677
- Zip::ZipFile.open(filename) do |zip|
685
+ Roo::ZipFile.open(filename) do |zip|
678
686
  process_zipfile_packed(zip, tmpdir)
679
687
  end
680
688
  end
data/lib/roo/excelx.rb CHANGED
@@ -521,7 +521,7 @@ Datei xl/comments1.xml
521
521
  # Extracts all needed files from the zip file
522
522
  def process_zipfile(tmpdir, zipfilename, zip, path='')
523
523
  @sheet_files = []
524
- Zip::ZipFile.open(zipfilename) {|zf|
524
+ Roo::ZipFile.open(zipfilename) {|zf|
525
525
  zf.entries.each {|entry|
526
526
  if entry.to_s.end_with?('workbook.xml')
527
527
  open(tmpdir+'/'+'roo_workbook.xml','wb') {|f|
@@ -564,7 +564,7 @@ Datei xl/comments1.xml
564
564
 
565
565
  # extract files from the zip file
566
566
  def extract_content(tmpdir, zipfilename)
567
- Zip::ZipFile.open(@filename) do |zip|
567
+ Roo::ZipFile.open(@filename) do |zip|
568
568
  process_zipfile(tmpdir, zipfilename,zip)
569
569
  end
570
570
  end
@@ -5,7 +5,7 @@ require 'cgi'
5
5
  class Roo::OpenOffice < Roo::Base
6
6
  class << self
7
7
  def extract_content(tmpdir, filename)
8
- Zip::ZipFile.open(filename) do |zip|
8
+ Roo::ZipFile.open(filename) do |zip|
9
9
  process_zipfile(tmpdir, zip)
10
10
  end
11
11
  end
data/roo.gemspec CHANGED
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Thomas Preymesser", "Hugh McGowan", "Ben Woosley"]
12
- s.date = "2013-08-18"
12
+ s.date = "2013-09-11"
13
13
  s.description = "Roo can access the contents of various spreadsheet files. It can handle\n* OpenOffice\n* Excel\n* Google spreadsheets\n* Excelx\n* LibreOffice\n* CSV"
14
14
  s.email = "ruby.ruby.ruby.roo@gmail.com"
15
15
  s.extra_rdoc_files = [
@@ -175,7 +175,7 @@ Gem::Specification.new do |s|
175
175
  s.required_ruby_version = Gem::Requirement.new(">= 1.9.0")
176
176
  s.rubygems_version = "1.8.24"
177
177
  s.summary = "Roo can access the contents of various spreadsheet files."
178
- 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"]
178
+ 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/Bibelbund.csv", "test/files/Bibelbund.ods", "test/files/Bibelbund.xls", "test/files/Bibelbund.xlsx", "test/files/Bibelbund.xml", "test/files/Bibelbund1.ods", "test/files/Pfand_from_windows_phone.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/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/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"]
179
179
 
180
180
  if s.respond_to? :specification_version then
181
181
  s.specification_version = 3
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: roo
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.12.1
4
+ version: 1.12.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -11,7 +11,7 @@ authors:
11
11
  autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
- date: 2013-08-18 00:00:00.000000000 Z
14
+ date: 2013-09-11 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: spreadsheet
@@ -308,17 +308,18 @@ test_files:
308
308
  - test/files/1900_base.xlsx
309
309
  - test/files/1904_base.xls
310
310
  - test/files/1904_base.xlsx
311
- - test/files/bad_excel_date.xls
312
- - test/files/bbu.ods
313
- - test/files/bbu.xls
314
- - test/files/bbu.xlsx
315
- - test/files/bbu.xml
316
311
  - test/files/Bibelbund.csv
317
312
  - test/files/Bibelbund.ods
318
313
  - test/files/Bibelbund.xls
319
314
  - test/files/Bibelbund.xlsx
320
315
  - test/files/Bibelbund.xml
321
316
  - test/files/Bibelbund1.ods
317
+ - test/files/Pfand_from_windows_phone.xlsx
318
+ - test/files/bad_excel_date.xls
319
+ - test/files/bbu.ods
320
+ - test/files/bbu.xls
321
+ - test/files/bbu.xlsx
322
+ - test/files/bbu.xml
322
323
  - test/files/bode-v1.ods.zip
323
324
  - test/files/bode-v1.xls.zip
324
325
  - test/files/boolean.csv
@@ -378,7 +379,6 @@ test_files:
378
379
  - test/files/paragraph.xls
379
380
  - test/files/paragraph.xlsx
380
381
  - test/files/paragraph.xml
381
- - test/files/Pfand_from_windows_phone.xlsx
382
382
  - test/files/prova.xls
383
383
  - test/files/ric.ods
384
384
  - test/files/simple_spreadsheet.ods
@@ -413,4 +413,3 @@ test_files:
413
413
  - test/test_generic_spreadsheet.rb
414
414
  - test/test_helper.rb
415
415
  - test/test_roo.rb
416
- has_rdoc: