rubyXL 3.3.26 → 3.3.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee8fa540c61ad0cc0f3d680e6c60fd0b11893d25
-  data.tar.gz: 7c8477f3b10319ce5b20fadf1acb0cb17a21dd1e
+  metadata.gz: 945b2b30016fc810af476534a32423d03d1671a5
+  data.tar.gz: f7878f7d391af37da188fc6d55f5ea113f8baad2
 SHA512:
-  metadata.gz: 8ff2856c3a2ab5e3631372bd61395d38aa237f457093cc591fa613519b3eb543fc5a81b093ed2c089bf0bd308385e4ae117665fa3ea566abd079a9a1c8f0a421
-  data.tar.gz: 53cb9b4f2a51f90adac6f48451a37848c8f0f843da6ccbb045c348e0824559c92ffbe9c33c891f82a047966422397878dd062cebaa3a6f97028da49a57451f8f
+  metadata.gz: 6d64e169ea59fc373e040050cb809ddc886ccdb706bd26a2e8aaea1414d2b4e23fe8ccdefa40f0e8185c63acc5ac52c7d2608385508a2a459664ad5a963dd82c
+  data.tar.gz: e00f176510998c45da4b7654970e80d67bebf025cbb96995620de7d4b213d37bc5e1b68d97f224af41da0acba15ff72733ce5842efe026228aee3b8705d52d13

data/VERSION

@@ -1 +1 @@
-3.3.26
+3.3.27

data/lib/rubyXL/convenience_methods.rb

@@ -194,6 +194,19 @@ module RubyXL
 
       register_new_xf(xf)
     end
+
+    # Calculate password hash from string for use in 'password' fields.
+    # https://www.openoffice.org/sc/excelfileformat.pdf
+    def password_hash(pwd)
+      hsh = 0
+      pwd.reverse.each_char { |c|
+        hsh = hsh ^ c.ord
+        hsh = hsh << 1
+        hsh -= 0x7fff if hsh > 0x7fff
+      }
+
+      (hsh ^ pwd.length ^ 0xCE4B).to_s(16)
+    end
   end
 
 

data/lib/rubyXL/objects/chartsheet.rb

@@ -8,7 +8,7 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-ssml_sheetProtection-4.html
   class ChartsheetProtection < OOXMLObject
-    define_attribute(:password, :string)
+    define_attribute(:password, RubyXL::ST_UnsignedShortHex)
     define_attribute(:content,  :bool, :default => false)
     define_attribute(:objects,  :bool, :default => false)
     define_element_name 'sheetProtection'

data/lib/rubyXL/objects/sheet_data.rb

@@ -80,6 +80,7 @@ module RubyXL
 
       case datatype
       when RubyXL::DataType::SHARED_STRING then workbook.shared_strings_container[r.to_i].to_s
+      when RubyXL::DataType::INLINE_STRING then is.to_s
       when RubyXL::DataType::RAW_STRING    then raw_value
       else
         if is_date? then workbook.num_to_date(r.to_f)

data/lib/rubyXL/objects/simple_types.rb

@@ -226,4 +226,7 @@ module RubyXL
   ST_TextStrikeType       = %w{ noStrike sngStrike dblStrike }
   ST_TextCapsType         = %w{ none small all }
 
+  # TODO: http://www.datypic.com/sc/ooxml/t-ssml_ST_UnsignedShortHex.html
+  ST_UnsignedShortHex     = :string
+
 end

data/lib/rubyXL/objects/text.rb

@@ -14,7 +14,7 @@ module RubyXL
     # http://www.w3.org/TR/REC-xml/#NT-Char:
     # Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF]
 
-    INVALID_XML10_CHARS = /([^\x09\x0A\x0D\x20-\uD7FF\uE000-\uFFFD\u10000-\u10FFFF])/
+    INVALID_XML10_CHARS = /([^\x09\x0A\x0D\x20-\uD7FF\uE000-\uFFFD\u{10000}-\u{10FFFF}])/
     ESCAPED_UNICODE = /_x([0-9A-F]{4})_/
 
     def before_write_xml

data/lib/rubyXL/objects/workbook.rb

@@ -31,7 +31,7 @@ module RubyXL
   class FileSharing < OOXMLObject
     define_attribute(:readOnlyRecommended, :bool, :default => false)
     define_attribute(:userName,            :string)
-    define_attribute(:reservationPassword, :string)
+    define_attribute(:reservationPassword, RubyXL::ST_UnsignedShortHex)
     define_element_name 'fileSharing'
   end
 
@@ -60,8 +60,8 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-ssml_workbookProtection-1.html
   class WorkbookProtection < OOXMLObject
-    define_attribute(:workbookPassword,  :string)
-    define_attribute(:revisionsPassword, :string)
+    define_attribute(:workbookPassword,  RubyXL::ST_UnsignedShortHex)
+    define_attribute(:revisionsPassword, RubyXL::ST_UnsignedShortHex)
     define_attribute(:lockStructure,     :bool,   :default => false)
     define_attribute(:lockWindows,       :bool,   :default => false)
     define_attribute(:lockRevision,      :bool,   :default => false)

data/lib/rubyXL/objects/worksheet.rb

@@ -126,7 +126,7 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-ssml_protectedRange-1.html
   class ProtectedRange < OOXMLObject
-    define_attribute(:password,           :string)
+    define_attribute(:password,           RubyXL::ST_UnsignedShortHex)
     define_attribute(:sqref,              :sqref,  :required => true)
     define_attribute(:name,               :string, :required => true)
     define_attribute(:securityDescriptor, :string)
@@ -141,7 +141,7 @@ module RubyXL
 
   # http://www.datypic.com/sc/ooxml/e-ssml_sheetProtection-1.html
   class WorksheetProtection < OOXMLObject
-    define_attribute(:password,            :string)
+    define_attribute(:password,            RubyXL::ST_UnsignedShortHex)
     define_attribute(:sheet,               :bool, :default => false)
     define_attribute(:objects,             :bool, :default => false)
     define_attribute(:scenarios,           :bool, :default => false)

data/lib/rubyXL/worksheet.rb

@@ -42,9 +42,22 @@ module LegacyWorksheet
       c.worksheet = self
       c.row = row_index
       c.column = column_index
-      c.raw_value = data
-      c.datatype = RubyXL::DataType::RAW_STRING unless formula || data.is_a?(Numeric)
-      c.formula = RubyXL::Formula.new(:expression => formula) if formula
+
+      if formula then
+        c.formula = RubyXL::Formula.new(:expression => formula)
+        c.raw_value = data
+      else
+        case data
+        when Numeric          then c.raw_value = data
+        when String           then
+          c.raw_value = data
+          c.datatype = RubyXL::DataType::RAW_STRING
+        when RubyXL::RichText then
+          c.is = data
+          c.datatype = RubyXL::DataType::INLINE_STRING
+        when NilClass         then nil
+        end
+      end
 
       range = cols && cols.locate_range(column_index)
       c.style_index = row.style_index || (range && range.style_index) || 0

data/rdoc/README_rdoc.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>README - rubyXL 3.3.26</title>
+<title>README - rubyXL 3.3.27</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "./";

data/rdoc/RubyXL.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>module RubyXL - rubyXL 3.3.26</title>
+<title>module RubyXL - rubyXL 3.3.27</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "./";
@@ -506,6 +506,12 @@
         <dd>
         
       
+        <dt id="ST_UnsignedShortHex">ST_UnsignedShortHex
+        
+        <dd><p>TODO: <a
+href="http://www.datypic.com/sc/ooxml/t-ssml_ST_UnsignedShortHex.html">www.datypic.com/sc/ooxml/t-ssml_ST_UnsignedShortHex.html</a></p>
+        
+      
         <dt id="ST_UpdateLinks">ST_UpdateLinks
         
         <dd>

data/rdoc/RubyXL/AExtension.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AExtension - rubyXL 3.3.26</title>
+<title>class RubyXL::AExtension - rubyXL 3.3.27</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/AExtensionStorageArea.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AExtensionStorageArea - rubyXL 3.3.26</title>
+<title>class RubyXL::AExtensionStorageArea - rubyXL 3.3.27</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/ActiveX.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::ActiveX - rubyXL 3.3.26</title>
+<title>class RubyXL::ActiveX - rubyXL 3.3.27</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/ActiveXBinary.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::ActiveXBinary - rubyXL 3.3.26</title>
+<title>class RubyXL::ActiveXBinary - rubyXL 3.3.27</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/AdjustHandleList.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AdjustHandleList - rubyXL 3.3.26</title>
+<title>class RubyXL::AdjustHandleList - rubyXL 3.3.27</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/Alignment.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::Alignment - rubyXL 3.3.26</title>
+<title>class RubyXL::Alignment - rubyXL 3.3.27</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/AlternateContent.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AlternateContent - rubyXL 3.3.26</title>
+<title>class RubyXL::AlternateContent - rubyXL 3.3.27</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/Authors.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::Authors - rubyXL 3.3.26</title>
+<title>class RubyXL::Authors - rubyXL 3.3.27</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/AutoFilter.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AutoFilter - rubyXL 3.3.26</title>
+<title>class RubyXL::AutoFilter - rubyXL 3.3.27</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/AutoFilterColumn.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AutoFilterColumn - rubyXL 3.3.26</title>
+<title>class RubyXL::AutoFilterColumn - rubyXL 3.3.27</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/BinaryImageFile.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::BinaryImageFile - rubyXL 3.3.26</title>
+<title>class RubyXL::BinaryImageFile - rubyXL 3.3.27</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/BodyProperties.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::BodyProperties - rubyXL 3.3.26</title>
+<title>class RubyXL::BodyProperties - rubyXL 3.3.27</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/BooleanNode.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::BooleanNode - rubyXL 3.3.26</title>
+<title>class RubyXL::BooleanNode - rubyXL 3.3.27</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/BooleanValue.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::BooleanValue - rubyXL 3.3.26</title>
+<title>class RubyXL::BooleanValue - rubyXL 3.3.27</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/Border.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::Border - rubyXL 3.3.26</title>
+<title>class RubyXL::Border - rubyXL 3.3.27</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/BorderEdge.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::BorderEdge - rubyXL 3.3.26</title>
+<title>class RubyXL::BorderEdge - rubyXL 3.3.27</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/Borders.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::Borders - rubyXL 3.3.26</title>
+<title>class RubyXL::Borders - rubyXL 3.3.27</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/Break.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::Break - rubyXL 3.3.26</title>
+<title>class RubyXL::Break - rubyXL 3.3.27</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/BreakList.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::BreakList - rubyXL 3.3.26</title>
+<title>class RubyXL::BreakList - rubyXL 3.3.27</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/CT_AdjPoint2D.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::CT_AdjPoint2D - rubyXL 3.3.26</title>
+<title>class RubyXL::CT_AdjPoint2D - rubyXL 3.3.27</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/CT_AlphaBiLevelEffect.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::CT_AlphaBiLevelEffect - rubyXL 3.3.26</title>
+<title>class RubyXL::CT_AlphaBiLevelEffect - rubyXL 3.3.27</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/CT_AlphaModulateEffect.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::CT_AlphaModulateEffect - rubyXL 3.3.26</title>
+<title>class RubyXL::CT_AlphaModulateEffect - rubyXL 3.3.27</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/CT_AlphaModulateFixedEffect.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::CT_AlphaModulateFixedEffect - rubyXL 3.3.26</title>
+<title>class RubyXL::CT_AlphaModulateFixedEffect - rubyXL 3.3.27</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/CT_AlphaOutsetEffect.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::CT_AlphaOutsetEffect - rubyXL 3.3.26</title>
+<title>class RubyXL::CT_AlphaOutsetEffect - rubyXL 3.3.27</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/CT_AlphaReplaceEffect.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::CT_AlphaReplaceEffect - rubyXL 3.3.26</title>
+<title>class RubyXL::CT_AlphaReplaceEffect - rubyXL 3.3.27</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/CT_Backdrop.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::CT_Backdrop - rubyXL 3.3.26</title>
+<title>class RubyXL::CT_Backdrop - rubyXL 3.3.27</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/CT_Bevel.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::CT_Bevel - rubyXL 3.3.26</title>
+<title>class RubyXL::CT_Bevel - rubyXL 3.3.27</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";

data/rdoc/RubyXL/CT_BiLevelEffect.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::CT_BiLevelEffect - rubyXL 3.3.26</title>
+<title>class RubyXL::CT_BiLevelEffect - rubyXL 3.3.27</title>
 
 <script type="text/javascript">
   var rdoc_rel_prefix = "../";