axlsx 1.1.8 → 1.2.0

data/test/workbook/worksheet/tc_protected_range.rb

@@ -11,7 +11,6 @@ def test_initialize_options
 end
 
 def test_range
-  assert_equal(0, @ws.protected_ranges.size)
   r = @ws.protect_range('A1:B1')
   assert_equal('A1:B1', r.sqref)
 end

data/test/workbook/worksheet/tc_row.rb

@@ -38,8 +38,8 @@ class TestRow < Test::Unit::TestCase
   end
 
   def test_add_cell_autowidth_info
-    width = @ws.send :calculate_width, 'this is the cell of cells', @ws.workbook.styles.fonts.first.sz
-    @row.add_cell("this is the cell of cells")
+    cell = @row.add_cell("this is the cell of cells")
+    width = cell.send(:autowidth)
     assert_equal(@ws.column_info.last.width, width)
   end
 

data/test/workbook/worksheet/tc_worksheet.rb

@@ -113,12 +113,12 @@ class TestWorksheet < Test::Unit::TestCase
   def test_dimension
     @ws.add_row [1, 2, 3]
     @ws.add_row [4, 5, 6]
-    assert_equal @ws.dimension, "A1:C2"
+    assert_equal @ws.dimension.sqref, "A1:C2"
   end
 
   def test_dimension_with_empty_row
     @ws.add_row
-    assert_equal "A1:AA200", @ws.dimension
+    assert_equal "A1:AA200", @ws.dimension.sqref
   end
 
   def test_referencing
@@ -148,7 +148,9 @@ class TestWorksheet < Test::Unit::TestCase
   end
 
   def test_drawing
-    assert @ws.drawing.is_a? Axlsx::Drawing
+    assert @ws.drawing == nil
+    @ws.add_chart(Axlsx::Pie3DChart)
+    assert @ws.drawing.is_a?(Axlsx::Drawing)
   end
 
   def test_col_style
@@ -306,18 +308,16 @@ class TestWorksheet < Test::Unit::TestCase
     assert_equal(doc.xpath('//xmlns:worksheet/xmlns:tableParts/xmlns:tablePart[@r:id="rId1"]').size, 1)
   end
 
-  def test_abs_auto_filter
-    @ws.add_row [1, "two", 3]
-    @ws.auto_filter = "A1:C1"
-    assert_equal(@ws.abs_auto_filter, "'Sheet1'!$A$1:$C$1")
-  end
-
   def test_to_xml_string
     schema = Nokogiri::XML::Schema(File.open(Axlsx::SML_XSD))
     doc = Nokogiri::XML(@ws.to_xml_string)
     assert(schema.validate(doc).map{ |e| puts e.message; e }.empty?, "error free validation")
   end
 
+  def test_styles
+    assert(@ws.styles.is_a?(Axlsx::Styles), 'worksheet provides access to styles')
+  end
+  
   def test_to_xml_string_with_illegal_chars
     nasties =  "\v\u2028\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u001f"
     @ws.add_row [nasties]
@@ -365,7 +365,7 @@ class TestWorksheet < Test::Unit::TestCase
   def test_set_fixed_width_column
     @ws.add_row ["mule", "donkey", "horse"], :widths => [20, :ignore, nil]
     assert(@ws.column_info.size == 3, "a data item for each column")
-    assert_equal(@ws.column_info[0].width, 20, "adding a row with fixed width updates :fixed attribute")
+    assert_equal(20, @ws.column_info[0].width, "adding a row with fixed width updates :fixed attribute")
     assert_equal(@ws.column_info[1].width, nil, ":ignore does not set any data")
   end
 
@@ -383,29 +383,27 @@ class TestWorksheet < Test::Unit::TestCase
   end
 
   def test_protect_range
-    assert(@ws.protected_ranges.is_a?(Axlsx::SimpleTypedList))
-    assert_equal(0, @ws.protected_ranges.size)
+    assert(@ws.send(:protected_ranges).is_a?(Axlsx::SimpleTypedList))
+    assert_equal(0, @ws.send(:protected_ranges).size)
     @ws.protect_range('A1:A3')
-    assert_equal('A1:A3', @ws.protected_ranges.last.sqref)
+    assert_equal('A1:A3', @ws.send(:protected_ranges).last.sqref)
   end
 
   def test_protect_range_with_cells
     @ws.add_row [1, 2, 3]
     assert_nothing_raised {@ws.protect_range(@ws.rows.first.cells) }
-    assert_equal('A1:C1', @ws.protected_ranges.last.sqref)
+    assert_equal('A1:C1', @ws.send(:protected_ranges).last.sqref)
     
   end
   def test_merge_cells
-    assert(@ws.merged_cells.is_a?(Array))
-    assert_equal(@ws.merged_cells.size, 0)
     @ws.add_row [1,2,3]
     @ws.add_row [4,5,6]
     @ws.add_row [7,8,9]
     @ws.merge_cells "A1:A2"
     @ws.merge_cells "B2:C3"
     @ws.merge_cells @ws.rows.last.cells[(0..1)]
-    assert_equal(@ws.merged_cells.size, 3)
-    assert_equal(@ws.merged_cells.last, "A3:B3")
+    assert_equal(@ws.send(:merged_cells).size, 3)
+    assert_equal(@ws.send(:merged_cells).last, "A3:B3")
   end
   
   def test_merge_cells_sorts_correctly_by_row_when_given_array
@@ -413,13 +411,13 @@ class TestWorksheet < Test::Unit::TestCase
       @ws.add_row [i]
     end
     @ws.merge_cells [@ws.rows[8].cells.first, @ws.rows[9].cells.first]
-    assert_equal "A9:A10", @ws.merged_cells.first
+    assert_equal "A9:A10", @ws.send(:merged_cells).first
   end
   
   def test_auto_filter
-    assert(@ws.auto_filter.nil?)
+    assert(@ws.auto_filter.range.nil?)
     assert_raise(ArgumentError) { @ws.auto_filter = 123 }
     @ws.auto_filter = "A1:D9"
-    assert_equal(@ws.auto_filter, "A1:D9")
+    assert_equal(@ws.auto_filter.range, "A1:D9")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: axlsx
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-14 00:00:00.000000000 Z
+date: 2012-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -60,21 +60,37 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.3.1
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.7
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: kramdown
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cover_me
   requirement: !ruby/object:Gem::Requirement
@@ -115,6 +131,7 @@ files:
 - lib/axlsx/drawing/bar_series.rb
 - lib/axlsx/drawing/cat_axis.rb
 - lib/axlsx/drawing/chart.rb
+- lib/axlsx/drawing/d_lbls.rb
 - lib/axlsx/drawing/drawing.rb
 - lib/axlsx/drawing/graphic_frame.rb
 - lib/axlsx/drawing/hyperlink.rb
@@ -170,31 +187,45 @@ files:
 - lib/axlsx/util/storage.rb
 - lib/axlsx/util/validators.rb
 - lib/axlsx/version.rb
+- lib/axlsx/workbook/defined_name.rb
+- 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/cell.rb
 - lib/axlsx/workbook/worksheet/cfvo.rb
 - lib/axlsx/workbook/worksheet/col.rb
 - lib/axlsx/workbook/worksheet/color_scale.rb
+- lib/axlsx/workbook/worksheet/cols.rb
 - lib/axlsx/workbook/worksheet/comment.rb
 - lib/axlsx/workbook/worksheet/comments.rb
 - lib/axlsx/workbook/worksheet/conditional_formatting.rb
 - lib/axlsx/workbook/worksheet/conditional_formatting_rule.rb
+- lib/axlsx/workbook/worksheet/conditional_formattings.rb
 - lib/axlsx/workbook/worksheet/data_bar.rb
 - lib/axlsx/workbook/worksheet/data_validation.rb
+- lib/axlsx/workbook/worksheet/data_validations.rb
 - lib/axlsx/workbook/worksheet/date_time_converter.rb
+- lib/axlsx/workbook/worksheet/dimension.rb
 - 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_setup.rb
 - lib/axlsx/workbook/worksheet/pane.rb
 - lib/axlsx/workbook/worksheet/print_options.rb
 - lib/axlsx/workbook/worksheet/protected_range.rb
+- lib/axlsx/workbook/worksheet/protected_ranges.rb
 - lib/axlsx/workbook/worksheet/row.rb
 - lib/axlsx/workbook/worksheet/selection.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/tables.rb
 - lib/axlsx/workbook/worksheet/worksheet.rb
+- lib/axlsx/workbook/worksheet/worksheet_comments.rb
+- lib/axlsx/workbook/worksheet/worksheet_drawing.rb
 - lib/axlsx.rb
 - lib/schema/dc.xsd
 - lib/schema/dcmitype.xsd
@@ -240,13 +271,18 @@ files:
 - examples/conditional_formatting/stop_and_go.rb
 - examples/data_validation.rb
 - examples/example.rb
+- examples/example.xlsx
+- examples/example_streamed.xlsx
 - examples/extractive.pdf
 - examples/extractive.rb
 - examples/image1.gif
 - examples/image1.jpeg
 - examples/image1.jpg
 - examples/image1.png
+- examples/no-use_autowidth.xlsx
 - examples/sample.png
+- examples/scraping_html.rb
+- examples/shared_strings_example.xlsx
 - examples/sheet_protection.rb
 - examples/sheet_view.rb
 - examples/skydrive/real_example.rb
@@ -268,6 +304,7 @@ files:
 - test/drawing/tc_cat_axis.rb
 - test/drawing/tc_cat_axis_data.rb
 - test/drawing/tc_chart.rb
+- test/drawing/tc_d_lbls.rb
 - test/drawing/tc_data_source.rb
 - test/drawing/tc_drawing.rb
 - test/drawing/tc_graphic_frame.rb
@@ -323,6 +360,7 @@ files:
 - test/tc_package.rb
 - test/util/tc_simple_typed_list.rb
 - test/util/tc_validators.rb
+- 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
@@ -367,7 +405,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -13242224990218359
+      hash: 2125383540867602531
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -387,6 +425,7 @@ test_files:
 - test/drawing/tc_cat_axis.rb
 - test/drawing/tc_cat_axis_data.rb
 - test/drawing/tc_chart.rb
+- test/drawing/tc_d_lbls.rb
 - test/drawing/tc_data_source.rb
 - test/drawing/tc_drawing.rb
 - test/drawing/tc_graphic_frame.rb
@@ -442,6 +481,7 @@ test_files:
 - test/tc_package.rb
 - test/util/tc_simple_typed_list.rb
 - test/util/tc_validators.rb
+- 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
@@ -466,3 +506,4 @@ test_files:
 - test/workbook/worksheet/tc_sheet_protection.rb
 - test/workbook/worksheet/tc_sheet_view.rb
 - test/workbook/worksheet/tc_worksheet.rb
+has_rdoc: axlsx