rspreadsheet 0.2.15 → 0.3

data/spec/worksheet_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+using ClassExtensions if RUBY_VERSION > '2.1'
 
 describe Rspreadsheet::Worksheet do
   describe "from test workbook file" do 
@@ -9,8 +10,10 @@ describe Rspreadsheet::Worksheet 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'})
+      @sheet.cell(50,12).mode.should_not == :regular
+      @sheet.detach_my_subnode_respect_repeated(50)
+      @sheet.rows(50).detach_my_subnode_respect_repeated(12)
+      @sheet.cell(50,12).mode.should == :regular
     end
   end
 end
@@ -21,6 +24,10 @@ describe Rspreadsheet::Worksheet do
       @book = Rspreadsheet.new
       @sheet = @book.create_worksheet
     end
+    it 'array of rows is empty Array' do
+      @sheet.subitems_array.should == []
+      @sheet.images.count.should == 0
+    end
     it 'has correctly namespaced xmlnode' do
       @xmlnode = @sheet.xmlnode
       @xmlnode.namespaces.to_a.size.should >5

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rspreadsheet
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: '0.3'
 platform: ruby
 authors:
 - Jakub A.Těšínský
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2017-01-18 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.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
 - !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.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.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.
@@ -160,7 +118,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".coveralls.yml"
-- ".directory"
 - ".gitignore"
 - ".kateproject"
 - ".travis.yml"
@@ -175,31 +132,41 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
-- investigate.rb
 - lib/helpers/class_extensions.rb
 - lib/helpers/configuration.rb
 - lib/rspreadsheet.rb
 - lib/rspreadsheet/cell.rb
 - lib/rspreadsheet/column.rb
 - lib/rspreadsheet/empty_file_template.ods
+- lib/rspreadsheet/image.rb
 - lib/rspreadsheet/row.rb
 - lib/rspreadsheet/tools.rb
 - lib/rspreadsheet/version.rb
 - lib/rspreadsheet/workbook.rb
 - lib/rspreadsheet/worksheet.rb
-- lib/rspreadsheet/xml_tied.rb
+- lib/rspreadsheet/xml_tied_array.rb
+- lib/rspreadsheet/xml_tied_item.rb
+- lib/rspreadsheet/xml_tied_repeatable.rb
 - reinstall_local_gem.sh
 - rspreadsheet.gemspec
 - spec/cell_spec.rb
+- spec/class_extensions_spec.rb
 - spec/column_spec.rb
+- spec/image_spec.rb
+- spec/included_image_spec.rb
 - spec/io_spec.rb
 - spec/row_spec.rb
 - spec/rspreadsheet_spec.rb
 - spec/spec_helper.rb
+- spec/test-image-blue.png
+- spec/test-image.png
 - spec/testfile1.ods
+- spec/testfile2-images.ods
 - 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
@@ -227,12 +194,18 @@ summary: Manipulating spreadsheets with Ruby (read / create / modify OpenDocumen
   Spreadsheet).
 test_files:
 - spec/cell_spec.rb
+- spec/class_extensions_spec.rb
 - spec/column_spec.rb
+- spec/image_spec.rb
+- spec/included_image_spec.rb
 - spec/io_spec.rb
 - spec/row_spec.rb
 - spec/rspreadsheet_spec.rb
 - spec/spec_helper.rb
+- spec/test-image-blue.png
+- spec/test-image.png
 - spec/testfile1.ods
+- spec/testfile2-images.ods
 - spec/tools_spec.rb
 - spec/workbook_spec.rb
 - spec/worksheet_spec.rb

data/investigate.rb

@@ -1,19 +0,0 @@
-require 'xml'
-
-ns = XML::Namespace.new(XML::Node.new('xxx'), 'soap', 'http://schemas.xmlsoap.org/soap/envelope/')
-
-
-d = XML::Document.new
-nr = XML::Node.new('root', 'text')
-d.root = nr
-n2 = XML::Node.new('element', 'content')
-nr << n2
-puts d.to_s
-
-n2.namespaces.namespace = ns
-nr.namespaces.namespace = ns
-puts d.to_s
-
-n2.namespaces.namespace = ns
-puts d.to_s
-

data/lib/rspreadsheet/xml_tied.rb

@@ -1,253 +0,0 @@
-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
-   case
-     when xmlnode.nil? then :outbound
-     when repeated>1  then :repeated
-     else :regular
-   end
-  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
-    parentnode = parent.xmlnode
-    if parentnode.nil?
-      nil
-    else
-      parent.find_my_subnode_respect_repeated(index, xml_options)
-    end
-  end
-  def detach_if_needed
-    detach if repeated? # item did not exist individually yet, detach it within its parent and therefore make it individally editable
-  end
-  def detach
-    parent.detach_if_needed if parent.respond_to?(:detach_if_needed)
-    parent.detach_my_subnode_respect_repeated(index, xml_options)
-    self
-  end
-  def _shift_by(diff)
-    set_index(index + diff)
-  end
-  def range
-    parent.find_my_subnode_range_respect_repeated(index,xml_options)
-  end
-  def invalid_reference?; false end
-  # destroys the object so it can not be used, this is necessarry to prevent
-  # accessing cells and rows which has been long time ago deleted and do not represent
-  # any physical object anymore
-  def invalidate_myself
-    raise_destroyed_cell_error = Proc.new {|*params| raise "Calling method of already destroyed Cell."}
-    (self.methods - Object.methods + [:nil?]).each do |method| # "undefine" all methods
-      self.singleton_class.send(:define_method, method, raise_destroyed_cell_error)
-    end
-    self.singleton_class.send(:define_method, :inspect, -> { "#<%s:0x%x destroyed cell>" % [self.class,object_id] })  # define descriptive inspect
-    self.singleton_class.send(:define_method, :invalid_reference?, -> { true }) # define invalid_reference? method
-#     self.instance_variables.each do |variable|
-#       instance_variable_set(variable,nil)
-#     end
-  end
-  def delete
-    parent.delete_subitem(index)
-    invalidate_myself
-  end
-
-end
-
-# abstract class. All importers MUST implement: prepare_subitem (and delete)
-# terminology
-#   item, subitem is object from @itemcache (quite often subclass of XMLTiedItem)
-#   node, subnode is LibXML::XML::Node object
-#
-# this class is made to be included, not subclassed - the reason is in delete method which calls super
-# @private
-
-module XMLTiedArray
-  attr_reader :itemcache
-
-  def find_my_subnode_range_respect_repeated(aindex, options)
-    index = 0
-    xmlnode.elements.select{|node| node.name == options[:xml_items_node_name]}.each do |node|
-      repeated = (node.attributes[options[:xml_repeated_attribute]] || 1).to_i
-      if index+repeated >= aindex
-        return (index+1..index+repeated)
-      else
-        index = index+repeated
-      end
-    end
-    return (index+1..Float::INFINITY)
-  end
-  
-  # vrátí xmlnode na souřadnici aindex
-  def find_my_subnode_respect_repeated(aindex, options)
-    find_subnode_respect_repeated(xmlnode,aindex, options)
-  end
-  # vrátí item na souřadnici aindex
-  def subitem(aindex)
-    aindex = aindex.to_i
-    if aindex.to_i<=0
-      raise 'Item index should be greater then 0' if Rspreadsheet.raise_on_negative_coordinates
-      nil 
-    else 
-      @itemcache[aindex] ||= prepare_subitem(aindex)
-    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..self.size).collect do |i|
-      subitem(i)
-    end
-  end
-  
-  def size; find_first_unused_index_respect_repeated(subitem_xml_options)-1 end
-      
-  def find_subnode_respect_repeated(axmlnode, aindex, options)
-    result1, result2 = find_subnode_with_range_respect_repeated(axmlnode, aindex, options)
-    return result1
-  end  
-    
-  def find_subnode_with_range_respect_repeated(axmlnode, aindex, options)
-    index = 0
-    axmlnode.elements.select{|node| node.name == options[:xml_items_node_name]}.each do |node|
-      repeated = (node.attributes[options[:xml_repeated_attribute]] || 1).to_i
-      oldindex = index
-      index = index+repeated
-      if index>= aindex
-        return node, oldindex..index
-      end
-    end
-    return nil, index..Float::INFINITY
-  end
-  
-  def prepare_repeated_subnode(times_repeated,options)
-    result = LibXML::XML::Node.new(options[:xml_items_node_name],nil, Tools.get_namespace('table'))
-    Tools.set_ns_attribute(result,'table',options[:xml_repeated_attribute],times_repeated, 1)
-    result
-  end
-  
-  def clone_before_and_set_repeated_attribute(node,times_repeated,options)
-    newnode = node.copy(true)
-    Tools.set_ns_attribute(newnode,'table',options[:xml_repeated_attribute],times_repeated,1)
-    node.prev = newnode
-  end
-  
-  # detaches subnode with aindex  
-  def detach_my_subnode_respect_repeated(aindex, options)
-    axmlnode = xmlnode
-    node,index_range = find_subnode_with_range_respect_repeated(axmlnode, aindex, options)
-    if index_range.size > 1 # pokud potřebuje vůbec detachovat
-      if !node.nil? # detach subnode
-        [index_range.begin+1..aindex-1,aindex..aindex,aindex+1..index_range.end].reject {|range| range.size<1}.each do |range| # create new structure by cloning
-          clone_before_and_set_repeated_attribute(node,range.size,options)
-        end
-        node.remove! # remove the original node
-      else # add outbound xmlnode
-        [index_range.begin+1..aindex-1,aindex..aindex].reject {|range| range.size<1}.each do |range|
-          axmlnode << prepare_repeated_subnode(range.size, options)
-        end
-      end
-    end
-    return find_subnode_respect_repeated(axmlnode, aindex, options)
-  end
-  
-  def insert_my_subnode_before_respect_repeated(aindex, options)
-    axmlnode = xmlnode
-    
-    node,index_range = find_subnode_with_range_respect_repeated(axmlnode, aindex, options)
-    
-    if !node.nil? # found the node, now do the insert
-      [index_range.begin+1..aindex-1,aindex..index_range.end].reject {|range| range.size<1}.each do |range| # split  original node by cloning
-        clone_before_and_set_repeated_attribute(node,range.size,options)
-      end
-      clone_before_and_set_repeated_attribute(node.prev,1,options)         # insert new node
-      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.prepare_repeated_subnode(range.size, options)
-      end  
-    end
-    return find_subnode_respect_repeated(axmlnode, aindex, options)
-  end
-
-  def delete_my_subnode_respect_repeated(aindex,options)
-    detach_my_subnode_respect_repeated(aindex,options) #TODO: tohle neni uplne spravne, protoze to zanecha skupinu rozdelenou na dve casti
-    subitem(aindex).xmlnode.remove!
-  end
-  
-  def find_first_unused_index_respect_repeated(options)
-    index = 0
-    return 1 if xmlnode.nil?
-    xmlnode.elements.select{|node| node.name == options[:xml_items_node_name]}.each do |node|
-      repeated = (node.attributes[options[:xml_repeated_attribute]] || 1).to_i
-      index = index+repeated
-    end
-    return index+1
-  end
-
-  def 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)
-    end
-    insert_my_subnode_before_respect_repeated(aindex,subitem_xml_options)  # nyní vlož node do xml
-    @itemcache[aindex] =  subitem(aindex)
-  end
-  
-  # clean up item from xml (handle possible detachments) and itemcache. leave the object invalidation on the object
-  # this should not be called from nowhere but XMLTiedItem.delete
-  def delete_subitem(aindex)
-    options = subitem_xml_options
-    delete_my_subnode_respect_repeated(aindex,options)  # vymaž node z xml
-    @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)
-    end
-  end
-  
-  def delete
-    @itemcache.each do |key,item| 
-      item.delete   # delete item - this destroys its subitems, xmlnode and invalidates it
-      @itemcache.delete(key)  # delete the entry from the hash, normally this would mean this ceases to exist, if user does not have reference stored somewhere. Of he does, the object is invalidated anyways
-    end
-    super # this for example for Row objects calls XMLTiedItem.delete because Row is subclass of XMLTiedItem
-  end
-
-  def find_nonempty_subnode_indexes(axmlnode, options)
-    index = 0
-    result = []
-    axmlnode.elements.select{|node| node.name == options[:xml_items_node_name]}.each do |node|
-      repeated = (node.attributes[options[:xml_repeated_attribute]] || 1).to_i
-      index = index + repeated
-      if !(node.content.nil? or node.content.empty? or node.content =='') and (repeated==1)
-        result << index
-      end
-    end
-    return result
-  end
-
-  # truncate the item completely, deleting all its subitems
-  def truncate
-    subitems.reverse.each{ |subitem| subitem.delete }  # reverse je tu jen kvuli performanci, aby to mazal zezadu
-  end  
-end
-
-end