rubyXL 2.5.2 → 2.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1868f2f48d4cb5ee9e4e7b8fc85adce5ddc1f758
-  data.tar.gz: 3f2c7d3bbd2c6b44e8cc0964800a5eb73d197f43
+  metadata.gz: a6a9361899bbb99bf07a40430e935fec0bd5d184
+  data.tar.gz: 5d7f2b2e4462798506e4f0555ed57cd0856ac511
 SHA512:
-  metadata.gz: 12fff8d8a13e2e69c6a949737758e1387d4ffe7ba1874e91b91fe01bc8b9d4a0e36a26c14d8cdc5e63dffcf1095d52ea19a4432ba14d737db8c486f03864e0e7
-  data.tar.gz: 7f5d6f2352eb067afd6d88aae53fdeca1b39c5d913d136af4cb113e1abda4ded8455d10cf0d7908d70946dacdd40e2bfbdc5668add753a79628fb3d4a4786ed3
+  metadata.gz: 746a8de512c5cf6226430ea9d33c435b00311129a880159c6b48b833496667384ccdd38f02111843e1cdd38533cbdf5fb0b4e0e2f71be42b88f07a13a0c9d859
+  data.tar.gz: 3683e09f2856e21adf0615f7723188e3b4b4ba08aa8eca8d7e448219cb0465543503abeb522f9d947234226644adf8b215090932acbaa4ae95bff7bbe1154a83

data/Gemfile

@@ -8,6 +8,7 @@ gem "rubyzip", ">= 1.0.0" , :require => 'zip'
 group :development do
   gem "shoulda", ">= 0"
   gem "bundler"
+  gem "rake"
   gem "jeweler"
   gem "simplecov", ">= 0"
   gem "rspec", ">= 1.3.4"

data/Gemfile.lock

@@ -1,12 +1,12 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (4.0.4)
+    activesupport (4.1.1)
       i18n (~> 0.6, >= 0.6.9)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
+      tzinfo (~> 1.1)
     addressable (2.3.6)
     builder (3.2.2)
     descendants_tracker (0.0.4)
@@ -24,7 +24,7 @@ GEM
       multi_json (>= 1.7.5, < 2.0)
       nokogiri (~> 1.6.0)
       oauth2
-    hashie (2.1.0)
+    hashie (2.1.1)
     highline (1.6.21)
     i18n (0.6.9)
     jeweler (2.0.1)
@@ -40,8 +40,8 @@ GEM
     jwt (0.1.11)
       multi_json (>= 1.5)
     mini_portile (0.5.3)
-    minitest (4.7.5)
-    multi_json (1.9.2)
+    minitest (5.3.3)
+    multi_json (1.10.0)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     nokogiri (1.6.1)
@@ -53,7 +53,7 @@ GEM
       multi_xml (~> 0.5)
       rack (~> 1.2)
     rack (1.5.2)
-    rake (10.2.2)
+    rake (10.3.1)
     rdoc (4.1.1)
       json (~> 1.4)
     rspec (2.14.1)
@@ -69,15 +69,16 @@ GEM
       shoulda-context (~> 1.0, >= 1.0.1)
       shoulda-matchers (>= 1.4.1, < 3.0)
     shoulda-context (1.2.1)
-    shoulda-matchers (2.5.0)
+    shoulda-matchers (2.6.1)
       activesupport (>= 3.0.0)
     simplecov (0.8.2)
       docile (~> 1.1.0)
       multi_json
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
-    thread_safe (0.3.2)
-    tzinfo (0.3.39)
+    thread_safe (0.3.3)
+    tzinfo (1.1.0)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
@@ -86,6 +87,7 @@ DEPENDENCIES
   bundler
   jeweler
   nokogiri (>= 1.4.4)
+  rake
   rspec (>= 1.3.4)
   rubyzip (>= 1.0.0)
   shoulda

data/README.rdoc

@@ -90,6 +90,9 @@ Please note: these methods are being phased out in favor of the OOXML object mod
 ==== Adding Worksheets
   worksheet = workbook.add_worksheet('Sheet2')
 
+==== Renaming Worksheets
+  worksheet.sheet_name = 'Cool New Name'
+
 ==== Adding Cells
   worksheet.add_cell(0, 0, 'A1')      # Sets cell A1 to string "A1"
   worksheet.add_cell(0, 1, '', 'A1')  # Sets formula in the cell B1 to '=A1'

data/VERSION

@@ -1 +1 @@
-2.5.2
+2.5.3

data/lib/rubyXL/cell.rb

@@ -35,7 +35,7 @@ module RubyXL
     end
 
     # Changes font size of cell
-    def change_font_size(font_size=10)
+    def change_font_size(font_size = 10)
       validate_worksheet
       raise 'Argument must be a number' unless font_size.is_a?(Integer) || font_size.is_a?(Float)
 
@@ -45,7 +45,7 @@ module RubyXL
     end
 
     # Changes font color of cell
-    def change_font_color(font_color='000000')
+    def change_font_color(font_color = '000000')
       validate_worksheet
       Color.validate_color(font_color)
 
@@ -55,7 +55,7 @@ module RubyXL
     end
 
     # Changes font italics settings of cell
-    def change_font_italics(italicized=false)
+    def change_font_italics(italicized = false)
       validate_worksheet
 
       font = get_cell_font.dup
@@ -64,7 +64,7 @@ module RubyXL
     end
 
     # Changes font bold settings of cell
-    def change_font_bold(bolded=false)
+    def change_font_bold(bolded = false)
       validate_worksheet
 
       font = get_cell_font.dup
@@ -73,7 +73,7 @@ module RubyXL
     end
 
     # Changes font underline settings of cell
-    def change_font_underline(underlined=false)
+    def change_font_underline(underlined = false)
       validate_worksheet
 
       font = get_cell_font.dup
@@ -81,7 +81,7 @@ module RubyXL
       update_font_references(font)
     end
 
-    def change_font_strikethrough(struckthrough=false)
+    def change_font_strikethrough(struckthrough = false)
       validate_worksheet
 
       font = get_cell_font.dup
@@ -97,60 +97,64 @@ module RubyXL
     private :update_font_references
 
     # changes horizontal alignment of cell
-    def change_horizontal_alignment(alignment='center')
+    def change_horizontal_alignment(alignment = 'center')
       validate_worksheet
       self.style_index = workbook.modify_alignment(self.style_index, true, alignment)
     end
 
     # changes vertical alignment of cell
-    def change_vertical_alignment(alignment='center')
+    def change_vertical_alignment(alignment = 'center')
       validate_worksheet
       self.style_index = workbook.modify_alignment(self.style_index, false, alignment)
     end
 
     # changes wrap of cell
-    def change_text_wrap(wrap=false)
+    def change_text_wrap(wrap = false)
       validate_worksheet
       self.style_index = workbook.modify_text_wrap(self.style_index, wrap)
     end
 
     # changes top border of cell
-    def change_border_top(weight='thin')
+    def change_border_top(weight = 'thin')
       change_border(:top, weight)
     end
 
     # changes left border of cell
-    def change_border_left(weight='thin')
+    def change_border_left(weight = 'thin')
       change_border(:left, weight)
     end
 
     # changes right border of cell
-    def change_border_right(weight='thin')
+    def change_border_right(weight = 'thin')
       change_border(:right, weight)
     end
 
     # changes bottom border of cell
-    def change_border_bottom(weight='thin')
+    def change_border_bottom(weight = 'thin')
       change_border(:bottom, weight)
     end
 
     # changes diagonal border of cell
-    def change_border_diagonal(weight='thin')
+    def change_border_diagonal(weight = 'thin')
       change_border(:diagonal, weight)
     end
 
-    # changes contents of cell, with formula option
-    def change_contents(data, formula=nil)
+    def change_contents(data, formula_expression = nil)
       validate_worksheet
-      self.datatype = RubyXL::DataType::RAW_STRING
 
-      case data
-      when Date           then data = workbook.date_to_num(data)
-      when Integer, Float then self.datatype = ''
+      if formula_expression then
+        self.datatype = nil
+        self.formula = RubyXL::Formula.new(:expression => formula_expression)
+      else
+        self.datatype = case data
+                        when Date, Integer, Float then nil
+                        else RubyXL::DataType::RAW_STRING
+                        end
       end
 
+      data = workbook.date_to_num(data) if data.is_a?(Date)
+
       self.raw_value = data
-      @formula = formula
     end
 
     # returns if font is italicized
@@ -247,7 +251,7 @@ module RubyXL
 
     def inspect
       str = "#<#{self.class}(#{row},#{column}): #{raw_value.inspect}" 
-      str += " =#{@formula}" if @formula
+      str += " =#{self.formula.expression}" if self.formula
       str += ", datatype = #{self.datatype}, style_index = #{self.style_index}>"
       return str
     end
@@ -266,19 +270,19 @@ module RubyXL
 
     def validate_workbook()
       unless workbook.nil? || workbook.worksheets.nil?
-        workbook.worksheets.each do |sheet|
+        workbook.worksheets.each { |sheet|
           unless sheet.nil? || sheet.sheet_data.nil? || sheet.sheet_data[row].nil?
             if sheet.sheet_data[row][column] == self
               return
             end
           end
-        end
+        }
       end
       raise "This cell #{self} is not in workbook #{workbook}"
     end
 
     def validate_worksheet()
-      return if @worksheet && @worksheet[row][column] == self
+      return if @worksheet && @worksheet[row] && @worksheet[row][column] == self
       raise "This cell #{self} is not in worksheet #{worksheet}"
     end
 
@@ -296,4 +300,3 @@ module RubyXL
 
   end
 end
-

data/lib/rubyXL/objects/data_validation.rb

@@ -23,7 +23,6 @@ module RubyXL
     define_child_node(RubyXL::Formula, :node_name => :formula1)
     define_child_node(RubyXL::Formula, :node_name => :formula2)
     define_element_name 'dataValidation'
-
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_dataValidations-1.html

data/lib/rubyXL/objects/workbook.rb

@@ -319,7 +319,8 @@ module RubyXL
 
       worksheets.each_with_index { |sheet, i|
         rel = relationship_container.find_by_target(sheet.xlsx_path.gsub(/^xl\//, ''))
-        sheets << RubyXL::Sheet.new(:name => sheet.sheet_name, :sheet_id => sheet.sheet_id || (i + 1),
+        sheets << RubyXL::Sheet.new(:name => sheet.sheet_name[0..30], # Max sheet name length is 31 char
+                                    :sheet_id => sheet.sheet_id || (i + 1),
                                     :state => sheet.state, :r_id => rel.id)
       }
       true

data/lib/rubyXL/objects/worksheet.rb

@@ -652,7 +652,7 @@ module RubyXL
                    'xmlns:x14ac' => 'http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac',
                    'xmlns:mv'    => 'urn:schemas-microsoft-com:mac:vml')
 
-    attr_accessor :state
+    attr_accessor :workbook, :state, :sheet_name, :sheet_id
 
     def before_write_xml # This method may need to be moved higher in the hierarchy
       first_nonempty_row = nil

data/lib/rubyXL/worksheet.rb

@@ -2,17 +2,13 @@ module RubyXL
 module LegacyWorksheet
   include Enumerable
 
-  attr_accessor :workbook, :sheet_name, :sheet_id
-
   def initialize(params = {})
     super
-    @workbook   = params[:workbook]
-    @sheet_name = params[:sheet_name]
-    @sheet_id   = params[:sheet_id]
+    self.workbook   = params[:workbook]
+    self.sheet_name = params[:sheet_name]
+    self.sheet_id   = params[:sheet_id]
     self.sheet_data = RubyXL::SheetData.new
     self.cols = RubyXL::ColumnRanges.new
-    @extLst = nil
-    @validations = []
   end
 
   # allows for easier access to sheet_data

data/rdoc/README_rdoc.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>README - rubyXL 2.5.2</title>
+<title>README - rubyXL 2.5.3</title>
 
 <link href="./fonts.css" rel="stylesheet">
 <link href="./rdoc.css" rel="stylesheet">
@@ -74,6 +74,7 @@
     <li><a href="#label-Table+identification">Table identification</a>
     <li><a href="#label-Modifying">Modifying</a>
     <li><a href="#label-Adding+Worksheets">Adding Worksheets</a>
+    <li><a href="#label-Renaming+Worksheets">Renaming Worksheets</a>
     <li><a href="#label-Adding+Cells">Adding Cells</a>
     <li><a href="#label-Changing+Cells">Changing Cells</a>
     <li><a href="#label-Changing+Fonts">Changing Fonts</a>
@@ -227,6 +228,10 @@ worksheet.get_column_border_right(0)</pre>
 
 <pre>worksheet = workbook.add_worksheet(&#39;Sheet2&#39;)</pre>
 
+<h4 id="label-Renaming+Worksheets">Renaming Worksheets<span><a href="#label-Renaming+Worksheets">&para;</a> <a href="#documentation">&uarr;</a></span></h4>
+
+<pre>worksheet.sheet_name = &#39;Cool New Name&#39;</pre>
+
 <h4 id="label-Adding+Cells">Adding Cells<span><a href="#label-Adding+Cells">&para;</a> <a href="#documentation">&uarr;</a></span></h4>
 
 <pre>worksheet.add_cell(0, 0, &#39;A1&#39;)      # Sets cell A1 to string &quot;A1&quot;

data/rdoc/RubyXL.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>module RubyXL - rubyXL 2.5.2</title>
+<title>module RubyXL - rubyXL 2.5.3</title>
 
 <link href="./fonts.css" rel="stylesheet">
 <link href="./rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/AExtension.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AExtension - rubyXL 2.5.2</title>
+<title>class RubyXL::AExtension - rubyXL 2.5.3</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/AExtensionStorageArea.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AExtensionStorageArea - rubyXL 2.5.2</title>
+<title>class RubyXL::AExtensionStorageArea - rubyXL 2.5.3</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/AdjustHandleList.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AdjustHandleList - rubyXL 2.5.2</title>
+<title>class RubyXL::AdjustHandleList - rubyXL 2.5.3</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/Alignment.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::Alignment - rubyXL 2.5.2</title>
+<title>class RubyXL::Alignment - rubyXL 2.5.3</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/AlternateContent.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AlternateContent - rubyXL 2.5.2</title>
+<title>class RubyXL::AlternateContent - rubyXL 2.5.3</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/AutoFilter.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AutoFilter - rubyXL 2.5.2</title>
+<title>class RubyXL::AutoFilter - rubyXL 2.5.3</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/AutoFilterColumn.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::AutoFilterColumn - rubyXL 2.5.2</title>
+<title>class RubyXL::AutoFilterColumn - rubyXL 2.5.3</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">

data/rdoc/RubyXL/BodyProperties.html

@@ -4,7 +4,7 @@
 <head>
 <meta charset="UTF-8">
 
-<title>class RubyXL::BodyProperties - rubyXL 2.5.2</title>
+<title>class RubyXL::BodyProperties - rubyXL 2.5.3</title>
 
 <link href="../fonts.css" rel="stylesheet">
 <link href="../rdoc.css" rel="stylesheet">