spreadsheet_architect 3.3.0 → 4.2.0

data/test/test_helper.rb

@@ -1,5 +1,15 @@
 ENV["RAILS_ENV"] = "test"
 
+begin
+  require 'warning'
+
+  Warning.ignore(
+    %r{mail/parsers/address_lists_parser}, ### Hide mail gem warnings
+  )
+rescue LoadError
+  # Do nothing
+end
+
 require File.expand_path("../dummy_app/config/environment.rb",  __FILE__)
 
 migration_path = Rails.root.join('db/migrate')
@@ -27,8 +37,6 @@ Minitest::Reporters.use!(
   Minitest.backtrace_filter
 )
 
-require 'custom_assertions'
-
 post_count = Post.count
 if post_count < 5
   (5 - post_count).times do |i|
@@ -36,14 +44,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,14 @@ 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
+
+    assert_raise error do
+      SpreadsheetArchitect.to_csv(foo: :bar)
+    end
   end
 
   test "NoDataError" do
@@ -27,7 +35,7 @@ class ExceptionsTest < ActiveSupport::TestCase
     assert error.new
 
     assert_raise error do
-      SpreadsheetArchitect.to_csv(foo: :bar)
+      SpreadsheetArchitect.to_csv(headers: [])
     end
   end
 

data/test/unit/kitchen_sink_test.rb

@@ -11,7 +11,8 @@ class KitchenSinkTest < ActiveSupport::TestCase
       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,7 +82,7 @@ class KitchenSinkTest < ActiveSupport::TestCase
   end
 
   def test_ods
-    @options.merge!({
+    opts = @options.merge({
       headers: [
         ['Latest Posts'],
         ['Title','Category','Author','Boolean','Posted on','Posted At']
@@ -99,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/options_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+
+class OptionsTest < ActiveSupport::TestCase
+
+  test "header: false" do
+    assert SpreadsheetArchitect.to_xlsx(headers: false, data: [[1]])
+  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)
@@ -85,13 +88,20 @@ class UtilsTest < ActiveSupport::TestCase
     assert_not_empty klass.get_options(@options, Post)
 
     ### without :headers removes :header_style
-    assert_equal klass.get_options({header_style: false, headers: false}, SpreadsheetArchitect)[:header_style], false
+    assert_equal klass.get_options({header_style: false, headers: false}, SpreadsheetArchitect)[:header_style], nil
 
     ### sets :sheet_name if needed 
     assert_equal klass.get_options({sheet_name: false}, SpreadsheetArchitect)[:sheet_name], 'Sheet1'
 
     ### sets :sheet_name if needed, using pluralized only when using Rails
     assert_equal klass.get_options({sheet_name: false}, Post)[:sheet_name], 'Posts'
+
+    ### removes default styles
+    assert_equal klass.get_options({skip_defaults: true}, SpreadsheetArchitect), {skip_defaults: true, sheet_name: "Sheet1"}
+    assert_equal klass.get_options({skip_defaults: true}, Post), {skip_defaults: true, sheet_name: "Posts"}
+
+    assert_not_equal klass.get_options({skip_defaults: false}, SpreadsheetArchitect), {skip_defaults: true, sheet_name: "Sheet1"}
+    assert_not_equal klass.get_options({skip_defaults: false}, Post), {skip_defaults: true, sheet_name: "Posts"}
   end
   
   test "convert_styles_to_ods" do
@@ -153,7 +163,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 +186,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'

metadata

@@ -1,22 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: spreadsheet_architect
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 4.2.0
 platform: ruby
 authors:
 - Weston Ganger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-28 00:00:00.000000000 Z
+date: 2021-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: axlsx
+  name: caxlsx
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 2.0.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 2.0.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '4'
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 1.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.7
+        version: 1.0.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -168,6 +168,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: warning
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Spreadsheet Architect is a library that allows you to create XLSX, ODS,
   or CSV spreadsheets easily from ActiveRecord relations, Plain Ruby classes, or predefined
   data.
@@ -182,16 +196,15 @@ files:
 - Rakefile
 - lib/spreadsheet_architect.rb
 - lib/spreadsheet_architect/action_controller_renderers.rb
+- lib/spreadsheet_architect/axlsx_string_width_patch.rb
 - lib/spreadsheet_architect/class_methods/csv.rb
 - lib/spreadsheet_architect/class_methods/ods.rb
 - lib/spreadsheet_architect/class_methods/xlsx.rb
 - lib/spreadsheet_architect/exceptions.rb
 - lib/spreadsheet_architect/mime_types.rb
-- lib/spreadsheet_architect/monkey_patches/axlsx_column_width.rb
 - lib/spreadsheet_architect/utils.rb
 - lib/spreadsheet_architect/utils/xlsx.rb
 - lib/spreadsheet_architect/version.rb
-- test/custom_assertions.rb
 - test/dummy_app/Rakefile
 - test/dummy_app/app/assets/config/manifest.js
 - test/dummy_app/app/assets/javascripts/application.js
@@ -298,11 +311,13 @@ files:
 - test/unit/general_test.rb
 - test/unit/kitchen_sink_test.rb
 - test/unit/multi_sheet_test.rb
-- test/unit/regressions_test.rb
+- test/unit/options_test.rb
 - test/unit/utils_test.rb
+- test/unit/xlsx_freeze_test.rb
 - test/unit/xlsx_utils_test.rb
 homepage: https://github.com/westonganger/spreadsheet_architect
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -312,14 +327,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Spreadsheet Architect is a library that allows you to create XLSX, ODS, or
@@ -329,11 +344,12 @@ test_files:
 - test/models/all_models_test.rb
 - test/integration/application_test.rb
 - test/test_helper.rb
+- test/unit/options_test.rb
 - test/unit/multi_sheet_test.rb
-- test/unit/regressions_test.rb
 - test/unit/formats_test.rb
 - test/unit/kitchen_sink_test.rb
 - test/unit/utils_test.rb
+- test/unit/xlsx_freeze_test.rb
 - test/unit/general_test.rb
 - test/unit/xlsx_utils_test.rb
 - test/unit/exceptions_test.rb
@@ -435,4 +451,3 @@ test_files:
 - test/dummy_app/db/schema.rb
 - test/dummy_app/db/test.sqlite3
 - test/dummy_app/db/migrate/20170103234524_add_posts.rb
-- test/custom_assertions.rb

data/lib/spreadsheet_architect/monkey_patches/axlsx_column_width.rb

@@ -1,56 +0,0 @@
-if RUBY_VERSION.to_f >= 2
-
-  module SpreadsheetArchitect
-    module AxlsxColumnWidthPatch
-      def initialize(*args)
-        @width = nil
-        super
-      end
-
-      def width=(v)
-        if v.nil?
-          @custom_width = false
-          @width = nil
-        elsif @width.nil? || @width < v+5
-          @custom_width = true
-          @best_fit = true
-          @width = v + 5
-        else
-          @custom_width = true
-          @width = v
-        end
-      end
-    end
-  end
-
-  module Axlsx
-    class Col
-      prepend ::SpreadsheetArchitect::AxlsxColumnWidthPatch
-    end
-  end
-
-else
-
-  module Axlsx
-    class Col
-      original_initialize = instance_method(:initialize)
-      define_method :initialize do |*args|
-        @width = nil
-
-        original_initialize.bind(self).(*args)
-      end
-
-      def width=(v)
-        if v.nil?
-          @custom_width = false
-          @width = nil
-        elsif @width.nil? || @width < v+5
-          @custom_width = true
-          @best_fit = true
-          @width = v + 5
-        end
-      end
-    end
-  end
-
-end