axlsx 1.2.3 → 1.3.1

data/test/workbook/worksheet/tc_table_style_info.rb

@@ -0,0 +1,53 @@
+require 'tc_helper.rb'
+
+class TestTableStyleInfo < Test::Unit::TestCase
+  def setup
+    p = Axlsx::Package.new
+    @ws = p.workbook.add_worksheet
+    40.times do 
+      @ws.add_row %w(aa bb cc dd ee ff gg hh ii jj kk)
+    end
+    @table = @ws.add_table(Axlsx::cell_range([@ws.rows.first.cells.first,@ws.rows.last.cells.last], false), :name => 'foo')
+    @options =  { :show_first_column => 1,
+                :show_last_column => 1,
+                :show_row_stripes => 1,
+                :show_column_stripes => 1,
+                :name => "TableStyleDark4" }
+
+
+  end
+
+  def test_initialize
+    table_style = Axlsx::TableStyleInfo.new @options
+    @options.each do |key, value|
+      assert_equal(value, table_style.send(key.to_sym))
+    end
+  end
+
+  def test_boolean_properties
+    table_style = Axlsx::TableStyleInfo.new
+    @options.keys.each do |key|
+     assert_nothing_raised { table_style.send("#{key.to_sym}=", true) }
+     assert_raises(ArgumentError) { table_style.send(key.to_sym, 'foo') }
+    end
+  end
+  def doc
+    @doc ||= Nokogiri::XML(Axlsx::TableStyleInfo.new(@options).to_xml_string)
+  end
+
+  def test_to_xml_string_first_column
+    assert(doc.xpath('//tableStyleInfo[@showLastColumn=1]'))
+  end
+
+  def test_to_xml_string_row_stripes
+    assert(doc.xpath('//tableStyleInfo[@showRowStripes=1]'))
+  end
+
+  def test_to_xml_string_column_stripes
+    assert(doc.xpath('//tableStyleInfo[@showColumnStripes=1]'))
+  end
+
+  def test_to_xml_string_name
+    assert(doc.xpath("//tableStyleInfo[@name=#{@options[:name]}]"))
+  end
+end

data/test/workbook/worksheet/tc_worksheet.rb

@@ -246,7 +246,7 @@ class TestWorksheet < Test::Unit::TestCase
 
   def test_to_xml_string_auto_filter
     @ws.add_row [1, "two"]
-    @ws.auto_filter = "A1:B1"
+    @ws.auto_filter.range = "A1:B1"
     doc = Nokogiri::XML(@ws.to_xml_string)
     assert_equal(doc.xpath('//xmlns:worksheet/xmlns:autoFilter[@ref="A1:B1"]').size, 1)
   end
@@ -324,13 +324,20 @@ class TestWorksheet < Test::Unit::TestCase
     assert_equal(0, @ws.rows.last.cells.last.value.index("\v"))
     assert_equal(nil,@ws.to_xml_string.index("\v"))
   end
+
+  def test_to_xml_string_with_newlines
+    cell_with_newline = "foo\n\r\nbar"
+    @ws.add_row [cell_with_newline]
+    assert_equal("foo\n\r\nbar", @ws.rows.last.cells.last.value)
+    assert_not_nil(@ws.to_xml_string.index("foo\n\r\nbar"))
+  end
   # Make sure the XML for all optional elements (like pageMargins, autoFilter, ...)
   # is generated in correct order.
   def test_valid_with_optional_elements
     @ws.page_margins.set :left => 9
     @ws.page_setup.set :fit_to_width => 1
     @ws.print_options.set :headings => true
-    @ws.auto_filter = "A1:C3"
+    @ws.auto_filter.range = "A1:C3"
     @ws.merge_cells "A4:A5"
     @ws.add_chart Axlsx::Pie3DChart
     @ws.add_table "E1:F3"
@@ -417,7 +424,14 @@ class TestWorksheet < Test::Unit::TestCase
   def test_auto_filter
     assert(@ws.auto_filter.range.nil?)
     assert_raise(ArgumentError) { @ws.auto_filter = 123 }
-    @ws.auto_filter = "A1:D9"
+    @ws.auto_filter.range = "A1:D9"
     assert_equal(@ws.auto_filter.range, "A1:D9")
   end
+
+  def test_sheet_pr_for_auto_filter
+    @ws.auto_filter.range = 'A1:D9'
+    @ws.auto_filter.add_column 0, :filters, :filter_items => [1]
+    doc = Nokogiri::XML(@ws.to_xml_string)
+    assert(doc.xpath('//sheetPr[@filterMode="true"]')) 
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: axlsx
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-08 00:00:00.000000000 Z
+date: 2012-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -191,7 +191,9 @@ files:
 - lib/axlsx/workbook/defined_names.rb
 - lib/axlsx/workbook/shared_strings_table.rb
 - lib/axlsx/workbook/workbook.rb
-- lib/axlsx/workbook/worksheet/auto_filter.rb
+- lib/axlsx/workbook/worksheet/auto_filter/auto_filter.rb
+- lib/axlsx/workbook/worksheet/auto_filter/filter_column.rb
+- lib/axlsx/workbook/worksheet/auto_filter/filters.rb
 - lib/axlsx/workbook/worksheet/cell.rb
 - lib/axlsx/workbook/worksheet/cfvo.rb
 - lib/axlsx/workbook/worksheet/col.rb
@@ -210,6 +212,7 @@ files:
 - lib/axlsx/workbook/worksheet/icon_set.rb
 - lib/axlsx/workbook/worksheet/merged_cells.rb
 - lib/axlsx/workbook/worksheet/page_margins.rb
+- lib/axlsx/workbook/worksheet/page_set_up_pr.rb
 - lib/axlsx/workbook/worksheet/page_setup.rb
 - lib/axlsx/workbook/worksheet/pane.rb
 - lib/axlsx/workbook/worksheet/print_options.rb
@@ -217,11 +220,13 @@ files:
 - lib/axlsx/workbook/worksheet/protected_ranges.rb
 - lib/axlsx/workbook/worksheet/row.rb
 - lib/axlsx/workbook/worksheet/selection.rb
+- lib/axlsx/workbook/worksheet/sheet_calc_pr.rb
 - lib/axlsx/workbook/worksheet/sheet_data.rb
 - lib/axlsx/workbook/worksheet/sheet_pr.rb
 - lib/axlsx/workbook/worksheet/sheet_protection.rb
 - lib/axlsx/workbook/worksheet/sheet_view.rb
 - lib/axlsx/workbook/worksheet/table.rb
+- lib/axlsx/workbook/worksheet/table_style_info.rb
 - lib/axlsx/workbook/worksheet/tables.rb
 - lib/axlsx/workbook/worksheet/worksheet.rb
 - lib/axlsx/workbook/worksheet/worksheet_comments.rb
@@ -264,6 +269,8 @@ files:
 - lib/schema/vml-wordprocessingDrawing.xsd
 - lib/schema/wml.xsd
 - lib/schema/xml.xsd
+- examples/auto_filter.rb
+- examples/auto_filter.xlsx
 - examples/basic_charts.rb
 - examples/chart_colors.rb
 - examples/conditional_formatting/example_conditional_formatting.rb
@@ -296,10 +303,27 @@ files:
 - examples/skydrive/axlsx.xlsx
 - examples/skydrive/real_example.rb
 - examples/sprk2012/basics.rb
+- examples/sprk2012/basics.xlsx
+- examples/sprk2012/gravatar.jpeg
+- examples/sprk2012/hair_club.jpg
 - examples/sprk2012/images.rb
+- examples/sprk2012/images.xlsx
+- examples/sprk2012/line_chart.rb
+- examples/sprk2012/line_chart.xlsx
+- examples/sprk2012/Screen Shot 2012-09-11 at 10.42.06 PM.png
+- examples/sprk2012/Screen Shot 2012-09-11 at 11.07.48 PM.png
+- examples/sprk2012/Screen Shot 2012-09-11 at 8.31.50 PM.png
+- examples/sprk2012/Screen Shot 2012-09-11 at 9.23.27 PM.png
+- examples/sprk2012/Screen Shot 2012-09-11 at 9.32.06 PM.png
+- examples/sprk2012/Screen Shot 2012-09-11 at 9.33.35 PM.png
+- examples/sprk2012/Screen Shot 2012-09-11 at 9.46.44 PM.png
+- examples/sprk2012/Screen Shot 2012-09-12 at 5.07.23 PM.png
+- examples/sprk2012/sprk2012.key
 - examples/sprk2012/styles.rb
+- examples/sprk2012/styles.xlsx
+- examples/styles.rb
+- examples/styles.xlsx
 - examples/two_cell_anchor_image.rb
-- examples/~$extractive.xlsx
 - LICENSE
 - README.md
 - Rakefile
@@ -376,7 +400,9 @@ files:
 - test/workbook/tc_defined_name.rb
 - test/workbook/tc_shared_strings_table.rb
 - test/workbook/tc_workbook.rb
-- test/workbook/worksheet/table/tc_table.rb
+- test/workbook/worksheet/auto_filter/tc_auto_filter.rb
+- test/workbook/worksheet/auto_filter/tc_filter_column.rb
+- test/workbook/worksheet/auto_filter/tc_filters.rb
 - test/workbook/worksheet/tc_cell.rb
 - test/workbook/worksheet/tc_cfvo.rb
 - test/workbook/worksheet/tc_col.rb
@@ -389,14 +415,19 @@ files:
 - test/workbook/worksheet/tc_date_time_converter.rb
 - test/workbook/worksheet/tc_icon_set.rb
 - test/workbook/worksheet/tc_page_margins.rb
+- test/workbook/worksheet/tc_page_set_up_pr.rb
 - test/workbook/worksheet/tc_page_setup.rb
 - test/workbook/worksheet/tc_pane.rb
 - test/workbook/worksheet/tc_print_options.rb
 - test/workbook/worksheet/tc_protected_range.rb
 - test/workbook/worksheet/tc_row.rb
 - test/workbook/worksheet/tc_selection.rb
+- test/workbook/worksheet/tc_sheet_calc_pr.rb
+- test/workbook/worksheet/tc_sheet_pr.rb
 - test/workbook/worksheet/tc_sheet_protection.rb
 - test/workbook/worksheet/tc_sheet_view.rb
+- test/workbook/worksheet/tc_table.rb
+- test/workbook/worksheet/tc_table_style_info.rb
 - test/workbook/worksheet/tc_worksheet.rb
 - test/workbook/worksheet/tc_worksheet_hyperlink.rb
 homepage: https://github.com/randym/axlsx
@@ -419,7 +450,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1228635287654264801
+      hash: 2473429157853002876
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -498,7 +529,9 @@ test_files:
 - test/workbook/tc_defined_name.rb
 - test/workbook/tc_shared_strings_table.rb
 - test/workbook/tc_workbook.rb
-- test/workbook/worksheet/table/tc_table.rb
+- test/workbook/worksheet/auto_filter/tc_auto_filter.rb
+- test/workbook/worksheet/auto_filter/tc_filter_column.rb
+- test/workbook/worksheet/auto_filter/tc_filters.rb
 - test/workbook/worksheet/tc_cell.rb
 - test/workbook/worksheet/tc_cfvo.rb
 - test/workbook/worksheet/tc_col.rb
@@ -511,14 +544,19 @@ test_files:
 - test/workbook/worksheet/tc_date_time_converter.rb
 - test/workbook/worksheet/tc_icon_set.rb
 - test/workbook/worksheet/tc_page_margins.rb
+- test/workbook/worksheet/tc_page_set_up_pr.rb
 - test/workbook/worksheet/tc_page_setup.rb
 - test/workbook/worksheet/tc_pane.rb
 - test/workbook/worksheet/tc_print_options.rb
 - test/workbook/worksheet/tc_protected_range.rb
 - test/workbook/worksheet/tc_row.rb
 - test/workbook/worksheet/tc_selection.rb
+- test/workbook/worksheet/tc_sheet_calc_pr.rb
+- test/workbook/worksheet/tc_sheet_pr.rb
 - test/workbook/worksheet/tc_sheet_protection.rb
 - test/workbook/worksheet/tc_sheet_view.rb
+- test/workbook/worksheet/tc_table.rb
+- test/workbook/worksheet/tc_table_style_info.rb
 - test/workbook/worksheet/tc_worksheet.rb
 - test/workbook/worksheet/tc_worksheet_hyperlink.rb
 has_rdoc: axlsx

data/lib/axlsx/workbook/worksheet/auto_filter.rb

@@ -1,35 +0,0 @@
-module Axlsx
-
-  #This class represents an auto filter range in a worksheet
-  class AutoFilter
-
-    # creates a new Autofilter object
-    # @param [Worksheet] worksheet
-    def initialize(worksheet)
-      raise ArgumentError, 'you must provide a worksheet' unless worksheet.is_a?(Worksheet)
-      @worksheet = worksheet
-    end
-
-    attr_reader :worksheet
-
-    # The range the autofilter should be applied to.
-    # This should be a string like 'A1:B8'
-    # @return [String]
-    attr_accessor :range
-
-    # the formula for the defined name required for this auto filter
-    # @return [String]
-    def defined_name
-      return unless range
-      Axlsx.cell_range(range.split(':').collect { |name| worksheet.name_to_cell(name)})
-    end
-
-    # serialize the object
-    # @return [String]
-    def to_xml_string(str='')
-      return unless range
-      str << "<autoFilter ref='#{range}'></autoFilter>"
-    end
-
-  end
-end