axlsx 1.3.5 → 1.3.6

data/test/drawing/tc_ser_axis.rb

@@ -2,29 +2,30 @@ require 'tc_helper.rb'
 
 class TestSerAxis < Test::Unit::TestCase
   def setup
-    @axis = Axlsx::SerAxis.new 12345, 54321
+    @axis = Axlsx::SerAxis.new
   end
+
   def teardown
   end
 
   def test_options
-    a = Axlsx::SerAxis.new 12345, 54321, :tickLblSkip => 9, :tickMarkSkip => 7
-    assert_equal(a.tickLblSkip, 9)
-    assert_equal(a.tickMarkSkip, 7)
+    a = Axlsx::SerAxis.new(:tick_lbl_skip => 9, :tick_mark_skip => 7)
+    assert_equal(a.tick_lbl_skip, 9)
+    assert_equal(a.tick_mark_skip, 7)
   end
 
 
-  def test_tickLblSkip
-    assert_raise(ArgumentError, "requires valid tickLblSkip") { @axis.tickLblSkip = -1 }
-    assert_nothing_raised("accepts valid tickLblSkip") { @axis.tickLblSkip = 1 }
-    assert_equal(@axis.tickLblSkip, 1)
+  def test_tick_lbl_skip
+    assert_raise(ArgumentError, "requires valid tick_lbl_skip") { @axis.tick_lbl_skip = -1 }
+    assert_nothing_raised("accepts valid tick_lbl_skip") { @axis.tick_lbl_skip = 1 }
+    assert_equal(@axis.tick_lbl_skip, 1)
   end
 
 
-  def test_tickMarkSkip
-    assert_raise(ArgumentError, "requires valid tickMarkSkip") { @axis.tickMarkSkip = :my_eyes }
-    assert_nothing_raised("accepts valid tickMarkSkip") { @axis.tickMarkSkip = 2 }
-    assert_equal(@axis.tickMarkSkip, 2)
+  def test_tick_mark_skip
+    assert_raise(ArgumentError, "requires valid tick_mark_skip") { @axis.tick_mark_skip = :my_eyes }
+    assert_nothing_raised("accepts valid tick_mark_skip") { @axis.tick_mark_skip = 2 }
+    assert_equal(@axis.tick_mark_skip, 2)
   end
 
 end

data/test/drawing/tc_val_axis.rb

@@ -2,23 +2,23 @@ require 'tc_helper.rb'
 
 class TestValAxis < Test::Unit::TestCase
   def setup
-    @axis = Axlsx::ValAxis.new 12345, 54321
+    @axis = Axlsx::ValAxis.new
   end
   def teardown
   end
 
   def test_initialization
-    assert_equal(@axis.crossBetween, :between, "axis crossBetween default incorrect")
+    assert_equal(@axis.cross_between, :between, "axis crossBetween default incorrect")
   end
 
   def test_options
-    a = Axlsx::ValAxis.new 2345, 4321, :crossBetween => :midCat
-    assert_equal(a.crossBetween, :midCat)
+    a = Axlsx::ValAxis.new(:cross_between => :midCat)
+    assert_equal(:midCat, a.cross_between)
   end
 
   def test_crossBetween
-    assert_raise(ArgumentError, "requires valid crossBetween") { @axis.crossBetween = :my_eyes }
-    assert_nothing_raised("accepts valid crossBetween") { @axis.crossBetween = :midCat }
+    assert_raise(ArgumentError, "requires valid crossBetween") { @axis.cross_between = :my_eyes }
+    assert_nothing_raised("accepts valid crossBetween") { @axis.cross_between = :midCat }
   end
 
 end

data/test/drawing/tc_vml_shape.rb

@@ -6,8 +6,8 @@ class TestVmlShape < Test::Unit::TestCase
     p = Axlsx::Package.new
     wb = p.workbook
     @ws = wb.add_worksheet
-    @ws.add_comment :ref => 'A1', :text => 'penut machine', :author => 'crank'
-    @ws.add_comment :ref => 'C3', :text => 'rust bucket', :author => 'PO'
+    @ws.add_comment :ref => 'A1', :text => 'penut machine', :author => 'crank', :visible => true
+    @ws.add_comment :ref => 'C3', :text => 'rust bucket', :author => 'PO', :visible => false
     @comments = @ws.comments
   end
 
@@ -84,11 +84,17 @@ class TestVmlShape < Test::Unit::TestCase
     assert(shape.top_row == 3)
     assert_raise(ArgumentError) { shape.top_row = [] }
   end
-
+  def test_visible
+    shape = @comments.first.vml_shape
+    shape.visible = false
+    assert(shape.visible == false)
+    assert_raise(ArgumentError) { shape.visible = 'foo' }
+  end
   def test_to_xml_string
     str = @comments.vml_drawing.to_xml_string()
     doc = Nokogiri::XML(str)
     assert_equal(doc.xpath("//v:shape").size, 2)
+    assert_equal(1, doc.xpath("//x:Visible").size, 'ClientData/x:Visible element rendering')
     @comments.each do |comment|
       shape = comment.vml_shape
       assert(doc.xpath("//v:shape/x:ClientData/x:Row[text()='#{shape.row}']").size == 1)

data/test/profile.rb

@@ -1,26 +1,20 @@
 #!/usr/bin/env ruby -s
 
-# Usage:
-# > ruby test/profile.rb
-# > pprof.rb --gif /tmp/axlsx > /tmp/axlsx.gif
-# > open /tmp/axlsx_noautowidth.gif
-
 $:.unshift "#{File.dirname(__FILE__)}/../lib"
 require 'axlsx'
-require 'perftools'
-Axlsx.trust_input = true
+require 'ruby-prof'
 row = []
 # Taking worst case scenario of all string data
 input = (32..126).to_a.pack('U*').chars.to_a
 20.times { row << input.shuffle.join}
-times = 3000
 
-PerfTools::CpuProfiler.start("/tmp/axlsx") do
+profile = RubyProf.profile do
   p = Axlsx::Package.new
   p.workbook.add_worksheet do |sheet|
-    times.times do
+    30.times do
       sheet << row
     end
   end
-  p.serialize("example.xlsx")
 end
+printer = RubyProf::CallTreePrinter.new(profile)
+printer.print(File.new('axlsx.qcachegrind', 'w'))

data/test/tc_helper.rb

@@ -2,6 +2,7 @@ $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
 require 'simplecov'
 SimpleCov.start do
   add_filter "/test/"
+  add_filter "/vendor/"
 end
 
 require 'test/unit'

data/test/util/tc_validators.rb

@@ -158,7 +158,11 @@ class TestValidators < Test::Unit::TestCase
     assert_raise(ArgumentError) { Axlsx.validate_split_state_type 'frozen_split' }
     assert_raise(ArgumentError) { Axlsx.validate_split_state_type 0 }
   end
-
+ 
+  def test_validate_integerish
+    assert_raise(ArgumentError) { Axlsx.validate_integerish Axlsx }
+    [1, 1.4, "a"].each { |test_value| assert_nothing_raised { Axlsx.validate_integerish test_value } }
+  end
   def test_validate_family
     assert_raise(ArgumentError) { Axlsx.validate_family 0 }
     (1..5).each do |item|

data/test/workbook/worksheet/tc_comment.rb

@@ -5,7 +5,7 @@ class TestComment < Test::Unit::TestCase
     p = Axlsx::Package.new
     wb = p.workbook
     @ws = wb.add_worksheet
-    @c1 = @ws.add_comment :ref => 'A1', :text => 'penut machine', :author => 'crank'
+    @c1 = @ws.add_comment :ref => 'A1', :text => 'penut machine', :author => 'crank', :visible => false
     @c2 = @ws.add_comment :ref => 'C3', :text => 'rust bucket', :author => 'PO'
   end
 
@@ -28,6 +28,10 @@ class TestComment < Test::Unit::TestCase
     assert_equal(@c2.author_index, 0)
   end
 
+  def test_visible
+    assert_equal(false, @c1.visible)
+    assert_equal(true, @c2.visible)
+  end
   def test_ref
     assert(@c1.ref == 'A1')
     assert(@c2.ref == 'C3')

data/test/workbook/worksheet/tc_comments.rb

@@ -25,9 +25,9 @@ class TestComments < Test::Unit::TestCase
   end
   def test_authors
     assert_equal(@ws.comments.authors.size, @ws.comments.size)
-    @ws.add_comment(:text => 'Yes We Can!', :author => :bob, :ref => 'F1')
+    @ws.add_comment(:text => 'Yes We Can!', :author => 'bob', :ref => 'F1')
     assert_equal(@ws.comments.authors.size, 3)
-    @ws.add_comment(:text => 'Yes We Can!', :author => :bob, :ref => 'F1')
+    @ws.add_comment(:text => 'Yes We Can!', :author => 'bob', :ref => 'F1')
     assert_equal(@ws.comments.authors.size, 3, 'only unique authors are returned') 
   end
   def test_pn

data/test/workbook/worksheet/tc_conditional_formatting.rb

@@ -130,6 +130,13 @@ class TestConditionalFormatting < Test::Unit::TestCase
     assert doc.xpath("//xmlns:worksheet/xmlns:conditionalFormatting//xmlns:cfRule[@type='cellIs'][@dxfId=0][@priority=1][@operator='greaterThan']//xmlns:formula='0.5'")
   end
 
+  def test_multiple_formulas
+    @ws.add_conditional_formatting "B3:B3", { :type => :cellIs, :dxfId => 0, :priority => 1, :operator => :between, :formula => ["1","5"] }
+    doc = Nokogiri::XML.parse(@ws.to_xml_string)
+    assert doc.xpath("//xmlns:worksheet/xmlns:conditionalFormatting//xmlns:cfRule[@type='cellIs'][@dxfId=0][@priority=1][@operator='between']//xmlns:formula='1'")
+    assert doc.xpath("//xmlns:worksheet/xmlns:conditionalFormatting//xmlns:cfRule[@type='cellIs'][@dxfId=0][@priority=1][@operator='between']//xmlns:formula='5'")
+  end
+
   def test_sqref
     assert_raise(ArgumentError) { @cf.sqref = 10 }
     assert_nothing_raised { @cf.sqref = "A1:A1" }

metadata

@@ -1,52 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: axlsx
 version: !ruby/object:Gem::Version
-  version: 1.3.5
-  prerelease: 
+  version: 1.3.6
 platform: ruby
 authors:
 - Randy Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.5
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,60 +55,33 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   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: 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: simplecov
-  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'
-description: ! '    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.
-
-'
+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
 executables: []
 extensions: []
@@ -128,6 +94,7 @@ files:
 - lib/axlsx/doc_props/app.rb
 - lib/axlsx/doc_props/core.rb
 - lib/axlsx/drawing/ax_data_source.rb
+- lib/axlsx/drawing/axes.rb
 - lib/axlsx/drawing/axis.rb
 - lib/axlsx/drawing/bar_3D_chart.rb
 - lib/axlsx/drawing/bar_series.rb
@@ -138,6 +105,7 @@ files:
 - lib/axlsx/drawing/graphic_frame.rb
 - lib/axlsx/drawing/hyperlink.rb
 - lib/axlsx/drawing/line_3D_chart.rb
+- lib/axlsx/drawing/line_chart.rb
 - lib/axlsx/drawing/line_series.rb
 - lib/axlsx/drawing/marker.rb
 - lib/axlsx/drawing/num_data.rb
@@ -324,6 +292,7 @@ files:
 - test/drawing/tc_graphic_frame.rb
 - test/drawing/tc_hyperlink.rb
 - test/drawing/tc_line_3d_chart.rb
+- test/drawing/tc_line_chart.rb
 - test/drawing/tc_line_series.rb
 - test/drawing/tc_marker.rb
 - test/drawing/tc_named_axis_data.rb
@@ -414,30 +383,26 @@ files:
 - test/workbook/worksheet/tc_worksheet_hyperlink.rb
 homepage: https://github.com/randym/axlsx
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4130267238681018479
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: excel OOXML (xlsx) with charts, styles, images and autowidth columns.
 test_files:
 - test/benchmark.rb
@@ -458,6 +423,7 @@ test_files:
 - test/drawing/tc_graphic_frame.rb
 - test/drawing/tc_hyperlink.rb
 - test/drawing/tc_line_3d_chart.rb
+- test/drawing/tc_line_chart.rb
 - test/drawing/tc_line_series.rb
 - test/drawing/tc_marker.rb
 - test/drawing/tc_named_axis_data.rb