workbook 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19f7a4905a129fba73781bb8ef9f672573419b5b754508bc3cc28aff968d5fb8
-  data.tar.gz: 7bd07336aaee461b7ff487c683b427ba29d717bee23731d80c1e74d1a1f7cd1e
+  metadata.gz: 898a4a79301299545d91cfdd5b5f1f261f4cde32337d4713256f21d894cc49f0
+  data.tar.gz: ee61cd9e3e3687092b5c8ca82e8aa10bf8f846553a3602ce3c46103b43ee4e9b
 SHA512:
-  metadata.gz: 5d20a391aee1d3338f08ecddb104cca25411626787bec16a2c0a25e125efa6bbee91f79350a919afcca7d6443fac62ca34d2f2da20985e1eae3b59c73e6f6b7f
-  data.tar.gz: 93d1ffe829d5fb3f591b9ef5244c013f4268d982f8e148893439b7788d8422f99e1449577fd708e753cb26db9029db1a08a1e46e8db0d12860e23db4124a8a82
+  metadata.gz: 27b2ab505f2ff035a12e839db5148337c504d81bb2c2517b2eb1ac4749df5e47f31fd281386c4c4d4880c2e24c75a3630d02c7a7bb13e5f62789543bf991f7f9
+  data.tar.gz: 465f709b61f96afe734739b214d1b56daa06e837ea8cd85f98c9343f9c1f7d3337409616bdc5617fa456de3718427d0d89ae89c1fa40a13efe4afbe8841ac175

data/CHANGELOG.md

@@ -1,8 +1,9 @@
 # Changelog
 
-### 0.9.0 (in progress)
+### 0.9.0
 
 * Dropped inheritance from Array and borrowed from the Enumerable module instead (this might break some existing implementations; please create pull request if you miss Array like functionality)
+* Fix: ODS: Currency formatted cell now no longer returns String
 
 ### 0.8.1
 

data/json_test.json

@@ -0,0 +1 @@
+[{"a":1,"b":2},{"a":"2012-01-01","b":null}]

data/lib/workbook/readers/ods_reader.rb

@@ -138,6 +138,7 @@ module Workbook
       def parse_local_value(valuetype)
         value = CGI.unescapeHTML(@cell.xpath("text:p//text()").to_s)
         value = value == "" ? nil : value
+
         case valuetype
         when "integer"
           value = @cell.xpath("@office:value").to_s.to_i
@@ -146,6 +147,8 @@ module Workbook
           value = value.to_i unless /\./.match?(@cell.xpath("@office:value").to_s) # sadly most integers are typed as floats...
         when "date"
           value = DateTime.parse(@cell.xpath("@office:date-value").to_s)
+        when "currency"
+          value = @cell.xpath("@office:value").to_s.to_f
         end
         value
       end

data/lib/workbook/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Workbook
-  VERSION = "0.8.2"
+  VERSION = "0.9.0"
 end

data/test/test_modules_cell.rb

@@ -142,6 +142,14 @@ class TestModulesCell < Minitest::Test
     assert_equal(2, t[2][2].index)
   end
 
+  def test_inspect
+    c = Workbook::Cell.new(1)
+    assert_equal("<Workbook::Cell @value=1 @cell_type=integer>", c.inspect)
+    c = Workbook::Cell.new(Date.new(2023,12,1))
+    assert_equal("<Workbook::Cell @value=2023-12-01 @cell_type=date>", c.inspect)
+  end
+
+
   def test_key
     t = Workbook::Table.new [[:a, :b, :c], [1, 2, 3], [4, 5, 6]]
     assert_equal(:c, t[2][2].key)

data/test/test_readers_ods_reader.rb

@@ -31,6 +31,14 @@ module Readers
       assert_equal(1.2, w.sheet.table[3][1].value)
     end
 
+    def test_currency
+      w = Workbook::Book.new
+      w.import File.join(File.dirname(__FILE__), "artifacts/currency_test.ods")
+
+      assert_equal(1200, w.sheet.table["H2"].value)
+      assert_equal(1200.4, w.sheet.table["H4"].value)
+    end
+
     def test_excel_standardized_open
       w = Workbook::Book.new
       w.import File.join(File.dirname(__FILE__), "artifacts/excel_different_types.ods")

data/test/test_sheet.rb

@@ -71,18 +71,6 @@ class TestWorkbook < Minitest::Test
     assert_equal(false, table1 == table0)
   end
 
-  def test_profile_speed
-    w = Workbook::Book.new [["a", "b"], [1, 2], [3, 4], [1, 2], [3, 4], [1, 2], [3, 4], [1, 2], [3, 4], [1, 2], [3, 4], [1, 2], [3, 4], [1, 2], [3, 4], [1, 2], [3, 4], [1, 2], [3, 4], [1, 2], [3, 4], [1, 2], [3, 4], [1, 2], [3, 4], [1, 2], [3, 4], [1, 2], [3, 4], [1, 2], [3, 4], [1, 2], [3, 4], [1, 2], [3, 4], [1, 2], [3, 4]]
-    require "ruby-prof"
-    RubyProf.start
-    w.sheet.table.each do |row|
-      row[:a].value
-    end
-    result = RubyProf.stop
-    printer = RubyProf::MultiPrinter.new(result)
-    printer.print(path: ".", profile: "profile")
-  end
-
   def test_name
     b = Workbook::Book.new [["a", "b"], [1, 2]]
     b.push Workbook::Sheet.new([["a", "b"], [2, 2]])

data/test/test_writers_json_writer.rb

@@ -17,5 +17,12 @@ module Writers
       assert_equal("[{\"a\":1,\"b\":2},{\"a\":\"2012-01-01\",\"b\":null}]",
         Workbook::Table.new([["a", "b"], [1, 2], [Date.new(2012, 1, 1), nil]]).to_json)
     end
+
+    def test_write_to_json
+      filename = Workbook::Table.new([["a", "b"], [1, 2], [Date.new(2012, 1, 1), nil]]).write_to_json("json_test.json")
+      json_written = File.read(filename)
+      assert_equal("[{\"a\":1,\"b\":2},{\"a\":\"2012-01-01\",\"b\":null}]",json_written)
+
+    end
   end
 end

data/workbook.gemspec

@@ -11,12 +11,11 @@ Gem::Specification.new do |s|
   s.summary = "Workbook is a datastructure to contain books of tables (an anlogy used in e.g. Excel)"
   s.description = "Workbook contains workbooks, as in a table, contains rows, contains cells, reads/writes excel, ods and csv and tab separated files, and offers basic diffing and sorting capabilities."
   s.authors = ["Maarten Brouwers"]
-  s.add_development_dependency "ruby-prof", "~> 0.14"
-  s.add_development_dependency("rake", "~> 12.0")
-  s.add_development_dependency("minitest", "~> 5.4")
+  s.add_development_dependency("rake", "> 12.0")
+  s.add_development_dependency("minitest", "> 5.4")
   s.add_development_dependency("byebug", "> 10")
-  s.add_development_dependency("standard", "~> 0.1.0")
-  s.add_development_dependency("simplecov", "~> 0.17.0")
+  s.add_development_dependency("standard", "> 1.0")
+  s.add_development_dependency("simplecov", "> 0.17.0")
   s.add_dependency("spreadsheet", "> 1.2")
   s.add_dependency("rchardet", ">= 1.8.0")
   s.add_dependency("json", "> 2.3")

metadata

@@ -1,55 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: workbook
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Maarten Brouwers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-11 00:00:00.000000000 Z
+date: 2024-09-14 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: ruby-prof
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '12.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '5.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '5.4'
 - !ruby/object:Gem::Dependency
@@ -70,28 +56,28 @@ dependencies:
   name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: 0.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: 0.17.0
 - !ruby/object:Gem::Dependency
@@ -209,6 +195,7 @@ files:
 - README.md
 - Rakefile
 - bin/axldiff
+- json_test.json
 - lib/workbook.rb
 - lib/workbook/book.rb
 - lib/workbook/cell.rb
@@ -255,6 +242,7 @@ files:
 - test/artifacts/book_with_tabs_and_colours.xlsx
 - test/artifacts/complex_types.ods
 - test/artifacts/complex_types.xls
+- test/artifacts/currency_test.ods
 - test/artifacts/excel_different_types.csv
 - test/artifacts/excel_different_types.ods
 - test/artifacts/excel_different_types.txt
@@ -337,6 +325,7 @@ test_files:
 - test/artifacts/book_with_tabs_and_colours.xlsx
 - test/artifacts/complex_types.ods
 - test/artifacts/complex_types.xls
+- test/artifacts/currency_test.ods
 - test/artifacts/excel_different_types.csv
 - test/artifacts/excel_different_types.ods
 - test/artifacts/excel_different_types.txt