rspreadsheet 0.1.1 → 0.2.0

data/lib/rspreadsheet/tools.rb

@@ -3,14 +3,14 @@ module Rspreadsheet
 # this module contains methods used bz several objects
 module Tools
   # converts cell adress like 'F12' to pair od integers [row,col]
-  def self.convert_cell_address(*coords)
-    if coords.length == 1
-      coords[0].match(/^([A-Z]{1,3})(\d{1,8})$/)
+  def self.convert_cell_address_to_coordinates(*addr)
+    if addr.length == 1
+      addr[0].match(/^([A-Z]{1,3})(\d{1,8})$/)
       colname = $~[1]
       rowname = $~[2]
-    elsif coords.length == 2
-      colname = coords[0]
-      rowname = coords[1]
+    elsif addr.length == 2
+      colname = addr[0]
+      rowname = addr[1]
     else
       raise 'Wrong number of arguments'
     end
@@ -20,6 +20,27 @@ module Tools
     row = rowname.to_i
     return [row,col]
   end
+  def self.convert_cell_coordinates_to_address(*coords)
+    coords = coords[0] if coords.length == 1
+    raise 'Wrong number of arguments' if coords.length != 2
+    row = coords[0].to_i # security against string arguments
+    col = coords[1].to_i
+    colstring = ''
+    if col > 702
+      pom = (col-703).div(26*26)+1
+      colstring += (pom+64).chr
+      col -= pom*26*26
+    end
+    if col > 26
+      pom = (col-27).div(26)+1
+      colstring += (pom+64).chr
+      col -= pom*26
+    end
+    colstring += (col+64).chr
+    return colstring+row.to_s
+  end
+  def self.c2a(*x); convert_cell_coordinates_to_address(*x) end
+  def self.a2c(*x); convert_cell_address_to_coordinates(*x) end
   def self.get_namespace(prefix)
     ns_array = {
       'office'=>"urn:oasis:names:tc:opendocument:xmlns:office:1.0",
@@ -85,7 +106,7 @@ module Tools
     end
   end
   def self.get_ns_attribute(node,ns_prefix,key)
-    node.attributes.get_attribute_ns(Tools.get_namespace(ns_prefix).href,key)
+    node.nil? ? nil : node.attributes.get_attribute_ns(Tools.get_namespace(ns_prefix).href,key)
   end
   def self.get_ns_attribute_value(node,ns_prefix,key)
     Tools.get_ns_attribute(node,ns_prefix,key).andand.value
@@ -94,6 +115,9 @@ module Tools
     node.attributes.get_attribute_ns(Tools.get_namespace(ns_prefix).href,key)
     attr.remove! unless attr.nil? 
   end
+  def self.create_ns_node(nodename,ns_prefix)
+    LibXML::XML::Node.new(nodename,nil, Tools.get_namespace(ns_prefix))
+  end
 end
  
 end

data/lib/rspreadsheet/version.rb

@@ -1,3 +1,3 @@
 module Rspreadsheet
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/rspreadsheet/worksheet.rb

@@ -2,7 +2,7 @@ require 'rspreadsheet/row'
 require 'rspreadsheet/tools'
 # require 'forwardable'
 
-module Rspreadsheet
+module Rspreadsheet 
 
 class Worksheet
   attr_accessor :name, :xmlnode
@@ -10,6 +10,7 @@ class Worksheet
 #   def_delegators :nonemptycells
 
   def initialize(xmlnode_or_sheet_name)
+    @rowcache=[]
     # set up the @xmlnode according to parameter
     case xmlnode_or_sheet_name
       when LibXML::XML::Node
@@ -21,10 +22,119 @@ class Worksheet
         @xmlnode['table:name'] = xmlnode_or_sheet_name
       else raise 'Provide name or xml node to create a Worksheet object'
     end
-      
-    ## initialize rows
-    @spredsheetrows=RowArray.new(self,@xmlnode)
   end
+  
+  def rowxmlnode(rowi)
+    find_subnode_respect_repeated(@xmlnode, rowi, {:xml_items_node_name => 'table-row', :xml_repeated_attribute => 'number-rows-repeated'})
+  end
+ 
+  def rowrange(rowi)
+    find_subnode_range_respect_repeated(@xmlnode, rowi, {:xml_items_node_name => 'table-row', :xml_repeated_attribute => 'number-rows-repeated'})
+  end
+
+  def row_nonempty_cells_col_indexes(rowi)
+    arowxmlnode = rowxmlnode(rowi)
+    if arowxmlnode.nil?
+      []
+    else
+      find_nonempty_subnode_indexes(arowxmlnode, {:xml_items_node_name => 'table-cell', :xml_repeated_attribute => 'number-columns-repeated'})
+    end
+  end
+  
+  def cellxmlnode(rowi,coli)
+    arowxmlnode = rowxmlnode(rowi)
+    if arowxmlnode.nil?
+      nil
+    else
+      find_subnode_respect_repeated(arowxmlnode, coli, {:xml_items_node_name => 'table-cell', :xml_repeated_attribute => 'number-columns-repeated'})
+    end
+  end
+ 
+  def cellrange(coli)
+    find_subnode_range_respect_repeated(@xmlnode, rowi, {:xml_items_node_name => 'table-row', :xml_repeated_attribute => 'number-rows-repeated'})
+  end
+  
+  def first_unused_row_index
+    find_first_unused_index_respect_repeated(xmlnode, {:xml_items_node_name => 'table-row', :xml_repeated_attribute => 'number-rows-repeated'})
+  end
+  
+  def detach_row_in_xml(rowi)
+    return detach_subnode_respect_repeated(xmlnode, rowi, {:xml_items_node_name => 'table-row', :xml_repeated_attribute => 'number-rows-repeated'})
+  end
+  def detach_cell_in_xml(rowi,coli)
+    rownode = detach_row_in_xml(rowi)
+    return detach_subnode_respect_repeated(rownode, coli, {:xml_items_node_name => 'table-cell', :xml_repeated_attribute => 'number-columns-repeated'})
+  end
+  
+  def detach_subnode_respect_repeated(axmlnode,aindex, options)
+    index = 0
+    axmlnode.elements.select{|node| node.name == options[:xml_items_node_name]}.each do |node|
+      repeated = (node.attributes[options[:xml_repeated_attribute]] || 1).to_i
+      oldindex = index
+      index = index+repeated
+      if index>= aindex  # found the node, now do the detachement
+        ranges = [oldindex+1..aindex-1,aindex..aindex,aindex+1..index].reject {|range| range.size<1}
+        ranges.each do |range|
+          newnode = node.copy(true)
+          Tools.set_ns_attribute(newnode,'table',options[:xml_repeated_attribute],range.size,1)
+          node.prev = newnode
+        end
+        node.remove!
+        return find_subnode_respect_repeated(axmlnode, aindex, options)
+      end
+    end
+    # add outbound xmlnode
+    [index+1..aindex-1,aindex..aindex].reject {|range| range.size<1}.each do |range|
+      node = LibXML::XML::Node.new(options[:xml_items_node_name],nil, Tools.get_namespace('table'))
+      Tools.set_ns_attribute(node,'table',options[:xml_repeated_attribute],range.size, 1)
+      axmlnode << node
+    end  
+    find_subnode_respect_repeated(axmlnode, aindex, options)
+  end
+
+  def find_subnode_respect_repeated(axmlnode, aindex, options)
+    index = 0
+    axmlnode.elements.select{|node| node.name == options[:xml_items_node_name]}.each do |node|
+      repeated = (node.attributes[options[:xml_repeated_attribute]] || 1).to_i
+      index = index+repeated
+      return node if index>= aindex
+    end
+    return nil
+  end
+  def find_subnode_range_respect_repeated(axmlnode, aindex, options)
+    index = 0
+    axmlnode.elements.select{|node| node.name == options[:xml_items_node_name]}.each do |node|
+      repeated = (node.attributes[options[:xml_repeated_attribute]] || 1).to_i
+      if index+repeated >= aindex
+        return (index+1..index+repeated)
+      else
+        index = index+repeated
+      end
+    end
+    return (index+1..Float::INFINITY)
+  end
+  
+  def find_nonempty_subnode_indexes(axmlnode, options)
+    index = 0
+    result = []
+    axmlnode.elements.select{|node| node.name == options[:xml_items_node_name]}.each do |node|
+      repeated = (node.attributes[options[:xml_repeated_attribute]] || 1).to_i
+      index = index + repeated
+      if !(node.content.nil? or node.content.empty? or node.content =='') and (repeated==1)
+        result << index
+      end
+    end
+    return result
+  end
+  def find_first_unused_index_respect_repeated(axmlnode, options)
+    index = 0
+    axmlnode.elements.select{|node| node.name == options[:xml_items_node_name]}.each do |node|
+      repeated = (node.attributes[options[:xml_repeated_attribute]] || 1).to_i
+      index = index+repeated
+    end
+    return index+1
+  end
+  
   def cells(r,c)
     rows(r).andand.cells(c)
   end
@@ -32,7 +142,7 @@ class Worksheet
     used_rows_range.collect{ |rowi| rows(rowi) }.collect { |row| row.nonemptycells }.flatten
   end
   def rows(rowi)
-    @spredsheetrows.get_row(rowi)
+    @rowcache[rowi] ||= Row.new(self,rowi) unless rowi<=0
   end
   ## syntactic sugar follows
   def [](r,c)
@@ -44,7 +154,7 @@ class Worksheet
   # allows syntax like sheet.F15
   def method_missing method_name, *args, &block
     if method_name.to_s.match(/^([A-Z]{1,3})(\d{1,8})(=?)$/)
-      row,col = Rspreadsheet::Tools.convert_cell_address($~[1],$~[2])
+      row,col = Rspreadsheet::Tools.convert_cell_address_to_coordinates($~[1],$~[2])
       assignchar = $~[3]
       if assignchar == '='
         self.cells(row,col).value = args.first
@@ -56,7 +166,7 @@ class Worksheet
     end
   end
   def used_rows_range
-    1..@spredsheetrows.first_unused_row_index-1
+    1..self.first_unused_row_index-1
   end
 end
 

data/reinstall.sh

@@ -1,6 +1,7 @@
 #!/bin/sh
 
 cd rspreadsheet
+rm rspreadsheet-0.*.gem
 gem build rspreadsheet.gemspec
-gem install rspreadsheet-0.1.0.gem
+sudo gem install rspreadsheet-0.*.gem
 cd ..

data/rspreadsheet.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Jakub A.Těšínský"]
   spec.email         = ["jAkub.cz (A is at)"]
   spec.summary       = %q{Manipulating spreadsheets with Ruby (read / create / modify OpenDocument Spreadsheet).}
-  spec.description   = %q{Manipulating spreadsheets with Ruby (read / create / modify OpenDocument Spreadsheet).}
+  spec.description   = %q{Manipulating OpenDocument spreadsheets with Ruby. This gem can create new, read existing files abd modify them. When modyfying files, it tries to change as little as possible, making it as much forward compatifle as possible.}
   spec.homepage      = "https://github.com/gorn/rspreadsheet"
   spec.license       = "GPL"
 

data/spec/cell_spec.rb

@@ -9,13 +9,13 @@ describe Rspreadsheet::Cell do
   end
   it 'contains good row and col coordinates' do
     @cell = @sheet1.cells(1,3)
-    @cell.row.should == 1
-    @cell.col.should == 3
+    @cell.rowi.should == 1
+    @cell.coli.should == 3
     @cell.coordinates.should == [1,3]
     
     @cell = @sheet2.cells(7,2)
-    @cell.row.should == 7
-    @cell.col.should == 2
+    @cell.rowi.should == 7
+    @cell.coli.should == 2
     @cell.coordinates.should == [7,2]
   end
   it 'can be referenced by more vars and both are synchronized' do
@@ -38,8 +38,8 @@ describe Rspreadsheet::Cell do
   it 'contains good row and col coordinates even after table:number-columns-repeated cells' do
     @cell = @sheet2.cells(13,5)
     @cell.value.should == 'afterrepeated'
-    @cell.row.should == 13
-    @cell.col.should == 5
+    @cell.rowi.should == 13
+    @cell.coli.should == 5
   end
   it 'does not accept negative and zero coordinates' do
     @sheet2.cells(0,5).should be(nil)
@@ -48,15 +48,41 @@ describe Rspreadsheet::Cell do
   end
   it 'has nonempty parents' do
     @cell = @sheet2.cells(13,5)
-    @cell.parent_row.should_not be_nil
+    @cell.row.should_not be_nil
     @cell.worksheet.should_not be_nil
 
     @cell = @sheet1.cells(2,2)
-    @cell.parent_row.should_not be_nil
+    @cell.row.should_not be_nil
     @cell.worksheet.should_not be_nil
   end
   it 'handles relative correctly' do
     @sheet2.cells(3,3).relative(-1,+2).coordinates.should == [2,5]
     @sheet2.cells(3,3).relative(0,0).coordinates.should == [3,3]
   end
+  it 'is automatically "unrepeated" on value assignement' do
+    @cell = @sheet2.cells(13,2)
+    @cell.is_repeated?.should == true
+    @cell.value = 'cokoli'
+    @cell.is_repeated?.should == false
+    @cell.value.should == 'cokoli'
+    @sheet2.cells(13,1).should_not == 'cokoli'
+    @sheet2.cells(13,3).should_not == 'cokoli'
+    @sheet2.cells(13,4).should_not == 'cokoli'
+  end
+  it 'returns type for the cell' do
+    book = Rspreadsheet.new($test_filename)
+    s = book.worksheets[1]
+    s.cells(1,2).type.should === :string
+    s.cells(2,2).type.should === :date
+    s.cells(3,1).type.should === :float
+    s.cells(3,2).type.should === :percentage
+    s.cells(4,2).type.should === :string
+    s.cells(200,200).type.should === :unassigned
+  end
+
 end
+
+
+
+
+

data/spec/row_spec.rb

@@ -9,22 +9,28 @@ describe Rspreadsheet::Row do
     @row = @sheet2.rows(1)
     @c = @row.cells(1)
     @c.value = 3
-    @c.value.should == 3
+    @c.value.should == 3 
   end
-  it 'creates minimal row on demand, which contains correctly namespaced attributes only'do
-    @sheet1.rows(1).cells(2).value = 'nejakydata'
-    @row = @sheet1.rows(1)
-    @xmlnode = @row.xmlnode
-    @xmlnode.namespaces.to_a.size.should >5
-    @xmlnode.namespaces.namespace.should_not be_nil
-    @xmlnode.namespaces.namespace.prefix.should == 'table'
+  it 'can be detached and changes to unrepeated if done' do
+    @row = @sheet1.rows(5)
+    @row2 = @row.detach
+    @row2.is_repeated?.should == false    
+  end
+  it 'is the synchronized object, now matter how you access it' do
+    @row1 = @sheet1.rows(5)
+    @row2 = @sheet1.rows(5)
+    @row1.should equal(@row2)
+    
+    @sheet1.rows(5).cells(2).value = 'nejakydata'
+    @row1 = @sheet1.rows(5)
+    @row2 = @sheet1.rows(5)
+    @row1.should equal(@row2)
+  
   end
   it 'cells in row are settable through sheet' do
-    @sheet1.rows(9).add_cell
     @sheet1.rows(9).cells(1).value = 2
     @sheet1.rows(9).cells(1).value.should == 2
     
-    @sheet1.rows(7).add_cell
     @sheet1.rows(7).cells(1).value = 7
     @sheet1.rows(7).cells(1).value.should == 7
     
@@ -46,27 +52,44 @@ describe Rspreadsheet::Row do
     @sheet1.rows(10).should be_kind_of(Rspreadsheet::Row)
     @sheet1.rows(11).should be_kind_of(Rspreadsheet::Row)
   end
-  it 'detachment works as expected' do
+  it 'detachment creates correct repeated groups' do
     @sheet1.rows(5).detach
     @sheet1.rows(5).repeated?.should == false
     @sheet1.rows(5).repeated.should == 1
     @sheet1.rows(5).xmlnode.should_not == nil
+
     @sheet1.rows(3).repeated?.should == true
     @sheet1.rows(3).repeated.should == 4
     @sheet1.rows(3).xmlnode.should_not == nil
-    @table_ns_href = "urn:oasis:names:tc:opendocument:xmlns:table:1.0"
-    @sheet1.rows(3).xmlnode.attributes.get_attribute_ns(@table_ns_href,'number-rows-repeated').value.should == '4'
+    @sheet1.rows(3).xmlnode.attributes.get_attribute_ns("urn:oasis:names:tc:opendocument:xmlns:table:1.0",'number-rows-repeated').value.should == '4'
+  end
+  it 'detachment assigns correct namespaces to node' do
+    @sheet1.rows(5).detach
+    @xmlnode = @sheet1.rows(5).xmlnode 
+    @xmlnode.namespaces.to_a.size.should >5
+    @xmlnode.namespaces.namespace.should_not be_nil
+    @xmlnode.namespaces.namespace.prefix.should == 'table'   
   end
   it 'by assigning value, the repeated row is automatically detached' do
-    row = @sheet1.rows(5)
-    row.detach
-    @table_ns_href = "urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+    @sheet1.rows(15).detach
+  
+    @sheet1.rows(2).repeated?.should == true
+    @sheet1.rows(2).cells(2).value = 'nejakydata'
+    @sheet1.rows(2).repeated?.should == false
+    
+    @sheet1.rows(22).repeated?.should == true
+    @sheet1.rows(22).cells(7).value = 'nejakydata'
+    @sheet1.rows(22).repeated?.should == false
+  end    
+  it 'styles can be assigned to rows' do
+    @sheet1.rows(5).detach
+    table_ns_href = "urn:oasis:names:tc:opendocument:xmlns:table:1.0"
     
     @sheet1.rows(5).style_name = 'newstylename'
-    @sheet1.rows(5).xmlnode.attributes.get_attribute_ns(@table_ns_href,'style-name').value.should == 'newstylename'
+    @sheet1.rows(5).xmlnode.attributes.get_attribute_ns(table_ns_href,'style-name').value.should == 'newstylename'
 
     @sheet1.rows(17).style_name = 'newstylename2'
-    @sheet1.rows(17).xmlnode.attributes.get_attribute_ns(@table_ns_href,'style-name').value.should == 'newstylename2'
+    @sheet1.rows(17).xmlnode.attributes.get_attribute_ns(table_ns_href,'style-name').value.should == 'newstylename2'
   end
   it 'ignores negative any zero row indexes' do
     @sheet1.rows(0).should be_nil
@@ -75,7 +98,7 @@ describe Rspreadsheet::Row do
   it 'has correct rowindex' do
     @sheet1.rows(5).detach
     (4..6).each do |i|
-      @sheet1.rows(i).row.should == i
+      @sheet1.rows(i).rowi.should == i
     end
   end
   it 'can open ods testfile and read its content' do
@@ -89,12 +112,12 @@ describe Rspreadsheet::Row do
     s[1,2].should === 'text'
     s[2,2].should === Date.new(2014,1,1)
   end
-  it 'normalizes to itself if single line' do
-    @sheet1.rows(5).detach
-    @sheet1.rows(5).cells(4).value='test'
-    @sheet1.rows(5).normalize
-    @sheet1.rows(5).cells(4).value.should == 'test'
-  end
+#   it 'normalizes to itself if single line' do
+#     @sheet1.rows(5).detach
+#     @sheet1.rows(5).cells(4).value='test'
+#     @sheet1.rows(5).normalize
+#     @sheet1.rows(5).cells(4).value.should == 'test'
+#   end
   it 'cell manipulation does not contain attributes without namespace nor doubled attributes' do # inspired by a real bug regarding namespaces manipulation
     @sheet2.rows(1).xmlnode.attributes.each { |attr| attr.ns.should_not be_nil}
     @sheet2.rows(1).cells(1).value.should_not == 'xyzxyz'
@@ -117,10 +140,10 @@ describe Rspreadsheet::Row do
   end
   it 'nonempty cells work properly' do
     nec = @sheet2.rows(1).nonemptycells
-    nec.collect{ |c| [c.row,c.col]}.should == [[1,1],[1,2]]
+    nec.collect{ |c| c.coordinates}.should == [[1,1],[1,2]]
     
     nec = @sheet2.rows(19).nonemptycells
-    nec.collect{ |c| [c.row,c.col]}.should == [[19,6]]
+    nec.collect{ |c| c.coordinates}.should == [[19,6]]
   end
 end