spreadsheet_architect 3.2.0 → 4.0.1

data/test/dummy_app/tmp/3.0.0.pre/integration/csv.csv

@@ -1,6 +1,6 @@
 Id,Name,Content,Age,Created At,Updated At
-1,,,0,,2018-07-06 15:32:02 UTC
-2,,,1,,2018-07-06 15:32:02 UTC
-3,,,2,,2018-07-06 15:32:02 UTC
-4,,,3,,2018-07-06 15:32:02 UTC
-5,,,4,,2018-07-06 15:32:02 UTC
+1,,,0,,2019-11-27 17:21:37 UTC
+2,,,1,,2019-11-27 17:21:37 UTC
+3,,,2,,2019-11-27 17:21:37 UTC
+4,,,3,,2019-11-27 17:21:37 UTC
+5,,,4,,2019-11-27 17:21:37 UTC

data/test/dummy_app/tmp/3.0.0.pre/models/ActiveModelObject/data.csv

@@ -1,3 +1,3 @@
 row1,test1
 123.456,,123
-123,2018-09-14,2018-09-14 19:20:52 -0700
+123,2019-11-27,2019-11-27 09:52:43 -0800

data/test/dummy_app/tmp/3.0.0.pre/models/ActiveModelObject/instances.csv

@@ -1,6 +1,6 @@
 Name,Content,Created At
-0,2,2018-09-14 19:20:51 -0700
-1,3,2018-09-14 19:20:51 -0700
-2,4,2018-09-14 19:20:51 -0700
-3,5,2018-09-14 19:20:51 -0700
-4,6,2018-09-14 19:20:51 -0700
+0,2,2019-11-27 09:52:42 -0800
+1,3,2019-11-27 09:52:42 -0800
+2,4,2019-11-27 09:52:42 -0800
+3,5,2019-11-27 09:52:42 -0800
+4,6,2019-11-27 09:52:42 -0800

data/test/dummy_app/tmp/3.0.0.pre/models/CustomColumnsMethodPost/data.csv

@@ -1,3 +1,3 @@
 row1,test1
 123.456,,123
-123,2018-09-14,2018-09-14 19:20:52 -0700
+123,2019-11-27,2019-11-27 09:52:43 -0800

data/test/dummy_app/tmp/3.0.0.pre/models/CustomColumnsMethodPost/instances.csv

@@ -1,6 +1,6 @@
 Name,The Content,Created At,Created At Date,asd
-0,2,2018-09-15 02:20:51 UTC,2018-09-15,tadaaa
-1,3,2018-09-15 02:20:51 UTC,2018-09-15,tadaaa
-2,4,2018-09-15 02:20:51 UTC,2018-09-15,tadaaa
-3,5,2018-09-15 02:20:51 UTC,2018-09-15,tadaaa
-4,6,2018-09-15 02:20:51 UTC,2018-09-15,tadaaa
+0,2,2019-11-27 17:52:42 UTC,2019-11-27,tadaaa
+1,3,2019-11-27 17:52:42 UTC,2019-11-27,tadaaa
+2,4,2019-11-27 17:52:42 UTC,2019-11-27,tadaaa
+3,5,2019-11-27 17:52:42 UTC,2019-11-27,tadaaa
+4,6,2019-11-27 17:52:42 UTC,2019-11-27,tadaaa

data/test/dummy_app/tmp/3.0.0.pre/models/CustomPost/data.csv

@@ -1,3 +1,3 @@
 row1,test1
 123.456,,123
-123,2018-09-14,2018-09-14 19:20:52 -0700
+123,2019-11-27,2019-11-27 09:52:43 -0800

data/test/dummy_app/tmp/3.0.0.pre/models/CustomPost/instances.csv

@@ -1,6 +1,6 @@
 Name,The Content,Created At,Created At Date,asd
-0,2,2018-09-15 02:20:51 UTC,2018-09-15,tadaaa
-1,3,2018-09-15 02:20:51 UTC,2018-09-15,tadaaa
-2,4,2018-09-15 02:20:51 UTC,2018-09-15,tadaaa
-3,5,2018-09-15 02:20:51 UTC,2018-09-15,tadaaa
-4,6,2018-09-15 02:20:51 UTC,2018-09-15,tadaaa
+0,2,2019-11-27 17:52:42 UTC,2019-11-27,tadaaa
+1,3,2019-11-27 17:52:42 UTC,2019-11-27,tadaaa
+2,4,2019-11-27 17:52:42 UTC,2019-11-27,tadaaa
+3,5,2019-11-27 17:52:42 UTC,2019-11-27,tadaaa
+4,6,2019-11-27 17:52:42 UTC,2019-11-27,tadaaa

data/test/dummy_app/tmp/3.0.0.pre/models/LegacyPlainRubyObject/data.csv

@@ -1,3 +1,3 @@
 row1,test1
 123.456,,123
-123,2018-09-14,2018-09-14 19:20:52 -0700
+123,2019-11-27,2019-11-27 09:52:43 -0800

data/test/dummy_app/tmp/3.0.0.pre/models/LegacyPlainRubyObject/instances.csv

@@ -1,6 +1,6 @@
 Name,Content,Object ID
-0,2,70194593688160
-1,3,70194593688100
-2,4,70194593688060
-3,5,70194593688000
-4,6,70194593687920
+0,2,47100396508880
+1,3,47100396508840
+2,4,47100396508800
+3,5,47100396508760
+4,6,47100396508700

data/test/dummy_app/tmp/3.0.0.pre/models/PlainRubyObject/data.csv

@@ -1,3 +1,3 @@
 row1,test1
 123.456,,123
-123,2018-09-14,2018-09-14 19:20:52 -0700
+123,2019-11-27,2019-11-27 09:52:43 -0800

data/test/dummy_app/tmp/3.0.0.pre/models/PlainRubyObject/empty.csv

@@ -0,0 +1 @@
+

data/test/dummy_app/tmp/3.0.0.pre/models/PlainRubyObject/instances.csv

@@ -1,6 +1,6 @@
 Name,Content,Object ID
-0,2,70194593673320
-1,3,70194593673280
-2,4,70194593673240
-3,5,70194593673200
-4,6,70194593673160
+0,2,47100396538300
+1,3,47100396538260
+2,4,47100396538220
+3,5,47100396538080
+4,6,47100396537920

data/test/dummy_app/tmp/3.0.0.pre/models/Post/data.csv

@@ -1,3 +1,3 @@
 row1,test1
 123.456,,123
-123,2018-09-14,2018-09-14 19:20:52 -0700
+123,2019-11-27,2019-11-27 09:52:43 -0800

data/test/dummy_app/tmp/3.0.0.pre/models/Post/empty.csv

@@ -1 +0,0 @@
-Id,Name,Content,Age,Created At,Updated At

data/test/dummy_app/tmp/3.0.0.pre/models/Post/instances.csv

@@ -1,6 +1,6 @@
 Id,Name,Content,Age,Created At,Updated At
-,0,2,,2018-09-14 19:20:51 -0700,
-,1,3,,2018-09-14 19:20:51 -0700,
-,2,4,,2018-09-14 19:20:51 -0700,
-,3,5,,2018-09-14 19:20:51 -0700,
-,4,6,,2018-09-14 19:20:51 -0700,
+,0,2,,2019-11-27 09:52:42 -0800,
+,1,3,,2019-11-27 09:52:42 -0800,
+,2,4,,2019-11-27 09:52:42 -0800,
+,3,5,,2019-11-27 09:52:42 -0800,
+,4,6,,2019-11-27 09:52:42 -0800,

data/test/test_helper.rb

@@ -3,7 +3,9 @@ ENV["RAILS_ENV"] = "test"
 require File.expand_path("../dummy_app/config/environment.rb",  __FILE__)
 
 migration_path = Rails.root.join('db/migrate')
-if ActiveRecord.gem_version >= ::Gem::Version.new("5.2.0")
+if ActiveRecord.gem_version >= ::Gem::Version.new("6.0.0")
+  ActiveRecord::MigrationContext.new(migration_path, ActiveRecord::SchemaMigration).migrate
+elsif ActiveRecord.gem_version >= ::Gem::Version.new("5.2.0")
   ActiveRecord::MigrationContext.new(migration_path).migrate
 else
   ActiveRecord::Migrator.migrate(migration_path)
@@ -25,8 +27,6 @@ Minitest::Reporters.use!(
   Minitest.backtrace_filter
 )
 
-require 'custom_assertions'
-
 post_count = Post.count
 if post_count < 5
   (5 - post_count).times do |i|
@@ -34,14 +34,14 @@ if post_count < 5
   end
 end
 
-axlsx_spec = Gem.loaded_specs['axlsx']
-if !axlsx_spec.source.is_a?(Bundler::Source::Rubygems)
-  axlsx_version = 'axlsx-master'
+caxlsx_spec = Gem.loaded_specs['caxlsx']
+if caxlsx_spec.source.is_a?(Bundler::Source::Rubygems)
+  caxlsx_version = caxlsx_spec.version.to_s
 else
-  axlsx_version = axlsx_spec.version.to_s
+  caxlsx_version = 'caxlsx-master'
 end
 
-VERSIONED_BASE_PATH = Rails.root.join("tmp/#{axlsx_version}")
+VERSIONED_BASE_PATH = Rails.root.join("../../tmp/#{caxlsx_version}")
 
 ### Cleanup old test spreadsheets
 FileUtils.remove_dir(VERSIONED_BASE_PATH, true)

data/test/unit/exceptions_test.rb

@@ -19,6 +19,10 @@ class ExceptionsTest < ActiveSupport::TestCase
       conditional_row_styles = [{if: true, styles: false}]
       SpreadsheetArchitect::Utils::XLSX.conditional_styles_for_row(conditional_row_styles, true, true)
     end
+
+    assert_raise error do
+      SpreadsheetArchitect::Utils.get_options({freeze: {rows: 1}, freeze_headers: true}, SpreadsheetArchitect)
+    end
   end
 
   test "NoDataError" do

data/test/unit/kitchen_sink_test.rb

@@ -6,12 +6,13 @@ class KitchenSinkTest < ActiveSupport::TestCase
     @options = {
       headers: [
         ['Latest Posts'],
-        ['Title','Category','Author','Posted on','Earnings']
+        ['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'
+      sheet_name: 'Kitchen Sink',
+      freeze_headers: true,
     }
   end
 
@@ -19,7 +20,7 @@ class KitchenSinkTest < ActiveSupport::TestCase
   end
 
   def test_xlsx
-    @options.merge!({
+    opts = @options.merge({
       column_styles: [
         {columns: 0, styles: {bold: true}},
         {columns: (1..3), styles: {color: "444444"}},
@@ -73,7 +74,7 @@ class KitchenSinkTest < ActiveSupport::TestCase
     })
 
     # Using Array Data
-    file_data = SpreadsheetArchitect.to_xlsx(@options)
+    file_data = SpreadsheetArchitect.to_xlsx(opts)
 
     File.open(VERSIONED_BASE_PATH.join("kitchen_sink.xlsx"),'w+b') do |f|
       f.write file_data
@@ -81,12 +82,17 @@ class KitchenSinkTest < ActiveSupport::TestCase
   end
 
   def test_ods
-    @options.merge!({
+    opts = @options.merge({
+      headers: [
+        ['Latest Posts'],
+        ['Title','Category','Author','Boolean','Posted on','Posted At']
+      ],
+      data: 50.times.map{|i| [i, "foobar-#{i}", (5.4*i), true, Date.today, Time.now]},
       column_types: [
         :string,
         :float,
-        :percent,
-        :currency,
+        :float, 
+        :boolean,
         :date,
         :time,
         nil
@@ -94,7 +100,7 @@ class KitchenSinkTest < ActiveSupport::TestCase
     })
 
     # Using Array Data
-    file_data = SpreadsheetArchitect.to_ods(@options)
+    file_data = SpreadsheetArchitect.to_ods(opts)
 
     File.open(VERSIONED_BASE_PATH.join("kitchen_sink.ods"),'w+b') do |f|
       f.write file_data

data/test/unit/regressions_test.rb

@@ -0,0 +1,11 @@
+require 'test_helper'
+
+class RegressionsTest < ActiveSupport::TestCase
+
+  test "XLSX" do
+  end
+
+  test "ODS" do
+  end
+
+end

data/test/unit/utils_test.rb

@@ -40,6 +40,9 @@ class UtilsTest < ActiveSupport::TestCase
 
     ### using Data option
     output = klass.get_cell_data(@options.merge(headers: true), SpreadsheetArchitect)
+    assert_equal [[]], output[:headers]
+
+    output = klass.get_cell_data(@options.merge(headers: false), SpreadsheetArchitect)
     assert_equal false, output[:headers]
 
     output = klass.get_cell_data(@options.merge(column_types: nil), SpreadsheetArchitect)
@@ -153,7 +156,7 @@ class UtilsTest < ActiveSupport::TestCase
   end
 
   test "stringify_keys" do
-    hash = klass.stringify_keys
+    hash = klass.stringify_keys({})
     assert_empty hash
 
     hash = klass.stringify_keys({foo: :bar})
@@ -176,4 +179,35 @@ class UtilsTest < ActiveSupport::TestCase
     assert_nil hash[:foo]
     assert_equal hash['foo']['foo']['foo']['foo'], :bar
   end
+
+  test "symbolize_keys" do
+    hash = klass.symbolize_keys({})
+    assert_empty hash
+
+    hash = klass.symbolize_keys({'foo' => :bar})
+    assert_nil hash['foo']
+    assert_equal hash[:foo], :bar
+
+    hash = klass.symbolize_keys({'foo' => :bar, bar: :foo})
+    assert_nil hash['foo']
+    assert_equal hash[:foo], :bar
+
+    hash = klass.symbolize_keys({'foo' => {'foo' => :bar}})
+    assert_nil hash['foo']
+    assert_equal hash[:foo][:foo], :bar
+
+    hash = klass.symbolize_keys({'foo' => {'foo' => {'foo' => :bar}}})
+    assert_nil hash['foo']
+    assert_equal hash[:foo][:foo][:foo], :bar
+  end
+
+  test "hash_array_symbolize_keys" do
+    array = klass.hash_array_symbolize_keys([])
+    assert_empty array
+
+    array = klass.hash_array_symbolize_keys([{'foo' => :bar}])
+    assert_nil array[0]['foo']
+    assert_equal array[0][:foo], :bar
+  end
+
 end

data/test/unit/xlsx_freeze_test.rb

@@ -0,0 +1,44 @@
+require "test_helper"
+
+class XlsxFreezeTest < ActiveSupport::TestCase
+
+  def setup
+    @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]},
+    }
+  end
+
+  def teardown
+  end
+
+  def test_1
+    opts = @options.merge({
+      freeze: {rows: 1, columns: 1},
+    })
+
+    # Using Array Data
+    file_data = SpreadsheetArchitect.to_xlsx(opts)
+
+    File.open(VERSIONED_BASE_PATH.join("freeze_test_1.xlsx"),'w+b') do |f|
+      f.write file_data
+    end
+  end
+
+  def test_2
+    opts = @options.merge({
+      freeze: {rows: (2..4), columns: (2..4)},
+    })
+
+    # Using Array Data
+    file_data = SpreadsheetArchitect.to_xlsx(opts)
+
+    File.open(VERSIONED_BASE_PATH.join("freeze_test_2.xlsx"),'w+b') do |f|
+      f.write file_data
+    end
+  end
+
+end

data/test/unit/xlsx_utils_test.rb

@@ -113,27 +113,6 @@ class XlsxUtilsTest < ActiveSupport::TestCase
     #end
   end
 
-  test "symbolize_keys" do
-    hash = klass.symbolize_keys
-    assert_empty hash
-
-    hash = klass.symbolize_keys({'foo' => :bar})
-    assert_nil hash['foo']
-    assert_equal hash[:foo], :bar
-
-    hash = klass.symbolize_keys({'foo' => :bar, bar: :foo})
-    assert_nil hash['foo']
-    assert_equal hash[:foo], :bar
-
-    hash = klass.symbolize_keys({'foo' => {'foo' => :bar}})
-    assert_nil hash['foo']
-    assert_equal hash[:foo][:foo], :bar
-
-    hash = klass.symbolize_keys({'foo' => {'foo' => {'foo' => :bar}}})
-    assert_nil hash['foo']
-    assert_equal hash[:foo][:foo][:foo], :bar
-  end
-
   test "constants" do
     assert_equal klass::COL_NAMES.count, 16384
     assert_equal klass::COL_NAMES.first, 'A'