rubyXL 3.2.6 → 3.2.7

data/lib/rubyXL/objects/column_range.rb

@@ -35,8 +35,9 @@ module RubyXL
     DEFAULT_WIDTH = 9
   end
 
-  class ColumnRanges < OOXMLObject
-    define_child_node(RubyXL::ColumnRange, :collection => true, :accessor => :column_ranges)
+  class ColumnRanges < OOXMLContainerObject
+    define_child_node(RubyXL::ColumnRange, :collection => true)
+
     define_element_name 'cols'
 
     # Locate an existing column range, make a new one if not found,
@@ -44,30 +45,46 @@ module RubyXL
     def get_range(col_index)
       col_num = col_index + 1
 
-      old_range = self.find(col_index)
+      old_range = self.locate_range(col_index)
 
       if old_range.nil? then
-        new_range = RubyXL::ColumnRange.new(:min => col_num, :max => col_num)
-        self.column_ranges << new_range
-        return new_range
-      elsif old_range.min == col_num &&
-              old_range.max == col_num then # Single column range, OK to change in place
-        return old_range
+        new_range = RubyXL::ColumnRange.new
       else
-        raise "Range splitting not implemented yet"
+        if old_range.min == col_num && old_range.max == col_num then
+          return old_range # Single column range, OK to change in place
+        elsif old_range.min == col_num then
+          new_range = old_range.dup
+          old_range.min += 1
+        elsif old_range.max == col_num then
+          new_range = old_range.dup
+          old_range.max -= 1
+        else
+          range_before = old_range.dup
+          range_before.max = col_index # col_num - 1
+          self << range_before
+
+          old_range.min = col_num + 1
+
+          new_range = RubyXL::ColumnRange.new
+        end
       end
+
+      new_range.min = new_range.max = col_num
+      self << new_range
+      return new_range
     end
 
-    def find(col_index)
-      column_ranges && column_ranges.find { |range| range.include?(col_index) }
+    def locate_range(col_index)
+      self.find { |range| range.include?(col_index) }
     end
 
     def insert_column(col_index)
-      column_ranges && column_ranges.each { |range| range.insert_column(col_index) }
+      self.each { |range| range.insert_column(col_index) }
     end
 
     def before_write_xml
-      !(column_ranges.nil? || column_ranges.empty?)
+      self.sort_by!{ |r| r.min }
+      !(self.empty?)
     end
 
   end

data/lib/rubyXL/objects/container_nodes.rb

@@ -38,6 +38,15 @@ module RubyXL
   class StringNodeW3C < OOXMLObject
     define_attribute(:_, :string, :accessor => :value)
     define_attribute('xsi:type', :string, :required => true, :default => 'dcterms:W3CDTF')
+
+    def to_time
+      value && (value.strip.empty? ? nil : DateTime.parse(value).to_time)
+    end
+
+    def self.default(v)
+      v && self.new(:value => v.to_datetime.iso8601)
+    end
+
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-docPropsVTypes_variant.html

data/lib/rubyXL/objects/document_properties.rb

@@ -139,21 +139,19 @@ module RubyXL
     end
 
     def created_at
-      val = dcterms_created && dcterms_created.value
-      val && (val.strip.empty? ? nil : DateTime.parse(val).to_time)
+      dcterms_created && dcterms_created.to_time
     end
 
     def created_at=(v)
-      self.dcterms_created = v && RubyXL::StringNodeW3C.new(:value => v.to_datetime.iso8601)
+      self.dcterms_created = RubyXL::StringNodeW3C.default(v)
     end
 
     def modified_at
-      val = dcterms_modified && dcterms_modified.value
-      val && (val.strip.empty? ? nil : DateTime.parse(val).to_time)
+      dcterms_modified && dcterms_modified.to_time
     end
 
     def modified_at=(v)
-      self.dcterms_modified = v && RubyXL::StringNodeW3C.new(:value => v.to_datetime.iso8601)
+      self.dcterms_modified = RubyXL::StringNodeW3C.default(v)
     end
 
   end

data/lib/rubyXL/objects/fill.rb

@@ -35,6 +35,11 @@ module RubyXL
     define_child_node(RubyXL::PatternFill)
     define_child_node(RubyXL::GradientFill)
     define_element_name 'fill'
+
+    def self.default(pattern_type)
+      self.new(:pattern_fill => RubyXL::PatternFill.new(:pattern_type => pattern_type))
+    end
+
   end
 
   # http://www.schemacentral.com/sc/ooxml/e-ssml_fills-1.html
@@ -42,11 +47,8 @@ module RubyXL
     define_child_node(RubyXL::Fill, :collection => :with_count)
     define_element_name 'fills'
 
-    def self.defaults
-      self.new(:_ => [
-                 RubyXL::Fill.new(:pattern_fill => RubyXL::PatternFill.new(:pattern_type => 'none')),
-                 RubyXL::Fill.new(:pattern_fill => RubyXL::PatternFill.new(:pattern_type => 'gray125'))
-               ])
+    def self.default
+      self.new(:_ => [ RubyXL::Fill.default('none'), RubyXL::Fill.default('gray125') ])
     end
   end
 

data/lib/rubyXL/objects/font.rb

@@ -83,7 +83,7 @@ module RubyXL
       self.color = RubyXL::Color.new(:rgb => font_color.to_s)
     end
 
-    def self.defaults(size = 10)
+    def self.default(size = 10)
       self.new(:name => RubyXL::StringValue.new(:val => 'Verdana'),
                :sz   => RubyXL::FloatValue.new(:val => size) )
     end
@@ -95,8 +95,8 @@ module RubyXL
     define_child_node(RubyXL::Font, :collection => :with_count)
     define_element_name 'fonts'
 
-    def self.defaults
-      self.new(:_ => [ RubyXL::Font.defaults(10), RubyXL::Font.defaults(8) ])
+    def self.default
+      self.new(:_ => [ RubyXL::Font.default(10), RubyXL::Font.default(8) ])
     end
   end
 

data/lib/rubyXL/objects/sheet_data.rb

@@ -3,6 +3,7 @@ require 'rubyXL/objects/simple_types'
 require 'rubyXL/objects/text'
 require 'rubyXL/objects/formula'
 require 'rubyXL/cell'
+require 'rubyXL/convenience_methods'
 
 module RubyXL
 
@@ -89,6 +90,7 @@ module RubyXL
     end
 
     include LegacyCell
+    include CellConvenienceMethods
   end
 
 #TODO#<row r="1" spans="1:1" x14ac:dyDescent="0.25">

data/lib/rubyXL/objects/stylesheet.rb

@@ -70,7 +70,7 @@ module RubyXL
     define_child_node(RubyXL::XF, :collection => :with_count)
     define_element_name 'cellStyleXfs'
 
-    def self.defaults
+    def self.default
       self.new(:_ => [ RubyXL::XF.new(:num_fmt_id => 0, :font_id => 0, :fill_id => 0, :border_id => 0) ])
     end
   end
@@ -80,7 +80,7 @@ module RubyXL
     define_child_node(RubyXL::XF, :collection => :with_count)
     define_element_name 'cellXfs'
 
-    def self.defaults
+    def self.default
       self.new(:_ => [
                  RubyXL::XF.new(
                    :num_fmt_id => 0, :font_id => 0, :fill_id => 0, :border_id => 0, :xfId => 0
@@ -94,7 +94,7 @@ module RubyXL
     define_child_node(RubyXL::CellStyle, :collection => :with_count)
     define_element_name 'cellStyles'
 
-    def self.defaults
+    def self.default
       self.new(:_ => [ RubyXL::CellStyle.new(:builtin_id => 0, :name => 'Normal', :xf_id => 0) ])
     end
   end
@@ -191,12 +191,12 @@ module RubyXL
     end
 
     def self.default
-      self.new(:fonts          => RubyXL::Fonts.defaults,
-               :fills          => RubyXL::Fills.defaults,
-               :borders        => RubyXL::Borders.defaults,
-               :cell_xfs       => RubyXL::CellXFs.defaults,
-               :cell_styles    => RubyXL::CellStyles.defaults,
-               :cell_style_xfs => RubyXL::CellStyleXFs.defaults)
+      self.new(:fonts          => RubyXL::Fonts.default,
+               :fills          => RubyXL::Fills.default,
+               :borders        => RubyXL::Borders.default,
+               :cell_xfs       => RubyXL::CellXFs.default,
+               :cell_styles    => RubyXL::CellStyles.default,
+               :cell_style_xfs => RubyXL::CellStyleXFs.default)
     end
 
     def get_number_format_by_id(format_id)

data/lib/rubyXL/objects/theme.rb

@@ -1391,7 +1391,7 @@ module RubyXL
       ROOT.join('xl', 'theme', 'theme1.xml')
     end
 
-    def self.defaults
+    def self.default
       default_theme = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <a:theme xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" name="Office Theme">
 <a:themeElements>

data/lib/rubyXL/objects/workbook.rb

@@ -416,7 +416,7 @@ module RubyXL
       @worksheets = worksheets
       add_worksheet if @worksheets.empty?
 
-      @theme                    = RubyXL::Theme.defaults
+      @theme                    = RubyXL::Theme.default
       @shared_strings_container = RubyXL::SharedStringsTable.new
       @stylesheet               = RubyXL::Stylesheet.default
       @relationship_container   = RubyXL::OOXMLRelationshipsFile.new

data/lib/rubyXL/objects/worksheet.rb

@@ -11,6 +11,7 @@ require 'rubyXL/objects/filters'
 require 'rubyXL/objects/data_validation'
 require 'rubyXL/objects/comments'
 require 'rubyXL/worksheet'
+require 'rubyXL/convenience_methods'
 
 module RubyXL
 
@@ -737,6 +738,7 @@ module RubyXL
     end
 
     include LegacyWorksheet
+    include WorksheetConvenienceMethods
   end
 
 end