rspreadsheet 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba8d928bfac03acfa731a5d4d44f380cdf6a5b49
-  data.tar.gz: f25cf83032b4d748337fe2601cf2060b69371214
+  metadata.gz: d3845679733a12aaed33574dc981b22d49d297fe
+  data.tar.gz: c7f151f9ed92317b006eec3e2fc323514b43a5f4
 SHA512:
-  metadata.gz: 73e568971ecdbfd2f3c19a5a8e3c171e2f2dba112fb2a3283f687568241b01e0cb292ee3677ca1ad2e223f9e159ce0ed5e9f8f823993d8b761b3590a1f13dd97
-  data.tar.gz: 22f35a0dd81b4e980d5d1ce2e50b6dbe2e13ca715061d3659378398bd7fe44871da7c50c23563a98108274f87502a292b1970f922477e242951be4e4ad7c7f71
+  metadata.gz: 0307c5a79b0e9aebc2ce1cfc56b6f8445542e4cc8dab661a92398c8c7e4debeaa55ed0f6dce7a7a9a47cbda6d53bdf24cc19f95a441e94b4a3458e4c16d947eb
+  data.tar.gz: 25acbd10e229976cd2b2112dbc35dbf2d4e8610302928df753a7a1110c64f23a0f052362684188fb33dba9341ab402075a0ed5e2b7635e90cc574d46c3b13ba2

data/.travis.yml

@@ -7,12 +7,17 @@ rvm:
   - 2.3.3
   - 2.4.0
 script: 'bundle exec rake'
-before_install:
-  - gem uninstall libxml-ruby
-  - gem update bundler
+matrix:
+  include:
+  - rvm: 2.4.0
+    before_install:
+      - gem uninstall libxml-ruby
+      - sudo apt-get install libxml2
+      - gem update bundler
+
 notifications:
   email:
     recipients:
       - jatesins@ncsu.edu
     on_failure: change
-    on_success: never
+    on_success: never

data/DEVEL_BLOG.md

@@ -9,6 +9,7 @@ After you have cloned the source run `bundle` command in gem directory to instal
 
 ## Ideas/wishlist
 
+  * make it configurable whether Time or DateTime will be used.
   * In future inntroduce syntax like `sheet.range('C3:E4')` for mass operations.
   * Trying to make row Enumerable - perhaps skipping empty or undefined cells.
   * Maybe insted two syntaxes for accessing cell, we make both of them do the same and return Proxy object which would act either as value or cell.

data/GUIDE.md

@@ -40,6 +40,9 @@ The file needs to be saved after doing changes.
 @workbook.save('new_filename.ods')   # changes filename and saves
 @workbook.save(any_io_object)        # file can be saved to any IO like object as well
 ````
+### Date and Time
+OpenDocument and ruby have different models of date, time and datetime. Ruby containg three different objects. Time and DateTime cover all cases, Date covers dates only. OpenDocument distinguishes two groups - time of a day (time) and everything else (date). To simplify things a little we return cell values containg time of day as Time object and cell values containg datetime of date as DateTime. I am aware that this is very arbitrary choice, but it is very practical. This way and to some extend the types of values from OpenDocument are preserved when read from files, beeing acted upon and written back to spreadshhet.
+
 
 ## Examples
 
@@ -47,7 +50,7 @@ The file needs to be saved after doing changes.
   * [extended examples](https://gist.github.com/gorn/b432e6a69e82628349e6) of lots of alternative syntax
 
 ## Conventions
-  * **all indexes are 1-based**. This applies to rows, cells cordinates, and all array like structures like list od  worksheets etc. Spreadsheet world is 1-based, ruby is 0-based do I had to make a decision. I intend to make an global option for this, but in early stage I need to keep things simple. 
+  * **all indexes are 1-based**. This applies to rows, cells cordinates, and all array like structures like list od  worksheets etc. Spreadsheet world is 1-based, ruby is 0-based so I had to make a decision. I intend to make an global option for this, but in early stage I need to keep things simple.
   * with numeric coordinates row always comes before col as in  (row,col)
   * with alphanumerical col always comes before row as in F12
   * Shorter syntax worksheet[x,y] returns value, longer syntax worksheet.cell(x,y) return cell objects. This allows to work conviniently with values using short syntax and access the cell object if needed (to access formatting for example).

data/lib/rspreadsheet/cell.rb

@@ -5,14 +5,17 @@
 require 'andand'
 require 'rspreadsheet/xml_tied_item'
 require 'date'
-require 'time'
+require 'time'            # extended functions for time like Time.strptime
 require 'bigdecimal'
 require 'bigdecimal/util' # for to_d method
 require 'helpers/class_extensions'
+require 'rspreadsheet/cell_format'     # CellFormat and Border classes
 
 module Rspreadsheet
 using ClassExtensions if RUBY_VERSION > '2.1'
 
+StartOfEpoch = Time.new(1899,12,30,0,0,0,0)
+
 ###
 # Represents a cell in spreadsheet which has coordinates, contains value, formula and can be formated.
 # You can get this object like this (suppose that @worksheet contains {Rspreadsheet::Worksheet} object)
@@ -20,15 +23,14 @@ using ClassExtensions if RUBY_VERSION > '2.1'
 #     @worksheet.cells(5,2)
 #
 # Note that when using syntax like `@worksheet[5,2]` or `@worksheet.B5` you won't get this object, but rather the value of the cell.
-# More precisely it is equvalient to @worksheet.cells(5,2).value.
+# More precisely it is equvalient to @worksheet.cells(5,2).value. Brief overview can be faound at [README]
 # 
 
 class Cell < XMLTiedItem
+# RSpreadsheet::Worksheet in which the cell is contained.
   attr_accessor :worksheet 
+# Row index of a cell. If you want to access the row object, see #row.  
   attr_reader :rowi
-  InternalDateFormat = '%Y-%m-%d'
-  InternalTimeFormat = 'PT%HH%MM%SS'
-#   InternalTimeFormat = 'PT%HH%MM%SS,%LS'
   
   # @!group XMLTiedItem related methods and extensions  
   def xml_options; {:xml_items_node_name => 'table-cell', :xml_repeated_attribute => 'number-columns-repeated'} end
@@ -64,8 +66,8 @@ class Cell < XMLTiedItem
         when gt == nil then nil
         when gt == Float then xmlnode.attributes['value'].to_f
         when gt == String then xmlnode.elements.first.andand.content.to_s
-        when gt == Date then Date.strptime(xmlnode.attributes['date-value'].to_s, InternalDateFormat)
-        when gt == Time then Time.strptime(xmlnode.attributes['time-value'].to_s, InternalTimeFormat)
+        when gt == :datetime then datetime_value
+        when gt == :time then time_value
         when gt == :percentage then xmlnode.attributes['value'].to_f
         when gt == :currency then xmlnode.attributes['value'].to_d
       end
@@ -75,6 +77,47 @@ class Cell < XMLTiedItem
       raise "Unknown cell mode #{self.mode}"
     end
   end
+  
+  ## according to http://docs.oasis-open.org/office/v1.2/os/OpenDocument-v1.2-os-part1.html#__RefHeading__1417674_253892949
+  ## the value od time-value is in a "duration" format defined here https://www.w3.org/TR/xmlschema-2/#duration
+  ## this method converts the time-value to Time object. Note that it does not check if the cell is in time-value
+  ## or not, this is the responibility of caller. However beware that specification does not specify how the time 
+  ## should be interpreted. By observing LibreOffice behaviour, I have found these options
+  ##   1. "Time only cell" has time is stored as PT16H22M35S (16:22:35) where the duration is duration from midnight.  
+  ##      Because ruby does NOT have TimeOfDay type we need to represent that as DateTime. I have chosen 1899-12-30 00:00:00 as 
+  ##      StartOfEpoch time, because it plays well with case 2.
+  ##   2. "DateTime converted to Time only cell" has time stored as PT923451H33M00.000000168S (15:33:00 with date part 2005-05-05 
+  ##      before conversion to time only). It is strange format which seems to have hours meaning number of hours after 1899-12-30 00:00:00
+  ##
+  ## Returns time-value of the cell. It does not check if cell has or should have this value, it is responibility of caller to do so.
+  def time_value
+    Cell.parse_time_value(xmlnode.attributes['time-value'].to_s)
+  end
+  def self.parse_time_value(svalue)
+    if (m = /^PT((?<hours>[0-9]+)H)?((?<minutes>[0-9]+)M)?((?<seconds>[0-9]+(\.[0-9]+)?)S)$/.match(svalue.delete(' ')))
+      # time was parsed manually
+      (StartOfEpoch + m[:hours].to_i*60*60 + m[:minutes].to_i*60 + m[:seconds].to_f.round(5))
+      #BASTL: Rounding is here because LibreOffice adds some fractions of seconds randomly
+    else
+      begin
+        Time.strptime(svalue, InternalTimeFormat)
+      rescue
+        Time.parse(svalue) # maybe add defaults for year-mont-day
+      end
+    end
+  end
+  def datetime_value
+    vs = xmlnode.attributes['date-value'].to_s
+    begin
+      DateTime.strptime(vs, InternalDateTimeFormat)
+    rescue
+      begin
+        DateTime.strptime(vs, InternalDateFormat)
+      rescue
+        DateTime.parse(vs)
+      end
+    end
+  end
   def value=(avalue)
     detach_if_needed
     if self.mode == :regular
@@ -90,13 +133,13 @@ class Cell < XMLTiedItem
           remove_all_value_attributes_and_content(xmlnode)
           set_type_attribute('string')
           xmlnode << Tools.prepare_ns_node('text','p', avalue.to_s)
-        when gt == Date then 
+        when gt == :datetime then 
           remove_all_value_attributes_and_content(xmlnode)
           set_type_attribute('date')
-          avalue = avalue.strftime(InternalDateFormat)
+          avalue = avalue.strftime(InternalDateTimeFormat)
           Tools.set_ns_attribute(xmlnode,'office','date-value', avalue)
           xmlnode << Tools.prepare_ns_node('text','p', avalue)
-        when gt == Time then
+        when gt == :time then
           remove_all_value_attributes_and_content(xmlnode)
           set_type_attribute('time')
           Tools.set_ns_attribute(xmlnode,'office','time-value', avalue.strftime(InternalTimeFormat))
@@ -133,8 +176,8 @@ class Cell < XMLTiedItem
     case 
       when gct == Float  then :float
       when gct == String then :string
-      when gct == Date   then :date
-      when gct == Time   then :time
+      when gct == :datetime  then :datetime
+      when gct == :time  then :time
       when gct == :percentage then :percentage
       when gct == :unassigned then :unassigned
       when gct == :currency then :currency
@@ -147,8 +190,8 @@ class Cell < XMLTiedItem
     # try guessing by value
     valueguess = case avalue
       when Numeric then Float
-      when Time then Time
-      when Date then Date
+      when Time then :time
+      when Date, DateTime then :datetime
       when String,nil then nil
       else nil
     end
@@ -160,8 +203,8 @@ class Cell < XMLTiedItem
         when nil then nil
         when 'float' then Float
         when 'string' then String
-        when 'time' then Time
-        when 'date' then Date
+        when 'time' then :time
+        when 'date' then :datetime
         when 'percentage' then :percentage
         when 'N/A' then :unassigned
         when 'currency' then :currency
@@ -231,167 +274,11 @@ class Cell < XMLTiedItem
   def border_bottom; format.border_bottom end
   def border_left;   format.border_left end
 
-end
-
-# proxy object to allow cell.format syntax. Also handles all logic for formats.
-# @private
-class CellFormat
-  def initialize(cell)
-    @cell = cell
-  end
-  def cellnode; @cell.xmlnode end
-  
-  # text style attribute readers
-  def bold;      get_text_style_node_attribute('font-weight') == 'bold' end
-  alias :bold? :bold 
-  def italic;    get_text_style_node_attribute('font-style') == 'italic' end
-  def color;     get_text_style_node_attribute('color') end
-  def font_size; get_text_style_node_attribute('font-size') end
-  def get_text_style_node_attribute(attribute_name)
-    text_style_node.nil? ? nil : Tools.get_ns_attribute_value(text_style_node,'fo',attribute_name)
-  end
-  def background_color; get_cell_style_node_attribute('background-color') end
-  def get_cell_style_node_attribute(attribute_name)
-    cell_style_node.nil? ? nil : Tools.get_ns_attribute_value(cell_style_node,'fo',attribute_name)
-  end
-  
-  # text style attribute writers
-  def bold=(value);     set_text_style_node_attribute('font-weight', value ? 'bold' : 'normal') end
-  def italic=(value);   set_text_style_node_attribute('font-style',  value ? 'italic' : 'normal') end
-  def color=(value);    set_text_style_node_attribute('color',  value) end
-  def font_size=(value);set_text_style_node_attribute('font-size',  value) end
-  def set_text_style_node_attribute(attribute_name,value)
-    @cell.detach if @cell.mode != :regular
-    if text_style_node.nil?
-      self.create_text_style_node
-      raise 'Style node was not correctly initialized' if text_style_node.nil?
-    end
-    Tools.set_ns_attribute(text_style_node,'fo',attribute_name,value)
-  end
-  def background_color=(value); set_cell_style_node_attribute('background-color',  value) end
-  def set_cell_style_node_attribute(attribute_name,value)
-    @cell.detach if @cell.mode != :regular
-    if cell_style_node.nil?
-      self.create_cell_style_node
-      raise 'Style node was not correctly initialized' if cell_style_node.nil?
-    end
-    Tools.set_ns_attribute(cell_style_node,'fo',attribute_name,value)
-  end
-  
- # @!group initialization of style related nodes, if they do not exist
-  def create_text_style_node
-    create_style_node if style_name.nil? or style_node.nil?
-    raise 'text_style_node already exists' unless text_style_node.nil?
-    style_node << Tools.prepare_ns_node('style','text-properties')
-  end
-  def create_cell_style_node
-    create_style_node if style_name.nil? or style_node.nil?
-    raise 'cell_style_node already exists' unless cell_style_node.nil?
-    style_node << Tools.prepare_ns_node('style','table-cell-properties')
-  end
-  def create_style_node
-    if style_name.nil?
-      proposed_style_name = unused_cell_style_name
-      Tools.set_ns_attribute(cellnode,'table','style-name',proposed_style_name)
-      raise 'Style name was not correctly initialized' if style_name!=proposed_style_name
-    end
-    anode =  Tools.prepare_ns_node('style','style')
-    Tools.set_ns_attribute(anode, 'style', 'name', proposed_style_name)
-    Tools.set_ns_attribute(anode, 'style', 'family', 'table-cell')
-    Tools.set_ns_attribute(anode, 'style', 'parent-style-name', 'Default')
-    automatic_styles_node << anode
-    raise 'Style node was not correctly initialized' if style_node.nil?
-  end
-  
-  def unused_cell_style_name
-    last = (cellnode.nil? ? [] : cellnode.doc.root.find('./office:automatic-styles/style:style')).
-      collect {|node| node['name']}.
-      collect{ |name| /^ce(\d*)$/.match(name); $1.andand.to_i}.
-      compact.max || 0
-    "ce#{last+1}"
-  end
-  def automatic_styles_node; style_node_with_partial_xpath('') end
-  def style_name; Tools.get_ns_attribute_value(cellnode,'table','style-name',nil) end
-  def style_node; style_node_with_partial_xpath("/style:style[@style:name=\"#{style_name}\"]") end
-  def text_style_node; style_node_with_partial_xpath("/style:style[@style:name=\"#{style_name}\"]/style:text-properties") end
-  def cell_style_node; style_node_with_partial_xpath("/style:style[@style:name=\"#{style_name}\"]/style:table-cell-properties") end
-  def style_node_with_partial_xpath(xpath)
-    return nil if cellnode.nil?
-    cellnode.doc.root.find("./office:automatic-styles#{xpath}").first 
-  end
-  def currency
-    Tools.get_ns_attribute_value(cellnode,'office','currency',nil) 
-  end
-  #returns object representing top border of the cell
-  def top;    @top    ||= Border.new(self,:top)  end
-  def bottom; @bottom ||= Border.new(self,:bottom) end
-  def left;   @left   ||= Border.new(self,:left) end
-  def right;  @right  ||= Border.new(self,:right) end
-  alias :border_top :top
-  alias :border_right :right
-  alias :border_bottom :bottom
-  alias :border_left :left
-  
-  def inspect
-    "#<Rspreadsheet::CellFormat bold:#{bold?.inspect}, borders:#{top.get_value_string.inspect} #{right.get_value_string.inspect} #{bottom.get_value_string.inspect} #{left.get_value_string.inspect}>"
-  end
-  
-end
-
-# represents one of the borders of a cell
-class Border
-  def initialize(cellformat,side)
-    @cellformat = cellformat
-    @side = side.to_s
-    raise "Wrong side of border object, can be top, bottom, left or right" unless ['left','right','top','bottom'].include? @side
-  end
-  def cellnode; @cell.xmlnode end
-  def attribute_name; "border-#{@side}" end
-  
-  def width=(value); set_border_string_part(1, value) end
-  def style=(value); set_border_string_part(2, value.to_s) end
-  def color=(value); set_border_string_part(3, value) end
-  def width; get_border_string_part(1).to_f end
-  def style; get_border_string_part(2) end
-  def color; get_border_string_part(3) end
-  def delete
-    @cellformat.set_cell_style_node_attribute(attribute_name, 'none')
-  end
-    
-    
-  ## internals  
-   
-  # set parth-th part of string which represents the border. String looks like "0.06pt solid #00ee00"
-  # part is 1 for width, 2 for style or 3 for color
-  def set_border_string_part(part,value)
-    current_value = @cellformat.get_cell_style_node_attribute(attribute_name)
-    
-    if current_value.nil? or (current_value=='none')
-      value_array = ['0.75pt', 'solid', '#000000']  # set default values
-    else
-      value_array = current_value.split(' ')  
-    end
-    raise 'Strange border attribute value. Does not have 3 parts' unless value_array.length == 3
-    value_array[part-1]=value
-    @cellformat.set_cell_style_node_attribute(attribute_name, value_array.join(' '))
-  end
-  
-  def get_border_string_part(part)
-    current_value = @cellformat.get_cell_style_node_attribute(attribute_name) || @cellformat.get_cell_style_node_attribute('border')
-    if current_value.nil? or (current_value=='none')
-      return nil
-    else
-      value_array = current_value.split(' ')  
-      raise 'Strange border attribute value. Does not have 3 parts' unless value_array.length == 3
-      return value_array[part-1]
-    end
-  end
-  
-  def get_value_string
-    @cellformat.get_cell_style_node_attribute(attribute_name)
-  end
-  
-end
+  private
+  InternalDateFormat = '%Y-%m-%d'
+  InternalDateTimeFormat = '%FT%T'
+  InternalTimeFormat = 'PT%HH%MM%SS'
+end ## Cell
 
 end # module
 
@@ -410,4 +297,3 @@ end # module
 
 
 
-

data/lib/rspreadsheet/cell_format.rb

@@ -0,0 +1,203 @@
+# @markup markdown
+# @author Jakub Tesinsky
+# @title rspreadsheet Cell
+
+# require 'andand'
+# require 'rspreadsheet/xml_tied_item'
+# require 'date'
+# require 'time'            # extended functions for time like Time.strptime
+# require 'bigdecimal'
+# require 'bigdecimal/util' # for to_d method
+# require 'helpers/class_extensions'
+
+module Rspreadsheet
+using ClassExtensions if RUBY_VERSION > '2.1'
+
+###
+# Represents a format of a cell. This object is returned by `@cell.format` method and allows syntax like
+#
+#    @cell.format.bold = true
+#    @cell.format.italic = false
+#    @cell.format.color = '#45AC00'
+#
+# Also handles all logic for formats.
+# @private
+class CellFormat
+  def initialize(cell)
+    @cell = cell
+  end
+  def cellnode; @cell.xmlnode end
+  
+  # text style attribute readers
+  def bold;      get_text_style_node_attribute('font-weight') == 'bold' end
+  alias :bold? :bold 
+  def italic;    get_text_style_node_attribute('font-style') == 'italic' end
+  def color;     get_text_style_node_attribute('color') end
+  def font_size; get_text_style_node_attribute('font-size') end
+  def get_text_style_node_attribute(attribute_name)
+    text_style_node.nil? ? nil : Tools.get_ns_attribute_value(text_style_node,'fo',attribute_name)
+  end
+  def background_color; get_cell_style_node_attribute('background-color') end
+  def get_cell_style_node_attribute(attribute_name)
+    cell_style_node.nil? ? nil : Tools.get_ns_attribute_value(cell_style_node,'fo',attribute_name)
+  end
+  
+  # text style attribute writers
+  def bold=(value);     set_text_style_node_attribute('font-weight', value ? 'bold' : 'normal') end
+  def italic=(value);   set_text_style_node_attribute('font-style',  value ? 'italic' : 'normal') end
+  def color=(value);    set_text_style_node_attribute('color',  value) end
+  def font_size=(value);set_text_style_node_attribute('font-size',  value) end
+  def set_text_style_node_attribute(attribute_name,value)
+    @cell.detach if @cell.mode != :regular
+    if text_style_node.nil?
+      self.create_text_style_node
+      raise 'Style node was not correctly initialized' if text_style_node.nil?
+    end
+    Tools.set_ns_attribute(text_style_node,'fo',attribute_name,value)
+  end
+  def background_color=(value); set_cell_style_node_attribute('background-color',  value) end
+  def set_cell_style_node_attribute(attribute_name,value)
+    @cell.detach if @cell.mode != :regular
+    if cell_style_node.nil?
+      self.create_cell_style_node
+      raise 'Style node was not correctly initialized' if cell_style_node.nil?
+    end
+    Tools.set_ns_attribute(cell_style_node,'fo',attribute_name,value)
+  end
+  
+ # @!group initialization of style related nodes, if they do not exist
+  def create_text_style_node
+    create_style_node if style_name.nil? or style_node.nil?
+    raise 'text_style_node already exists' unless text_style_node.nil?
+    style_node << Tools.prepare_ns_node('style','text-properties')
+  end
+  def create_cell_style_node
+    create_style_node if style_name.nil? or style_node.nil?
+    raise 'cell_style_node already exists' unless cell_style_node.nil?
+    style_node << Tools.prepare_ns_node('style','table-cell-properties')
+  end
+  def create_style_node
+    if style_name.nil?
+      proposed_style_name = unused_cell_style_name
+      Tools.set_ns_attribute(cellnode,'table','style-name',proposed_style_name)
+      raise 'Style name was not correctly initialized' if style_name!=proposed_style_name
+    end
+    anode =  Tools.prepare_ns_node('style','style')
+    Tools.set_ns_attribute(anode, 'style', 'name', proposed_style_name)
+    Tools.set_ns_attribute(anode, 'style', 'family', 'table-cell')
+    Tools.set_ns_attribute(anode, 'style', 'parent-style-name', 'Default')
+    automatic_styles_node << anode
+    raise 'Style node was not correctly initialized' if style_node.nil?
+  end
+  
+  def unused_cell_style_name
+    last = (cellnode.nil? ? [] : cellnode.doc.root.find('./office:automatic-styles/style:style')).
+      collect {|node| node['name']}.
+      collect{ |name| /^ce(\d*)$/.match(name); $1.andand.to_i}.
+      compact.max || 0
+    "ce#{last+1}"
+  end
+  def automatic_styles_node; style_node_with_partial_xpath('') end
+  def style_name; Tools.get_ns_attribute_value(cellnode,'table','style-name',nil) end
+  def style_node; style_node_with_partial_xpath("/style:style[@style:name=\"#{style_name}\"]") end
+  def text_style_node; style_node_with_partial_xpath("/style:style[@style:name=\"#{style_name}\"]/style:text-properties") end
+  def cell_style_node; style_node_with_partial_xpath("/style:style[@style:name=\"#{style_name}\"]/style:table-cell-properties") end
+  def style_node_with_partial_xpath(xpath)
+    return nil if cellnode.nil?
+    cellnode.doc.root.find("./office:automatic-styles#{xpath}").first 
+  end
+  def currency
+    Tools.get_ns_attribute_value(cellnode,'office','currency',nil) 
+  end
+  #returns object representing top border of the cell
+  def top;    @top    ||= Border.new(self,:top)  end
+  def bottom; @bottom ||= Border.new(self,:bottom) end
+  def left;   @left   ||= Border.new(self,:left) end
+  def right;  @right  ||= Border.new(self,:right) end
+  alias :border_top :top
+  alias :border_right :right
+  alias :border_bottom :bottom
+  alias :border_left :left
+  
+  def inspect
+    "#<Rspreadsheet::CellFormat bold:#{bold?.inspect}, borders:#{top.get_value_string.inspect} #{right.get_value_string.inspect} #{bottom.get_value_string.inspect} #{left.get_value_string.inspect}>"
+  end
+  # experimental. Allows to assign a style to cell.
+  def style_name=(value)
+    Tools.set_ns_attribute_value(cellnode,'table','style-name',value)
+  end
+  
+end
+
+# represents one of the borders of a cell
+class Border
+  def initialize(cellformat,side)
+    @cellformat = cellformat
+    @side = side.to_s
+    raise "Wrong side of border object, can be top, bottom, left or right" unless ['left','right','top','bottom'].include? @side
+  end
+  def cellnode; @cell.xmlnode end
+  def attribute_name; "border-#{@side}" end
+  
+  def width=(value); set_border_string_part(1, value) end
+  def style=(value); set_border_string_part(2, value.to_s) end
+  def color=(value); set_border_string_part(3, value) end
+  def width; get_border_string_part(1).to_f end
+  def style; get_border_string_part(2) end
+  def color; get_border_string_part(3) end
+  def delete
+    @cellformat.set_cell_style_node_attribute(attribute_name, 'none')
+  end
+    
+    
+  ## internals  
+   
+  # set parth-th part of string which represents the border. String looks like "0.06pt solid #00ee00"
+  # part is 1 for width, 2 for style or 3 for color
+  def set_border_string_part(part,value)
+    current_value = @cellformat.get_cell_style_node_attribute(attribute_name)
+    
+    if current_value.nil? or (current_value=='none')
+      value_array = ['0.75pt', 'solid', '#000000']  # set default values
+    else
+      value_array = current_value.split(' ')  
+    end
+    raise 'Strange border attribute value. Does not have 3 parts' unless value_array.length == 3
+    value_array[part-1]=value
+    @cellformat.set_cell_style_node_attribute(attribute_name, value_array.join(' '))
+  end
+  
+  def get_border_string_part(part)
+    current_value = @cellformat.get_cell_style_node_attribute(attribute_name) || @cellformat.get_cell_style_node_attribute('border')
+    if current_value.nil? or (current_value=='none')
+      return nil
+    else
+      value_array = current_value.split(' ')  
+      raise 'Strange border attribute value. Does not have 3 parts' unless value_array.length == 3
+      return value_array[part-1]
+    end
+  end
+  
+  def get_value_string
+    @cellformat.get_cell_style_node_attribute(attribute_name)
+  end
+  
+end
+
+end # module
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

data/lib/rspreadsheet/tools.rb

@@ -185,9 +185,13 @@ module Tools
     end
     raise 'Could not get unused filename within sane times of iterations'
   end
-  
-end
  
+  def self.new_time_value(h,m,s)
+    Time.new(StartOfEpoch.year,StartOfEpoch.month,StartOfEpoch.day,h,m,s)
+  end
+ 
+end
+  
 end
 
 # @private

data/lib/rspreadsheet/version.rb

@@ -1,3 +1,3 @@
 module Rspreadsheet
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/lib/rspreadsheet/workbook.rb

@@ -73,7 +73,7 @@ class Workbook
       when @filename.nil? && (io.kind_of?(String) || io.kind_of?(File) || io.kind_of?(IO) || io.kind_of?(StringIO))
         Zip::File.open(TEMPLATE_FILE_NAME) do |empty_template_zip|                       # open empty_template file
           write_zip_to(io) do |output_zip|                                               # open output stream of file
-            copy_internally_without_content_and_manifest(empty_template_zip,output_zip)  # copy empty_template internals
+            copy_internally_without_content(empty_template_zip,output_zip)  # copy empty_template internals
             update_manifest_and_content_xml(empty_template_zip,output_zip)               # update xmls + pictures
           end
         end
@@ -91,7 +91,7 @@ class Workbook
       when @filename.kind_of?(String) && (io.kind_of?(IO) || io.kind_of?(StringIO))
         Zip::File.open(@filename) do | old_zip |                                    # open old file
           write_zip_to(io) do |output_zip_stream|                                   # open output stream
-            copy_internally_without_content_and_manifest(old_zip,output_zip_stream) # copy the old internals
+            copy_internally_without_content(old_zip,output_zip_stream) # copy the old internals
             update_manifest_and_content_xml(old_zip,output_zip_stream)              # update xmls + pictures
           end
         end
@@ -118,14 +118,14 @@ class Workbook
   def update_manifest_xml(input_zip,output_zip)
     # read manifest
     @manifest_xml = LibXML::XML::Document.io input_zip.get_input_stream(MANIFEST_FILE_NAME)
-
+    modified = false
     # save all pictures - iterate through sheets and pictures and check if they are saved and if not, save them
     @worksheets.each do |sheet|
       sheet.images.each do |image|
         # check if it is saved
         @ifname = image.internal_filename
-        if @ifname.nil? or input_zip.find_entry(@ifname).nil?   
-          # if it does not have name -> make up unused name 
+        if @ifname.nil? or input_zip.find_entry(@ifname).nil?
+          # if it does not have name -> make up unused name
           if @ifname.nil?
             @ifname = image.internal_filename = Rspreadsheet::Tools.get_unused_filename(input_zip,'Pictures/',File.extname(image.original_filename))
           end
@@ -141,19 +141,21 @@ class Workbook
             Tools.set_ns_attribute(node,'manifest','full-path',@ifname)
             Tools.set_ns_attribute(node,'manifest','media-type',image.mime)
             @manifest_xml.find_first("//manifest:manifest") << node
+            modified = true
           end  
         end
       end
     end
 
-    # write manifest
-    save_entry_to_zip(output_zip, MANIFEST_FILE_NAME, @manifest_xml.to_s)
+    # write manifest if it was modified
+    save_entry_to_zip(output_zip, MANIFEST_FILE_NAME, 
+                      @manifest_xml.to_s) if modified
   end
   
-  def copy_internally_without_content_and_manifest(input_zip,output_zip)
+  def copy_internally_without_content(input_zip,output_zip)
     input_zip.each do |entry|
       next unless entry.file? 
-      next if entry.name == CONTENT_FILE_NAME || entry.name == MANIFEST_FILE_NAME
+      next if entry.name == CONTENT_FILE_NAME 
       save_entry_to_zip(output_zip, entry.name, entry.get_input_stream.read)
     end
   end
@@ -161,7 +163,7 @@ class Workbook
   def save_entry_to_zip(zip,internal_filename,contents)
     if zip.kind_of? Zip::File
 #       raise [internal_filename,contents].inspect  unless File.exists?(internal_filename)
-      zip.get_output_stream(internal_filename) do  |f| 
+      zip.get_output_stream(internal_filename) do  |f|
         f.write contents
       end
     else

data/lib/rspreadsheet/xml_tied_array.rb

@@ -167,9 +167,11 @@ module XMLTiedArray
   # array containing subnodes of xmlnode which represent subitems
   def xmlsubnodes
     return [] if xmlnode.nil?
+    ele = xmlnode.elements
+    return [] if ele.empty?
     so = subitem_xml_options[:xml_items_node_name]
     
-    xmlnode.elements.select do |node| 
+    ele.select do |node| 
       node.andand.name == so
     end
   end

data/rspreadsheet.gemspec

@@ -22,12 +22,12 @@ Gem::Specification.new do |spec|
     # if the shell fails, the system command returns nil. In that case we assume that the package is NOT installed. It might be overkill, because I am supresing the stderr as well
     (system("dpkg-query -l #{pkgname} 2>/dev/null | grep -q '^i'")==true) or  # debian based
     (system("rpm -qa 2>/dev/null | grep -q '#{pkgname}' ")==true) or          # rpm based 
-    (system("pkg_info -q -e #{pkgname} >/dev/null 2>&1")==true)               # openbsd and alike
+    (system("pkg_info -q -e '#{pkgname}-*' >/dev/null 2>&1")==true)           # OpenBSD and alike (although OpenBSD registers the gem as a gem, so this is perhaps unnecessary
   end
-  
+
   # runtime dependencies
   unless package_natively_installed?('ruby-libxml')
-    spec.add_runtime_dependency 'libxml-ruby', '~>2.7'   # parsing XML files
+    spec.add_runtime_dependency 'libxml-ruby', '2.8'   # parsing XML files
   end
   spec.add_runtime_dependency 'rubyzip', '~>1.1'       # opening zip files
   spec.add_runtime_dependency 'andand', '~>1.3'
@@ -45,7 +45,7 @@ Gem::Specification.new do |spec|
     spec.add_development_dependency "guard", '~>2.13'
     spec.add_development_dependency "guard-rspec", '~>4.6'
   end
-  
+
 #   spec.add_development_dependency 'equivalent-xml'     # implementing xml diff
 
 end

data/spec/cell_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
- 
+
 describe Rspreadsheet::Cell do
   before do 
     book1 = Rspreadsheet.new
@@ -38,6 +38,8 @@ describe Rspreadsheet::Cell do
     @cell.value.should == 'zapate'
     @sheet1.rows[1][2] = 'zaseste'  ## tohle je divoka moznost
     @cell.value.should == 'zaseste'
+    
+    @sheet1.A11 = 'dalsi test'
   end
   it 'can include links' do
     @sheet2.A12.should == '[http://example.org/]'
@@ -94,7 +96,7 @@ describe Rspreadsheet::Cell do
   end
   it 'returns correct type for the cell' do
     @sheet2.cell(1,2).type.should eq :string
-    @sheet2.cell(2,2).type.should eq :date
+    @sheet2.cell(2,2).type.should eq :datetime
     @sheet2.cell(3,1).type.should eq :float
     @sheet2.cell(3,2).type.should eq :percentage
     @sheet2.cell(4,2).type.should eq :string
@@ -104,7 +106,7 @@ describe Rspreadsheet::Cell do
   end
   it 'returns value of correct type' do
     @sheet2[1,2].should be_kind_of(String)
-    @sheet2[2,2].should be_kind_of(Date)
+    @sheet2[2,2].should be_kind_of(DateTime)  # maybe date
     @sheet2[3,1].should be_kind_of(Float)
     @sheet2[3,2].should be_kind_of(Float)
     @sheet2.cell(3,2).type.should eq :percentage
@@ -276,14 +278,38 @@ describe Rspreadsheet::Cell do
     @cell.value.min.should eq 42
     @cell.value.sec.should eq 0
   end
-  it 'can read various types of times', :pending => 'see is' do
-    raise @sheet2.cell('D23').xml.inspect
+  it 'parse_time_value converts correcty different time values' do
+    dyear = 1899; dmonth = 12; dday = 30
+    Rspreadsheet::Cell.parse_time_value('PT923451H33M00S').should == Time.new(2005,5,5,3,33,00,0)
+    Rspreadsheet::Cell.parse_time_value('PT1H33M00S').should == Time.new(dyear,dmonth,dday,1,33,00,0)
+  end
+  it 'handles time of day correctly on assignement' do
+    @sheet1.A11 = Rspreadsheet::Tools.new_time_value(2,13,27)
+    @sheet1.A12 = @sheet1.A11
+    @sheet1.A12.should == @sheet1.A11
+    @sheet1.cell('A12').type.should == :time
+  end
+  it 'can read various types of times' do
     expect {@cell = @sheet2.cell('D22'); @cell.value }.not_to raise_error
+    @cell.value.hour.should == 2
+    @cell.value.min.should == 22
     expect {@cell = @sheet2.cell('D23'); @cell.value }.not_to raise_error
-    
-    @cell.value.should == Time.new(2005,5,5,3,33,00)
+    @cell.value.should == Time.new(2005,5,5,3,33,0,0)
+  end
+  it 'handles dates and datetimes correctly on assignement' do
+    @sheet1.A11 = DateTime.new(2011,1,1,2,13,27,0)
+    @sheet1.A12 = @sheet1.A11
+    @sheet1.A12.should == @sheet1.A11
+    @sheet1.cell('A12').type.should == :datetime
+    @sheet1.A11 = Date.new(2012,2,2)
+    @sheet1.A12 = @sheet1.A11
+    @sheet1.A12.should == @sheet1.A11
+    @sheet1.cell('A12').type.should == :datetime
+  end
+  it 'can read various types of dates' do
+    expect {@cell = @sheet2.cell('F22'); @cell.value }.not_to raise_error
+    @cell.value.should == DateTime.new(2006,6,6,3,44,21,0)
   end
-  
   it 'can be addressed by even more ways and all are identical' do
     @cell = @sheet1.cell(2,2)
     @sheet1.cell('B2').value = 'zaseste'
@@ -408,4 +434,8 @@ describe Rspreadsheet::Cell do
     @cell.format.top.style = 'none'
     @cell.border_top.should_not be_nil ## ?????
   end
+  
+  it 'automatically creates new style, if a style is automatic, some of its attributes changes and there are several cells pointing to it', :penting=>'' do
+  
+  end
 end

data/spec/tools_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
  
-describe Rspreadsheet::Tools, :focus do
+describe Rspreadsheet::Tools do
   before do
     @tools = Rspreadsheet::Tools
   end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rspreadsheet
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Jakub A.Těšínský
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-20 00:00:00.000000000 Z
+date: 2017-03-30 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: libxml-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '2.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +122,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.13'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.6'
 description: 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.
@@ -136,6 +178,7 @@ files:
 - lib/helpers/configuration.rb
 - lib/rspreadsheet.rb
 - lib/rspreadsheet/cell.rb
+- lib/rspreadsheet/cell_format.rb
 - lib/rspreadsheet/column.rb
 - lib/rspreadsheet/empty_file_template.ods
 - lib/rspreadsheet/image.rb
@@ -165,8 +208,6 @@ files:
 - spec/tools_spec.rb
 - spec/workbook_spec.rb
 - spec/worksheet_spec.rb
-- w/test.rb
-- w/time.ods
 homepage: https://github.com/gorn/rspreadsheet
 licenses:
 - GPL
@@ -187,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Manipulating spreadsheets with Ruby (read / create / modify OpenDocument

data/w/test.rb

@@ -1,8 +0,0 @@
-
-
-require 'rspreadsheet'
-book = Rspreadsheet.open './time.ods'
-sheet = book.worksheets(1)
-p cell = sheet.A1 # exception
-cell = sheet.cells('A1') # works
-p cell.to_s # exception