axlsx_styler 0.1.5 → 1.1.0

data/test/helper_methods.rb

@@ -0,0 +1,12 @@
+# Save to a file using Axlsx::Package#serialize
+def serialize(filename)
+  @axlsx.serialize File.expand_path("../../tmp/#{filename}.xlsx", __FILE__)
+  assert_equal true, @workbook.styles_applied
+end
+
+# Save to a file by getting contents from stream
+def to_stream(filename)
+  File.open(File.expand_path("../../tmp/#{filename}.xlsx", __FILE__), 'w') do |f|
+    f.write @axlsx.to_stream.read
+  end
+end

data/test/integration/application_test.rb

@@ -0,0 +1,18 @@
+### FOR RAILS TESTS
+
+require 'test_helper'
+
+class ApplicationTest < ActionDispatch::IntegrationTest
+
+  def test_xlsx
+    get '/spreadsheets/test.xlsx'
+    assert_response :success
+
+    path = File.expand_path("../../../tmp/axlsx_rails.xlsx", __FILE__)
+
+    File.open(path, 'w+b') do |f|
+      f.write @response.body
+    end
+  end
+
+end

data/test/test_helper.rb

@@ -1,4 +1,31 @@
-require 'axlsx_styler'
-require 'minitest/autorun'
-require 'minitest/pride'
-require 'awesome_print'
+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("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)
+end
+
+require "rails/test_help"
+
+Rails.backtrace_cleaner.remove_silencers!
+
+class ActiveSupport::TestCase
+  # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
+  fixtures :all
+end
+
+require 'minitest/reporters'
+Minitest::Reporters.use!
+
+require 'helper_methods'
+
+### Cleanup old test spreadsheets
+path = File.expand_path("../../tmp", __FILE__)
+FileUtils.remove_dir(path, true)
+FileUtils.mkdir(path)

data/test/unit/borders_test.rb

@@ -0,0 +1,127 @@
+require 'test_helper'
+
+class BordersTest < MiniTest::Test
+
+  def setup
+    @axlsx = Axlsx::Package.new
+    @workbook = @axlsx.workbook
+  end
+
+  def test_table_with_borders
+    filename = 'borders_test'
+    @workbook.add_worksheet do |sheet|
+      sheet.add_row
+      sheet.add_row ['', 'Product', 'Category',  'Price']
+      sheet.add_row ['', 'Butter', 'Dairy',      4.99]
+      sheet.add_row ['', 'Bread', 'Baked Goods', 3.45]
+      sheet.add_row ['', 'Broccoli', 'Produce',  2.99]
+      sheet.add_row ['', 'Pizza', 'Frozen Foods',  4.99]
+      sheet.column_widths 5, 20, 20, 20
+
+      sheet.add_style 'B2:D2', b: true
+      sheet.add_style 'B2:B6', b: true
+      sheet.add_style 'B2:D2', bg_color: '95AFBA'
+      sheet.add_style 'B3:D6', bg_color: 'E2F89C'
+      sheet.add_style 'D3:D6', alignment: { horizontal: :left }
+      sheet.add_border 'B2:D6'
+      sheet.add_border 'B3:D3', [:top]
+      sheet.add_border 'B3:D3', edges: [:bottom], style: :medium
+      sheet.add_border 'B3:D3', edges: [:bottom], style: :medium, color: '32f332'
+    end
+    serialize(filename)
+    assert_equal 12, @workbook.styles.style_index.count
+    assert_equal 12 + 2, @workbook.styles.style_index.keys.max
+  end
+
+  def test_duplicate_borders
+    filename = 'duplicate_borders_test'
+    @workbook.add_worksheet do |sheet|
+      sheet.add_row
+      sheet.add_row ['', 'B2', 'C2', 'D2']
+      sheet.add_row ['', 'B3', 'C3', 'D3']
+      sheet.add_row ['', 'B4', 'C4', 'D4']
+
+      sheet.add_border 'B2:D4'
+      sheet.add_border 'B2:D4'
+    end
+    serialize(filename)
+    assert_equal 8, @workbook.styles.style_index.count
+    assert_equal 8, @workbook.styled_cells.count
+  end
+
+  def test_multiple_style_borders_on_same_cells
+    filename = 'multiple_style_borders'
+    @workbook.add_worksheet do |sheet|
+      sheet.add_row
+      sheet.add_row ['', 'B2', 'C2', 'D2']
+      sheet.add_row ['', 'B3', 'C3', 'D3']
+
+      sheet.add_border 'B2:D3', :all
+      sheet.add_border 'B2:D2', edges: [:bottom], style: :thick, color: 'ff0000'
+    end
+    serialize(filename)
+    assert_equal 6, @workbook.styles.style_index.count
+    assert_equal 6, @workbook.styled_cells.count
+
+    b2_cell_style = {
+      border: {
+        style: :thick,
+        color: 'ff0000',
+        edges: [:bottom, :left, :top]
+      },
+      type: :xf,
+      name: 'Arial',
+      sz: 11,
+      family: 1
+    }
+    assert_equal b2_cell_style, @workbook.styles.style_index.values.find{|x| x == b2_cell_style}
+
+    d3_cell_style = {
+      border: {
+        style: :thin,
+        color: '000000',
+        edges: [:bottom, :right]
+      },
+      type: :xf,
+      name: 'Arial',
+      sz: 11,
+      family: 1
+    }
+    assert_equal d3_cell_style, @workbook.styles.style_index.values.find{|x| x == d3_cell_style}
+  end
+
+  # Overriding borders (part 1)
+  def test_mixed_borders_1
+    filename = 'mixed_borders_1'
+    @workbook.add_worksheet do |sheet|
+      sheet.add_row
+      sheet.add_row ['', '1', '2', '3']
+      sheet.add_row ['', '4', '5', '6']
+      sheet.add_row ['', '7', '8', '9']
+      sheet.add_style 'B2:D4', border: { style: :thin, color: '000000' }
+      sheet.add_border 'C3:D4', style: :medium
+    end
+    @workbook.apply_styles
+    assert_equal 9, @workbook.styled_cells.count
+    assert_equal 2, @workbook.styles.style_index.count
+    serialize(filename)
+  end
+
+  # Overriding borders (part 2)
+  def test_mixed_borders
+    filename = 'mixed_borders_2'
+    @workbook.add_worksheet do |sheet|
+      sheet.add_row
+      sheet.add_row ['', '1', '2', '3']
+      sheet.add_row ['', '4', '5', '6']
+      sheet.add_row ['', '7', '8', '9']
+      sheet.add_border 'B2:D4', style: :medium
+      sheet.add_style 'D2:D4', border: { style: :thin, color: '000000' }
+    end
+    @workbook.apply_styles
+    assert_equal 8, @workbook.styled_cells.count
+    assert_equal 6, @workbook.styles.style_index.count
+    serialize(filename)
+  end
+
+end

data/test/unit/examples_test.rb

@@ -0,0 +1,20 @@
+require 'test_helper'
+
+class ExamplesTest < MiniTest::Test
+
+  def setup
+    @axlsx = Axlsx::Package.new
+    @workbook = @axlsx.workbook
+  end
+  
+  def teardown
+  end
+
+  def test_examples
+    path = File.expand_path("../../../examples/**.rb", __FILE__)
+    Dir[path].each do |file| 
+      require file
+    end
+  end
+
+end

data/test/unit/merge_styles_test.rb

@@ -0,0 +1,56 @@
+require 'test_helper'
+
+class MergeStylesTest < MiniTest::Test
+
+  def setup
+    @axlsx = Axlsx::Package.new
+    @workbook = @axlsx.workbook
+  end
+
+  def test_merge_styles_1
+    filename = 'merge_styles_1'
+    bold = @workbook.styles.add_style b: true
+
+    @workbook.add_worksheet do |sheet|
+      sheet.add_row
+      sheet.add_row ['', '1', '2', '3'], style: [nil, bold]
+      sheet.add_row ['', '4', '5', '6'], style: bold
+      sheet.add_row ['', '7', '8', '9']
+      sheet.add_style 'B2:D4', b: true
+      sheet.add_border 'B2:D4', { style: :thin, color: '000000' }
+    end
+    @workbook.apply_styles
+    assert_equal 9, @workbook.styles.style_index.count
+    serialize(filename)
+  end
+
+  def test_merge_styles_2
+    filename = 'merge_styles_2'
+    bold = @workbook.styles.add_style b: true
+
+    @workbook.add_worksheet do |sheet|
+      sheet.add_row ['A1', 'B1'], style: [nil, bold]
+      sheet.add_row ['A2', 'B2'], style: bold
+      sheet.add_row ['A3', 'B3']
+      sheet.add_style 'A1:A2', i: true
+    end
+    @workbook.apply_styles
+    assert_equal 3, @workbook.styles.style_index.count
+    serialize(filename)
+  end
+
+  def test_merge_styles_3
+    filename = 'merge_styles_3'
+    bold = @workbook.styles.add_style b: true
+
+    @workbook.add_worksheet do |sheet|
+      sheet.add_row ['A1', 'B1'], style: [nil, bold]
+      sheet.add_row ['A2', 'B2']
+      sheet.add_style 'B1:B2', bg_color: 'FF0000'
+    end
+    @workbook.apply_styles
+    assert_equal 3, @workbook.styles.style_index.count
+    serialize(filename)
+  end
+
+end

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

data/test/unit/serialize_test.rb

@@ -0,0 +1,34 @@
+require 'test_helper'
+
+class SerializeTest < MiniTest::Test
+
+  def setup
+    @axlsx = Axlsx::Package.new
+    @workbook = @axlsx.workbook
+  end
+
+  def test_works_without_apply_styles_serialize
+    filename = 'without_apply_styles_serialize'
+    assert_nil @workbook.styles_applied
+    @workbook.add_worksheet do |sheet|
+      sheet.add_row ['A1', 'B1']
+      sheet.add_style 'A1:B1', b: true
+    end
+    serialize(filename)
+    assert_equal 1, @workbook.styles.style_index.count
+  end
+
+  # Backwards compatibility with pre 0.1.5 (serialize)
+  def test_works_with_apply_styles_serialize
+    filename = 'with_apply_styles_serialize'
+    assert_nil @workbook.styles_applied
+    @workbook.add_worksheet do |sheet|
+      sheet.add_row ['A1', 'B1']
+      sheet.add_style 'A1:B1', b: true
+    end
+    @workbook.apply_styles # important for backwards compatibility
+    assert_equal 1, @workbook.styles.style_index.count
+    serialize(filename)
+  end
+
+end

data/test/unit/to_stream_test.rb

@@ -0,0 +1,34 @@
+require 'test_helper'
+
+class ToStreamTest < MiniTest::Test
+
+  def setup
+    @axlsx = Axlsx::Package.new
+    @workbook = @axlsx.workbook
+  end
+
+  def test_works_without_apply_styles_to_stream
+    filename = 'without_apply_styles_to_stream'
+    assert_nil @workbook.styles_applied
+    @workbook.add_worksheet do |sheet|
+      sheet.add_row ['A1', 'B1']
+      sheet.add_style 'A1:B1', b: true
+    end
+    to_stream(filename)
+    assert_equal 1, @workbook.styles.style_index.count
+  end
+
+  # Backwards compatibility with pre 0.1.5 (to_stream)
+  def test_works_with_apply_styles_to_stream
+    filename = 'with_apply_styles_to_stream'
+    assert_nil @workbook.styles_applied
+    @workbook.add_worksheet do |sheet|
+      sheet.add_row ['A1', 'B1']
+      sheet.add_style 'A1:B1', b: true
+    end
+    @workbook.apply_styles # important for backwards compatibility
+    assert_equal 1, @workbook.styles.style_index.count
+    to_stream(filename)
+  end
+
+end

metadata

@@ -1,29 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: axlsx_styler
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 1.1.0
 platform: ruby
 authors:
+- Weston Ganger
 - Anton Sakovich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-06 00:00:00.000000000 Z
+date: 2020-08-26 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.0'
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -42,90 +43,160 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   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'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: awesome_print
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  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'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  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: '1.6'
-description: "\n    Axlsx gem is an excellent tool to build Excel worksheets. The
-  sheets are\n    created row-by-row and styles are immediately added to each cell
-  when a\n    row is created. This gem allows to follow an alternative route: fill
-  out\n    a spreadsheet with data and apply styles later. Styles can be added\n    to
-  individual cells as well as to ranges of cells. As a bonus, this gem\n    also simplifies
-  drawing borders around groups of cells.\n  "
+        version: '0'
+description: Build clean and maintainable styles for your axlsx spreadsheets. Build
+  your spreadsheeet with data and then apply styles later.
 email:
+- weston@westonganger.com
 - sakovias@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- Gemfile
+- CHANGELOG.md
 - LICENSE.txt
 - README.md
 - Rakefile
-- axlsx_styler.gemspec
-- examples/colors_and_borders.rb
-- examples/vanilla_axlsx.md
 - lib/axlsx_styler.rb
 - lib/axlsx_styler/axlsx_cell.rb
+- lib/axlsx_styler/axlsx_package.rb
+- lib/axlsx_styler/axlsx_styles.rb
 - lib/axlsx_styler/axlsx_workbook.rb
 - lib/axlsx_styler/axlsx_worksheet.rb
 - lib/axlsx_styler/border_creator.rb
 - lib/axlsx_styler/version.rb
-- spreadsheet.png
-- test/cell_test.rb
-- test/integration_test.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
+- test/dummy_app/app/controllers/spreadsheets_controller.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.ru
+- test/dummy_app/config/application.rb
+- test/dummy_app/config/boot.rb
+- 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/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/secrets.yml
+- test/dummy_app/db/schema.rb
+- test/dummy_app/db/test.sqlite3
+- test/dummy_app/log/test.log
+- test/helper_methods.rb
+- test/integration/application_test.rb
 - test/test_helper.rb
-- test/workbook_test.rb
-homepage: https://github.com/sakovias/axlsx_styler
+- test/unit/borders_test.rb
+- test/unit/examples_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
 licenses:
 - MIT
 metadata: {}
@@ -137,20 +208,54 @@ 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: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: This gem allows to separate data from styles when using Axlsx gem.
+summary: Build clean and maintainable styles for your axlsx spreadsheets. Build your
+  spreadsheeet with data and then apply styles later.
 test_files:
-- test/cell_test.rb
-- test/integration_test.rb
+- test/integration/application_test.rb
 - test/test_helper.rb
-- test/workbook_test.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/spreadsheets/test.xlsx.axlsx
+- 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/environments/production.rb
+- test/dummy_app/config/environments/test.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/session_store.rb
+- test/dummy_app/config/initializers/wrap_parameters.rb
+- test/dummy_app/config/initializers/backtrace_silencers.rb
+- test/dummy_app/config/secrets.yml
+- test/dummy_app/config/application.rb
+- test/dummy_app/Rakefile
+- test/dummy_app/db/schema.rb
+- test/dummy_app/db/test.sqlite3
+- test/helper_methods.rb