axlsx_styler 1.0.0 → 1.1.0

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)
@@ -21,7 +23,6 @@ end
 require 'minitest/reporters'
 Minitest::Reporters.use!
 
-require 'custom_assertions'
 require 'helper_methods'
 
 ### Cleanup old test spreadsheets

data/test/unit/regresssions_test.rb

@@ -0,0 +1,44 @@
+require 'test_helper'
+
+class RegressionsTest < MiniTest::Test
+
+  def setup
+    @axlsx = Axlsx::Package.new
+    @workbook = @axlsx.workbook
+  end
+
+  def test_dxf_cell
+    @workbook.add_worksheet do |sheet|
+      sheet.add_row (1..2).to_a
+      sheet.add_style "A1:A1", { bg_color: "AA0000" }
+
+      sheet.add_row (1..2).to_a
+      sheet.add_style "B1:B1", { bg_color: "CC0000" }
+
+      sheet.add_row (1..2).to_a
+      sheet.add_style "A3:B3", { bg_color: "00FF00" }
+
+      highlight = @workbook.styles.add_style(bg_color: "0000FF", type: :dxf)
+
+      sheet.add_conditional_formatting(
+        "A2:B2",
+        {
+          type: :cellIs,
+          operator: :greaterThan,
+          formula: "1",
+          dxfId: highlight,
+          priority: 1
+        }
+      )
+    end
+
+    serialize("test_dxf_cell")
+
+    #puts @workbook.styles.dxfs.map{|x| x.to_xml_string}
+    assert_equal @workbook.styles.dxfs.count, 1
+
+    #puts @workbook.styles.cellXfs.map{|x| x.to_xml_string}
+    assert_equal @workbook.styles.cellXfs.count, 6
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: axlsx_styler
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Weston Ganger
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-25 00:00:00.000000000 Z
+date: 2020-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx
@@ -158,8 +158,8 @@ files:
 - lib/axlsx_styler/axlsx_worksheet.rb
 - lib/axlsx_styler/border_creator.rb
 - lib/axlsx_styler/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
 - test/dummy_app/app/assets/stylesheets/application.css
 - test/dummy_app/app/controllers/application_controller.rb
@@ -192,8 +192,8 @@ files:
 - test/test_helper.rb
 - test/unit/borders_test.rb
 - test/unit/examples_test.rb
-- test/unit/general_test.rb
 - test/unit/merge_styles_test.rb
+- test/unit/regresssions_test.rb
 - test/unit/serialize_test.rb
 - test/unit/to_stream_test.rb
 homepage: https://github.com/axlsx-styler-gem/axlsx_styler
@@ -215,47 +215,47 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Build clean and maintainable styles for your axlsx spreadsheets. Build your
   spreadsheeet with data and then apply styles later.
 test_files:
-- test/custom_assertions.rb
-- test/dummy_app/app/assets/javascripts/application.js
-- test/dummy_app/app/assets/stylesheets/application.css
-- test/dummy_app/app/controllers/application_controller.rb
-- test/dummy_app/app/controllers/spreadsheets_controller.rb
+- test/integration/application_test.rb
+- test/test_helper.rb
+- test/unit/examples_test.rb
+- test/unit/borders_test.rb
+- test/unit/merge_styles_test.rb
+- test/unit/regresssions_test.rb
+- test/unit/serialize_test.rb
+- test/unit/to_stream_test.rb
 - test/dummy_app/app/models/application_record.rb
-- test/dummy_app/app/views/layouts/application.html.erb
 - test/dummy_app/app/views/spreadsheets/test.xlsx.axlsx
-- test/dummy_app/config/application.rb
-- test/dummy_app/config/boot.rb
+- test/dummy_app/app/views/layouts/application.html.erb
+- test/dummy_app/app/assets/stylesheets/application.css
+- test/dummy_app/app/assets/config/manifest.js
+- test/dummy_app/app/assets/javascripts/application.js
+- test/dummy_app/app/controllers/spreadsheets_controller.rb
+- test/dummy_app/app/controllers/application_controller.rb
+- test/dummy_app/config.ru
+- test/dummy_app/log/test.log
 - test/dummy_app/config/database.yml
-- test/dummy_app/config/environment.rb
-- test/dummy_app/config/environments/development.rb
 - test/dummy_app/config/environments/production.rb
 - test/dummy_app/config/environments/test.rb
-- test/dummy_app/config/initializers/backtrace_silencers.rb
+- test/dummy_app/config/environments/development.rb
+- test/dummy_app/config/routes.rb
+- test/dummy_app/config/environment.rb
+- test/dummy_app/config/locales/en.yml
+- test/dummy_app/config/boot.rb
+- test/dummy_app/config/initializers/secret_token.rb
 - test/dummy_app/config/initializers/inflections.rb
 - test/dummy_app/config/initializers/mime_types.rb
-- test/dummy_app/config/initializers/secret_token.rb
 - test/dummy_app/config/initializers/session_store.rb
 - test/dummy_app/config/initializers/wrap_parameters.rb
-- test/dummy_app/config/locales/en.yml
-- test/dummy_app/config/routes.rb
+- test/dummy_app/config/initializers/backtrace_silencers.rb
 - test/dummy_app/config/secrets.yml
-- test/dummy_app/config.ru
+- test/dummy_app/config/application.rb
+- test/dummy_app/Rakefile
 - test/dummy_app/db/schema.rb
 - test/dummy_app/db/test.sqlite3
-- test/dummy_app/log/test.log
-- test/dummy_app/Rakefile
 - test/helper_methods.rb
-- test/integration/application_test.rb
-- test/test_helper.rb
-- test/unit/borders_test.rb
-- test/unit/examples_test.rb
-- test/unit/general_test.rb
-- test/unit/merge_styles_test.rb
-- test/unit/serialize_test.rb
-- test/unit/to_stream_test.rb

data/test/custom_assertions.rb

@@ -1,21 +0,0 @@
-def assert_changed(expression, &block)
-  if expression.respond_to?(:call)
-    e = expression
-  else
-    e = lambda{ eval(expression, block.binding) }
-  end
-  old = e.call
-  block.call
-  assert_not_equal old, e.call
-end
-
-def assert_not_changed(expression, &block)
-  if expression.respond_to?(:call)
-    e = expression
-  else
-    e = lambda{ eval(expression, block.binding) }
-  end
-  old = e.call
-  block.call
-  assert_equal old, e.call
-end

data/test/unit/general_test.rb

@@ -1,84 +0,0 @@
-require 'test_helper'
-
-class GeneralTest < MiniTest::Test
-
-  def setup
-    @axlsx = Axlsx::Package.new
-    @workbook = @axlsx.workbook
-  end
-
-  def test_adding_styled_cells
-    p = Axlsx::Package.new
-    wb = p.workbook
-    wb.add_styled_cell 'Cell 1'
-    wb.add_styled_cell 'Cell 2'
-    assert_equal ['Cell 1', 'Cell 2'].to_set, wb.styled_cells
-    assert_nil wb.styles_applied
-  end
-
-  def test_can_add_style
-    p = Axlsx::Package.new
-    wb = p.workbook
-    sheet = wb.add_worksheet
-    row = sheet.add_row ["x", "y"]
-    cell = row.cells.first
-
-    cell.add_style b: true
-    assert_equal({b: true}, cell.raw_style)
-  end
-
-  def test_table_with_num_fmt
-    filename = 'num_fmt_test'
-    t = Time.now
-    day = 24 * 60 * 60
-    @workbook.add_worksheet do |sheet|
-      sheet.add_row %w(Date Count Percent)
-      sheet.add_row [t - 2 * day, 2, 2.to_f.round(2) / 11]
-      sheet.add_row [t - 1 * day, 3, 3.to_f.round(2) / 11]
-      sheet.add_row [t,           6, 6.to_f.round(2) / 11]
-
-      sheet.add_style 'A1:B1', b: true
-      sheet.add_style 'A2:A4', format_code: 'YYYY-MM-DD hh:mm:ss'
-    end
-    serialize(filename)
-    assert_equal 2, @workbook.styles.style_index.count
-    assert_equal 2 + 2, @workbook.styles.style_index.keys.max
-    assert_equal 5, @workbook.styled_cells.count
-  end
-
-  def test_duplicate_styles
-    filename = 'duplicate_styles'
-    @workbook.add_worksheet do |sheet|
-      sheet.add_row %w(Index City)
-      sheet.add_row [1, 'Ottawa']
-      sheet.add_row [2, 'Boston']
-
-      sheet.add_border 'A1:B1', [:bottom]
-      sheet.add_border 'A1:B1', [:bottom]
-      sheet.add_style 'A1:A3', b: true
-      sheet.add_style 'A1:A3', b: true
-    end
-    serialize(filename)
-    assert_equal 4, @workbook.styled_cells.count
-    assert_equal 3, @workbook.styles.style_index.count
-  end
-
-  def test_multiple_named_styles
-    filename = 'multiple_named_styles'
-    bold_blue = { b: true, fg_color: '0000FF' }
-    large = { sz: 16 }
-    red = { fg_color: 'FF0000' }
-    @workbook.add_worksheet do |sheet|
-      sheet.add_row %w(Index City)
-      sheet.add_row [1, 'Ottawa']
-      sheet.add_row [2, 'Boston']
-
-      sheet.add_style 'A1:B1', bold_blue, large
-      sheet.add_style 'A1:A3', red
-    end
-    serialize(filename)
-    assert_equal 4, @workbook.styled_cells.count
-    assert_equal 3, @workbook.styles.style_index.count
-  end
-
-end