rspreadsheet 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ece0fff71891eecf4cbdf45b2c0d305b63a47e37
-  data.tar.gz: c8429a173fbe6f67d3c870b6cd9220d0a1960ca3
+  metadata.gz: 02a08c37680f411ec24be8451e70504c2efcaef5
+  data.tar.gz: 1ed4f196aa6891c9a2ba78631a099f03b3e9263f
 SHA512:
-  metadata.gz: 84f8ec487137af55e90ec4227e2828248b60b7e943e49cf261e4538971b25e4b9363f325bcb60ddfd9e98790c07ccb3d9c0bd97570dc168ac312cd559b452748
-  data.tar.gz: 40f34733025850b05f84bd768232bef7f39035733d5973a63d4c24d938e14d9b4021a7a38c7341eab1064535068481e3eaa392b25adec1a3800c19e061cea78c
+  metadata.gz: b617514fbf0909eaf9eb3c42fb5794cb8b1182fbf0302c255faa9a6b0ef1aa9a75f6a8489c339f858ef341c605d4ac87d6b5895ca713bcbdeddad346ae395467
+  data.tar.gz: 4acb190f8388ecf64d42b6a063ea4b5198803d2d316f7486831f571490dda2c3a001cdd701b8a7cc660e7146d4c448e159cd203e36a77a943aee0965dbb52090

data/.yardopts

@@ -0,0 +1,5 @@
+--no-private
+--markup markdown
+lib/rspreadsheet/*.rb
+lib/**.rb
+

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+# Changelog
+
+see [Changelog on github](https://github.com/gorn/rspreadsheet/releases)

data/DEVEL_BLOG.md

@@ -2,14 +2,9 @@ See [GUIDE.md](GUIDE.md#conventions) for syntax conventions.
 
 ## Ideas/wishlist
 
-  * What should be returned when asking for row/cell outside used range? Currently it creates new row/cell on fly, but maybe it should only return nil, so the user needs to insert apropriate rows/cells himself before using them. However it spoils little bit syntax like spreadsheet.rows(5).cells(3) because if rows returns nil, that would fail and ugly constructs like spreadsheet.andand.rows(5).andand.cells(3) would be needed. The only way this could be acoided is by using something like "UncreatedRow" object. This concern falls to category "clash of worlds" like the indexing issue (0 vs 1 based) and many others. - now it returns "UncreatedRow/Cell" which is detached upon value assignement.
   * In future inntroduce syntax like ``sheet.range('C3:E4')`` for mass operations. Also maybe ``sheet.cells('C3')`` or ``sheet.cells(3, 'C')`` etc.
   * Trying to make row Enumerable - perhaps skipping empty or undefined cells.
-  * Accessors for nonempty/defined 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.
-  * Allow any of these:
-    * ``book['Spring 2014']`` as alternative to ``book.worksheets('Spring 2014')`` ?
-    * ``sheet.cells('F13')`` as alternative to ``sheet.cells(14,5)`` ?
   * Document that there is a little distinction betwean RSpreadsheet and RSpreadsheet::Workbook. The former delegates everythink to the other.
   * allow `book.worskheets.first` syntax
   * allow `sheet.cells.sum { |cell| cell.value }
@@ -37,22 +32,24 @@ Guiding ideas
   * [github](https://github.com/gorn/rspreadsheet) hosts the repository where you can get the code
   * [coverals](https://coveralls.io/r/gorn/rspreadsheet) checks how well source is covered by tests
 
-### Local manual testing and releasing (to github released, ).
+### Local testing and releasing (to github and rubygems).
+
+1. make changes
+2. test if all tests pass (run `bundle exex guard` to test automatically). If not go to 1
+3. build and install locally
+    * ``rake build`` - builds the gem to pkg directory. 
+    * ``sudo rake install`` - installs gem to local system [^1]
+4. Now can locally and manually use/test the gem. This should not be replacement for automated testing. If you make some changes, go to 1.
+5. When happy, increment the version number and `git add .; git commit -am'commit message'; git push`
+6. ``rake release`` - creates a version tag in git and pushes the code to github + Rubygems. After this is succesfull the new version appears as release in Github and RubyGems.
+
+gem alternativa to points 3-6
 
     gem build rspreadsheet.gemspec              -\   These two lines together are in install.sh
     sudo gem install rspreadsheet-x.y.z.gem     -/   which should be invoked from parent directory
     gem push rspreadsheet-x.y.z.gem             releases the gem, do not forgot to update version in rspreadsheet.gemspec before doing this
 
-alternative way using ``rake`` command - release is more automatic
-
-  1. build and install locally
-    * ``rake build`` - builds the gem to pkg directory. 
-    * ``sudo rake install`` - If this fails with "mkmf.rb can't find header files for ruby at /usr/lib/ruby/include/ruby.h" you may want to ``sudo aptitude install ruby-dev``
-  * Now can locally and manually use/test the gem. This should not be replacement for automated testing. If you make some changes, repeat step 1.
-  * When happy, increment the version number and deploy in next step.
-  * ``rake release`` - creates a version tag in git and pushes the code to github + Rubygems. After this is succesfull the new version appears as release in Github and RubyGems.
-
-
+[^1]:  if this fails with "mkmf.rb can't find header files for ruby at /usr/lib/ruby/include/ruby.h" you may want to ``sudo aptitude install ruby-dev``
 
 ### Naming conventions
 

data/Guardfile

@@ -1,4 +1,4 @@
-guard 'rspec' do
+def watch_all
   # watch /lib/rspreadsheet/ files
   watch(%r{^lib/rspreadsheet/(.+).rb$}) do |m|
     "spec/#{m[1]}_spec.rb"
@@ -8,4 +8,20 @@ guard 'rspec' do
   watch(%r{^spec/(.+).rb$}) do |m|
     "spec/#{m[1]}.rb"
   end
-end
+end
+
+# classical part
+scope group: :normal
+
+group :normal do
+  guard 'rspec' do watch_all end
+end
+
+# see http://stackoverflow.com/questions/18501471/guard-how-to-run-specific-tags-from-w-in-guards-console
+group :focus do
+  guard 'rspec', cli: '--tag focus' do watch_all end
+end
+
+#group :f do
+#  guard 'rspec', cli: '--tag focus' do watch_all end
+#end

data/README.md

@@ -40,7 +40,7 @@ sheet.rows(5).cells.sum{ |cell| cell.value }
 
 total = 0
 sheet.rows.each do |row|
-  puts "Sponsor #{row[1]} with email #{row(2)} has donated #{row(3)} USD."
+  puts "Sponsor #{row[1]} with email #{row[2]} has donated #{row[3]} USD."
   total += row[3]
 end
 puts "Totally fundraised #{total} USD"
@@ -97,3 +97,9 @@ One of the main ideas is that the manipulation with OpenDOcument files should be
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
+## Further reading
+
+* [Advanced Guide](GUIDE.md) how to use the gem
+* [Code documentation](http://www.rubydoc.info/github/gorn/rspreadsheet) is hosted on [rubydoc.info](http://www.rubydoc.info/)
+* [Changelog](CHANGELOG.md)
+* [Documentation for developers](DEVEL_BLOG.md) containing ideas for future development and documentation on testing tools

data/lib/class_extensions.rb

@@ -1,3 +1,5 @@
+# @private
+
 class LibXML::XML::Node
   def elements
     result = []
@@ -34,4 +36,14 @@ class LibXML::XML::Node
   def equals?(node2)  #TODO redefine == with this
     self.simplification_of?(node2) and node2.simplification_of?(self)
   end
+end
+
+class Array
+  def sum(identity = 0, &block)
+    if block_given?
+      map(&block).sum(identity)
+    else
+      inject { |sum, element| sum + element } || identity
+    end
+  end
 end

data/lib/rspreadsheet.rb

@@ -5,6 +5,7 @@ require 'class_extensions'
 
 module Rspreadsheet
 
+  # makes creating new workbooks as easy as `Rspreadsheet.new` or `Rspreadsheet.open('filename.ods')
   def self.new(filename=nil)
     Workbook.new(filename)
   end  

data/lib/rspreadsheet/cell.rb

@@ -1,13 +1,30 @@
+# @markup markdown
+# @author Jakub Tesinsky
+# @titel rspreadsheet Cell
+
 require 'andand'
 require 'rspreadsheet/xml_tied'
 
+
+
 module Rspreadsheet
-  
+
+###
+# 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)
+#
+#     @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.
+
 class Cell < XMLTiedItem
   attr_accessor :worksheet, :coli, :rowi
-  def xml_repeated_attribute;  'number-columns-repeated' end
-  def xml_items_node_name; 'table-cell' end
-  def xml_options; {:xml_items_node_name => xml_items_node_name, :xml_repeated_attribute => xml_repeated_attribute} end
+  # `xml_options[:xml_items_node_name]` gives the name of the tag representing cell
+  # `xml_options[:number-columns-repeated]` gives the name of the previous tag which sais how many times the item is repeated
+  def xml_options; {:xml_items_node_name => 'table-cell', :xml_repeated_attribute => 'number-columns-repeated'} end
+  
+  ## defining abstract methods from XMLTiedItem
+  # returns parent XMLTiedArray object of myself (XMLTiedItem)
   def parent; row end
   def index; @coli end
   def set_index(value); @coli=value end
@@ -59,21 +76,21 @@ class Cell < XMLTiedItem
           set_type_attribute('float')
           remove_all_value_attributes_and_content(xmlnode)
           Tools.set_ns_attribute(xmlnode,'office','value', avalue.to_s) 
-          xmlnode << Tools.create_ns_node('text','p', avalue.to_f.to_s)
+          xmlnode << Tools.prepare_ns_node('text','p', avalue.to_f.to_s)
         when gt == String then
           set_type_attribute('string')
           remove_all_value_attributes_and_content(xmlnode)
-          xmlnode << Tools.create_ns_node('text','p', avalue.to_s)
+          xmlnode << Tools.prepare_ns_node('text','p', avalue.to_s)
         when gt == Date then 
           set_type_attribute('date')
           remove_all_value_attributes_and_content(xmlnode)
           Tools.set_ns_attribute(xmlnode,'office','date-value', avalue.strftime('%Y-%m-%d'))
-          xmlnode << Tools.create_ns_node('text','p', avalue.strftime('%Y-%m-%d')) 
+          xmlnode << Tools.prepare_ns_node('text','p', avalue.strftime('%Y-%m-%d')) 
         when gt == :percentage
           set_type_attribute('percentage')
           remove_all_value_attributes_and_content(xmlnode)
           Tools.set_ns_attribute(xmlnode,'office','value', '%0.2d%' % avalue.to_f) 
-          xmlnode << Tools.create_ns_node('text','p', (avalue.to_f*100).round.to_s+'%')
+          xmlnode << Tools.prepare_ns_node('text','p', (avalue.to_f*100).round.to_s+'%')
       end
     else
       raise "Unknown cell mode #{self.mode}"
@@ -165,22 +182,72 @@ class Cell < XMLTiedItem
 end
 
 # proxy object to allow cell.format syntax. Also handles all logic for formats.
+# @private
 class CellFormat
-  attr_reader :bold
   def initialize(cell)
-    @bold = false
     @cell = cell
   end
   def cellnode; @cell.xmlnode end
-  def bold=(value)
-    Rspreadsheet::Tools.set_ns_attribute(cellnode,'table','style-name','ce99')
-  end
-  def bold; Tools.get_ns_attribute_value(text_style_node,'fo','font-weight') == 'bold' end
-  def italic; Tools.get_ns_attribute_value(text_style_node,'fo','font-style') == 'italic' end
-  def color; Tools.get_ns_attribute_value(text_style_node,'fo','color') end
-  def font_size; Tools.get_ns_attribute_value(text_style_node,'fo','font-size') end
-  def background_color; Tools.get_ns_attribute_value(cell_style_node,'fo','background-color') end
- 
+  
+  # text style attribute readers
+  def bold;      get_text_style_node_attribute('font-weight') == 'bold' end
+  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)
+    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)
+    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.doc.root.find('./office:automatic-styles/style:style').
       collect {|node| node['name']}.
@@ -188,6 +255,7 @@ class CellFormat
       compact.max
     "ce#{last+1}"
   end
+  def automatic_styles_node; cellnode.doc.root.find("./office:automatic-styles").first end
   def style_name; Tools.get_ns_attribute_value(cellnode,'table','style-name') end
   def style_node; cellnode.doc.root.find("./office:automatic-styles/style:style[@style:name=\"#{style_name}\"]").first end
   def text_style_node; cellnode.doc.root.find("./office:automatic-styles/style:style[@style:name=\"#{style_name}\"]/style:text-properties").first end

data/lib/rspreadsheet/row.rb

@@ -1,45 +1,57 @@
 require 'rspreadsheet/cell'
 require 'rspreadsheet/xml_tied'
 
-# Currently this is only syntax sugar for cells and contains no functionality
 
 module Rspreadsheet
 
+# Represents a row in a 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)
+#
+#     @row = @worksheet.rows(5)
+#
+# Mostly you will this object to access row cells
+#
+#     @row.cells(2)     # identical to @worksheet.rows(5).cells(2)
+#     @row[2]           # identical to @worksheet[5,2] or @row.cells(2)
+#
+# or manipulate rows
+#
+#     @row.add_row_above   # adds empty row above
+#     @row.delete          # deletes row
+#
+# and shifts all other rows down/up appropriatelly.
+
 class Row < XMLTiedItem
   include XMLTiedArray
-  attr_reader :worksheet, :rowi
-  def xml_repeated_attribute; 'number-rows-repeated' end
-  def xml_items_node_name; 'table-row' end
-  def xml_options; {:xml_items_node_name => xml_items_node_name, :xml_repeated_attribute => xml_repeated_attribute} end
-  def subitem_xml_options; {:xml_items_node_name => 'table-cell', :xml_repeated_attribute => 'number-columns-repeated'} end
+  ## @return [Worksheet] worksheet which contains the row
+  # @!attribute [r] worksheet
+  attr_reader :worksheet
+  ## @return [Integer] row index of the row
+  # @!attribute [r] rowi
+  attr_reader :rowi 
     
   def initialize(aworksheet,arowi)
     @worksheet = aworksheet
     @rowi = arowi
     @itemcache = Hash.new  #TODO: move to module XMLTiedArray
   end
+  
   def xmlnode; parent.find_my_subnode_respect_repeated(index, xml_options)  end
     
-  # XMLTiedItem things and extensions
-  def parent; @worksheet end
-  def index; @rowi end
-  def set_index(value); @rowi=value end
-    
-  # XMLTiedArray rozšíření 
-  def prepare_subitem(coli); Cell.new(@worksheet,@rowi,coli) end
-  def cells(*params)
-    raise 'Invalid row reference' if invalid_reference?
-    case params.length 
-      when 0 then subitems_array
-      when 1 then subitem(params[0]) 
-      else raise Exception.new('Wrong number of arguments.')
-    end
-  end
-  # syntactis sugar to cells and its values
+ # @!group Syntactic sugar
+  def cells(*params); subitems(*params) end
+  
+  ## @return [String or Float or Date] value of the cell
+  # @param coli [Integer] colum index of the cell 
+  # returns value of the cell at column `coli`
   def [](coli); cells(coli).value end
+  ## @param coli [Integer] colum index of the cell 
+  # @param avalue [String or Float or Date] colum index of the cell  
+  # sets value of the cell at column `coli`
   def []=(coli,avalue); cells(coli).value=avalue end
-    
-  # další
+ # @!endgroup
+  
+ # @!group Other methods
   def style_name=(value); 
     detach_if_needed
     Tools.set_ns_attribute(xmlnode,'table','style-name',value)
@@ -56,10 +68,32 @@ class Row < XMLTiedItem
     end
   end
   alias :used_range :range
-  def shift_by(diff)
+  # Inserts row above itself (and shifts itself and all following rows down)
+  def add_row_above
+    parent.add_row_above(rowi)
+  end
+  def cellvalues
+    cells.collect{|c| c.value}
+  end
+  
+ # @!group Private methods, which should not be called directly
+  # @private
+  # shifts internal represetation of row by diff. This should not be called directly
+  # by user, it is only used by XMLTiedArray as hook when shifting around rows
+  def _shift_by(diff)
     super
     @itemcache.each_value{ |cell| cell.set_rowi(@rowi) }
   end
+  
+ private
+  # @!group XMLTiedArray related methods
+  def subitem_xml_options; {:xml_items_node_name => 'table-cell', :xml_repeated_attribute => 'number-columns-repeated'} end
+  def prepare_subitem(coli); Cell.new(@worksheet,@rowi,coli) end
+  # @!group XMLTiedItem related methods and extensions
+  def xml_options; {:xml_items_node_name => 'table-row', :xml_repeated_attribute => 'number-rows-repeated'} end
+  def parent; @worksheet end                
+  def index; @rowi end                       
+  def set_index(value); @rowi=value end      
 end
 
 # class Row

data/lib/rspreadsheet/tools.rb

@@ -2,31 +2,59 @@ module Rspreadsheet
 
 # this module contains methods used bz several objects
 module Tools
+  def self.only_letters?(x); x.kind_of?(String) and x.match(/^[A-Za-z]*$/) != nil end
+  def self.kind_of_integer?(x)
+    (x.kind_of?(Numeric) and x.to_i==x) or 
+    (x.kind_of?(String) and x.match(/^\d*(\.0*)?$/) != nil)
+  end
+
   # converts cell adress like 'F12' to pair od integers [row,col]
   def self.convert_cell_address_to_coordinates(*addr)
     if addr.length == 1
-      addr[0].match(/^([A-Z]{1,3})(\d{1,8})$/)
+      addr[0].match(/^([A-Za-z]{1,3})(\d{1,8})$/)
       colname = $~[1]
-      rowname = $~[2]
+      rowname = $~[2].to_i
     elsif addr.length == 2
-      colname = addr[0]
-      rowname = addr[1]
+      a = addr[0]; b = addr[1]
+      if a.kind_of?(Integer) and b.kind_of?(Integer) # most common case first
+        colname,rowname = b,a 
+      elsif only_letters?(a)
+        if kind_of_integer?(b)
+          colname,rowname = a,b.to_i
+        else
+          raise 'Wrong parameters - first is letters, but the seconds is not digits only'
+        end
+      elsif kind_of_integer?(a)
+        if only_letters?(b)
+          colname,rowname = b,a.to_i
+        elsif kind_of_integer?(b)
+          colname,rowname = b.to_i,a.to_i
+        else
+          raise 'Wrong second out of two paremeters - mix of digits and numbers'
+        end
+      else 
+        raise 'Wrong first out of two paremeters - mix of digits and numbers'
+      end
     else
       raise 'Wrong number of arguments'
     end
      
     ## first possibility how to implement it
-#     colname=colname.rjust(3,'@')
-#     col = (colname[-1].ord-64)+(colname[-2].ord-64)*26+(colname[-3].ord-64)*26*26
+    # colname=colname.rjust(3,'@')
+    # col = (colname[-1].ord-64)+(colname[-2].ord-64)*26+(colname[-3].ord-64)*26*26
 
     ## second possibility how to implement it
     # col=(colname.to_i(36)-('A'*colname.size).to_i(36)).to_s(36).to_i(26)+('1'*colname.size).to_i(26)
     
+    if colname.kind_of?(Integer)
+      col=colname
+    else
     ## third possibility how to implement it (second one little shortened)
-    s=colname.size
-    col=(colname.to_i(36)-(36**s-1).div(3.5)).to_s(36).to_i(26)+(26**s-1)/25
+      s=colname.size
+      col=(colname.upcase.to_i(36)-(36**s-1).div(3.5)).to_s(36).to_i(26)+(26**s-1)/25
+    end
     
-    row = rowname.to_i
+    row = rowname
     return [row,col]
   end
   def self.convert_cell_coordinates_to_address(*coords)
@@ -50,6 +78,9 @@ module Tools
   end
   def self.c2a(*x); convert_cell_coordinates_to_address(*x) end
   def self.a2c(*x); convert_cell_address_to_coordinates(*x) end
+  # Finds {LibXML::XML::Namespace} object by its prefix. It knows all OpenDocument commonly used namespaces.
+  # @return [LibXML::XML::Namespace] namespace object
+  # @param prefix [String] namespace prefix
   def self.get_namespace(prefix)
     ns_array = {
       'office'=>"urn:oasis:names:tc:opendocument:xmlns:office:1.0",
@@ -114,8 +145,12 @@ module Tools
       nil
     end
   end
-  def self.get_ns_attribute(node,ns_prefix,key)
-    node.nil? ? nil : node.attributes.get_attribute_ns(Tools.get_namespace(ns_prefix).href,key)
+  def self.get_ns_attribute(node,ns_prefix,key,default=:undefined_default)
+    if default==:undefined_default
+      node.attributes.get_attribute_ns(Tools.get_namespace(ns_prefix).href,key)
+    else
+      node.nil? ? default : node.attributes.get_attribute_ns(Tools.get_namespace(ns_prefix).href,key) || default
+    end
   end
   def self.get_ns_attribute_value(node,ns_prefix,key)
     Tools.get_ns_attribute(node,ns_prefix,key).andand.value
@@ -124,13 +159,14 @@ 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(ns_prefix,nodename,value=nil)
+  def self.prepare_ns_node(ns_prefix,nodename,value=nil)
     LibXML::XML::Node.new(nodename,value, Tools.get_namespace(ns_prefix))
   end
 end
  
 end
 
+# @private
 class Range
   def size
     res = self.end-self.begin+1

data/lib/rspreadsheet/version.rb

@@ -1,3 +1,3 @@
 module Rspreadsheet
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/lib/rspreadsheet/workbook.rb

@@ -3,10 +3,10 @@ require 'libxml'
 
 module Rspreadsheet
 class Workbook
-  attr_reader :worksheets, :filename
+  attr_reader :filename
   attr_reader :xmlnode # debug
   def initialize(afilename=nil)
-    @worksheets={}
+    @worksheets=[]
     @filename = afilename
     @content_xml = Zip::File.open(@filename || './lib/rspreadsheet/empty_file_template.ods') do |zip|
       LibXML::XML::Document.io zip.get_input_stream('content.xml')
@@ -30,34 +30,46 @@ class Workbook
       end
     end
   end
+  def xmldoc; @xmlnode.doc end
+  
+  #@!group Worskheets methods
   def create_worksheet_from_node(source_node)
     sheet = Worksheet.new(source_node)
     register_worksheet(sheet)
     return sheet
   end
-  def create_worksheet_with_name(name)
+  def create_worksheet(name = "Strana #{worksheets_count}")
     sheet = Worksheet.new(name)
     register_worksheet(sheet)
     return sheet
   end
-  def create_worksheet
-    index = worksheets_count
-    create_worksheet_with_name("Strana #{index}")
+  # @return [Integer] number of sheets in the workbook
+  def worksheets_count; @worksheets.length end
+  # @return [String] names of sheets in the workbook
+  def worksheet_names; @worksheets.collect{ |ws| ws.name } end
+  # @param [Integer,String]
+  # @return [Worskheet] worksheet with given index or name
+  def worksheets(index_or_name)
+    case index_or_name
+      when Integer then begin
+        case index_or_name
+          when 0 then nil 
+          when 1..Float::INFINITY then @worksheets[index_or_name-1]
+          when -Float::INFINITY..-1 then @worksheets[index_or_name]    # zaporne indexy znamenaji pocitani zezadu
+        end  
+      end
+      when String then @worksheets.select{|ws| ws.name == index_or_name}.first
+      when NilClass then nil
+      else raise 'method worksheets requires Integer index of the sheet or its String name'
+    end
   end
+  def [](index_or_name); self.worksheets(index_or_name) end
+  
+  private 
   def register_worksheet(worksheet)
     index = worksheets_count+1
-    @worksheets[index]=worksheet
-    @worksheets[worksheet.name]=worksheet unless worksheet.name.nil?
+    @worksheets[index-1]=worksheet
     @xmlnode << worksheet.xmlnode if worksheet.xmlnode.doc != @xmlnode.doc
   end
-  def worksheets_count
-    @worksheets.keys.select{ |k| k.kind_of? Numeric }.size #TODO: ?? max
-  end
-  def worksheet_names
-    @worksheets.keys.reject{ |k| k.kind_of? Numeric }
-  end
-  def xmldoc
-    @xmlnode.doc
-  end
 end
 end

data/lib/rspreadsheet/worksheet.rb

@@ -6,7 +6,7 @@ module Rspreadsheet
 
 class Worksheet
   include XMLTiedArray
-  attr_accessor :name, :xmlnode
+  attr_accessor :xmlnode
   def subitem_xml_options; {:xml_items_node_name => 'table-row', :xml_repeated_attribute => 'number-rows-repeated'} end
 
   def initialize(xmlnode_or_sheet_name)
@@ -16,12 +16,17 @@ class Worksheet
       when LibXML::XML::Node
         @xmlnode = xmlnode_or_sheet_name
       when String
-        @xmlnode = Tools.create_ns_node('table','table')
-        Tools.set_ns_attribute(@xmlnode,'table','name', xmlnode_or_sheet_name)
+        @xmlnode = Tools.prepare_ns_node('table','table')
+        self.name = xmlnode_or_sheet_name
       else raise 'Provide name or xml node to create a Worksheet object'
     end
   end
   
+  # name of the worksheet
+  # @returns [String]
+  def name; Tools.get_ns_attribute_value(@xmlnode,'table','name') end
+  def name=(value); Tools.set_ns_attribute(@xmlnode,'table','name', value) end
+  
   def rowxmlnode(rowi)
     find_my_subnode_respect_repeated(rowi, {:xml_items_node_name => 'table-row', :xml_repeated_attribute => 'number-rows-repeated'})
   end
@@ -30,13 +35,13 @@ class Worksheet
     find_first_unused_index_respect_repeated({:xml_items_node_name => 'table-row', :xml_repeated_attribute => 'number-rows-repeated'})
   end
   
-  def insert_row_above(arowi)
-    insert_subitem_before(arowi)
+  def add_row_above(arowi)
+    add_empty_subitem_before(arowi)
   end
   
   def insert_cell_before(arowi,acoli)
     detach_row_in_xml(arowi)
-    rows(arowi).insert_subitem_before(acoli)
+    rows(arowi).add_empty_subitem_before(acoli)
   end
   
   def detach_row_in_xml(rowi)
@@ -47,22 +52,33 @@ class Worksheet
     used_rows_range.collect{ |rowi| rows(rowi).nonemptycells }.flatten
   end
   
-  # rozšíření XMLTiedArray
-  def rows(rowi); subitem(rowi) end
+  #@!group XMLTiedArray connected methods
+  def rows(*params); subitems(*params) end
   def prepare_subitem(rowi); Row.new(self,rowi) end
   def rowcache; @itemcache end
   
-  ## syntactic sugar follows
-  def [](r,c)
-    cells(r,c).andand.value
+  #@!group How to get to cells? (syntactic sugar)
+  # Returns value of the cell given either by  row,column integer coordinates of by address.
+  # @param [(Integer,Integer), String] either row and column of the cell (i.e. 3,5) or a string containing it address i.e. 'F12'
+  def [](*params)
+    cells(*params).andand.value
   end
-  def []=(r,c,avalue)
-    cells(r,c).andand.value=avalue
+  # Aets value of the cell given either by  row,column integer coordinates of by address. It also sets the type of the cell according to type of the value. For details #see Cell.value=
+  def []=(*params)
+    cells(*params[0..-2]).andand.value = params.last 
   end
-  def cells(r,c)
-    rows(r).andand.cells(c)
+  # Returns a Cell object placed in row and column or on a Cell on string address
+  # @param [(Integer,Integer), String] either row and column of the cell (i.e. 3,5) or a string containing it address i.e. 'F12'
+  def cells(*params)
+    case params.length 
+      when 0 then raise 'Not implemented yet' #TODO: return list of all cells
+      when 1..2
+        r,c = Rspreadsheet::Tools.a2c(*params)
+        rows(r).andand.cells(c)
+      else raise Exception.new('Wrong number of arguments.')
+    end
   end
-  # allows syntax like sheet.F15
+  # Allows syntax like sheet.F15. TO catch errors easier, allows only up to three uppercase letters in colum part, althought it won't be necessarry to restrict.
   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_to_coordinates($~[1],$~[2])

data/lib/rspreadsheet/xml_tied.rb

@@ -1,11 +1,13 @@
 module Rspreadsheet
 
+# @private
 class XMLTied
   def xml
     xmlnode.to_s
   end
 end
   
+# @private
 # abstrac class. All successort MUST implement: set_index,xml_options,parent,index
 class XMLTiedItem < XMLTied
   def mode
@@ -15,7 +17,7 @@ class XMLTiedItem < XMLTied
      else :regular
    end
   end
-  def repeated; (Tools.get_ns_attribute_value(xmlnode, 'table', xml_repeated_attribute) || 1 ).to_i end
+  def repeated; (Tools.get_ns_attribute_value(xmlnode, 'table', xml_options[:xml_repeated_attribute]) || 1 ).to_i end
   def repeated?; mode==:repeated || mode==:outbound end
   alias :is_repeated? :repeated?
   def xmlnode
@@ -34,7 +36,7 @@ class XMLTiedItem < XMLTied
     parent.detach_my_subnode_respect_repeated(index, xml_options)
     self
   end
-  def shift_by(diff)
+  def _shift_by(diff)
     set_index(index + diff)
   end
   def range
@@ -59,12 +61,14 @@ class XMLTiedItem < XMLTied
     parent.delete_subitem(index)
     invalidate_myself
   end
+
 end
 
 # abstrac class. All successort MUST implement: prepare_subitem
 # terminology
 #  item, subitem is object from @itemcache (quite often subclass of XMLTiedItem)
 #  node, subnode is LibXML::XML::Node object
+# @private
 
 module XMLTiedArray
   attr_reader :itemcache
@@ -96,6 +100,14 @@ module XMLTiedArray
     end
   end
   
+  def subitems(*params)
+    case params.length 
+      when 0 then subitems_array
+      when 1 then subitem(params[0]) 
+      else raise Exception.new('Wrong number of arguments.')
+    end
+  end
+  
   def subitems_array
     (1..(find_first_unused_index_respect_repeated(subitem_xml_options)-1)).collect do |i|
       subitem(i)
@@ -184,15 +196,12 @@ module XMLTiedArray
     return index+1
   end
 
-  def insert_subitem_before(aindex)
-    insert_subitem_before_with_options(aindex,subitem_xml_options)
-  end
-  def insert_subitem_before_with_options(aindex,options)
+  def add_empty_subitem_before(aindex)
     @itemcache.keys.sort.reverse.select{|i| i>=aindex }.each do |i| 
       @itemcache[i+1]=@itemcache.delete(i)
-      @itemcache[i+1].shift_by(1)
+      @itemcache[i+1]._shift_by(1)
     end
-    insert_my_subnode_before_respect_repeated(aindex,options)  # nyní vlož node do xml
+    insert_my_subnode_before_respect_repeated(aindex,subitem_xml_options)  # nyní vlož node do xml
     @itemcache[aindex] =  subitem(aindex)
   end
   
@@ -204,7 +213,7 @@ module XMLTiedArray
     @itemcache.delete(aindex)
     @itemcache.keys.sort.select{|i| i>=aindex+1 }.each do |i| 
       @itemcache[i-1]=@itemcache.delete(i)
-      @itemcache[i-1].shift_by(-1)
+      @itemcache[i-1]._shift_by(-1)
     end
   end
   

data/spec/cell_spec.rb

@@ -4,9 +4,8 @@ describe Rspreadsheet::Cell do
   before do 
     book1 = Rspreadsheet.new
     @sheet1 = book1.create_worksheet
-    @c = @sheet1.cells(1,1)
     book2 = Rspreadsheet.new($test_filename)
-    @sheet2 = book2.worksheets[1]
+    @sheet2 = book2.worksheets(1)
   end
   it 'contains good row and col coordinates' do
     @cell = @sheet1.cells(1,3)
@@ -186,8 +185,6 @@ describe Rspreadsheet::Cell do
     @cell.xmlnode.attributes['style-name'].should_not be_nil
   end
   it 'can set formats of the cells' do
-    skip 'not implemented yet'; pending
-=begin
     @cell = @sheet2.cells(1,1)
     # bold
     @cell.format.bold.should be_falsey
@@ -204,12 +201,12 @@ describe Rspreadsheet::Cell do
     # background_color
     @cell.format.background_color.should be_nil
     @cell.format.background_color = '#AABBCC'
+    @cell.format.style_name.should_not eq 'cell'
     @cell.format.background_color.should eq '#AABBCC'
     # font_size
     @cell.format.font_size.should be_nil
     @cell.format.font_size = '11pt'
     @cell.format.font_size.should eq '11pt'
-=end
   end
   it 'method cells without arguments returns array of cells' do
     @a = @sheet2.rows(1).cells
@@ -221,7 +218,7 @@ describe Rspreadsheet::Cell do
     @sheet1.cells(2,2).detach
     @cell = @sheet1.cells(2,2)
     @cell.rowi.should == 2
-    @sheet1.insert_row_above(1)
+    @sheet1.add_row_above(1)
     @cell.rowi.should == 3
   end
   it 'switches to invalid_reference cell when deleted' do
@@ -251,10 +248,27 @@ describe Rspreadsheet::Cell do
     expect(@cell.inspect).to include('abcde','::Cell','6','2','row')
   end
   it 'stores date correctly' do
-    @c.value= Date.parse('2014-01-02')
-    @c.value.year.should eq 2014
-    @c.value.month.should eq 1
-    @c.value.day.should eq 2
+    @cell = @sheet1.cells(1,1)
+    @cell.value= Date.parse('2014-01-02')
+    @cell.value.year.should eq 2014
+    @cell.value.month.should eq 1
+    @cell.value.day.should eq 2
+  end
+  it 'can be addressed by even more ways and all are identical' do
+    @cell = @sheet1.cells(2,2)
+    @sheet1.cells('B2').value = 'zaseste'
+    @sheet1.cells('B2').value.should == 'zaseste'
+    @cell.value.should == 'zaseste'
+    @sheet1.cells(2,'B').value.should == 'zaseste'
+    @sheet1.cells(2,'B').value = 'zasedme'
+    @cell.value.should == 'zasedme'
+    @sheet1['B2'].should == 'zasedme'
+    @sheet1['B2'] = 'zaosme'
+    @cell.value.should == 'zaosme'
+    
+    @sheet2.cells('F2').should be @sheet2.cells(2,6)
+    @sheet2.cells('BA177').should be @sheet2.cells(177,53)
+    @sheet2.cells('ADA2').should be @sheet2.cells(2,781)
   end
 end
 

data/spec/row_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Rspreadsheet::Row do
   before do 
     @sheet1 = Rspreadsheet.new.create_worksheet
-    @sheet2 = Rspreadsheet.new($test_filename).worksheets[1]
+    @sheet2 = Rspreadsheet.new($test_filename).worksheets(1)
   end
   it 'allows access to cells in a row' do
     @row = @sheet2.rows(1)
@@ -106,7 +106,7 @@ describe Rspreadsheet::Row do
   end
   it 'can open ods testfile and read its content' do
     book = Rspreadsheet.new($test_filename)
-    s = book.worksheets[1]
+    s = book.worksheets(1)
     (1..10).each do |i|
       s.rows(i).should be_kind_of(Rspreadsheet::Row)
       s.rows(i).repeated.should == 1
@@ -168,14 +168,17 @@ describe Rspreadsheet::Row do
     @row.range.should == (16..19)
     @row.rowi.should == 16
     
-    @sheet1.insert_row_above(7)
+    @sheet1.add_row_above(7)
     @sheet1.rows(17).range.should == (17..20)
     @row.range.should == (17..20)
     @row.rowi.should == 17
-    @sheet1.rows(17).should equal(@row)    
+    @sheet1.rows(17).should equal(@row)
+    
+    @row.add_row_above
+    @row.rowi.should == 18
   end
   it 'inserted has correct class' do # based on real error
-    @sheet2.insert_row_above(1)
+    @sheet2.add_row_above(1)
     @sheet2.rows(1).should be_kind_of(Rspreadsheet::Row)
   end
   it 'can be deleted' do

data/spec/rspreadsheet_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Rspreadsheet do
   it 'can open ods testfile and reads its content correctly' do
     book = Rspreadsheet.new($test_filename)
-    s = book.worksheets[1]
+    s = book.worksheets(1)
     (1..10).each do |i|
       s[i,1].should === i
     end
@@ -18,8 +18,8 @@ describe Rspreadsheet do
     
     book1 = Rspreadsheet.new($test_filename)   # now open both again
     book2 = Rspreadsheet.new(tmp_filename)
-    @sheet1 = book1.worksheets[1]
-    @sheet2 = book2.worksheets[1]
+    @sheet1 = book1.worksheets(1)
+    @sheet2 = book2.worksheets(1)
     
     @sheet1.nonemptycells.each do |cell|       # and test identity
       @sheet2[cell.rowi,cell.coli].should == cell.value
@@ -48,9 +48,9 @@ describe Rspreadsheet do
     tmp_filename = '/tmp/testfile1.ods'        # first delete temp file
     File.delete(tmp_filename) if File.exists?(tmp_filename)
     book = Rspreadsheet.new($test_filename)    # than open test file
-    book.worksheets[1].rows(1).cells(1).value.should_not == 'xyzxyz'
-    book.worksheets[1].rows(1).cells(1).value ='xyzxyz'
-    book.worksheets[1].rows(1).cells(1).value.should == 'xyzxyz'
+    book.worksheets(1).rows(1).cells(1).value.should_not == 'xyzxyz'
+    book.worksheets(1).rows(1).cells(1).value ='xyzxyz'
+    book.worksheets(1).rows(1).cells(1).value.should == 'xyzxyz'
     
     book.save(tmp_filename)                    # and save it as temp file
     
@@ -71,11 +71,8 @@ describe Rspreadsheet do
     book.create_worksheet
   end
   it 'examples from README file are working' do
-    skip 'not implemented yet'; pending
-=begin
-
     book = Rspreadsheet.open($test_filename)
-    sheet = book.worksheets[1]
+    sheet = book.worksheets(1)
     sheet.B5 = 'cell value'
     
     sheet.B5.should eq 'cell value'
@@ -91,16 +88,15 @@ describe Rspreadsheet do
       sheet.cells(5,2).format.background_color = '#FF0000'
     }.not_to raise_error
     
-    sheet.rows(4).cellvalues.sum.should eq 4+7*4
-    sheet.rows(5).cells.sum{ |cell| cell.value }.should eq 4+7*4
+    sheet.rows(4).cellvalues.sum{|val| val.to_f}.should eq 4+7*4
+    sheet.rows(4).cells.sum{ |cell| cell.value.to_f }.should eq 4+7*4
 
     total = 0
     sheet.rows.each do |row|
-      expect {"Sponsor #{row[1]} with email #{row(2)} has donated #{row(3)} USD." }.not_to raise_error
-      total += row[1]
+      expect {"Sponsor #{row[1]} with email #{row[2]} has donated #{row[3]} USD." }.not_to raise_error
+      total += row[1].to_f
     end
-    total.should eq 99
-=end
+    total.should eq 55
   end
 end
 

data/spec/spec_helper.rb

@@ -1,11 +1,20 @@
+
+# This tells Bundler only load gems in side gemspec (not the locally installed ones). See http://stackoverflow.com/questions/4398262/setup-rspec-to-test-a-gem-not-rails
+require 'bundler/setup'
+Bundler.setup
+
 RSpec.configure do |c|
   c.fail_fast = true
 #   c.warnings = true
+  c.treat_symbols_as_metadata_keys_with_true_values = true # so i can run individual test just by appending :focus to them
 end
 
+# this enables Coveralls
 require 'coveralls'
 Coveralls.wear!
 
+# some variables used everywhere
 $test_filename = './spec/testfile1.ods'
 
+# require my gem
 require 'rspreadsheet'

data/spec/tools_spec.rb

@@ -1,25 +1,49 @@
 require 'spec_helper'
  
-describe Rspreadsheet::Tools do
-  it 'Converts correctly cell adresses to coordinates and back' do
-    Rspreadsheet::Tools.convert_cell_address_to_coordinates('A1').should == [1,1]
-    Rspreadsheet::Tools.convert_cell_address_to_coordinates('C17').should == [17,3]
-    Rspreadsheet::Tools.convert_cell_address_to_coordinates('AM1048576').should == [1048576,39]
-    Rspreadsheet::Tools.convert_cell_address_to_coordinates('ADA2').should == [2,781]
-    Rspreadsheet::Tools.convert_cell_address_to_coordinates('ZZ1').should == [1,702]
-    Rspreadsheet::Tools.convert_cell_coordinates_to_address([1,1]).should == 'A1'
-    Rspreadsheet::Tools.convert_cell_coordinates_to_address([17,3]).should == 'C17'
-    Rspreadsheet::Tools.convert_cell_coordinates_to_address([1,27]).should == 'AA1'
-    Rspreadsheet::Tools.convert_cell_coordinates_to_address([1,39]).should == 'AM1'
-    Rspreadsheet::Tools.convert_cell_coordinates_to_address([1,53]).should == 'BA1'
-    Rspreadsheet::Tools.convert_cell_coordinates_to_address([1,702]).should == 'ZZ1'
-    Rspreadsheet::Tools.convert_cell_coordinates_to_address([2,703]).should == 'AAA2'
-    Rspreadsheet::Tools.convert_cell_coordinates_to_address([1048576,39]).should == 'AM1048576'
-    Rspreadsheet::Tools.convert_cell_coordinates_to_address([2,781]).should == 'ADA2' 
-    Rspreadsheet::Tools.c2a([2,781]).should == 'ADA2' 
-    Rspreadsheet::Tools.c2a(2,781).should == 'ADA2' 
-    Rspreadsheet::Tools.a2c('ADA2').should == [2,781]
-    Rspreadsheet::Tools.a2c('ADA','2').should == [2,781]
-    (1..200).each { |i| Rspreadsheet::Tools.a2c(Rspreadsheet::Tools.c2a(1,i*10)).should == [1,i*10] }
+describe Rspreadsheet::Tools, :focus do
+  before do
+    @tools = Rspreadsheet::Tools
+  end
+  it 'converts correctly cell adresses to coordinates' do
+    @tools.convert_cell_address_to_coordinates('A1').should == [1,1]
+    @tools.convert_cell_address_to_coordinates('C17').should == [17,3]
+    @tools.convert_cell_address_to_coordinates('AM1048576').should == [1048576,39]
+    @tools.convert_cell_address_to_coordinates('Am1048576').should == [1048576,39]
+    @tools.convert_cell_address_to_coordinates('aDa2').should == [2,781]
+    @tools.convert_cell_address_to_coordinates('Zz1').should == [1,702]
+    @tools.a2c('AdA2').should == [2,781]
+    @tools.a2c('ADA','2').should == [2,781]
+  end
+  it 'converts correctly cell coordinates to adresses' do
+    @tools.convert_cell_coordinates_to_address([1,1]).should == 'A1'
+    @tools.convert_cell_coordinates_to_address([17,3]).should == 'C17'
+    @tools.convert_cell_coordinates_to_address([1,27]).should == 'AA1'
+    @tools.convert_cell_coordinates_to_address([1,39]).should == 'AM1'
+    @tools.convert_cell_coordinates_to_address([1,53]).should == 'BA1'
+    @tools.convert_cell_coordinates_to_address([1,702]).should == 'ZZ1'
+    @tools.convert_cell_coordinates_to_address([2,703]).should == 'AAA2'
+    @tools.convert_cell_coordinates_to_address([1048576,39]).should == 'AM1048576'
+    @tools.convert_cell_coordinates_to_address([2,781]).should == 'ADA2' 
+    @tools.c2a([2,781]).should == 'ADA2' 
+    @tools.c2a(2,781).should == 'ADA2' 
+  end
+  it 'conversions c2a and a2c are inverse of each other' do
+    (1..200).each { |i| @tools.a2c(@tools.c2a(1,i*10)).should == [1,i*10] }
+  end
+  it 'raises exception when given rubbisch' do
+    expect{ @tools.a2c('A1A') }.to raise_error
+    expect{ @tools.a2c('1A11') }.to raise_error
+    expect{ @tools.a2c('1A11') }.to raise_error
+  end
+  it 'converts correctly cell adresses given by components to coordinates' do
+    @tools.a2c('A','1').should eq [1,1]
+    @tools.a2c('C','17').should eq [17,3]
+    @tools.a2c('17','C',).should eq [17,3]
+    @tools.a2c('17','ZZ',).should eq [17,702]
+  end
+  it 'given two numbers converts them correctly even when "hidden" in strings' do
+    @tools.a2c('3','17').should eq [3,17]
+    @tools.a2c(21,'11.0').should eq [21,11]
+    @tools.a2c('23',22/2).should eq [23,11]
   end
 end

data/spec/workbook_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
-describe Rspreadsheet::Workbook, :focus=>true do
+describe Rspreadsheet::Workbook do
   it 'has correct number of sheets' do
     book = Rspreadsheet::Workbook.new($test_filename)
     book.worksheets_count.should == 1
-    book.worksheets[0].should be_nil
-    book.worksheets[1].should be_kind_of(Rspreadsheet::Worksheet)
-    book.worksheets[2].should be_nil
-    book.worksheets[nil].should be_nil
+    book.worksheets(0).should be_nil
+    book.worksheets(1).should be_kind_of(Rspreadsheet::Worksheet)
+    book.worksheets(2).should be_nil
+    book.worksheets(nil).should be_nil
   end
   it 'freshly created has correctly namespaced xmlnode' do
     @xmlnode = Rspreadsheet::Workbook.new.xmlnode
@@ -28,10 +28,23 @@ describe Rspreadsheet::Workbook, :focus=>true do
   it 'nonemptycells behave correctly' do
     book = Rspreadsheet::Workbook.new()
     book.create_worksheet
-    @sheet = book.worksheets[1]
+    @sheet = book.worksheets(1)
     @sheet.cells(3,3).value = 'data'
     @sheet.cells(5,7).value = 'data'
     @sheet.nonemptycells.collect{|c| c.coordinates}.should =~  [[3,3],[5,7]]
   end
-
+  it 'can create named sheets and they are the same as "numbered" ones' do
+    book = Rspreadsheet::Workbook.new
+    book.create_worksheet('test')
+    book.worksheets('test').should eq book.worksheets(1)
+    book.create_worksheet('another')
+    book.worksheets('another').should eq book.worksheets(2)    
+  end
+  it 'can access sheets with brief syntax' do
+    book = Rspreadsheet::Workbook.new
+    book.create_worksheet('test')
+    book.worksheets('test').should be book.worksheets(1)
+    book['test'].should be book.worksheets(1)
+    book[1].should be book.worksheets(1)
+  end
 end 

data/spec/worksheet_spec.rb

@@ -1,19 +1,21 @@
 require 'spec_helper'
 
 describe Rspreadsheet::Worksheet do
-  before do 
-    @sheet = Rspreadsheet.new($test_filename).worksheets[1]
-  end
-  it 'contains nonempty xml in rows for testfile' do
-    @sheet.rows(1).xmlnode.elements.size.should be >1
-  end
-  it 'uses detach_my_subnode_respect_repeated well' do
-    @sheet.detach_my_subnode_respect_repeated(50, {:xml_items_node_name => 'table-row', :xml_repeated_attribute => 'number-rows-repeated'})
-    @sheet.rows(50).detach_my_subnode_respect_repeated(12, {:xml_items_node_name => 'table-cell', :xml_repeated_attribute => 'number-columns-repeated'})
+  describe "from test workbook file" do 
+    before do 
+      @sheet = Rspreadsheet.new($test_filename).worksheets(1)
+    end
+    it 'contains nonempty xml in rows for testfile' do
+      @sheet.rows(1).xmlnode.elements.size.should be >1
+    end
+    it 'uses detach_my_subnode_respect_repeated well' do
+      @sheet.detach_my_subnode_respect_repeated(50, {:xml_items_node_name => 'table-row', :xml_repeated_attribute => 'number-rows-repeated'})
+      @sheet.rows(50).detach_my_subnode_respect_repeated(12, {:xml_items_node_name => 'table-cell', :xml_repeated_attribute => 'number-columns-repeated'})
+    end
   end
 end
 
-describe Rspreadsheet::Worksheet do
+describe Rspreadsheet::Worksheet, :focus do
   before do
     book = Rspreadsheet.new
     @sheet = book.create_worksheet
@@ -26,6 +28,10 @@ describe Rspreadsheet::Worksheet do
     @xmlnode.namespaces.namespace.should_not be_nil
     @xmlnode.namespaces.namespace.prefix.should == 'table'
   end
+  it 'freshly created has correct name' do
+    @sheet2 = Rspreadsheet.new.create_worksheet('test')
+    @sheet2.name.should eq 'test'
+  end
   it 'remembers the value stored to A1 cell' do
     @sheet[1,1].should == nil
     @sheet[1,1] = 'test text'
@@ -42,7 +48,7 @@ describe Rspreadsheet::Worksheet do
     @sheet.cells(1,1).class.should == Rspreadsheet::Cell
   end
   it 'has name, which can be changed and is remembered' do
-    @sheet.name.should be(nil)
+    @sheet.name.should_not be(nil) # it should have some default name
     @sheet.name = 'Icecream'
     @sheet.name.should == 'Icecream'
     @sheet.name = 'Cofee'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspreadsheet
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Jakub A.Těšínský
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2014-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libxml-ruby
@@ -165,6 +165,8 @@ files:
 - ".kateproject"
 - ".kateproject.d/notes.txt"
 - ".travis.yml"
+- ".yardopts"
+- CHANGELOG.md
 - COPYING.txt
 - DEVEL_BLOG.md
 - GUIDE.md