rspreadsheet 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cc3f5ca1cc2aae4f3e64a0bb6d42799a9119a74
-  data.tar.gz: e9751aa12fd6c75d30ee490d08ca507b09002412
+  metadata.gz: b667a14fc5845f86995ec8f260650b47f92fc8b8
+  data.tar.gz: d8311461aeb22d2d801f8615bc8d3e43a1b35707
 SHA512:
-  metadata.gz: 5f0d59fd7a97e3704a1ef80f10f304a789416147ae00387004d15d0bb8baaa71a451bde562b8b681269c75e306b206af6790b8212385b7841744d7bd4230a123
-  data.tar.gz: 4544f3128402eb4fea4eb77a82050292d3235882a025611d1f7a8dce48fbd88a7fb8b365130183776ac9156a34acdcf5827d18cc7bd3a326199674b7044f373b
+  metadata.gz: e742ce5a232d4d1e4a46c64bbffab4d4607ed3024cb327ad514f9c27f30053d86e2edaef6b3755927136719f667ea9076b9c79f35baf166431315e1fde0e18b7
+  data.tar.gz: 778a31e6b50ee4d15873ec6c416361f0f4ea24476608b2555004fb54fac070117612b4bff1747678ea6a25a6e3001176bcdb22866891a6ed13f6889074a5e50a

data/DEVEL_BLOG.md

@@ -31,16 +31,17 @@ Guiding ideas
 
 ### Local manual testing and releasing (to github released, ).
 
+    gem build rspreadsheet.gemspec
+    sudo gem install rspreadsheet-x.y.z.gem
+    gem push rspreadsheet-x.y.z.gem
+
+alternative way using ``rake`` command - release is more automatic
+
   * ``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. 
   * ``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.
 
-alternative way using ``gem`` command
-
-    gem build rspreadsheet.gemspec
-    sudo gem install rspreadsheet-x.y.z.gem
-    gem push rspreadsheet-x.y.z.gem
 
 
 ### Naming conventions

data/GUIDE.md

@@ -32,6 +32,9 @@ sheet.cells(1,1).value = value
 
 p sheet.A1.class          # => Rspreadsheet::Cell
 
+# relative cells
+sheet.cells(4,7).relative(-1,0) # => cell 3,7
+
 # build the top five list
 (1..5).each { |i| sheet[i,1] = i }
 sheet.columns(1).format.bold = true

data/lib/rspreadsheet/cell.rb

@@ -23,10 +23,11 @@ class Cell
   def ns_office; @parent_row.xmlnode.doc.root.namespaces.find_by_prefix('office') end
   def ns_text; @parent_row.xmlnode.doc.root.namespaces.find_by_prefix('text') end
   def to_s; value end
-  def xml; self.source_node.to_s; end
-  def value_xml; self.source_node.children.first.children.first.to_s; end
+  def cell_xml; self.xmlnode.to_s; end
+  def xml; self.xmlnode.children.first.andand.inner_xml end
   def coordinates; [row,col]; end
   def row; @parent_row.row; end
+  def worksheet; @parent_row.worksheet; end
   def value
     gt = guess_cell_type
     if (@mode == :regular) or (@mode == @repeated)
@@ -87,7 +88,23 @@ class Cell
   def set_type_attribute(typestring)
     Tools.set_ns_attribute(@xmlnode,'office','value-type',typestring)
   end
-  
+  def type
+    case 
+      when guess_cell_type == Float  then :float
+      when guess_cell_type == String then :string
+      when guess_cell_type == Date   then :date
+      when guess_cell_type == 'percentage' then :percentage
+      when guess_cell_type == nil then :empty
+      else :unknown
+    end
+  end
+  # use this to find node in cell xml. ex. xmlfind('.//text:a') finds all link nodes
+  def xmlfindall(path)
+    xmlnode.find(path)
+  end
+  def xmlfindfirst(path)
+    xmlfindall(path).first
+  end
   # based on @xmlnode and optionally value which is about to be assigned, guesses which type the result should be
   def guess_cell_type(avalue=nil)
     # try guessing by value
@@ -106,7 +123,7 @@ class Cell
         when 'float' then Float
         when 'string' then String
         when 'date' then Date
-        when 'percentage' then 'percentage'
+        when 'percentage' then :percentage
         else 
           if @xmlnode.children.size == 0
             nil
@@ -141,26 +158,21 @@ class Cell
   def inspect
     "#<Cell:[#{row},#{col}]=#{value}(#{guess_cell_type.to_s})"
   end
+  def relative(rowdiff,coldiff)
+    worksheet.cells(self.row+rowdiff, self.col+coldiff)
+  end
 end
 
 end
 
-# ## initialize cells
-#   @cells = Hash.new do |hash, coords|
-#     # we create empty cell and place it to hash, we do not have to check whether there is a cell in XML already, because it would be in hash as well
-#     hash[coords]=Cell.new(coords[0],coords[1])
-#     # TODO: create XML empty node here or upon save?
-#   end
-#   rowi = 1
-#   unless @xmlnode.nil?
-#     @xmlnode.elements.select{ |node| node.name == 'table-row'}.each do |row_source_node|
-#       coli = 1
-#       row_source_node.elements.select{ |node| node.name == 'table-cell'}.each do |cell_source_node|
-#         initialize_cell(rowi,coli,cell_source_node)
-#         coli += 1
-#       end
-#       rowi += 1
-#     end
-#   end
+
+
+
+
+
+
+
+
+
 
 

data/lib/rspreadsheet/row.rb

@@ -1,12 +1,14 @@
 require('rspreadsheet/cell')
-include Forwardable
+require('forwardable')
+
 
 # Currently this is only syntax sugar for cells and contains no functionality
 
 module Rspreadsheet
 
 class RowArray
-  def initialize(aworksheet_node)
+  def initialize(aworksheet,aworksheet_node)
+    @worksheet = aworksheet
     @worksheet_node = aworksheet_node
 
     # initialize @rowgroups from @worksheet_node
@@ -106,7 +108,7 @@ class RowArray
     @rowgroups[index..index]=replaceby
     result
   end
-  
+  def worksheet; @worksheet end
  private
   def get_row_group_index(rowi)
     @rowgroups.find_index{ |rowgroup| rowgroup.range.cover?(rowi) }
@@ -119,6 +121,8 @@ class Row
   def self.empty_row_node
     LibXML::XML::Node.new('table-row',nil, Tools.get_namespace('table'))
   end
+  def worksheet; @parent_array.worksheet end
+  def parent_array; @parent_array end  # for debug only
 end
 
 class RowWithXMLNode < Row

data/lib/rspreadsheet/version.rb

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

data/lib/rspreadsheet/workbook.rb

@@ -26,7 +26,7 @@ class Workbook
     Zip::File.open(@filename) do |zip|
       # it is easy, because @xmlnode in in sync with contents all the time
       zip.get_output_stream('content.xml') do |f|
-        f.write @content_xml
+        f.write @content_xml.to_s(:indent => false)
       end
     end
   end

data/lib/rspreadsheet/worksheet.rb

@@ -23,7 +23,7 @@ class Worksheet
     end
       
     ## initialize rows
-    @spredsheetrows=RowArray.new(@xmlnode)
+    @spredsheetrows=RowArray.new(self,@xmlnode)
   end
   def cells(r,c)
     rows(r).andand.cells(c)
@@ -36,10 +36,10 @@ class Worksheet
   end
   ## syntactic sugar follows
   def [](r,c)
-    cells(r,c).value
+    cells(r,c).andand.value
   end
   def []=(r,c,avalue)
-    cells(r,c).value=avalue
+    cells(r,c).andand.value=avalue
   end
   # allows syntax like sheet.F15
   def method_missing method_name, *args, &block

data/reinstall.sh

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

data/rspreadsheet.gemspec

@@ -28,8 +28,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake", '~>0.9'
   # testig - see http://bit.ly/1n5yM51
-  spec.add_development_dependency "rspec", '~>2'       # testing
-  spec.add_development_dependency 'pry-nav'            # enables pry 'next', 'step' commands
+  spec.add_development_dependency "rspec", '~>2'             # testing
+  spec.add_development_dependency 'pry-nav', '~>0'           # enables pry 'next', 'step' commands
   
   # optional and testing
   spec.add_development_dependency "coveralls", '~>0.7'

data/spec/cell_spec.rb

@@ -46,4 +46,17 @@ describe Rspreadsheet::Cell do
     @sheet2.cells(2,-5).should be(nil)
     @sheet2.cells(-2,-5).should be(nil)
   end
+  it 'has nonempty parents' do
+    @cell = @sheet2.cells(13,5)
+    @cell.parent_row.should_not be_nil
+    @cell.worksheet.should_not be_nil
+
+    @cell = @sheet1.cells(2,2)
+    @cell.parent_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
 end

data/spec/rspreadsheet_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Rspreadsheet::Tools do
   it 'converts correctly cell adresses' do
-    Rspreadsheet::Tools.convert_cell_address('A1') [0].should == 1
+    Rspreadsheet::Tools.convert_cell_address('A1')[0].should == 1
     Rspreadsheet::Tools.convert_cell_address('A1')[1].should == 1
     Rspreadsheet::Tools.convert_cell_address('C5')[0].should == 5
     Rspreadsheet::Tools.convert_cell_address('C5')[1].should == 3

data/spec/worksheet_spec.rb

@@ -47,4 +47,9 @@ describe Rspreadsheet::Worksheet do
     @sheet.name = 'Cofee'
     @sheet.name.should == 'Cofee'    
   end
+  it 'out of range indexes return nil value' do
+    @sheet[-1,-1].should == nil
+    @sheet[0,0].should == nil
+    @sheet[999,999].should == nil
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspreadsheet
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jakub A.Těšínský
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2014-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libxml-ruby
@@ -98,14 +98,14 @@ dependencies:
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -180,6 +180,7 @@ files:
 - lib/rspreadsheet/version.rb
 - lib/rspreadsheet/workbook.rb
 - lib/rspreadsheet/worksheet.rb
+- reinstall.sh
 - rspreadsheet.gemspec
 - spec/cell_spec.rb
 - spec/row_spec.rb