diff options
| author | Randy Morgan <[email protected]> | 2012-07-06 22:38:46 +0900 |
|---|---|---|
| committer | Randy Morgan <[email protected]> | 2012-07-06 22:38:46 +0900 |
| commit | 8df90fd696334e13fdf32e76ed1df292f4590e4b (patch) | |
| tree | 482921188c09f7f11f5a291f0dfbf2964dafcec8 /lib | |
| parent | 55ae3a5702e1370a0a61ac95e2366170147c74b2 (diff) | |
| download | caxlsx-8df90fd696334e13fdf32e76ed1df292f4590e4b.tar.gz caxlsx-8df90fd696334e13fdf32e76ed1df292f4590e4b.zip | |
make fit_to_page MOAR readable
Implement some of the feedback from devolves session on readable code -
and remove some garbage that found its way into the repo --- github.app
you are too convenient.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/axlsx/workbook/worksheet/page_setup.rb | 9 | ||||
| -rw-r--r-- | lib/axlsx/workbook/worksheet/worksheet.rb | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/lib/axlsx/workbook/worksheet/page_setup.rb b/lib/axlsx/workbook/worksheet/page_setup.rb index 10cba403..4a06e1be 100644 --- a/lib/axlsx/workbook/worksheet/page_setup.rb +++ b/lib/axlsx/workbook/worksheet/page_setup.rb @@ -92,6 +92,15 @@ module Axlsx [@fit_to_width, @fit_to_height] end + + # helper method for worksheet to determine if the page setup is configured for fit to page printing + # We treat any page set up that has a value set for fit_to_width or fit_to_height value as fit_to_page. + # @return [Boolean] + def fit_to_page? + # is there some better what to express this? + (fit_to_width != nil || fit_to_height != nil) + end + # Serializes the page settings element. # @param [String] str # @return [String] diff --git a/lib/axlsx/workbook/worksheet/worksheet.rb b/lib/axlsx/workbook/worksheet/worksheet.rb index 5959f039..3d1bdb6c 100644 --- a/lib/axlsx/workbook/worksheet/worksheet.rb +++ b/lib/axlsx/workbook/worksheet/worksheet.rb @@ -89,8 +89,9 @@ module Axlsx # If you want the worksheet to fit on more pages (e.g. 2x2), set {PageSetup#fit_to_width} and {PageSetup#fit_to_height} accordingly. # @return Boolean # @see #page_setup - def fit_to_page - (@page_setup != nil && (@page_setup.fit_to_width != nil || @page_setup.fit_to_height != nil)) + def fit_to_page? + return false unless @page_setup + @page_setup.fit_to_page? end @@ -303,7 +304,7 @@ module Axlsx # @return [Boolean] def fit_to_page=(v) warn('axlsx::DEPRECIATED: Worksheet#fit_to_page has been depreciated. This value will automatically be set for you when you use PageSetup#fit_to.') - fit_to_page + fit_to_page? end @@ -530,7 +531,7 @@ module Axlsx rels = relationships str = '<?xml version="1.0" encoding="UTF-8"?>' str.concat "<worksheet xmlns=\"%s\" xmlns:r=\"%s\">" % [XML_NS, XML_NS_R] - str.concat "<sheetPr><pageSetUpPr fitToPage=\"%s\"></pageSetUpPr></sheetPr>" % fit_to_page if fit_to_page + str.concat "<sheetPr><pageSetUpPr fitToPage=\"%s\"></pageSetUpPr></sheetPr>" % fit_to_page? if fit_to_page? str.concat "<dimension ref=\"%s\"></dimension>" % dimension unless rows.size == 0 @sheet_view.to_xml_string(str) if @sheet_view if @column_info.size > 0 |
