excel-esv 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 296eaa62bc218863be1ed8d947df92b64fa20e3a
-  data.tar.gz: df593163f0e19a30bc541185369099e53dca4a67
+  metadata.gz: '091fb26ba128c0aa7edfb4626b5352932f5cd687'
+  data.tar.gz: 19a2ce71dff87da35950c2565c4e3f14356ccf7e
 SHA512:
-  metadata.gz: e041a707d2f2280ed5e9281fcaa23ed0b57480fa27b6de36d31a0325c75008833e5bcde9857e6ed94a2c766f7127e5bf26c1fb2a7c2a6271e3b8b8a7548df535
-  data.tar.gz: e22498268e8c84dc2cd459eac4d87fcf49fb20c00201726ca2f09b21c4da33ca10f6524d55891798257913b4fa901f2079f08a151a9640c6f37440f92d9ffb0a
+  metadata.gz: f5d61d2edd87c497fe58009ee373becca121ba5bbba4da5af46dbc2974bfede3a8f54c7d2cb25c60511c9557e12dfdb1d8912c2fb305e600c1951b4982154b19
+  data.tar.gz: d16b94bce839a3962cde843c50af7047c142a4c4f8f23d991a657ed6cd603dbfb799a162fe6c095048ded07c10ac0a6675f378f83f584f3a82b64d02e10731b9

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 3.0.0
+
+* Returns the last value of any formula cells instead of returning a `Spreadsheet::Formula`.
+* Returns the URL of any link cells instead of returning a `Spreadsheet::Link`.
+
 # 2.0.0
 
 * `parse` now returns an actual nested `Array`, not array-like `Spreadsheet::Row` records.

data/README.md

@@ -2,9 +2,11 @@
 
 Ruby library/gem for Excel parsing and generation with the ease of CSV.
 
-Exporting CSVs because Excel generation is too complex? No more!
+Exporting CSVs because Excel generation is too complex? No more! CSVs can also be difficult to open correctly, e.g. in Excel on Mac.
 
-CSVs can be difficult to open correctly, e.g. in Excel on Mac.
+ESV will read and generate XLS files. There is currently no XLSX support, but Pull Requests are welcome.
+
+By design, ESV only reads and writes simple values like integers, floats, strings and dates/datetimes. When parsing a spreadsheet with formulas, you will get their last value, if known.
 
 
 ## Usage

data/lib/esv.rb

@@ -25,7 +25,15 @@ module ESV
     worksheet_count = book.worksheets.length
     raise "Expected 1 worksheet, found #{worksheet_count}." if worksheet_count > 1
 
-    book.worksheet(0).to_a.map(&:to_a)
+    book.worksheet(0).to_a.map(&:to_a).map { |row|
+      row.map { |cell|
+        case cell
+        when Spreadsheet::Formula then cell.value
+        when Spreadsheet::Link then cell.href
+        else cell
+        end
+      }
+    }
   end
 
   def self.parse_file(path)

data/lib/esv/version.rb

@@ -1,3 +1,3 @@
 module ESV
-  VERSION = "2.0.0"
+  VERSION = "3.0.0"
 end

data/spec/esv_spec.rb

@@ -23,7 +23,7 @@ describe ESV, ".parse" do
     }.to raise_error(/Expected 1 worksheet, found 2/)
   end
 
-  it "ignores formatting" do
+  it "ignores formatting, always returning a plain array of data" do
     output = ESV.parse(excel_file_with_formatting([1, 2]))
     expect(output).to eq [
       [ 1, 2 ],
@@ -32,24 +32,68 @@ describe ESV, ".parse" do
     expect(output[0].class).to eq Array
   end
 
+  it "returns the last value of a formula cell" do
+    output = ESV.parse(excel_file_with_formula)
+    expect(output).to eq [
+      [ "one", "two" ],
+    ]
+
+    expect(output[0].class).to eq Array
+  end
+
+  it "returns the last value of a formula cell" do
+    output = ESV.parse(excel_file_with_formula)
+    expect(output).to eq [
+      [ "one", "two" ],
+    ]
+
+    expect(output[0].class).to eq Array
+  end
+
+  it "returns the URL of a link cell" do
+    output = ESV.parse(excel_file_with_link("https://example.com"))
+    expect(output).to eq [
+      [ "one", "https://example.com" ],
+    ]
+
+    expect(output[0][1].class).to eq String
+  end
+
   private
 
   def excel_file_with_two_worksheets
-    book = Spreadsheet::Workbook.new
-    book.create_worksheet
-    book.create_worksheet
-
-    data = ""
-    fake_file = StringIO.new(data)
-    book.write(fake_file)
-    data
+    excel_file do |sheet, book|
+      book.create_worksheet
+    end
   end
 
   def excel_file_with_formatting(data)
+    excel_file do |sheet|
+      sheet.row(0).replace(data)
+      sheet.row(0).default_format = Spreadsheet::Format.new(color: :blue)
+    end
+  end
+
+  def excel_file_with_formula
+    excel_file do |sheet|
+      formula = Spreadsheet::Formula.new
+      formula.value = "two"
+      sheet.row(0).replace([ "one", formula ])
+    end
+  end
+
+  def excel_file_with_link(url)
+    excel_file do |sheet|
+      link = Spreadsheet::Link.new(url)
+      sheet.row(0).replace([ "one", link ])
+    end
+  end
+
+  def excel_file(&block)
     book = Spreadsheet::Workbook.new
     sheet = book.create_worksheet
-    sheet.row(0).replace(data)
-    sheet.row(0).default_format = Spreadsheet::Format.new(color: :blue)
+
+    block.call(sheet, book)
 
     data = ""
     fake_file = StringIO.new(data)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: excel-esv
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Henrik Nyh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-19 00:00:00.000000000 Z
+date: 2018-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spreadsheet