diff options
| author | Ryan Winograd <[email protected]> | 2020-08-20 09:16:23 -0500 |
|---|---|---|
| committer | Ryan Winograd <[email protected]> | 2020-08-20 09:19:26 -0500 |
| commit | 759f1261000f125a47e11b58905afc4fea8b72e7 (patch) | |
| tree | 6e12b219ab5cc5671f57be5e5e1ffd3a603b724a /lib/axlsx/package.rb | |
| parent | e7673f431813cde7aab2d032a4417d4ddeeb9342 (diff) | |
| download | caxlsx-759f1261000f125a47e11b58905afc4fea8b72e7.tar.gz caxlsx-759f1261000f125a47e11b58905afc4fea8b72e7.zip | |
Deprecate using `#serialize` with boolean argument
Update `Axlsx::Package#serialize` to accept the second argument as a
boolean (being deprecated) or an options hash.
In order to transition toward using keyword arguments for
`Axlsx::Package#serialize`, change the documented method signature to an
options hash, while still parsing the second argument as `confirm_valid`
if a boolean is provided (in which case we also warn the user that a
boolean argument is deprecated).
Diffstat (limited to 'lib/axlsx/package.rb')
| -rw-r--r-- | lib/axlsx/package.rb | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/lib/axlsx/package.rb b/lib/axlsx/package.rb index 3afb6f8d..d9636536 100644 --- a/lib/axlsx/package.rb +++ b/lib/axlsx/package.rb @@ -74,13 +74,14 @@ module Axlsx # Serialize your workbook to disk as an xlsx document. # # @param [String] output The name of the file you want to serialize your package to - # @param [Boolean] confirm_valid Validate the package prior to serialization. - # @param [String, nil] zip_command When `nil`, `#serialize` with RubyZip to + # @param [Hash] options + # @option options [Boolean] :confirm_valid Validate the package prior to serialization. + # @option options [String] :zip_command When `nil`, `#serialize` with RubyZip to # zip the XLSX file contents. When a String, the provided zip command (e.g., # "zip") is used to zip the file contents (may be faster for large files) # @return [Boolean] False if confirm_valid and validation errors exist. True if the package was serialized # @note A tremendous amount of effort has gone into ensuring that you cannot create invalid xlsx documents. - # confirm_valid should be used in the rare case that you cannot open the serialized file. + # options[:confirm_valid] should be used in the rare case that you cannot open the serialized file. # @see Package#validate # @example # # This is how easy it is to create a valid xlsx file. Of course you might want to add a sheet or two, and maybe some data, styles and charts. @@ -99,7 +100,8 @@ module Axlsx # # Serialize to a stream # s = p.to_stream() # File.open('example_streamed.xlsx', 'w') { |f| f.write(s.read) } - def serialize(output, confirm_valid=false, zip_command: nil) + def serialize(output, options = {}) + confirm_valid, zip_command = parse_serialize_options(options) return false unless !confirm_valid || self.validate.empty? zip_provider = if zip_command ZipCommand.new(zip_command) @@ -359,5 +361,23 @@ module Axlsx rels.lock rels end + + # Parse the arguments of `#serialize` + # @return [Boolean, (String or nil)] Returns an array where the first value is + # `confirm_valid` and the second is the `zip_command`. + # @private + def parse_serialize_options(options) + if options.is_a?(Hash) + invalid_keys = options.keys - [:confirm_valid, :zip_command] + if invalid_keys.any? + raise ArgumentError.new("Invalid keyword arguments: #{invalid_keys}") + end + [options.fetch(:confirm_valid, false), options.fetch(:zip_command, nil)] + else + warn "[DEPRECATION] Axlsx::Package#serialize with confirm_valid as a boolean is deprecated. " + + "Use keyword args instead e.g., package.serialize(output, confirm_valid: false)" + [options, nil] + end + end end end |
