depreciating Worksheet.fit_to_page as a writable attribute.

5 files changed, 23 insertions, 25 deletions

diff --git a/lib/axlsx/workbook/worksheet/page_setup.rb b/lib/axlsx/workbook/worksheet/page_setup.rb
index 83195b62..af5f2411 100644
--- a/lib/axlsx/workbook/worksheet/page_setup.rb
+++ b/lib/axlsx/workbook/worksheet/page_setup.rb
@@ -45,12 +45,7 @@ module Axlsx
     # @return [Integer]
     attr_reader :scale
 
-    # The worksheet that owns this page_setup.
-    # @return [Worksheet]
-    attr_reader :worksheet
-
     # Creates a new PageSetup object
-    # @option options [Worksheet] worksheet The worksheet that owns this page_setup **required**
     # @option options [Integer] fit_to_height Number of vertical pages to fit on
     # @option options [Integer] fit_to_width Number of horizontal pages to fit on
     # @option options [Symbol] orientation Orientation of the page (:default, :landscape, :portrait)
@@ -58,8 +53,6 @@ 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
 
@@ -72,15 +65,15 @@ module Axlsx
     end
 
     # @see fit_to_height
-    def fit_to_height=(v); Axlsx::validate_unsigned_int(v); @fit_to_height = v; @worksheet.fit_to_page = (@fit_to_height.to_i + @fit_to_width.to_i > 0); end
+    def fit_to_height=(v); Axlsx::validate_unsigned_int(v); @fit_to_height = v end
     # @see fit_to_width
-    def fit_to_width=(v); Axlsx::validate_unsigned_int(v); @fit_to_width = v; @worksheet.fit_to_page = (@fit_to_height.to_i + @fit_to_width.to_i > 0); end
+    def fit_to_width=(v); Axlsx::validate_unsigned_int(v); @fit_to_width = v end
     # @see orientation
-    def orientation=(v); Axlsx::validate_page_orientation(v); @orientation = v; end
+    def orientation=(v); Axlsx::validate_page_orientation(v); @orientation = v end
     # @see paper_height
-    def paper_height=(v); Axlsx::validate_number_with_unit(v); @paper_height = v; end
+    def paper_height=(v); Axlsx::validate_number_with_unit(v); @paper_height = v end
     # @see paper_width
-    def paper_width=(v); Axlsx::validate_number_with_unit(v); @paper_width = v; end
+    def paper_width=(v); Axlsx::validate_number_with_unit(v); @paper_width = v end
     # @see scale
     def scale=(v); Axlsx::validate_page_scale(v); @scale = v; end
 
diff --git a/lib/axlsx/workbook/worksheet/table.rb b/lib/axlsx/workbook/worksheet/table.rb
index 1ed23cc5..b848180b 100644
--- a/lib/axlsx/workbook/worksheet/table.rb
+++ b/lib/axlsx/workbook/worksheet/table.rb
@@ -19,8 +19,8 @@ module Axlsx
     attr_reader :style
 
     # Creates a new Table object
-    # @param [String] ref The reference to the table data.
-    # @param [Sheet] ref The sheet containing the table data.
+    # @param [String] ref The reference to the table data like 'A1:G24'.
+    # @param [Worksheet] sheet The sheet containing the table data.
     # @option options [Cell, String] name
     # @option options [TableStyle] style
     def initialize(ref, sheet, options={})
diff --git a/lib/axlsx/workbook/worksheet/worksheet.rb b/lib/axlsx/workbook/worksheet/worksheet.rb
index 3789ba60..854e629c 100644
--- a/lib/axlsx/workbook/worksheet/worksheet.rb
+++ b/lib/axlsx/workbook/worksheet/worksheet.rb
@@ -51,10 +51,14 @@ module Axlsx
     # @return Boolean
     attr_reader :selected
 
-    # Indicates if the worksheet should be fitted to a single page when printed. If you want the worksheet to fit on more pages (e.g. 2x2), set {PageSetup#fit_to_width} and {PageSetup#fit_to_height} accordingly.
+    # Indicates if the worksheet will be fit by witdh or height to a specific number of pages.
+    # To alter the width or height for page fitting, please use page_setup.fit_to_widht or page_setup.fit_to_height.
+    # 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
-    attr_reader :fit_to_page
+    def fit_to_page
+      (@page_setup != nil && (@page_setup.fit_to_width != nil || @page_setup.fit_to_height != nil))
+    end
 
 
     # Column info for the sheet
@@ -102,7 +106,7 @@ module Axlsx
     # @see PageSetup#initialize
     # @return [PageSetup]
     def page_setup
-      @page_setup ||= PageSetup.new(:worksheet => self)
+      @page_setup ||= PageSetup.new
       yield @page_setup if block_given?
       @page_setup
     end
@@ -156,7 +160,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].merge(:worksheet=>self)  if options[:page_setup]
+      @page_setup = PageSetup.new options[:page_setup]  if options[:page_setup]
       @print_options = PrintOptions.new options[:print_options] if options[:print_options]
       @rows = SimpleTypedList.new Row
       @column_info = SimpleTypedList.new Col
@@ -237,8 +241,8 @@ module Axlsx
     # (see #fit_to_page)
     # @return [Boolean]
     def fit_to_page=(v)
-      Axlsx::validate_boolean v
-      @fit_to_page = v
+      warn('DEPRECIATED: fit_to_page has been depreciated. This value will automatically be set for you when page_setup.fit_to_width or page_setup.fit_to_height are specified.')
+      fit_to_page
     end
 
 
diff --git a/test/workbook/worksheet/tc_page_setup.rb b/test/workbook/worksheet/tc_page_setup.rb
index f374b0e5..fee9fb7e 100644
--- a/test/workbook/worksheet/tc_page_setup.rb
+++ b/test/workbook/worksheet/tc_page_setup.rb
@@ -28,7 +28,6 @@ class TestPageSetup < Test::Unit::TestCase
     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)
@@ -39,7 +38,6 @@ 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)
@@ -77,14 +75,12 @@ 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
diff --git a/test/workbook/worksheet/tc_worksheet.rb b/test/workbook/worksheet/tc_worksheet.rb
index 81179dbd..0155a959 100644
--- a/test/workbook/worksheet/tc_worksheet.rb
+++ b/test/workbook/worksheet/tc_worksheet.rb
@@ -189,7 +189,7 @@ class TestWorksheet < Test::Unit::TestCase
   end
 
   def test_to_xml_string_fit_to_page
-    @ws.fit_to_page = true
+    @ws.page_setup.fit_to_width = 1
     doc = Nokogiri::XML(@ws.to_xml_string)
     assert_equal(doc.xpath('//xmlns:worksheet/xmlns:sheetPr/xmlns:pageSetUpPr[@fitToPage="true"]').size, 1)
   end
@@ -200,6 +200,11 @@ class TestWorksheet < Test::Unit::TestCase
     assert_equal(doc.xpath('//xmlns:worksheet/xmlns:dimension[@ref="A1:C1"]').size, 1)
   end
 
+  def test_fit_to_page_assignation_does_nothing
+    @ws.fit_to_page = false
+    assert_equal(@ws.fit_to_page, false)
+  end
+
   def test_to_xml_string_selected
     @ws.selected = true
     doc = Nokogiri::XML(@ws.to_xml_string)