If worksheet.fit_to_page must be true, lets set it to true. I am far too lazy and forgetful to remember to set that every time I want to fit_to_width or fit_to_height.

3 files changed, 23 insertions, 14 deletions

diff --git a/lib/axlsx/workbook/worksheet/page_setup.rb b/lib/axlsx/workbook/worksheet/page_setup.rb
index f8441570..20e05f66 100644
--- a/lib/axlsx/workbook/worksheet/page_setup.rb
+++ b/lib/axlsx/workbook/worksheet/page_setup.rb
@@ -1,9 +1,6 @@
 module Axlsx
   # Page setup settings for printing a worksheet. All settings are optional.
   #
-  # When using {#fit_to_width} and/or {#fit_to_height}, make sure to also set {Worksheet#fit_to_page} to true –
-  # otherwise this setting will not have any effect.
-  #
   # @note The recommended way to manage print options is via Worksheet#page_setup
   # @see Worksheet#print_options
   # @see Worksheet#initialize
@@ -26,12 +23,10 @@ module Axlsx
     
     # Number of vertical pages to fit on.
     # @return [Integer]
-    # @note Make sure to also set {Worksheet#fit_to_page} to true – otherwise this setting will not have any effect.
     attr_reader :fit_to_height
 
     # Number of horizontal pages to fit on.
     # @return [Integer]
-    # @note Make sure to also set {Worksheet#fit_to_page} to true – otherwise this setting will not have any effect.
     attr_reader :fit_to_width
 
     # Orientation of the page (:default, :landscape, :portrait)
@@ -50,6 +45,8 @@ module Axlsx
     # @return [Integer]
     attr_reader :scale
 
+    # The worksheet that owns this page_setup.
+    attr_reader :worksheet
 
     # Creates a new PageSetup object
     # @option options [Integer] fit_to_height Number of vertical pages to fit on
@@ -59,6 +56,8 @@ module Axlsx
     # @option options [String] paper_width Width of paper (number followed by unit identifier: "210mm", "8.5in")
     # @option options [Integer] scale Print scaling (percent value, integer ranging from 10 to 400)
     def initialize(options = {})
+      raise ArgumentError, "Worksheet option is required" unless options[:worksheet].is_a?(Worksheet)
+      @worksheet = options[:worksheet]
       set(options)
     end
 
@@ -71,9 +70,9 @@ module Axlsx
     end
 
     # @see fit_to_height
-    def fit_to_height=(v); Axlsx::validate_unsigned_int(v); @fit_to_height = v; end
+    def fit_to_height=(v); Axlsx::validate_unsigned_int(v); @fit_to_height = v; @worksheet.fit_to_page = true; end
     # @see fit_to_width
-    def fit_to_width=(v); Axlsx::validate_unsigned_int(v); @fit_to_width = v; end
+    def fit_to_width=(v); Axlsx::validate_unsigned_int(v); @fit_to_width = v; @worksheet.fit_to_page = true; end
     # @see orientation
     def orientation=(v); Axlsx::validate_page_orientation(v); @orientation = v; end
     # @see paper_height
@@ -88,7 +87,7 @@ module Axlsx
     # @return [String]
     def to_xml_string(str = '')
       str << '<pageSetup '
-      str << instance_values.map{ |k,v| k.gsub(/_(.)/){ $1.upcase } << %{="#{v}"} }.join(' ')
+      str << instance_values.reject{ |k, v| k == 'worksheet' }.map{ |k,v| k.gsub(/_(.)/){ $1.upcase } << %{="#{v}"} }.join(' ')
       str << '/>'
     end
   end
diff --git a/lib/axlsx/workbook/worksheet/worksheet.rb b/lib/axlsx/workbook/worksheet/worksheet.rb
index 887968e0..3789ba60 100644
--- a/lib/axlsx/workbook/worksheet/worksheet.rb
+++ b/lib/axlsx/workbook/worksheet/worksheet.rb
@@ -90,7 +90,6 @@ module Axlsx
     #
     #      # using options when creating the worksheet.
     #      ws = wb.add_worksheet :page_setup => {:fit_to_width => 2, :orientation => :landscape}
-    #      ws.fit_to_page = true # otherwise fit_to_width will be ignored
     #
     #      # use the set method of the page_setup object
     #      ws.page_setup.set(:paper_width => "297mm", :paper_height => "210mm")
@@ -103,7 +102,7 @@ module Axlsx
     # @see PageSetup#initialize
     # @return [PageSetup]
     def page_setup
-      @page_setup ||= PageSetup.new
+      @page_setup ||= PageSetup.new(:worksheet => self)
       yield @page_setup if block_given?
       @page_setup
     end
@@ -157,7 +156,7 @@ module Axlsx
       @show_gridlines = true
       self.name = "Sheet" + (index+1).to_s
       @page_margins = PageMargins.new options[:page_margins] if options[:page_margins]
-      @page_setup = PageSetup.new options[:page_setup] if options[:page_setup]
+      @page_setup = PageSetup.new options[:page_setup].merge(:worksheet=>self)  if options[:page_setup]
       @print_options = PrintOptions.new options[:print_options] if options[:print_options]
       @rows = SimpleTypedList.new Row
       @column_info = SimpleTypedList.new Col
diff --git a/test/workbook/worksheet/tc_page_setup.rb b/test/workbook/worksheet/tc_page_setup.rb
index ff323c75..f374b0e5 100644
--- a/test/workbook/worksheet/tc_page_setup.rb
+++ b/test/workbook/worksheet/tc_page_setup.rb
@@ -3,8 +3,8 @@ require 'tc_helper.rb'
 class TestPageSetup < Test::Unit::TestCase
 
   def setup
-    p = Axlsx::Package.new
-    ws = p.workbook.add_worksheet :name => "hmmm"
+    @p = Axlsx::Package.new
+    ws = @p.workbook.add_worksheet :name => "hmmm"
     @ps = ws.page_setup
   end
 
@@ -18,9 +18,17 @@ class TestPageSetup < Test::Unit::TestCase
   end
 
   def test_initialize_with_options
-    optioned = Axlsx::PageSetup.new(:fit_to_height => 1, :fit_to_width => 2, :orientation => :landscape, :paper_height => "297mm", :paper_width => "210mm", :scale => 50)
+    page_setup = { :fit_to_height => 1,
+                   :fit_to_width => 2,
+                   :orientation => :landscape,
+                   :paper_height => "297mm",
+                   :paper_width => "210mm",
+                   :scale => 50 }
+
+    optioned = @p.workbook.add_worksheet(:name => 'optioned', :page_setup => page_setup).page_setup
     assert_equal(1, optioned.fit_to_height)
     assert_equal(2, optioned.fit_to_width)
+    assert_equal(true, optioned.worksheet.fit_to_page)
     assert_equal(:landscape, optioned.orientation)
     assert_equal("297mm", optioned.paper_height)
     assert_equal("210mm", optioned.paper_width)
@@ -31,6 +39,7 @@ class TestPageSetup < Test::Unit::TestCase
     @ps.set(:fit_to_height => 1, :fit_to_width => 2, :orientation => :landscape, :paper_height => "297mm", :paper_width => "210mm", :scale => 50)
     assert_equal(1, @ps.fit_to_height)
     assert_equal(2, @ps.fit_to_width)
+    assert_equal(true, @ps.worksheet.fit_to_page)
     assert_equal(:landscape, @ps.orientation)
     assert_equal("297mm", @ps.paper_height)
     assert_equal("210mm", @ps.paper_width)
@@ -68,12 +77,14 @@ class TestPageSetup < Test::Unit::TestCase
     assert_raise(ArgumentError) { @ps.fit_to_height = 1.5 }
     assert_nothing_raised { @ps.fit_to_height = 2 }
     assert_equal(2, @ps.fit_to_height)
+    assert_equal(true, @ps.worksheet.fit_to_page)
   end
 
   def test_fit_to_width
     assert_raise(ArgumentError) { @ps.fit_to_width = false }
     assert_nothing_raised { @ps.fit_to_width = 1 }
     assert_equal(1, @ps.fit_to_width)
+    assert_equal(true, @ps.worksheet.fit_to_page)
   end
 
   def test_orientation