rspreadsheet 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e68b11b80d618d17de31bb79ff8723d7367dbbc
-  data.tar.gz: 5cf05fdad441db2cea08b21784ce55cac716b149
+  metadata.gz: 1baffe562cc732b33a3919529ebac6eee2a4e337
+  data.tar.gz: 0405d76a41fecf70a3a131f0fcfdabd41877cb71
 SHA512:
-  metadata.gz: 5c438393ef32daba2c6deb4d4d4b251125adc6322ad39297e1f6a4c9d08a7814ff76e5d8f40679e470ffb76fc295048e9da44b590f0561b93dce984617bbf137
-  data.tar.gz: 0a125394984f40ae1aa8fe2db8c142f3a04e921b580714019ee4d29075f549d784c2773cd688b4482600a2eec83ef6ec406b2903d83f83a7c08ec79af470cb8a
+  metadata.gz: a60aa7bc6cbcd3af3d8de9b161b220d8f9f0db92279ee14715a107cd7bb0f902e27dfb87d4b3c42e86634f198c7163e18a01a8721b5a7501ade4d54246cd93a9
+  data.tar.gz: 7f44c68924b04255565aaf06e0ac77ba6b3e719a748630122f8f7fd2bff5fe563033321a1e42db3c1070a9164627dd373fec7cba42901b2e9fe4536ac5f3c7b1

data/.travis.yml

@@ -10,8 +10,9 @@ script: 'bundle exec rake'
 matrix:
   include:
   - rvm: 2.4.0
-    before_install:
+    xx_before_install:
       - gem uninstall libxml-ruby
+      - sudo apt-get install ruby-libxml
       - sudo apt-get install libxml2
       - gem update bundler
 

data/DEVEL_BLOG.md

@@ -74,10 +74,7 @@ RSpreadsheet.generate('pricelist.ods') do
     
 ## Release notes
 
-  2017-01
-  - file can be saced to any IO now, making it suitable for creating files on fly.
-  - basic image handling implemented (issue [#24](https://github.com/gorn/rspreadsheet/issues/24))
-  - bug corrected: inserted row was not empty, but rather copy of the row below.
+  Release notes are maintaned [on github](https://github.com/gorn/rspreadsheet/releases).
     
 ## Developing this gem
 

data/lib/helpers/class_extensions.rb

@@ -1,4 +1,4 @@
-if  RUBY_VERSION > '2.1'
+if RUBY_VERSION > '2.1'
 
   module ClassExtensions
 
@@ -10,6 +10,9 @@ if  RUBY_VERSION > '2.1'
           inject(0){ |sum, element| sum.to_f + element.to_f } || identity
         end
       end
+      def self.marker
+        'yes'
+      end
     end
     
     refine LibXML::XML::Node do
@@ -69,6 +72,9 @@ else # Monkeypatching
         inject(0){ |sum, element| sum.to_f + element.to_f } || identity
       end
     end
+    def self.marker
+      'yes2'
+    end
   end
 
   class LibXML::XML::Node

data/lib/rspreadsheet/cell.rb

@@ -46,6 +46,10 @@ class Cell < XMLTiedItem
   end
   def row; @worksheet.rows(rowi) end
   def coordinates; [rowi,coli] end
+  def address
+    Tools.convert_cell_coordinates_to_address(coordinates)
+  end
+
   def to_s; value.to_s end
   def valuexml; self.valuexmlnode.andand.inner_xml end
   def valuexmlnode; self.xmlnode.elements.first end
@@ -128,8 +132,9 @@ class Cell < XMLTiedItem
         when gt == Float then
           remove_all_value_attributes_and_content
           set_type_attribute('float')
-          Tools.set_ns_attribute(xmlnode,'office','value', avalue.to_s) 
-          xmlnode << Tools.prepare_ns_node('text','p', avalue.to_f.to_s)
+          sav=avalue.to_f.to_s # to_f handles case when avalue is decimal number
+          Tools.set_ns_attribute(xmlnode,'office','value', sav) 
+          xmlnode << Tools.prepare_ns_node('text','p', sav)
         when gt == String then
           remove_all_value_attributes_and_content
           set_type_attribute('string')
@@ -137,14 +142,18 @@ class Cell < XMLTiedItem
         when gt == :datetime then 
           remove_all_value_attributes_and_content
           set_type_attribute('date')
-          avalue = avalue.strftime(InternalDateTimeFormat)
-          Tools.set_ns_attribute(xmlnode,'office','date-value', avalue)
-          xmlnode << Tools.prepare_ns_node('text','p', avalue)
+          if avalue.kind_of?(DateTime) or avalue.kind_of?(Date) or avalue.kind_of?(Time)
+            avalue = avalue.strftime(InternalDateTimeFormat)
+            Tools.set_ns_attribute(xmlnode,'office','date-value', avalue)
+            xmlnode << Tools.prepare_ns_node('text','p', avalue)
+          end
         when gt == :time then
           remove_all_value_attributes_and_content
           set_type_attribute('time')
-          Tools.set_ns_attribute(xmlnode,'office','time-value', avalue.strftime(InternalTimeFormat))
-          xmlnode << Tools.prepare_ns_node('text','p', avalue.strftime('%H:%M'))
+          if avalue.kind_of?(DateTime) or avalue.kind_of?(Date) or avalue.kind_of?(Time)
+            Tools.set_ns_attribute(xmlnode,'office','time-value', avalue.strftime(InternalTimeFormat))
+            xmlnode << Tools.prepare_ns_node('text','p', avalue.strftime('%H:%M'))
+          end
         when gt == :percentage then
           remove_all_value_attributes_and_content
           set_type_attribute('percentage')
@@ -153,8 +162,10 @@ class Cell < XMLTiedItem
         when gt == :currency then
           remove_all_value_attributes_and_content
           set_type_attribute('currency')
-          Tools.set_ns_attribute(xmlnode,'office','value', '%f' % avalue.to_d)
-          xmlnode << Tools.prepare_ns_node('text','p', avalue.to_d.to_s+' '+self.format.currency)
+          unless avalue.nil?
+            Tools.set_ns_attribute(xmlnode,'office','value', '%f' % avalue.to_d)
+            xmlnode << Tools.prepare_ns_node('text','p', avalue.to_d.to_s+' '+self.format.currency)
+          end
       end
     else
       raise "Unknown cell mode #{self.mode}"
@@ -203,7 +214,7 @@ class Cell < XMLTiedItem
       else nil
     end
     result = valueguess
-
+    
     if valueguess.nil?  # valueguess is most important if not succesfull then try guessing by type from node xml
       typ = xmlnode.nil? ? 'N/A' : xmlnode.attributes['value-type']
       typeguess = case typ
@@ -256,9 +267,6 @@ class Cell < XMLTiedItem
   def format
     @format ||= CellFormat.new(self)
   end
-  def address
-    Tools.convert_cell_coordinates_to_address(coordinates)
-  end
   
   def formula
     rawformula = Tools.get_ns_attribute(xmlnode,'table','formula',nil).andand.value

data/lib/rspreadsheet/row.rb

@@ -37,12 +37,18 @@ class Row < XMLTiedItem
     initialize_xml_tied_item(aworksheet,arowi)
   end
   
- # @!group Syntactic sugar
-  def cells(*params); subitems(*params) end
+ # @!group Syntactic sugar  
+  def cells(*params)
+    if params.length == 1
+      subitems(Tools.convert_column_name_to_index(params[0]))
+    else
+      subitems(*params)
+    end
+  end
   alias :cell :cells
   
   ## @return [String or Float or Date] value of the cell
-  # @param coli [Integer] colum index of the cell 
+  # @param coli [Integer ot String] colum index of the cell of colum letter
   # returns value of the cell at column `coli`. 
   #  
   #     @row = @worksheet.rows(5)     # with cells containing names of months

data/lib/rspreadsheet/tools.rb

@@ -13,22 +13,22 @@ module Tools
     if addr.length == 1
       addr[0].to_s.match(/^([A-Za-z]{1,3})(\d{1,8})$/)
       colname = $~[1]
-      rowname = $~[2].to_i
+      rowi = $~[2].to_i
     elsif addr.length == 2
       a = addr[0]; b = addr[1]
       if a.kind_of?(Integer) and b.kind_of?(Integer) # most common case first
-        colname,rowname = b,a 
+        colname,rowi = b,a 
       elsif only_letters?(a)
         if kind_of_integer?(b)
-          colname,rowname = a,b.to_i
+          colname,rowi = 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
+          colname,rowi = b,a.to_i
         elsif kind_of_integer?(b)
-          colname,rowname = b.to_i,a.to_i
+          colname,rowi = b.to_i,a.to_i
         else
           raise 'Wrong second out of two paremeters - mix of digits and numbers'
         end
@@ -39,24 +39,23 @@ module Tools
       raise 'Wrong number of arguments'
     end
      
+    return [rowi,convert_column_name_to_index(colname)]
+  end
+  
+  def self.convert_column_name_to_index(colname)
+    return colname if colname.kind_of?(Integer)
     ## 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
+    # return (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)
+    # return (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.upcase.to_i(36)-(36**s-1).div(3.5)).to_s(36).to_i(26)+(26**s-1)/25
-    end
-    
-    row = rowname
-    return [row,col]
+    s=colname.size
+    return (colname.to_s.upcase.to_i(36)-(36**s-1).div(3.5)).to_s(36).to_i(26)+(26**s-1)/25
   end
+  
   def self.convert_cell_coordinates_to_address(*coords)
     coords = coords[0] if coords.length == 1
     raise 'Wrong number of arguments' if coords.length != 2
@@ -200,4 +199,4 @@ class Range
     res = self.end-self.begin+1
     res>0 ? res : 0
   end
-end
+end

data/lib/rspreadsheet/version.rb

@@ -1,3 +1,3 @@
 module Rspreadsheet
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

data/lib/rspreadsheet/worksheet.rb

@@ -106,7 +106,7 @@ class Worksheet
       when 1..2
         r,c = Rspreadsheet::Tools.a2c(*params)
         row(r).andand.cell(c)
-      else raise Exception.new('Wrong number of arguments.')
+      else raise ArgumentError.new('Wrong number of arguments.')
     end
   end
   alias :cell :cells
@@ -128,8 +128,9 @@ class Worksheet
       super
     end
   end
+  alias :rowcount :size
   def used_rows_range
-    1..self.first_unused_row_index-1
+    1..self.rowcount
   end
 end
 

data/lib/rspreadsheet/xml_tied_array.rb

@@ -74,7 +74,7 @@ module XMLTiedArray
     case params.length 
       when 0 then subitems_array
       when 1 then subitem(params[0]) 
-      else raise Exception.new('Wrong number of arguments.')
+      else raise ArgumentError.new('Wrong number of arguments.')
     end
   end
 
@@ -129,7 +129,6 @@ module XMLTiedArray
   # @!group inserting new subnodes TODO: refactor out repeatable connected code
   def insert_new_empty_subnode_before(aindex)
     node_after = my_subnode(aindex)
-    
     if !node_after.nil?
       node_after.prev = prepare_empty_subnode
       return node_after.prev
@@ -162,7 +161,7 @@ module XMLTiedArray
   def prepare_empty_xmlnode
     raise 'xmlnode is empty and I do not know how to create empty xmlnode. Please provide prepare_empty_xmlnode method in your object.'
   end
-  
+    
   # @!group finding and accessing subnodes
   # array containing subnodes of xmlnode which represent subitems
   def xmlsubnodes

data/lib/rspreadsheet/xml_tied_repeatable.rb

@@ -61,7 +61,7 @@ module XMLTiedArray_WithRepeatableItems
       node.remove!                                             # remove the original node
     else # insert outbound xmlnode
       [index+1..aindex-1,aindex..aindex].reject {|range| range.size<1}.each do |range|
-        axmlnode << XMLTiedArray_WithRepeatableItems.prepare_repeated_subnode(range.size, options)
+        axmlnode << prepare_repeated_subnode(range.size, options)
       end  
     end #TODO: Out of bounds indexes handling
     return my_subnode(aindex)

data/rspreadsheet.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
 
   # runtime dependencies
   unless package_natively_installed?('ruby-libxml')
-    spec.add_runtime_dependency 'libxml-ruby', '2.8'   # parsing XML files
+    spec.add_runtime_dependency 'libxml-ruby', '3.0'   # parsing XML files
   end
   spec.add_runtime_dependency 'rubyzip', '~>1.1'       # opening zip files
   spec.add_runtime_dependency 'andand', '~>1.3'

data/spec/cell_spec.rb

@@ -452,4 +452,25 @@ describe Rspreadsheet::Cell do
   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
+  
+  it 'gracedully accepts nil in assignement' do
+    expect {
+      @sheet2.cell('B1').value = nil
+      @sheet2.cell('B2').value = nil
+      @sheet2.cell('B3').value = nil
+      @sheet2.cell('B22').value = nil
+      @sheet2.cell('D22').value = nil
+      @sheet2.cell('F22').value = nil    
+    }.not_to raise_error
+  end
+  it 'can be inserted before existing cell and this one is shifted right' do
+    @sheet1.B2 = 'test'
+    @sheet1.B2.should == 'test'
+    inscell = @sheet1.insert_cell_before(2,2)
+    inscell.value = 'new'
+    @sheet1.B2.should == 'new'
+    @sheet1.C2.should == 'test'
+    inscell = @sheet1.insert_cell_before(2,4) # should not move cells with data
+    @sheet1.C2.should == 'test' 
+  end
 end

data/spec/class_extensions_spec.rb

@@ -21,8 +21,8 @@ if RUBY_VERSION > '2.1'
       @m2 = LibXML::XML::Node.new('a')
     end
     it 'can compare nodes' do
-      @n.should == @m
-      @n.should_not == @m2
+      @n.to_s.should == @m.to_s
+      @n.to_s.should_not == @m2.to_s
     end
     it 'has correct elements' do
   #     raise @n.first_diff(@m).inspect
@@ -46,4 +46,4 @@ if RUBY_VERSION > '2.1'
       end
     end
   end
-end
+end

data/spec/io_spec.rb

@@ -71,6 +71,5 @@ end
 def xmls_should_be_identical(xml1,xml2) 
   xml2.root.first_diff(xml1.root).should be_nil
   xml1.root.first_diff(xml2.root).should be_nil
-  
-  xml1.root.should == xml2.root
+  xml1.root.to_s.should == xml2.root.to_s
 end

data/spec/row_spec.rb

@@ -10,7 +10,7 @@ describe Rspreadsheet::Row do
     @row = @sheet2.rows(1)
     @c = @row.cells(1)
     @c.value = 3
-    @c.value.should == 3 
+    @c.value.should == 3
   end
   it 'allows access to cells using different syntax' do
     @row = @sheet1.rows(1)

data/spec/rspreadsheet_spec.rb

@@ -48,8 +48,7 @@ describe Rspreadsheet do
     
     @content_xml2.root.first_diff(@content_xml1.root).should be_nil
     @content_xml1.root.first_diff(@content_xml2.root).should be_nil
-    
-    @content_xml1.root.should == @content_xml2.root
+    @content_xml1.root.to_s.should == @content_xml2.root.to_s
   end
 
   it 'when open and save file modified, than the file is different' do

data/spec/worksheet_spec.rb

@@ -8,6 +8,7 @@ describe Rspreadsheet::Worksheet do
     end
     it 'contains nonempty xml in rows for testfile' do
       @sheet.rows(1).xmlnode.elements.size.should be >1
+      @sheet.rows(1).xml.index '<text:p>text</text:p>'
     end
     it 'uses detach_my_subnode_respect_repeated well' do
       @sheet.cell(50,12).mode.should_not == :regular

data/spec/xml_tied_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+require 'rspreadsheet/xml_tied_array'
+
+describe Rspreadsheet::XMLTiedArray do
+	before do
+		@book = Rspreadsheet.new
+		@sheet = @book.create_worksheet
+    class TestXMLTiedArray 
+      include Rspreadsheet::XMLTiedArray
+    end
+	end
+  it 'method subitems does not accept 2 parameteres' do
+    expect {@sheet.subitems(1,2)}.to raise_error ArgumentError
+  end
+  it 'does not have xmlnode method by default' do
+    tx = TestXMLTiedArray.new
+    expect {tx.xmlnode}.to raise_error
+  end
+  
+  it 'raises when prepare_empty_xmlnode fails in insert_new_empty_subnode_before' do
+    class TestXMLTiedArray 
+      def subitem_xml_options; {} end
+      def xmlnode; nil end
+    end
+    
+    tx = TestXMLTiedArray.new
+    expect {tx.insert_new_empty_subnode_before(0)}.to raise_error IndexError
+    expect {tx.insert_new_empty_subnode_before(1)}.to raise_error /create empty xmlnode/
+  end
+end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rspreadsheet
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Jakub A.Těšínský
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-19 00:00:00.000000000 Z
+date: 2017-05-04 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
@@ -122,34 +108,6 @@ 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.
@@ -208,6 +166,7 @@ files:
 - spec/tools_spec.rb
 - spec/workbook_spec.rb
 - spec/worksheet_spec.rb
+- spec/xml_tied_spec.rb
 homepage: https://github.com/gorn/rspreadsheet
 licenses:
 - GPL
@@ -228,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Manipulating spreadsheets with Ruby (read / create / modify OpenDocument
@@ -250,3 +209,4 @@ test_files:
 - spec/tools_spec.rb
 - spec/workbook_spec.rb
 - spec/worksheet_spec.rb
+- spec/xml_tied_spec.rb