axlsx_styler 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6da36a303dacdfc72388437e8e993607859fa1fc35bcf7c7937e73c0f85d71ba
-  data.tar.gz: a234265db298461f325be13515e56eeab110c08671ee976c30c59f57ed8b470e
+  metadata.gz: 8e2267d5ca327982984c81d1878626c04c7e131faaa00a1658538185bef9b0ed
+  data.tar.gz: 3f4fb23d36366e5b87876800306223979f414ccccde4dd6718967edc8d232cdd
 SHA512:
-  metadata.gz: eab70334fc493760f7b4f561067d0d3a447bae22b236cbe78926a6ba87aa4fe4e88ae5b0532582eddc14b2d570100cfa04b0b7e3412ca2626badedb659214063
-  data.tar.gz: d5ea3bf3bdb7c611b1ab988963f8916f575d14309443bf9fedb85872e347fc594cf64adebbea615acf4ffdbf4fac1bfabcc615570cc6ef35713029cb235e1f76
+  metadata.gz: 5290e9be78ca4df5b4c5fca45e60bf5bf648fdfd9bd7891a5fb2b17bdf1a310f23278528218a06070e9d2452af5ad4e7b8827c13d6a9505a185e15c68d0fdf69
+  data.tar.gz: 8ed27aff1ffefd5e9b5f2f7b15559b10b2ac1cc7682b51551024c6ec02f0e9ed239d6382e573d9b694ff38018b42aabdf42258e98737828092c486653cfa6058

data/CHANGELOG.md

@@ -1,8 +1,16 @@
 # Changelog
 
+- **Unreleased**
+  - Nothing yet
+
+- **1.2.0 - October 21, 2022**
+  - This gem has now been merged into caxlsx v3.3.0 as such we are now deprecating this gem and dropping support for caxlsx v3.3.0+
+  - [#35](https://github.com/axlsx-styler-gem/axlsx_styler/pull/35) - Do not overwrite spreadsheet default font attributes if they have been customized
+
 - **1.1.0 - August 26, 2020**
   - [Issue #29](https://github.com/axlsx-styler-gem/axlsx_styler/issues/29) - Fix error `Invalid cellXfs id` when applying `dxf` styles
   - [PR #28](https://github.com/axlsx-styler-gem/axlsx_styler/pull/28) - Allow passing arrays of cell ranges to the `add_style` and `add_border` methods
+
 - **1.0.0 - January 5, 2020**
   - Switch to the `caxlsx` gem (Community Axlsx) from the legacy unmaintained `axlsx` gem. Axlsx has had a long history of being poorly maintained so this community gem improves the situation.
   - Require Ruby 2.3+
@@ -10,14 +18,19 @@
   - Removed unnecessary module `AxlsxStyler::Axlsx`
   - Major test suite improvements
   - Add Rails dummy app to test suite and test with `axlsx_rails`
+
 - **0.2.0**
   - Add support for `axlsx` v3 (at this time for v3.0.0.pre).
   - Update test suite to run against both v2 and v3 of `axlsx`
+
 - **0.1.7**
   - Allow mixing vanilla `axlsx` styles and those from `add_style` and `add_border`. See [this example](./examples/mixing_styles.rb)
+
 - **0.1.5**
   - Hide `Workbook#apply_styles` method to make it easier to use.
+
 - **0.1.3**
   - Make border styles customizable.
+
 - **0.1.2**
   - Allow applying multiple style hashes.

data/README.md

@@ -1,12 +1,15 @@
 # axlsx_styler
 
 <a href="https://badge.fury.io/rb/axlsx_styler" target="_blank"><img height="21" style='border:0px;height:21px;' border='0' src="https://badge.fury.io/rb/axlsx_styler.svg" alt="Gem Version"></a>
-<a href='https://travis-ci.org/axlsx-styler-gem/axlsx_styler' target='_blank'><img height='21' style='border:0px;height:21px;' src='https://api.travis-ci.org/axlsx-styler-gem/axlsx_styler.svg?branch=master' border='0' alt='Build Status' /></a>
+<a href='https://github.com/axlsx-styler-gem/axlsx_styler/actions' target='_blank'><img src="https://github.com/axlsx-styler-gem/axlsx_styler/workflows/Tests/badge.svg" style="max-width:100%;" height='21' style='border:0px;height:21px;' border='0' alt="CI Status"></a>
 <a href='https://rubygems.org/gems/axlsx_styler' target='_blank'><img height='21' style='border:0px;height:21px;' src='https://ruby-gem-downloads-badge.herokuapp.com/axlsx_styler?label=rubygems&type=total&total_label=downloads&color=brightgreen' border='0' alt='RubyGems Downloads' /></a>
 
+> **Note**
+> **This gem has been [merged upstream into caxlsx v3.3.0](https://github.com/caxlsx/caxlsx/blob/master/CHANGELOG.md#v3.3.0). Please remove this gem from your Gemfile when using caxlsx@v3.3.0 and above.**
+
 `axlsx_styler` is a gem that allows you to build clean and maintainable styles for your `axlsx` spreadsheets. Build your spreadsheeet with data and then apply styles later.
 
-While [`axlsx`](https://github.com/randym/axlsx) is an excellent tool to build Excel spreadsheets in Ruby, the sheets styles are only applied immediately as the row is created. This makes it very difficult to style easily and effectively.
+While [`axlsx`](https://github.com/caxlsx/caxlsx) is an excellent tool to build Excel spreadsheets in Ruby, the sheets styles are only applied immediately as the row is created. This makes it very difficult to style easily and effectively.
 
 To solve this issue, `axlsx_styler` was born to allow the separation of styles from content within your `axlsx` code. It gives you the ability to fill out a spreadsheet with data and apply styles later. 
 

data/lib/axlsx_styler/axlsx_styles.rb

@@ -12,7 +12,10 @@ module AxlsxStyler
       if options[:type] == :dxf
         style_id = super
       else
-        raw_style = {type: :xf, name: 'Arial', sz: 11, family: 1}.merge(options)
+        ### https://github.com/caxlsx/caxlsx/blob/9b6a78f43b9415bd155bddf6a6d872f5d5555595/lib/axlsx/stylesheet/styles.rb#L459
+        font_defaults = {name: @fonts.first.name, sz: @fonts.first.sz, family: @fonts.first.family} 
+
+        raw_style = {type: :xf}.merge(font_defaults).merge(options)
 
         if raw_style[:format_code]
           raw_style.delete(:num_fmt)

data/lib/axlsx_styler/version.rb

@@ -1,3 +1,3 @@
 module AxlsxStyler
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/test/dummy_app/config/application.rb

@@ -8,6 +8,10 @@ require 'axlsx_styler'
 
 module Dummy
   class Application < Rails::Application
+    if Rails::VERSION::STRING.to_f >= 5.1
+      config.load_defaults Rails::VERSION::STRING.to_f
+    end
+
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
@@ -36,14 +40,6 @@ module Dummy
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
 
-    # Enable the asset pipeline
-    config.assets.enabled = true
-
-    config.assets.quiet = true
-
-    # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
-
     config.generators.test_framework = false
     config.generators.helper = false
     config.generators.stylesheets = false

data/test/helper_methods.rb

@@ -6,7 +6,7 @@ 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|
+  File.open(File.expand_path("../../tmp/#{filename}.xlsx", __FILE__), 'wb') do |f|
     f.write @axlsx.to_stream.read
   end
 end

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')

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: axlsx_styler
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Weston Ganger
 - Anton Sakovich
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-26 00:00:00.000000000 Z
+date: 2022-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx
@@ -18,6 +18,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -25,6 +28,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -137,6 +143,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: Build clean and maintainable styles for your axlsx spreadsheets. Build
   your spreadsheeet with data and then apply styles later.
 email:
@@ -172,8 +192,6 @@ files:
 - 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
@@ -185,8 +203,6 @@ files:
 - 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
@@ -200,7 +216,7 @@ homepage: https://github.com/axlsx-styler-gem/axlsx_styler
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -216,46 +232,42 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+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/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/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/assets/stylesheets/application.css
 - test/dummy_app/app/controllers/application_controller.rb
-- test/dummy_app/config.ru
-- test/dummy_app/log/test.log
+- 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/application.rb
+- test/dummy_app/config/boot.rb
 - 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/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/initializers/backtrace_silencers.rb
+- test/dummy_app/config/locales/en.yml
+- test/dummy_app/config/routes.rb
 - test/dummy_app/config/secrets.yml
-- test/dummy_app/config/application.rb
-- test/dummy_app/Rakefile
+- test/dummy_app/config.ru
 - test/dummy_app/db/schema.rb
-- test/dummy_app/db/test.sqlite3
+- 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/merge_styles_test.rb
+- test/unit/regresssions_test.rb
+- test/unit/serialize_test.rb
+- test/unit/to_stream_test.rb

data/test/dummy_app/config/environments/development.rb

@@ -1,30 +0,0 @@
-Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
-
-  # In the development environment your application's code is reloaded on
-  # every request.  This slows down response time but is perfect for development
-  # since you don't have to restart the web server when you make code changes.
-  config.cache_classes = false
-
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
-
-  # Show full error reports and disable caching
-  config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
-
-  # Don't care if the mailer can't send
-  config.action_mailer.raise_delivery_errors = false
-
-  # Print deprecation notices to the Rails logger
-  config.active_support.deprecation = :log
-
-  # Only use best-standards-support built into browsers
-  config.action_dispatch.best_standards_support = :builtin
-
-  # Do not compress assets
-  config.assets.compress = false
-
-  # Expands the lines which load the assets
-  config.assets.debug = true
-end

data/test/dummy_app/config/environments/production.rb

@@ -1,60 +0,0 @@
-Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
-
-  # Code is not reloaded between requests
-  config.cache_classes = true
-
-  # Full error reports are disabled and caching is turned on
-  config.consider_all_requests_local       = false
-  config.action_controller.perform_caching = true
-
-  # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_files = false
-
-  # Compress JavaScripts and CSS
-  config.assets.compress = true
-
-  # Don't fallback to assets pipeline if a precompiled asset is missed
-  config.assets.compile = false
-
-  # Generate digests for assets URLs
-  config.assets.digest = true
-
-  # Defaults to Rails.root.join("public/assets")
-  # config.assets.manifest = YOUR_PATH
-
-  # Specifies the header that your server uses for sending files
-  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
-
-  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
-  # config.force_ssl = true
-
-  # See everything in the log (default is :info)
-  # config.log_level = :debug
-
-  # Use a different logger for distributed setups
-  # config.logger = SyslogLogger.new
-
-  # Use a different cache store in production
-  # config.cache_store = :mem_cache_store
-
-  # Enable serving of images, stylesheets, and JavaScripts from an asset server
-  # config.action_controller.asset_host = "http://assets.example.com"
-
-  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
-  # config.assets.precompile += %w( search.js )
-
-  # Disable delivery errors, bad email addresses will be ignored
-  # config.action_mailer.raise_delivery_errors = false
-
-  # Enable threaded mode
-  # config.threadsafe!
-
-  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found)
-  config.i18n.fallbacks = true
-
-  # Send deprecation notices to registered listeners
-  config.active_support.deprecation = :notify
-end