spreadbase 0.1.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89cb94c9ff4d62b429681c6d4cca60ea78b168e2764c4a17a8b94f62b3e39ba4
-  data.tar.gz: be8c13aca79e8ee79ecf409f2d8f009e5e1c71220cf67368243e779d2432f35b
+  metadata.gz: 37e52d4079a3f0f7c0ba6fef6db24dbe8426f1f47d66904ea9fa418744719e27
+  data.tar.gz: 79304c560419b6500e95f9c4fb5c8d8bfbf9ffe3ed1b591125ab696be5652560
 SHA512:
-  metadata.gz: 2f12dcc306f702bba5d0ae6a726c3e61a3a4088d4de68e0fb82aadd04a8b226b5da34f17123326816de6532ffdf4ca5c7c5f0f6f161a52f9216a0ad258c04112
-  data.tar.gz: eabcb7bd63da042b2aba2013fca3510e2e17f2033d7510bb52970f9d2eff9bcea3698271ffcdc52e0cd9b45dad1219efec1a0a2466ba97f230448c9a36570874
+  metadata.gz: c02992b1b27f909a4df2bc93df27965b90277d0343bed2a5c0cb88c99e8ff337146ba6239aa5764f826833e2ebde0793ac20ce0170afa473b9e78796c361e38f
+  data.tar.gz: c02bbb08fe16bbb8dff403fac1948bc2f3457f544408c9e5bbd996fd90dbe3d4df6a68ad766f0217592f10823773bd0cdf307210b259ff1690c7ecf02ffadad9

data/.github/workflows/ci.yml

@@ -0,0 +1,25 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  rspec:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby: ['3.1', '3.0', '2.7', '2.6', '2.5', '2.4']
+
+    steps:
+      - name: Checkout spreadbase repository
+        uses: actions/checkout@v2
+
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - name: Run RSpec
+        run: |
+          bundle exec rake spec

data/Gemfile

@@ -1,3 +1,7 @@
 source 'https://rubygems.org'
 
 gemspec
+
+if Gem.ruby_version >= Gem::Version.new('3.0.0')
+  gem 'rexml'
+end

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status][BS img]](https://travis-ci.org/saveriomiroddi/spreadbase)
+[![CI](https://github.com/saveriomiroddi/spreadbase/actions/workflows/ci.yml/badge.svg)](https://github.com/saveriomiroddi/spreadbase/actions/workflows/ci.yml)
 
 SpreadBase!!
 ============
@@ -139,9 +139,9 @@ Notes
 - Numbers are decoded to Fixnum or Float, depending on the existence of the fractional part.
   Alternatively, numbers with a fractional part can be decoded as Bigdecimal, using the option:
 
-  `SpreadBase::Document.new( "Random numbers für alle!.ods", :floats_as_bigdecimal => true )`
+  `SpreadBase::Document.new( "Random numbers für alle!.ods", floats_as_bigdecimal: true )`
 
-- The gem has been tested on Ruby 1.9.3-p125, on Linux and Mac OS X.
+- The gem is tested on all the supported Ruby versions (see [Build](https://github.com/saveriomiroddi/spreadbase/actions/workflows/ci.yml)), and used mainly on Linux.
 - The column widths are retained (decoding/encoding), but at the current version, they're not [officially] accessible via any API.
 
 Currently unsupported features
@@ -154,5 +154,3 @@ Roadmap/Todo
 ------------
 
 https://github.com/saveriomiroddi/spreadbase/wiki/Todo-%28roadmap%29
-
-[BS img]: https://travis-ci.org/saveriomiroddi/spreadbase.svg?branch=master

data/lib/spreadbase/codecs/open_document_12.rb

@@ -1,4 +1,4 @@
-require 'zipruby'
+require 'zip'
 require 'rexml/document'
 
 module SpreadBase # :nodoc:
@@ -37,11 +37,9 @@ module SpreadBase # :nodoc:
         document_buffer = encode_to_content_xml(el_document, options)
         zip_buffer      = ''
 
-        Zip::Archive.open_buffer(zip_buffer, Zip::CREATE) do | zip_file |
-          zip_file.add_dir('META-INF')
-
-          zip_file.add_buffer('META-INF/manifest.xml', MANIFEST_XML);
-          zip_file.add_buffer('content.xml',           document_buffer);
+        Zip::File.open_buffer(zip_buffer) do | zip_file |
+          zip_file.get_output_stream('META-INF/manifest.xml') { |f| f << MANIFEST_XML }
+          zip_file.get_output_stream('content.xml') { |f| f << document_buffer }
         end
 
         zip_buffer
@@ -61,9 +59,7 @@ module SpreadBase # :nodoc:
       # _returns_ the SpreadBase::Document instance.
       #
       def decode_archive(zip_buffer, options={})
-        content_xml_data = Zip::Archive.open_buffer(zip_buffer) do | zip_file |
-          zip_file.fopen('content.xml') { | file | file.read }
-        end
+        content_xml_data = read_content_xml(zip_buffer)
 
         decode_content_xml(content_xml_data, options)
       end
@@ -109,6 +105,22 @@ module SpreadBase # :nodoc:
 
       private
 
+      def read_content_xml(zip_buffer)
+        io = StringIO.new(zip_buffer)
+
+        zip_file = if using_rubyzip_3?
+          Zip::File.new(io, buffer: true)
+        else
+          Zip::File.new(io, false, true)
+        end
+
+        zip_file.read('content.xml')
+      end
+
+      def using_rubyzip_3?
+        Gem.loaded_specs['rubyzip'].version >= Gem::Version.new('3.0.0')
+      end
+
       def pretty_xml(document)
         buffer = ""
 

data/lib/spreadbase/codecs/open_document_12_modules/decoding.rb

@@ -59,7 +59,7 @@ module SpreadBase # :nodoc:
           # A single column/row can represent multiple columns (table:number-(columns|rows)-repeated)
           #
           table.column_width_styles = column_nodes.inject([]) { | current_styles, node | current_styles + decode_column_width_style(node) }
-          table.data                = row_nodes.inject([]) { | current_rows, node | current_rows + decode_row_node(node, options) }
+          table.data                = decode_row_nodes(row_nodes, options)
 
           table
         end
@@ -73,23 +73,48 @@ module SpreadBase # :nodoc:
           make_array_from_repetitions(style_name, repetitions)
         end
 
+        def decode_row_nodes(row_nodes, options)
+          rows = []
+          row_nodes.inject(0) do |size, node|
+            row, repetitions = decode_row_node(node, options)
+            row.empty? || append_row(rows, size, row, repetitions)
+            size + repetitions
+          end
+          rows
+        end
+
         def decode_row_node(row_node, options)
           repetitions = (row_node.attributes['table:number-rows-repeated'] || '1').to_i
           cell_nodes  = row_node.elements.to_a('table:table-cell')
 
-          # Watch out the :flatten; a single cell can represent multiple cells (table:number-columns-repeated)
-          #
-          values = cell_nodes.map { | node | decode_cell_node(node, options) }.flatten
+          [decode_cell_nodes(cell_nodes, options), repetitions]
+        end
 
-          make_array_from_repetitions(values, repetitions)
+        def append_row(rows, size, row, repetitions)
+          (size - rows.size).times { rows << [] }
+          rows.concat(make_array_from_repetitions(row, repetitions))
         end
 
-        def decode_cell_node(cell_node, options)
-          value = decode_cell_value(cell_node, options)
+        def decode_cell_nodes(cell_nodes, options)
+          cells = []
+          cell_nodes.inject(0) do |size, node|
+            cell, repetitions = decode_cell_node(node, options)
+            cell.nil? || append_cell(cells, size, cell, repetitions)
+            size + repetitions
+          end
+          cells
+        end
 
-          repetitions = (cell_node.attributes['table:number-columns-repeated'] || '1').to_i
+        def decode_cell_node(cell_node, options)
+          [
+            decode_cell_value(cell_node, options),
+            (cell_node.attributes['table:number-columns-repeated'] || '1').to_i
+          ]
+        end
 
-          make_array_from_repetitions(value, repetitions)
+        def append_cell(cells, size, cell, repetitions)
+          cells[size - 1] = nil if size != cells.size
+          cells.concat(make_array_from_repetitions(cell, repetitions))
         end
 
         def decode_cell_value(cell_node, options)

data/lib/spreadbase/version.rb

@@ -1,3 +1,3 @@
 module SpreadBase
-  VERSION = "0.1.4"
+  VERSION = "0.4.0"
 end

data/spec/codecs/open_document_12_spec.rb

@@ -15,7 +15,7 @@ describe SpreadBase::Codecs::OpenDocument12 do
       'abc', [
         [1,      1.1,        T_BIGDECIMAL],
         [T_DATE, T_DATETIME, T_TIME],
-        [nil,    'a',        nil]
+        [nil,    nil,        'a']
       ]
     )
 
@@ -56,8 +56,8 @@ describe SpreadBase::Codecs::OpenDocument12 do
 
         assert_size(row_3, 3) do | value_1, value_2, value_3 |
           expect(value_1).to eq(nil)
-          expect(value_2).to eq('a')
-          expect(value_3).to eq(nil)
+          expect(value_2).to eq(nil)
+          expect(value_3).to eq('a')
         end
 
       end
@@ -112,4 +112,90 @@ describe SpreadBase::Codecs::OpenDocument12 do
     expect(value).to eq(T_BIGDECIMAL)
   end
 
+  context "when cells at the end of the row are empty" do
+    let(:document_archive) do
+      document = SpreadBase::Document.new
+
+      document.tables << SpreadBase::Table.new(
+        'abc', [
+          [nil],
+          [nil, nil],
+          [1  , nil],
+          [nil, 1  , nil]
+        ]
+      )
+
+      SpreadBase::Codecs::OpenDocument12.new.encode_to_archive(document)
+    end
+
+    it "should drop such cells" do
+      document = SpreadBase::Codecs::OpenDocument12.new.decode_archive(document_archive)
+      table = document.tables[0]
+
+      assert_size(table.data, 4) do |row_1, row_2, row_3, row_4|
+        assert_size(row_1, 0)
+
+        assert_size(row_2, 0)
+
+        assert_size(row_3, 1) do |value_1|
+          expect(value_1).to eq(1)
+        end
+
+        assert_size(row_4, 2) do |value_1, value_2|
+          expect(value_1).to be_nil
+          expect(value_2).to eq(1)
+        end
+      end
+    end
+  end
+
+  context "when cells of the last row are empty" do
+    let(:document_archive) do
+      document = SpreadBase::Document.new
+
+      document.tables << SpreadBase::Table.new(
+        'abc', [
+          []
+        ]
+      )
+
+      document.tables << SpreadBase::Table.new(
+        'def', [
+          [nil]
+        ]
+      )
+
+      document.tables << SpreadBase::Table.new(
+        'ghi', [
+          [nil, nil]
+        ]
+      )
+
+      document.tables << SpreadBase::Table.new(
+        'jkl', [
+          [nil],
+          [1],
+          [nil]
+        ]
+      )
+
+      SpreadBase::Codecs::OpenDocument12.new.encode_to_archive(document)
+    end
+
+    it "should drop such row" do
+      document = SpreadBase::Codecs::OpenDocument12.new.decode_archive(document_archive)
+      tables = document.tables
+
+      assert_size(tables, 4) do |table_1, table_2, table_3, table_4|
+        assert_size(table_1.data, 0)
+
+        assert_size(table_2.data, 0)
+
+        assert_size(table_3.data, 0)
+
+        assert_size(table_4.data, 2)
+      end
+    end
+  end
+
 end

data/spec/elements/document_spec.rb

@@ -109,4 +109,27 @@ abc:
     expect(@sample_document.to_s(with_headers: true)).to eq(expected_string)
   end
 
+  it "should parse a existing ODS file" do
+    ods_file = File.expand_path('../fixtures/test.ods', __dir__)
+    document = SpreadBase::Document.new(ods_file)
+
+    expect(document.tables[0].name).to eq('Sheet1')
+    expect(document.tables[0].data).to match([
+      match(['hoge'                                      ]),
+      match([nil   , 'fuga'                              ]),
+      match([nil   , nil   , 'piyo'                      ]),
+      match([nil   , nil   , nil   , 'hogera'            ]),
+      match([nil   , nil   , nil   , nil     , 'hogehoge'])
+    ])
+
+    expect(document.tables[1].name).to eq('Sheet2')
+    expect(document.tables[1].data).to match([
+      match([nil  , nil     , nil  , nil  , 'foo']),
+      match([nil  , nil     , nil  , 'bar'       ]),
+      match([nil  , nil     , 'baz'              ]),
+      match([nil  , 'foobar'                     ]),
+      match(['qux'                               ])
+    ])
+  end
+
 end

data/spreadbase.gemspec

@@ -8,16 +8,16 @@ Gem::Specification.new do |s|
   s.name        = "spreadbase"
   s.version     = SpreadBase::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.required_ruby_version = '>= 2.3.0'
+  s.required_ruby_version = '>= 2.4.0'
   s.authors     = ["Saverio Miroddi"]
-  s.date        = '2020-02-03'
+  s.date        = '2021-12-31'
   s.email       = ["saverio.pub2@gmail.com"]
   s.homepage    = "https://github.com/saveriomiroddi/spreadbase"
   s.summary     = %q{Library for reading/writing OpenOffice Calc documents.}
   s.description = %q{Library for reading/writing OpenOffice Calc documents.}
   s.license     = "GPL-3.0"
 
-  s.add_runtime_dependency     "zipruby", "~>0.3.6"
+  s.add_runtime_dependency     "rubyzip", ">=2.3.0"
   s.add_development_dependency "rspec",   "~>3.9.0"
 
   s.add_development_dependency "rake",   "~>13.0"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: spreadbase
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Saverio Miroddi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-03 00:00:00.000000000 Z
+date: 2021-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: zipruby
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -59,9 +59,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -80,6 +80,7 @@ files:
 - spec/codecs/open_document_12_spec.rb
 - spec/elements/document_spec.rb
 - spec/elements/table_spec.rb
+- spec/fixtures/test.ods
 - spec/spec_helper.rb
 - spec/spec_helpers.rb
 - spreadbase.gemspec
@@ -100,14 +101,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Library for reading/writing OpenOffice Calc documents.

data/.travis.yml

@@ -1,7 +0,0 @@
-dist: bionic
-language: ruby
-rvm:
-  - 2.3
-  - 2.4
-  - 2.5
-  - 2.6