spreadsheet_architect 4.2.0 → 5.0.0

data/test/dummy_app/tmp/axlsx-master/models/LegacyPlainRubyObject/data.csv

@@ -0,0 +1,4 @@
+
+row1,test1
+123.456,,123
+123,2019-09-05,2019-09-05 04:38:44 -0700

data/test/dummy_app/tmp/axlsx-master/models/LegacyPlainRubyObject/empty.csv

@@ -0,0 +1 @@
+

data/test/dummy_app/tmp/axlsx-master/models/LegacyPlainRubyObject/instances.csv

@@ -0,0 +1,6 @@
+Name,Content,Object ID
+0,2,70178248097220
+1,3,70178248097180
+2,4,70178248097140
+3,5,70178248097100
+4,6,70178248097060

data/test/dummy_app/tmp/axlsx-master/models/PlainRubyObject/data.csv

@@ -0,0 +1,4 @@
+
+row1,test1
+123.456,,123
+123,2019-09-05,2019-09-05 04:38:44 -0700

data/test/dummy_app/tmp/axlsx-master/models/PlainRubyObject/empty.csv

@@ -0,0 +1 @@
+

data/test/dummy_app/tmp/axlsx-master/models/PlainRubyObject/instances.csv

@@ -0,0 +1,6 @@
+Name,Content,Object ID
+0,2,70178248093200
+1,3,70178248093160
+2,4,70178248093120
+3,5,70178248093080
+4,6,70178248093040

data/test/dummy_app/tmp/axlsx-master/models/Post/data.csv

@@ -0,0 +1,4 @@
+
+row1,test1
+123.456,,123
+123,2019-09-05,2019-09-05 04:38:44 -0700

data/test/dummy_app/tmp/axlsx-master/models/Post/empty.csv

@@ -0,0 +1 @@
+

data/test/dummy_app/tmp/axlsx-master/models/Post/instances.csv

@@ -0,0 +1,6 @@
+Id,Name,Content,Age,Created At,Updated At
+,0,2,,2019-09-05 04:38:44 -0700,
+,1,3,,2019-09-05 04:38:44 -0700,
+,2,4,,2019-09-05 04:38:44 -0700,
+,3,5,,2019-09-05 04:38:44 -0700,
+,4,6,,2019-09-05 04:38:44 -0700,

data/test/integration/application_test.rb

@@ -4,43 +4,35 @@ require 'test_helper'
 
 class ApplicationTest < ActionDispatch::IntegrationTest
   def setup
-    @path = VERSIONED_BASE_PATH.join("integration")
+    @path = TMP_PATH.join("integration")
     FileUtils.mkdir_p(@path)
   end
 
   def test_csv
-    get '/spreadsheets/csv', params: {format: :csv}
+    get '/spreadsheets/csv'
     assert_response :success
 
-    File.open(File.join(@path, 'csv.csv'), 'w+b') do |f|
-      f.write @response.body
-    end
+    save_file('integration/test.csv', @response.body)
   end
 
   def test_ods
     get '/spreadsheets/ods'
     assert_response :success
 
-    File.open(File.join(@path, 'ods.ods'), 'w+b') do |f|
-      f.write @response.body
-    end
+    save_file('integration/test.ods', @response.body)
   end
 
   def test_xlsx
     get '/spreadsheets/xlsx'
     assert_response :success
 
-    File.open(File.join(@path, 'xlsx.xlsx'), 'w+b') do |f|
-      f.write @response.body
-    end
+    save_file('integration/test.xlsx', @response.body)
   end
 
-  def test_alt_xlsx
-    get '/spreadsheets/alt_xlsx', params: {format: :xlsx}
+  def test_respond_with
+    get '/spreadsheets/test_respond_with', params: {format: :xlsx}
     assert_response :success
 
-    File.open(File.join(@path, 'alt_xlsx.xlsx'), 'w+b') do |f|
-      f.write @response.body
-    end
+    save_file('integration/test_respond_with.xlsx', @response.body)
   end
 end

data/test/models/all_models_test.rb

@@ -14,7 +14,7 @@ class AllModelsTest < ActiveSupport::TestCase
   end
 
   def set_path(klass)
-    @path = VERSIONED_BASE_PATH.join("models/#{klass}")
+    @path = TMP_PATH.join("models/#{klass}")
     FileUtils.mkdir_p(@path)
   end
 
@@ -47,9 +47,7 @@ class AllModelsTest < ActiveSupport::TestCase
 
         data = which.send(method, instances: instances)
 
-        File.open(File.join(@path, "instances.#{format}"), 'w+b') do |f|
-          f.write data
-        end
+        save_file("models/#{klass}/instances.#{format}", data)
       end
 
       test "Empty :instances #{klass} #{format}" do
@@ -58,9 +56,9 @@ class AllModelsTest < ActiveSupport::TestCase
         method = "to_#{format}"
         which = klass.respond_to?(method) ? klass : SpreadsheetArchitect
 
-        File.open(File.join(@path, "empty.#{format}"),'w+b') do |f|
-          f.write which.send(method, instances: [])
-        end
+        data = which.send(method, instances: [])
+
+        save_file("models/#{klass}/empty.#{format}", data)
       end
 
       test ":data #{klass} #{format}" do
@@ -71,9 +69,7 @@ class AllModelsTest < ActiveSupport::TestCase
 
         data = which.send(method, data: @data)
 
-        File.open(File.join(@path, "data.#{format}"), 'w+b') do |f|
-          f.write data
-        end
+        save_file("models/#{klass}/data.#{format}", data)
       end
 
       test "Empty :data #{klass} #{format}" do
@@ -82,26 +78,26 @@ class AllModelsTest < ActiveSupport::TestCase
         method = "to_#{format}"
         which = klass.respond_to?(method) ? klass : SpreadsheetArchitect
 
-        File.open(File.join(@path, "empty.#{format}"),'w+b') do |f|
-          f.write which.send(method, data: [])
-        end
+        data = which.send(method, data: [])
+
+        save_file("models/#{klass}/empty.#{format}", data)
       end
 
       if klass.is_a?(ActiveRecord::Base)
         test "ActiveRecord::Relation" do
           method = "to_#{format}"
 
-          File.open(File.join(@path, "active_record_relation.#{format}"),'w+b') do |f|
-            f.write klass.all.send(method)
-          end
+          data = klass.all.send(method)
+
+          save_file("models/#{klass}/active_record_relation.#{format}", data)
         end
 
         test "Empty ActiveRecord::Relation" do
           method = "to_#{format}"
 
-          File.open(File.join(@path, "empty_active_record_relation.#{format}"),'w+b') do |f|
-            f.write klass.limit(0).send(method)
-          end
+          data = klass.limit(0).send(method)
+
+          save_file("models/#{klass}/empty_active_record_relation.#{format}", data)
         end
       end
 

data/test/test_helper.rb

@@ -1,5 +1,7 @@
 ENV["RAILS_ENV"] = "test"
 
+require 'pry'
+
 begin
   require 'warning'
 
@@ -10,6 +12,8 @@ rescue LoadError
   # Do nothing
 end
 
+require 'pry'
+
 require File.expand_path("../dummy_app/config/environment.rb",  __FILE__)
 
 migration_path = Rails.root.join('db/migrate')
@@ -30,6 +34,8 @@ class ActiveSupport::TestCase
   fixtures :all
 end
 
+require 'minitest-spec-rails' ### for describe blocks
+
 require 'minitest/reporters'
 Minitest::Reporters.use!(
   Minitest::Reporters::DefaultReporter.new,
@@ -37,6 +43,8 @@ Minitest::Reporters.use!(
   Minitest.backtrace_filter
 )
 
+require 'minitest-spec-rails'
+
 post_count = Post.count
 if post_count < 5
   (5 - post_count).times do |i|
@@ -44,15 +52,36 @@ if post_count < 5
   end
 end
 
-caxlsx_spec = Gem.loaded_specs['caxlsx']
-if caxlsx_spec.source.is_a?(Bundler::Source::Rubygems)
-  caxlsx_version = caxlsx_spec.version.to_s
-else
-  caxlsx_version = 'caxlsx-master'
+TMP_PATH = Rails.root.join("../../tmp/")
+
+### Cleanup old test spreadsheets
+FileUtils.remove_dir(TMP_PATH, true)
+FileUtils.mkdir_p(TMP_PATH)
+
+def save_file(path, file_data)
+  if file_data.is_a?(Axlsx::Package)
+    file_data = file_data.to_stream.read
+  elsif file_data.is_a?(RODF::Spreadsheet)
+    file_data = file_data.bytes
+  end
+
+  path = Rails.root.join("../../tmp/", path)
+
+  FileUtils.mkdir_p(File.dirname(path))
+
+  File.open(TMP_PATH.join(path), "w+b") do |f|
+    f.write file_data
+  end
 end
 
-VERSIONED_BASE_PATH = Rails.root.join("../../tmp/#{caxlsx_version}")
+def parse_ods_spreadsheet(spreadsheet)
+  Nokogiri::XML(spreadsheet.xml)
+end
 
-### Cleanup old test spreadsheets
-FileUtils.remove_dir(VERSIONED_BASE_PATH, true)
-FileUtils.mkdir_p(VERSIONED_BASE_PATH)
+def parse_axlsx_package(package)
+  Nokogiri::XML(package.workbook.worksheets.first.to_xml_string)
+end
+
+def parse_axlsx_worksheet(worksheet)
+  Nokogiri::XML(worksheet.to_xml_string)
+end

data/test/unit/ods/general_test.rb

@@ -0,0 +1,121 @@
+require "test_helper"
+
+class OdsGeneralTest < ActiveSupport::TestCase
+
+  test "multisheet" do
+    test_data = [[1,2,3], [4,5,6], [7,8,9]]
+
+    spreadsheet = Post.to_rodf_spreadsheet
+    spreadsheet = CustomPost.to_rodf_spreadsheet({sheet_name: 'Latest Projects'}, spreadsheet)
+    spreadsheet = SpreadsheetArchitect.to_rodf_spreadsheet({data: test_data, sheet_name: 'Another Sheet'}, spreadsheet)
+
+    save_file("ods/multi_sheet.ods", spreadsheet.bytes)
+  end
+
+  test "kitchen sink" do
+    options = {
+      headers: [
+        ['Latest Posts'],
+        ['Title','Category','Author','Posted on','Posted At','Earnings']
+      ],
+      data: 50.times.map{|i| [i, "foobar-#{i}", 5.4*i, true, Date.today, Time.now]},
+      header_style: {background_color: "000000", color: "FFFFFF", align: :center, font_size: 12, bold: true},
+      row_style: {background_color: nil, color: "000000", align: :left, font_size: 12},
+      sheet_name: 'Kitchen Sink',
+      freeze_headers: true,
+      column_types: [
+        :string,
+        :float,
+        :float, 
+        :boolean,
+        :date,
+        :time,
+        nil
+      ],
+    }
+
+    # Using Array Data
+    file_data = SpreadsheetArchitect.to_ods(options)
+
+    save_file("ods/kitchen_sink.ods", file_data)
+  end
+
+  describe "column_types" do
+    test "validates provided types" do
+      assert_raise SpreadsheetArchitect::Exceptions::ArgumentError do
+        SpreadsheetArchitect.to_ods(
+          data: [], 
+          column_types: [""]
+        )
+      end
+
+      SpreadsheetArchitect.to_ods(
+        data: [], 
+        column_types: [:string, :float, :date, :time, :boolean, :hyperlink, nil, ->(x){ :foo }]
+      )
+    end
+
+    test "works with Proc types" do
+      url = "https://github.com/westonganger/spreadsheet_architect"
+
+      data = [
+        [1, 2],
+        [1, url],
+      ]
+
+      ss = SpreadsheetArchitect.to_rodf_spreadsheet(
+        data: data, 
+        column_types: [
+          :string, 
+          ->(x){ x.to_s.start_with?("http") ? :hyperlink : :string }
+        ]
+      )
+
+      doc = parse_ods_spreadsheet(ss)
+
+      cells = doc.xpath("//table:table-cell")
+      hyperlinks = doc.xpath("//text:a")
+
+      assert_equal 4, cells.size
+      assert_equal 1, hyperlinks.size
+
+      cell = cells[3]
+      assert_equal url, cell.text
+      assert_equal url, cell.at_xpath(".//text:a").attributes["href"].value
+
+      save_file("ods/hyperlinks.ods", ss)
+    end
+
+    describe "hyperlinks" do
+      test "shows the text and have the correct attributes" do
+        url = "https://github.com/westonganger/spreadsheet_architect"
+
+        data = [
+          [1,2,3],
+          [1, url, "https://github.com/caxlsx/caxlsx"],
+        ]
+
+        ss = SpreadsheetArchitect.to_rodf_spreadsheet(data: data, column_types: [:string, :hyperlink, :string])
+
+        doc = parse_ods_spreadsheet(ss)
+
+        cells = doc.xpath("//table:table-cell")
+        hyperlinks = doc.xpath("//text:a")
+
+        assert_equal 6, cells.size
+        assert_equal 2, hyperlinks.size
+
+        cell = cells[1]
+        assert_equal "2", cell.text
+        assert_equal "2", cell.at_xpath(".//text:a").attributes["href"].value
+
+        cell = cells[4]
+        assert_equal url, cell.text
+        assert_equal url, cell.at_xpath(".//text:a").attributes["href"].value
+
+        save_file("ods/hyperlinks.ods", ss)
+      end
+    end
+  end
+
+end

data/test/unit/{formats_test.rb → rails/formats_test.rb}

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class FormatsTest < ActiveSupport::TestCase
+class RailsFormatsTest < ActiveSupport::TestCase
 
   [:xlsx, :ods, :csv].each do |format|
     test "Registers :#{format} mime type" do

data/test/unit/{exceptions_test.rb → spreadsheet_architect/exceptions_test.rb}

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ExceptionsTest < ActiveSupport::TestCase
+class SpreadsheetArchitectExceptionsTest < ActiveSupport::TestCase
 
   test "ArgumentError" do
     error = SpreadsheetArchitect::Exceptions::ArgumentError
@@ -129,8 +129,8 @@ class ExceptionsTest < ActiveSupport::TestCase
     end
   end
 
-  test "InvalidRangeStylesOptionError" do
-    error = SpreadsheetArchitect::Exceptions::InvalidRangeStylesOptionError
+  test "InvalidRangeOptionError" do
+    error = SpreadsheetArchitect::Exceptions::InvalidRangeOptionError
 
     assert_raise ArgumentError do
       error.new
@@ -149,6 +149,22 @@ class ExceptionsTest < ActiveSupport::TestCase
     end
   end
 
+  test "InvalidRangeValue" do
+    error = SpreadsheetArchitect::Exceptions::InvalidRangeValue
+
+    assert_raise error do
+      SpreadsheetArchitect::Utils::XLSX.verify_range("foo:foo", 1)
+    end
+
+    assert_raise error do
+      SpreadsheetArchitect::Utils::XLSX.verify_range("@1:A2", 1)
+    end
+
+    assert_raise error do
+      SpreadsheetArchitect::Utils::XLSX.verify_range("A1:A2", 1)
+    end
+  end
+
   test "InvalidRangeError" do
     error = SpreadsheetArchitect::Exceptions::InvalidRangeError
 
@@ -174,18 +190,6 @@ class ExceptionsTest < ActiveSupport::TestCase
     assert_raise error do
       SpreadsheetArchitect::Utils::XLSX.verify_range("foo", 1)
     end
-
-    assert_raise error do
-      SpreadsheetArchitect::Utils::XLSX.verify_range("foo:foo", 1)
-    end
-
-    assert_raise error do
-      SpreadsheetArchitect::Utils::XLSX.verify_range("A1:A2", 1)
-    end
-
-    assert_raise error do
-      SpreadsheetArchitect::Utils::XLSX.verify_range("@1:A2", 1)
-    end
   end
 
 end

data/test/unit/{general_test.rb → spreadsheet_architect/spreadsheet_architect_test.rb}

@@ -1,12 +1,12 @@
 require 'test_helper'
 
-class GeneralTest < ActiveSupport::TestCase
+class SpreadsheetArchitectTest < ActiveSupport::TestCase
 
-  test "Version accessible by default" do
+  test "version accessible by default" do
     assert_not_nil SpreadsheetArchitect::VERSION
   end
 
-  test "Constants dont change" do
+  test "constants dont change" do
     x = SpreadsheetArchitect.default_options.to_s
     SpreadsheetArchitect.to_xlsx(headers: [[1]], data: [[1]], header_style: {b: false}, row_style: {background_color: '000000'})
     assert_equal(x, SpreadsheetArchitect.default_options.to_s)

data/test/unit/spreadsheet_architect/utils/ods_test.rb

@@ -0,0 +1,58 @@
+require 'test_helper'
+
+class SpreadsheetArchitect::Utils::OdsTest < ActiveSupport::TestCase
+  klass = SpreadsheetArchitect::Utils::ODS
+  
+  describe "get_cell_type" do
+    describe "without passing the type argument" do
+      test "it gets the correct cell type" do
+        assert_equal :string, klass.get_cell_type("foobar")
+        assert_equal :float, klass.get_cell_type(1)
+      end
+    end
+
+    describe "when passing the type argument" do
+      test "returns the given type" do
+        assert_equal "foobar", klass.get_cell_type(1, "foobar")
+      end
+
+      describe "hyperlinks" do
+        test "returns :string" do
+          assert_equal :string, klass.get_cell_type("foobar", :hyperlink)
+          assert_equal :string, klass.get_cell_type(1, :hyperlink)
+        end
+      end
+    end
+  end
+
+  describe "convert_styles" do
+    test "convert_styles_to_ods" do
+      ods_styles = klass.convert_styles({
+        background_color: '333333', 
+        color: '000000', 
+        align: true, 
+        bold: true, 
+        font_size: 14, 
+        italic: true, 
+        underline: true, 
+        test: true
+      })
+
+      assert_equal(ods_styles, {
+        'cell' => {
+          'background-color' => '#333333'
+        }, 
+        'text' => {
+          'color' => '#000000', 
+          'align' => true, 
+          'font-weight' => 'bold', 
+          'font-size' => 14, 
+          'font-style' => 'italic', 
+          'text-underline-type' => 'single', 
+          'text-underline-style' => 'solid'
+        }
+      })
+    end
+  end
+
+end

data/test/unit/{xlsx_utils_test.rb → spreadsheet_architect/utils/xlsx_test.rb}

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class XlsxUtilsTest < ActiveSupport::TestCase
+class SpreadsheetArchitectXlsxUtilsTest < ActiveSupport::TestCase
   klass = SpreadsheetArchitect::Utils::XLSX
 
   def setup
@@ -30,26 +30,22 @@ class XlsxUtilsTest < ActiveSupport::TestCase
     num_columns = 26
     num_rows = 10
 
-    assert_raise SpreadsheetArchitect::Exceptions::InvalidRangeStylesOptionError do
+    assert_raise SpreadsheetArchitect::Exceptions::InvalidRangeError do
       klass.range_hash_to_str({}, num_columns, num_rows)
     end
 
-    assert_raise SpreadsheetArchitect::Exceptions::InvalidRangeStylesOptionError do
-      klass.range_hash_to_str({columns: 1}, num_columns, num_rows)
-    end
-
-    assert_raise SpreadsheetArchitect::Exceptions::InvalidRangeStylesOptionError do
-      klass.range_hash_to_str({rows: 1}, num_columns, num_rows)
-    end
-
-    assert_raise SpreadsheetArchitect::Exceptions::InvalidRangeStylesOptionError do
+    assert_raise SpreadsheetArchitect::Exceptions::InvalidRangeOptionError do
       klass.range_hash_to_str({columns: [1,2,3], rows: 1}, num_columns, num_rows)
     end
 
-    assert_raise SpreadsheetArchitect::Exceptions::InvalidRangeStylesOptionError do
+    assert_raise SpreadsheetArchitect::Exceptions::InvalidRangeOptionError do
       klass.range_hash_to_str({columns: 1, rows: [1,2,3]}, num_columns, num_rows)
     end
 
+    assert_equal klass.range_hash_to_str({columns: 1}, num_columns, num_rows), "B1:B10"
+
+    assert_equal klass.range_hash_to_str({rows: 1}, num_columns, num_rows), "A1:Z1"
+
     assert_equal klass.range_hash_to_str({columns: 0, rows: 1}, num_columns, num_rows), "A1:A1"
 
     assert_equal klass.range_hash_to_str({columns: (0..2), rows: (1..3)}, num_columns, num_rows), "A1:C3"
@@ -58,7 +54,7 @@ class XlsxUtilsTest < ActiveSupport::TestCase
 
     assert_equal klass.range_hash_to_str({columns: :all, rows: :all}, num_columns, num_rows), "A1:Z10"
 
-    assert_raise SpreadsheetArchitect::Exceptions::InvalidRangeError do
+    assert_raise SpreadsheetArchitect::Exceptions::InvalidRangeValue do
       assert_equal klass.range_hash_to_str({columns: ('foobar'..'asd'), rows: (1..3)}, num_columns, num_rows), "foobar1:asd3"
     end
   end
@@ -76,13 +72,11 @@ class XlsxUtilsTest < ActiveSupport::TestCase
       klass.verify_range("A1Z10", num_rows)
     end
 
-    assert_raise SpreadsheetArchitect::Exceptions::InvalidRangeError do
-      klass.verify_range("A1:A11", num_rows)
+    assert_raise SpreadsheetArchitect::Exceptions::InvalidRangeValue do
+      klass.verify_range("A1:A#{num_rows+1}", num_rows)
     end
 
-    #assert_raise SpreadsheetArchitect::Exceptions::InvalidRangeError do
-      klass.verify_range("A1:AAA1", num_rows)
-    #end
+    klass.verify_range("A1:AAA1", num_rows)
   end
 
   test "verify_column" do
@@ -108,9 +102,7 @@ class XlsxUtilsTest < ActiveSupport::TestCase
       klass.verify_column([], num_columns)
     end
 
-    #assert_raise SpreadsheetArchitect::Exceptions::InvalidColumnError do
-      klass.verify_column("ZZ", num_columns)
-    #end
+    klass.verify_column("ZZ", num_columns)
   end
 
   test "constants" do