axlsx 1.3.6 → 2.0.0

data/test/workbook/worksheet/tc_table.rb

@@ -36,8 +36,8 @@ class TestTable < Test::Unit::TestCase
   end
 
   def test_rId
-    @ws.add_table("A1:D5")
-    assert_equal(@ws.tables.first.rId, "rId1")
+    table = @ws.add_table("A1:D5")
+    assert_equal @ws.relationships.for(table).Id, table.rId
   end
 
   def test_index

data/test/workbook/worksheet/tc_worksheet.rb

@@ -123,9 +123,7 @@ class TestWorksheet < Test::Unit::TestCase
   end
 
   def test_rId
-    assert_equal(@ws.rId, "rId1")
-    ws = @ws.workbook.add_worksheet
-    assert_equal(ws.rId, "rId2")
+    assert_equal @ws.workbook.relationships.for(@ws).Id, @ws.rId
   end
 
   def test_index
@@ -169,6 +167,27 @@ class TestWorksheet < Test::Unit::TestCase
     assert_equal(@ws.workbook.charts.size, 1, "add_chart adds a chart to the workbook")
   end
 
+  def test_add_page_break_with_string_cell_ref
+    assert(@ws.row_breaks.empty?)
+    assert(@ws.col_breaks.empty?)
+    @ws.add_page_break("B1")
+    assert_equal(1, @ws.row_breaks.size)
+    assert_equal(1, @ws.col_breaks.size)
+  end
+
+  def test_add_page_break_with_cell
+    @ws.add_row [1, 2, 3, 4]
+    @ws.add_row [1, 2, 3, 4]
+
+
+    assert(@ws.row_breaks.empty?)
+    assert(@ws.col_breaks.empty?)
+    @ws.add_page_break(@ws.rows.last.cells[1])
+    assert_equal(1, @ws.row_breaks.size)
+    assert_equal(1, @ws.col_breaks.size)
+  end
+
+
   def test_drawing
     assert @ws.drawing == nil
     @ws.add_chart(Axlsx::Pie3DChart)
@@ -205,13 +224,20 @@ class TestWorksheet < Test::Unit::TestCase
   def test_cols
     @ws.add_row [1,2,3,4]
     @ws.add_row [1,2,3,4]
-    @ws.add_row [1,2,3,4]
+    @ws.add_row [1,2,3]
     @ws.add_row [1,2,3,4]
     c = @ws.cols[1]
     assert_equal(c.size, 4)
     assert_equal(c[0].value, 2)
   end
 
+  def test_cols_with_block
+    @ws.add_row [1,2,3]
+    @ws.add_row [1]
+    cols = @ws.cols {|row, column| :foo }
+    assert_equal(:foo, cols[1][1])
+  end
+
   def test_row_style
     @ws.add_row [1,2,3,4]
     @ws.add_row [1,2,3,4]
@@ -288,6 +314,12 @@ class TestWorksheet < Test::Unit::TestCase
     assert_equal(doc.xpath('//xmlns:worksheet/xmlns:mergeCells/xmlns:mergeCell[@ref="E1:F1"]').size, 1)
   end
 
+  def test_to_xml_string_row_breaks
+  @ws.add_page_break("A1")
+    doc = Nokogiri::XML(@ws.to_xml_string)
+    assert_equal(doc.xpath('//xmlns:worksheet/xmlns:rowBreaks/xmlns:brk[@id="0"]').size, 1)
+  end
+
   def test_to_xml_string_sheet_protection
     @ws.sheet_protection.password = 'fish'
     doc = Nokogiri::XML(@ws.to_xml_string)
@@ -334,16 +366,16 @@ class TestWorksheet < Test::Unit::TestCase
   def test_to_xml_string_drawing
     @ws.add_chart Axlsx::Pie3DChart
     doc = Nokogiri::XML(@ws.to_xml_string)
-    assert_equal(doc.xpath('//xmlns:worksheet/xmlns:drawing[@r:id="rId1"]').size, 1)
+    assert_equal @ws.send(:worksheet_drawing).relationship.Id, doc.xpath('//xmlns:worksheet/xmlns:drawing').first["r:id"]
   end
 
   def test_to_xml_string_tables
     @ws.add_row ["one", "two"]
     @ws.add_row [1, 2]
-    @ws.add_table "A1:B2"
+    table = @ws.add_table "A1:B2"
     doc = Nokogiri::XML(@ws.to_xml_string)
     assert_equal(doc.xpath('//xmlns:worksheet/xmlns:tableParts[@count="1"]').size, 1)
-    assert_equal(doc.xpath('//xmlns:worksheet/xmlns:tableParts/xmlns:tablePart[@r:id="rId1"]').size, 1)
+    assert_equal table.rId, doc.xpath('//xmlns:worksheet/xmlns:tableParts/xmlns:tablePart').first["r:id"]
   end
 
   def test_to_xml_string

data/test/workbook/worksheet/tc_worksheet_hyperlink.rb

@@ -32,22 +32,13 @@ class TestWorksheetHyperlink < Test::Unit::TestCase
     assert_equal(@options[:ref], @a.ref)
   end
 
-  def test_id
-    @a.target = :external
-
-    assert_equal("rId1", @a.id)
-    @a.target = :internal
-    assert_equal(nil, @a.id)
-  end
-
-
   def test_to_xml_string_with_non_external
     doc = Nokogiri::XML(@ws.to_xml_string)
     assert_equal(doc.xpath("//xmlns:hyperlink[@ref='#{@a.ref}']").size, 1)
     assert_equal(doc.xpath("//xmlns:hyperlink[@tooltip='#{@a.tooltip}']").size, 1)
     assert_equal(doc.xpath("//xmlns:hyperlink[@location='#{@a.location}']").size, 1)
     assert_equal(doc.xpath("//xmlns:hyperlink[@display='#{@a.display}']").size, 1)
-    assert_equal(doc.xpath("//xmlns:hyperlink[@r:id='#{@a.id}']").size, 0)
+    assert_equal(doc.xpath("//xmlns:hyperlink[@r:id]").size, 0)
   end
 
   def test_to_xml_stirng_with_external
@@ -57,7 +48,7 @@ class TestWorksheetHyperlink < Test::Unit::TestCase
     assert_equal(doc.xpath("//xmlns:hyperlink[@tooltip='#{@a.tooltip}']").size, 1)
     assert_equal(doc.xpath("//xmlns:hyperlink[@display='#{@a.display}']").size, 1)
     assert_equal(doc.xpath("//xmlns:hyperlink[@location='#{@a.location}']").size, 0)
-    assert_equal(doc.xpath("//xmlns:hyperlink[@r:id='#{@a.id}']").size, 1)
+    assert_equal(doc.xpath("//xmlns:hyperlink[@r:id='#{@a.relationship.Id}']").size, 1)
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: axlsx
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 2.0.0
 platform: ruby
 authors:
 - Randy Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-23 00:00:00.000000000 Z
+date: 2013-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -28,16 +28,16 @@ dependencies:
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 0.9.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 0.9.9
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.1
 description: |2
       xlsx spreadsheet generation with charts, images, automated column width, customizable styles and full schema validation. Axlsx helps you create beautiful Office Open XML Spreadsheet documents ( Excel, Google Spreadsheets, Numbers, LibreOffice) without having to understand the entire ECMA specification. Check out the README for some examples of how easy it is. Best of all, you can validate your xlsx file before serialization so you know for sure that anything generated is going to load on your client's machine.
 email: digital.ipseity@gmail.com
@@ -167,11 +181,13 @@ files:
 - 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/break.rb
 - lib/axlsx/workbook/worksheet/cell.rb
 - lib/axlsx/workbook/worksheet/cell_serializer.rb
 - lib/axlsx/workbook/worksheet/cfvo.rb
 - lib/axlsx/workbook/worksheet/cfvos.rb
 - lib/axlsx/workbook/worksheet/col.rb
+- lib/axlsx/workbook/worksheet/col_breaks.rb
 - lib/axlsx/workbook/worksheet/color_scale.rb
 - lib/axlsx/workbook/worksheet/cols.rb
 - lib/axlsx/workbook/worksheet/comment.rb
@@ -198,6 +214,7 @@ files:
 - lib/axlsx/workbook/worksheet/protected_range.rb
 - lib/axlsx/workbook/worksheet/protected_ranges.rb
 - lib/axlsx/workbook/worksheet/row.rb
+- lib/axlsx/workbook/worksheet/row_breaks.rb
 - lib/axlsx/workbook/worksheet/selection.rb
 - lib/axlsx/workbook/worksheet/sheet_calc_pr.rb
 - lib/axlsx/workbook/worksheet/sheet_data.rb
@@ -249,6 +266,8 @@ files:
 - lib/schema/vml-wordprocessingDrawing.xsd
 - lib/schema/wml.xsd
 - lib/schema/xml.xsd
+- examples/2010_comments.rb
+- examples/anchor_swapping.rb
 - examples/auto_filter.rb
 - examples/basic_charts.rb
 - examples/chart_colors.rb
@@ -267,6 +286,7 @@ files:
 - examples/sheet_protection.rb
 - examples/skydrive/real_example.rb
 - examples/styles.rb
+- examples/underline.rb
 - examples/wrap_text.rb
 - examples/image1.jpeg
 - LICENSE
@@ -274,12 +294,15 @@ files:
 - Rakefile
 - CHANGELOG.md
 - .yardopts
+- .yardopts_guide
+- test/axlsx.qcachegrind
 - test/benchmark.rb
 - test/content_type/tc_content_type.rb
 - test/content_type/tc_default.rb
 - test/content_type/tc_override.rb
 - test/doc_props/tc_app.rb
 - test/doc_props/tc_core.rb
+- test/drawing/tc_axes.rb
 - test/drawing/tc_axis.rb
 - test/drawing/tc_bar_3D_chart.rb
 - test/drawing/tc_bar_series.rb
@@ -317,7 +340,6 @@ files:
 - test/drawing/tc_view_3D.rb
 - test/drawing/tc_vml_drawing.rb
 - test/drawing/tc_vml_shape.rb
-- test/example.xlsx
 - test/profile.rb
 - test/rels/tc_relationship.rb
 - test/rels/tc_relationships.rb
@@ -342,6 +364,7 @@ files:
 - test/tc_axlsx.rb
 - test/tc_helper.rb
 - test/tc_package.rb
+- test/util/tc_serialized_attributes.rb
 - test/util/tc_simple_typed_list.rb
 - test/util/tc_validators.rb
 - test/workbook/tc_defined_name.rb
@@ -350,6 +373,7 @@ files:
 - 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_break.rb
 - test/workbook/worksheet/tc_cell.rb
 - test/workbook/worksheet/tc_cfvo.rb
 - test/workbook/worksheet/tc_col.rb
@@ -392,7 +416,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -400,17 +424,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: excel OOXML (xlsx) with charts, styles, images and autowidth columns.
 test_files:
+- test/axlsx.qcachegrind
 - test/benchmark.rb
 - test/content_type/tc_content_type.rb
 - test/content_type/tc_default.rb
 - test/content_type/tc_override.rb
 - test/doc_props/tc_app.rb
 - test/doc_props/tc_core.rb
+- test/drawing/tc_axes.rb
 - test/drawing/tc_axis.rb
 - test/drawing/tc_bar_3D_chart.rb
 - test/drawing/tc_bar_series.rb
@@ -448,7 +474,6 @@ test_files:
 - test/drawing/tc_view_3D.rb
 - test/drawing/tc_vml_drawing.rb
 - test/drawing/tc_vml_shape.rb
-- test/example.xlsx
 - test/profile.rb
 - test/rels/tc_relationship.rb
 - test/rels/tc_relationships.rb
@@ -473,6 +498,7 @@ test_files:
 - test/tc_axlsx.rb
 - test/tc_helper.rb
 - test/tc_package.rb
+- test/util/tc_serialized_attributes.rb
 - test/util/tc_simple_typed_list.rb
 - test/util/tc_validators.rb
 - test/workbook/tc_defined_name.rb
@@ -481,6 +507,7 @@ test_files:
 - 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_break.rb
 - test/workbook/worksheet/tc_cell.rb
 - test/workbook/worksheet/tc_cfvo.rb
 - test/workbook/worksheet/tc_col.rb