writeexcel 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20b416cc3748f15ad174799abf46360206cd2121
-  data.tar.gz: 75a4470abe845517634c386a89d6b7a147a741cc
+  metadata.gz: 5b531b36875f0418a1d22f1eacac9cf7f1e811ff
+  data.tar.gz: 0bc6f8b78768aa2e2ce03b97066d10d1b751ff63
 SHA512:
-  metadata.gz: 24ebdecf66d38da930c4c6b5b5ab7a242c42838d97651e42ccbaa009f78545cb9819f726ae2d578de14c41617e115da3c933e423de59a6d60520b59397ec18d6
-  data.tar.gz: e301135144176bb1af2ce65c15ee1f2a03aab117b262a489500b088c7e31920c15d4aa90f4f93d299b0194581e0736bad21bb7b7b30e32f0a5c19a2867d6d86f
+  metadata.gz: 6323cf3fab002c0211284e4fe5f0e41038af0ca322d1a79197b7e52cdd23c3d2a36982e7871d52022cbfa467d03f24f9bd56e81442f440ffa633401ada8fe71a
+  data.tar.gz: 05e0fc08c9824fb5590f267919fea15c1525bf0c34bae99d01842392885e921ac57a382d3e989ad6d139dbfdd08087f644da3002ef1874e1281a722532ed448e

data/README.rdoc

@@ -82,6 +82,10 @@ Example Code:
 * and ......
 
 == Recent Change
+v1.0.2
+* Bug fix issue 28. bug in non ascii worksheet names.
+* Bug fix in testcase issue 28. fail due to defferent timezone.
+
 v1.0.1
 * Bug fix issue 25. bug in Chart#set_legend.
 
@@ -93,7 +97,7 @@ v1.0.0
 Original was written in Perl by John McNamara (jmcnamara@cpan.org).
 
 Convert to ruby by Hideo Nakamura (cxn03651@msj.biglobe.ne.jp)
-Copyright (c) 2009-2013 Hideo NAKAMURA. See LICENSE for details.
+Copyright (c) 2009-2013 Hideo NAKAMURA. See LICENSE.txt for details.
 
 == License
 

data/examples/data_validate.rb

@@ -134,7 +134,6 @@
 #
 txt = 'Select a value from a drop down list'
 row += 2
-bp=1
 worksheet.write(row, 0, txt)
 worksheet.data_validation(row, 1,
     {

data/examples/images.rb

@@ -21,7 +21,6 @@
 worksheet2 = workbook.add_worksheet('Image 2')
 worksheet3 = workbook.add_worksheet('Image 3')
 worksheet4 = workbook.add_worksheet('Image 4')
-bp=1
 
 # Insert a basic image
 worksheet1.write('A10', "Image inserted into worksheet.")

data/examples/merge3.rb

@@ -24,7 +24,6 @@
 [1, 3,6,7].each { |row| worksheet.set_row(row, 30) }
 worksheet.set_column('B:D', 20)
 
-bp=1
 ###############################################################################
 #
 # Example 1: Merge cells containing a hyperlink using write_url_range()

data/examples/properties_jp.rb

@@ -15,7 +15,7 @@
 
 workbook  = WriteExcel.new('properties_jp.xls')
 worksheet = workbook.add_worksheet
-bp =1
+
 workbook.set_properties(
     :title    => 'スプレッドシートの作成例',
     :subject  => 'ファイルのプロパティをセット',

data/examples/regions.rb

@@ -40,7 +40,6 @@
 west.write(0, 1, 100000)
 
 # Set the active worksheet
-bp=1
 south.activate()
 
 # Set the width of the first column

data/html/en/doc_en.html

@@ -703,7 +703,7 @@ name="sheets"
 <p>If no arguments are passed the method returns a list of all the worksheets in the workbook. This is useful if you want to repeat an operation on each worksheet:</p>
 
 <pre>
-    workbook.sheets.each do |worksheet| 
+    workbook.sheets.each do |worksheet|
       print worksheet.name
     end
 </pre>
@@ -5830,6 +5830,7 @@ name="Additional_Examples"
     chart_area.rb           A demo of area style charts.
     chart_bar.rb            A demo of bar (vertical histogram) style charts.
     chart_column.rb         A demo of column (histogram) style charts.
+    chart_legend.rb         A demo of chart with/without legend.
     chart_line.rb           A demo of line style charts.
     chart_pie.rb            A demo of pie style charts.
     chart_scatter.rb        A demo of scatter style charts.
@@ -5857,6 +5858,7 @@ name="Additional_Examples"
     outline.rb              An example of outlines and grouping.
     outline_collapsed.rb    An example of collapsed outlines.
     panes.rb                An examples of how to create panes.
+    password_protection.rb  An example of sheet protection by password.
     properties.rb           Add document properties to a workbook.
     properties_jp.rb        Add document properties in Japanese to a workbook.
     protection.rb           Example of cell locking and formula hiding.
@@ -5864,6 +5866,7 @@ name="Additional_Examples"
     right_to_left.rb        Change default sheet direction to right to left.
     row_wrap.rb             How to wrap data from one worksheet onto another.
     sales.rb                An example of a simple sales spreadsheet.
+    stats.rb                A simple example of how to use functions.
     stocks.rb               Demonstrates conditional formatting.
     tab_colors.rb           Example of how to set worksheet tab colours.
     write_arrays.rb         Example of writing 1D or 2D arrays of data.
@@ -5931,7 +5934,7 @@ name="THE_EXCEL_BINARY_FORMAT"
 <h1><a class='u' href='#___top' title='click to go to top of document'
 name="LICENSE"
 >LICENSE</a></h1>
-<p>Same as Ruby.</p>
+<p>MIT Lisence.</p>
 
 <h1><a class='u' href='#___top' title='click to go to top of document'
 name="COPYRIGHT"

data/lib/writeexcel/version.rb

@@ -1,5 +1,5 @@
 require 'writeexcel'
 
 class WriteExcel < Workbook
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/lib/writeexcel/workbook.rb

@@ -872,7 +872,7 @@ def check_sheetname(name, name_utf16be = false, chart = nil)       #:nodoc:
     check_sheetname_valid_chars(name, name_utf16be)
 
     # Handle utf8 strings
-    if is_utf8?(name)
+    if !name_utf16be && is_utf8?(name)
       name = utf8_to_16be(name)
       name_utf16be = true
     end
@@ -914,19 +914,27 @@ def check_sheetname_even(name)       #:nodoc:
 
   def check_sheetname_valid_chars(name, name_utf16be)       #:nodoc:
     # Check that sheetname doesn't contain any invalid characters
-    invalid_char    = %r![\[\]:*?/\\]!
-    if !name_utf16be && name =~ invalid_char
-      # Check ASCII names
+    invalid_chars    = %r![\[\]:*?/\\]!
+
+    if ascii_sheetname_invalid_chars?(name, name_utf16be, invalid_chars) ||
+        non_ascii_sheetname_invalid_chars?(name, invalid_chars)
       raise "Invalid character []:*?/\\ in worksheet name: #{name}"
-    else
-      # Extract any 8bit clean chars from the UTF16 name and validate them.
-      str = name.dup
-      while str =~ /../m
-        hi, lo = $~[0].unpack('aa')
-        if hi == "\0" and lo =~ invalid_char
-          raise 'Invalid character []:*?/\\ in worksheet name: ' + name
-        end
-        str = $~.post_match
+    end
+  end
+
+  def ascii_sheetname_invalid_chars?(name, name_utf16be, invalid_chars)  # :nodoc:
+    # Check ASCII names
+    !name_utf16be && name =~ invalid_chars
+  end
+
+  def non_ascii_sheetname_invalid_chars?(name, invalid_chars)   # :nodoc:
+    # Extract any 8bit clean chars from the UTF16 name and validate them.
+    str = ruby_19 { name.dup.force_encoding("binary") } || ruby_18 { name.dup }
+    while str =~ /../m
+      hi, lo = $~[0].unpack('aa')
+      str = $~.post_match
+      if hi == "\0" and lo =~ invalid_chars
+        raise 'Invalid character []:*?/\\ in worksheet name: ' + name
       end
     end
   end

data/test/helper.rb

@@ -1,7 +1,10 @@
 # -*- coding: utf-8 -*-
 require 'rubygems'
+require 'simplecov'
 require 'test/unit'
 
+SimpleCov.start
+
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'writeexcel'

data/test/test_01_add_worksheet.rb

@@ -3,8 +3,41 @@
 
 class TC_add_worksheet < Test::Unit::TestCase
 
-  def test_true
-    assert(true)
+  def setup
+    @workbook = WriteExcel.new(StringIO.new)
+  end
+
+  def test_ascii_worksheet_name
+
+    name = "Test"
+
+    assert_nothing_raised {
+      sheet = @workbook.add_worksheet(name)
+      assert_equal name, sheet.name
+    }
+
+  end
+
+  def test_utf_8_worksheet_name
+
+    name = "Décembre"
+
+    assert_nothing_raised {
+      sheet = @workbook.add_worksheet(name)
+      assert_equal utf8_to_16be(name), sheet.name
+    }
+
+  end
+
+  def test_utf_16be_worksheet_name
+
+    name = utf8_to_16be("Décembre")
+
+    assert_nothing_raised {
+      sheet = @workbook.add_worksheet(name, true)
+      assert_equal name, sheet.name
+    }
+
   end
 
 end

data/test/test_example_match.rb

@@ -318,7 +318,6 @@ def test_regions
     west.write(0, 1, 100000)
 
     # Set the active worksheet
-    bp=1
     south.activate()
 
     # Set the width of the first column
@@ -701,7 +700,7 @@ def test_data_validate
     #
     txt = 'Select a value from a drop down list'
     row += 2
-    bp=1
+
     worksheet.write(row, 0, txt)
     worksheet.data_validation(row, 1,
         {
@@ -1156,7 +1155,6 @@ def test_images
     worksheet2 = workbook.add_worksheet('Image 2')
     worksheet3 = workbook.add_worksheet('Image 3')
     worksheet4 = workbook.add_worksheet('Image 4')
-    bp=1
 
     # Insert a basic image
     worksheet1.write('A10', "Image inserted into worksheet.")
@@ -3423,14 +3421,16 @@ def test_compatibility_mode_write_number
   end
 
   def test_properties
+    tz = ENV["TZ"]
     workbook  = WriteExcel.new(@file)
 
     #
     # adjust @localtime to target xls file.
     #
+    ENV["TZ"] = "Japan"
     workbook.instance_variable_set(
                                    :@localtime,
-                                   Time.local(2013, 5, 5, 22, 37, 42)
+                                   Time.gm(2013, 5, 5, 13, 37, 42).localtime
                                    )
 
     worksheet = workbook.add_worksheet
@@ -3454,6 +3454,8 @@ def test_properties
 
     # do assertion
     compare_file("#{PERL_OUTDIR}/properties.xls", @file)
+
+    ENV["TZ"] = tz
   end
 
   def test_chart_legend

data/test/test_properties.rb

@@ -9,9 +9,10 @@ def setup
   end
 
   def test_pack_VT_FILETIME
+    filetime =
     assert_equal(
                  '40 00 00 00 00 FD 2D ED CE 48 CE 01',
-                 unpack_record(pack_VT_FILETIME(Time.local(2013, 5, 4, 22, 54, 42)))
+                 unpack_record(pack_VT_FILETIME(Time.gm(2013, 5, 4, 13, 54, 42)))
                  )
   end
 
@@ -26,7 +27,7 @@ def test_create_summary_property_set
                                         [4, "VT_LPSTR", "Hideo NAKAMURA"],
                                         [5, "VT_LPSTR", "Sample, Example, Properties"],
                                         [6, "VT_LPSTR", "Created with Ruby and WriteExcel"],
-                                        [12, "VT_FILETIME", Time.local(2013, 5, 4, 21, 47, 16)]
+                                        [12, "VT_FILETIME", Time.gm(2013, 5, 4, 12, 47, 16)]
                                        ]
                                              ))
                  )

data/writeexcel.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |gem|
     "LICENSE.txt",
     "README.rdoc"
   ]
+  gem.add_development_dependency 'simplecov'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: writeexcel
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Hideo NAKAMURA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
-dependencies: []
+date: 2013-12-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Multiple worksheets can be added to a workbook and formatting can be
   applied to cells. Text, numbers, formulas, hyperlinks and images can be written
   to the cells.
@@ -299,7 +313,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Write to a cross-platform Excel binary file.