axlsx 1.1.0 → 1.1.1

data/test/profile.rb

@@ -15,11 +15,12 @@ require 'perftools'
 row = []
 input = (32..126).to_a.pack('U*').chars.to_a
 20.times { row << input.shuffle.join}
-times = 1000
+times = 3000
 
 PerfTools::CpuProfiler.start("/tmp/axlsx_noautowidth") do
   p = Axlsx::Package.new
   p.use_autowidth = false
+  p.use_shared_strings = true
   wb = p.workbook
   
   #A Simple Workbook

data/test/stylesheet/tc_styles.rb

@@ -19,11 +19,26 @@ class TestStyles < Test::Unit::TestCase
   end
   def test_add_style_border_hash
     border_count = @styles.borders.size
-    s = @styles.add_style :border => {:style=>:thin, :color => "FFFF0000"}
+    s = @styles.add_style :border => {:style => :thin, :color => "FFFF0000"}
     assert_equal(@styles.borders.size, border_count + 1)
     assert_equal(@styles.borders.last.prs.last.color.rgb, "FFFF0000")
     assert_raise(ArgumentError) { @styles.add_style :border => {:color => "FFFF0000"} }
+    assert_equal @styles.borders.last.prs.size, 4
+  end
+
+  def test_add_style_border_edges
+    s = @styles.add_style :border => { :style => :thin, :color => "0000FFFF", :edges => [:top, :bottom] }
+    parts = @styles.borders.last.prs
+    parts.each { |pr| assert_equal(pr.color.rgb, "0000FFFF", "Style is applied to #{pr.name} properly") }
+    assert((parts.map { |pr| pr.name.to_s }.sort && ['bottom', 'top']).size == 2, "specify two edges, and you get two border prs")
+  end
 
+  def test_do_not_alter_options_in_add_style
+    #This should test all options, but for now - just the bits that we know caused some pain
+    options = { :border => { :style => :thin, :color =>"FF000000" } }
+    @styles.add_style options
+    assert_equal options[:border][:style], :thin, 'thin style is stil in option'
+    assert_equal options[:border][:color], "FF000000", 'color is stil in option'
   end
 
   def test_add_style

data/test/workbook/worksheet/tc_cell.rb

@@ -212,24 +212,34 @@ class TestCell < Test::Unit::TestCase
     assert_equal(@c.row.worksheet.merged_cells.last, "A1:C1")
   end
 
-  def test_equality
-    c2 = @row.add_cell 1, :type=>:float, :style=>1
-
-    assert_equal(c2.shareable_hash,@c.shareable_hash)
-      c3 = @row.add_cell 2, :type=>:float, :style=>1
-      c4 = @row.add_cell 1, :type=>:float, :style=>1, :color => "#FFFFFFFF"
-      assert_equal(c4.shareable_hash == c2.shareable_hash,false)
-      c5 = @row.add_cell 1, :type=>:float, :style=>1, :color => "#FFFFFFFF"
-      assert_equal(c5.shareable_hash, c4.shareable_hash)
-
-  end
-
   def test_ssti
     assert_raise(ArgumentError, "ssti must be an unsigned integer!") { @c.send(:ssti=, -1) }
     @c.send :ssti=, 1
     assert_equal(@c.ssti, 1)
   end
 
+  def test_plain_string
+    @c.type = :integer
+    assert_equal(@c.plain_string?, false)
+
+    @c.type = :string
+    @c.value = 'plain string'
+    assert_equal(@c.plain_string?, true)
+
+    @c.value = nil
+    assert_equal(@c.plain_string?, false)
+
+    @c.value = ''
+    assert_equal(@c.plain_string?, false)
+
+    @c.value = '=sum'
+    assert_equal(@c.plain_string?, false)
+
+    @c.value = 'plain string'
+    @c.font_name = 'Arial'
+    assert_equal(@c.plain_string?, false)
+  end
+
   def test_to_xml_string
     c_xml = Nokogiri::XML(@c.to_xml_string(1,1))
     assert_equal(c_xml.xpath("/c[@s=1]").size, 1)

data/test/workbook/worksheet/tc_date_time_converter.rb

@@ -111,12 +111,18 @@ class TestDateTimeConverter < Test::Unit::TestCase
   end
 
   def test_timezone
+
     utc = Time.utc 2012 # January 1st, 2012 at 0:00 UTC
-    local = begin
-      Time.new 2012, 1, 1, 1, 0, 0, 3600 # January 1st, 2012 at 1:00 GMT+1
-    rescue ArgumentError
-      Time.parse "2012-01-01 01:00:00 +0100"
-    end
+
+    # JRuby makes no assumption on time zone. randym
+    #local = begin
+    #  Time.new 2012, 1, 1, 1, 0, 0, 3600 # January 1st, 2012 at 1:00 GMT+1
+    #rescue ArgumentError
+    #  Time.parse "2012-01-01 01:00:00 +0100"
+    #end
+
+    local = Time.parse "2012-01-01 01:00:00 +0100"
+
     assert_equal local, utc
     assert_equal Axlsx::DateTimeConverter::time_to_serial(local), Axlsx::DateTimeConverter::time_to_serial(utc)
     Axlsx::Workbook.date1904 = true

data/test/workbook/worksheet/tc_worksheet.rb

@@ -207,8 +207,10 @@ class TestWorksheet < Test::Unit::TestCase
   def test_to_xml_string_merge_cells
     @ws.add_row [1, "two"]
     @ws.merge_cells "A1:D1"
+    @ws.merge_cells "E1:F1"
     doc = Nokogiri::XML(@ws.to_xml_string)
     assert_equal(doc.xpath('//xmlns:worksheet/xmlns:mergeCells/xmlns:mergeCell[@ref="A1:D1"]').size, 1)
+    assert_equal(doc.xpath('//xmlns:worksheet/xmlns:mergeCells/xmlns:mergeCell[@ref="E1:F1"]').size, 1)
   end
 
   def test_to_xml_string_page_margins
@@ -252,8 +254,14 @@ class TestWorksheet < Test::Unit::TestCase
     assert(errors.empty?, "error free validation")
   end
 
-  def test_valid_with_page_margins
+  # 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.auto_filter = "A1:C3"
+    @ws.merge_cells "A4:A5"
+    @ws.add_chart Axlsx::Pie3DChart
+    @ws.add_table "E1:F3"
     schema = Nokogiri::XML::Schema(File.open(Axlsx::SML_XSD))
     doc = Nokogiri::XML(@ws.to_xml_string)
     errors = []
@@ -299,7 +307,6 @@ class TestWorksheet < Test::Unit::TestCase
     @ws.add_row ["chasing windmills", "penut"]
     @ws.column_widths nil, 0.5
     assert_equal(@ws.column_info[1].width, 0.5, 'eat my width')
-    assert_raise(ArgumentError, 'reject invalid columns') { @ws.column_widths 2, 7, nil }
     assert_raise(ArgumentError, 'only accept unsigned ints') { @ws.column_widths 2, 7, -1 }
     assert_raise(ArgumentError, 'only accept Integer, Float or Fixnum') { @ws.column_widths 2, 7, "-1" }
   end

metadata

@@ -1,108 +1,62 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: axlsx
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 1.1.1
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 0
-  version: 1.1.0
 platform: ruby
-authors: 
+authors:
 - Randy Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-03 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2160215160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 4
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rmagick
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 2
-        - 12
-        - 2
-        version: 2.12.2
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2160215160
+- !ruby/object:Gem::Dependency
   name: rubyzip
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &2160213980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.5
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2160213980
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2160213220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.8.7
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id005
-description: "    xlsx generation with charts, images, automated column width, customizable styles and full schema validation. Axlsx excels at helping you generate beautiful Office Open XML Spreadsheet documents 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.\n"
+  version_requirements: *2160213220
+description: ! '    xlsx generation with charts, images, automated column width, customizable
+  styles and full schema validation. Axlsx excels at helping you generate beautiful
+  Office Open XML Spreadsheet documents 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
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/axlsx/content_type/content_type.rb
 - lib/axlsx/content_type/default.rb
 - lib/axlsx/content_type/override.rb
@@ -143,7 +97,6 @@ files:
 - lib/axlsx/package.rb
 - lib/axlsx/rels/relationship.rb
 - lib/axlsx/rels/relationships.rb
-- lib/axlsx/stylesheet/#num_fmt.rb#
 - lib/axlsx/stylesheet/border.rb
 - lib/axlsx/stylesheet/border_pr.rb
 - lib/axlsx/stylesheet/cell_alignment.rb
@@ -164,6 +117,20 @@ files:
 - lib/axlsx/util/cbf.rb
 - lib/axlsx/util/cfb.rb~
 - lib/axlsx/util/constants.rb
+- lib/axlsx/util/doc/_index.html
+- lib/axlsx/util/doc/class_list.html
+- lib/axlsx/util/doc/css/common.css
+- lib/axlsx/util/doc/css/full_list.css
+- lib/axlsx/util/doc/css/style.css
+- lib/axlsx/util/doc/file_list.html
+- lib/axlsx/util/doc/frames.html
+- lib/axlsx/util/doc/index.html
+- lib/axlsx/util/doc/js/app.js
+- lib/axlsx/util/doc/js/full_list.js
+- lib/axlsx/util/doc/js/jquery.js
+- lib/axlsx/util/doc/method_list.html
+- lib/axlsx/util/doc/top-level-namespace.html
+- lib/axlsx/util/font_tables.rb~
 - lib/axlsx/util/ms_off_crypto.rb
 - lib/axlsx/util/ms_off_crypto.rb~
 - lib/axlsx/util/ms_offcrypto.rb~
@@ -226,9 +193,9 @@ files:
 - lib/schema/vml-wordprocessingDrawing.xsd
 - lib/schema/wml.xsd
 - lib/schema/xml.xsd
+- examples/axlsx.xlsx
 - examples/example.csv
 - examples/example.rb
-- examples/example.rb~
 - examples/example.xlsx
 - examples/example_streamed.xlsx
 - examples/image1.gif
@@ -236,18 +203,15 @@ files:
 - examples/image1.jpg
 - examples/image1.png
 - examples/no-use_autowidth.xlsx
+- examples/real_example.rb
+- examples/sample.png
 - examples/shared_strings_example.xlsx
 - LICENSE
 - README.md
 - Rakefile
 - CHANGELOG.md
 - .yardopts
-- test/#benchmark.txt#
-- test/#tc_helper.rb#
 - test/benchmark.rb
-- test/benchmark.rb~
-- test/benchmark.txt
-- test/benchmark.txt~
 - test/content_type/tc_content_type.rb
 - test/content_type/tc_default.rb
 - test/content_type/tc_override.rb
@@ -281,9 +245,6 @@ files:
 - test/drawing/tc_val_axis.rb
 - test/drawing/tc_val_axis_data.rb
 - test/drawing/tc_view_3D.rb
-- test/example.csv
-- test/example.xlsx
-- test/example_streamed.xlsx
 - test/profile.rb
 - test/rels/tc_relationship.rb
 - test/rels/tc_relationships.rb
@@ -305,9 +266,7 @@ files:
 - test/stylesheet/tc_table_styles.rb
 - test/stylesheet/tc_xf.rb
 - test/tc_axlsx.rb
-- test/tc_axlsx.rb~
 - test/tc_helper.rb
-- test/tc_helper.rb~
 - test/tc_package.rb
 - test/util/tc_simple_typed_list.rb
 - test/util/tc_validators.rb
@@ -324,46 +283,30 @@ files:
 - test/workbook/worksheet/tc_worksheet.rb
 homepage: https://github.com/randym/axlsx
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: excel OOXML (xlsx) with charts, styles, images and autowidth columns.
-test_files: 
-- test/#benchmark.txt#
-- test/#tc_helper.rb#
+test_files:
 - test/benchmark.rb
-- test/benchmark.rb~
-- test/benchmark.txt
-- test/benchmark.txt~
 - test/content_type/tc_content_type.rb
 - test/content_type/tc_default.rb
 - test/content_type/tc_override.rb
@@ -397,9 +340,6 @@ test_files:
 - test/drawing/tc_val_axis.rb
 - test/drawing/tc_val_axis_data.rb
 - test/drawing/tc_view_3D.rb
-- test/example.csv
-- test/example.xlsx
-- test/example_streamed.xlsx
 - test/profile.rb
 - test/rels/tc_relationship.rb
 - test/rels/tc_relationships.rb
@@ -421,9 +361,7 @@ test_files:
 - test/stylesheet/tc_table_styles.rb
 - test/stylesheet/tc_xf.rb
 - test/tc_axlsx.rb
-- test/tc_axlsx.rb~
 - test/tc_helper.rb
-- test/tc_helper.rb~
 - test/tc_package.rb
 - test/util/tc_simple_typed_list.rb
 - test/util/tc_validators.rb

data/examples/example.rb~

@@ -1,112 +0,0 @@
-# encoding: UTF-8
-     require 'rubygems'
-     require 'axlsx.rb'
-
-
-#A Simple Workbook
-      p = Axlsx::Package.new
-      p.workbook.add_worksheet do |sheet|
-        sheet.add_row ["First", "Second", "Third"]
-        sheet.add_row [1, 2, 3]
-      end
-      p.serialize("example1.xlsx")
-
-#Generating A Bar Chart
-     p = Axlsx::Package.new
-     p.workbook.add_worksheet do |sheet|
-       sheet.add_row ["First", "Second", "Third"]
-       sheet.add_row [1, 2, 3]
-       sheet.add_chart(Axlsx::Bar3DChart, :start_at => [0,2], :end_at => [5, 15], :title=>"example 2: Chart") do |chart|
-         chart.add_series :data=>sheet.rows.last.cells, :labels=> sheet.rows.first.cells
-       end
-     end  
-     p.serialize("example2.xlsx")
-
-#Generating A Pie Chart
-     p = Axlsx::Package.new
-     p.workbook.add_worksheet do |sheet|
-       sheet.add_row ["First", "Second", "Third"]
-       sheet.add_row [1, 2, 3]
-       sheet.add_chart(Axlsx::Pie3DChart, :start_at => [0,2], :end_at => [5, 15], :title=>"example 3: Pie Chart") do |chart|
-         chart.add_series :data=>sheet.rows.last.cells, :labels=> sheet.rows.first.cells
-       end
-     end  
-     p.serialize("example3.xlsx")
-
-
-#Using Custom Styles
-
-     p = Axlsx::Package.new
-     wb = p.workbook
-     black_cell = wb.styles.add_style :bg_color => "FF000000", :fg_color => "FFFFFFFF", :sz=>14, :alignment => { :horizontal=> :center }
-     blue_cell = wb.styles.add_style  :bg_color => "FF0000FF", :fg_color => "FFFFFFFF", :sz=>14, :alignment => { :horizontal=> :center }
-     wb.add_worksheet do |sheet|
-       sheet.add_row ["Text Autowidth", "Second", "Third"], :style => [black_cell, blue_cell, black_cell]
-       sheet.add_row [1, 2, 3], :style => Axlsx::STYLE_THIN_BORDER
-     end
-     p.serialize("example4.xlsx")
-
-#Using Custom Formatting and date1904
-
-     p = Axlsx::Package.new
-     wb = p.workbook
-     date = wb.styles.add_style :format_code=>"yyyy-mm-dd", :border => Axlsx::STYLE_THIN_BORDER
-     padded = wb.styles.add_style :format_code=>"00#", :border => Axlsx::STYLE_THIN_BORDER
-     percent = wb.styles.add_style :format_code=>"0%", :border => Axlsx::STYLE_THIN_BORDER
-     wb.date1904 = true # required for generation on mac
-     wb.add_worksheet do |sheet|
-       sheet.add_row ["Custom Formatted Date", "Percent Formatted Float", "Padded Numbers"], :style => Axlsx::STYLE_THIN_BORDER
-       sheet.add_row [Time.now, 0.2, 32], :style => [date, percent, padded]
-     end
-     p.serialize("example5.xlsx")
-
-#Validation
-
-     p = Axlsx::Package.new
-     p.workbook.add_worksheet do |sheet|
-       sheet.add_row ["First", "Second", "Third"]
-       sheet.add_row [1, 2, 3]
-     end
-
-     p.validate.each do |error|
-       puts error.inspect
-     end
-      
-#Generating A Line Chart
-
-     p = Axlsx::Package.new
-     p.workbook.add_worksheet do |sheet|
-       sheet.add_row ["First", 1, 5, 7, 9]
-       sheet.add_row ["Second", 5, 2, 14, 9]
-       sheet.add_chart(Axlsx::Line3DChart, :title=>"example 6: Line Chart") do |chart|
-         chart.start_at 0, 2
-         chart.end_at 10, 15
-         chart.add_series :data=>sheet.rows.first.cells[(1..-1)], :title=> sheet.rows.first.cells.first
-         chart.add_series :data=>sheet.rows.last.cells[(1..-1)], :title=> sheet.rows.last.cells.first
-       end
-       
-     end  
-     p.serialize("example6.xlsx")
-
-#Add an Image
-
-     p = Axlsx::Package.new
-     p.workbook.add_worksheet do |sheet|
-       img = File.expand_path('examples/image1.jpeg') 
-       puts img
-       sheet.add_image(:image_src => img) do |image|
-         image.width=720
-         image.height=666
-         image.start_at 2, 2
-       end
-     end  
-     p.serialize("example7.xlsx")
-
-
-#Japanese Support
-
-     p = Axlsx::Package.new
-     p.workbook.add_worksheet do |sheet|
-       sheet.add_row ["���{�� "]
-     end  
-     p.serialize("example8.xlsx")