oxcelix 0.2.2 → 0.2.4

data/CHANGES

@@ -1,12 +1,64 @@
-09/10: Replaced an instance of Ox::load_file, as it won't work on windows
-Corrected bug
-08/10: The sheet class now inherits Matrix. Sheet can return a cell based on its excel name. Sheet::data is obsolete - deleted. Moved r, v, s to the Cellvalues module - they are not needed elsewhere but the Cell class. Documentation changes. .yardopts file added.
-slight documentation changes, yard options added to (protected and private methods docs are now readable)
-
-07/10: Changed gem version
-Removed sharedstrings and sheetbase properties as they were useless. Docs updated with the change.
-Update oxcelix.gemspec
-Raised visibility in rdoc, so that all method documentation gets readable.
-Update workbook.rb
-replaced Ox::load_file with IO.read + Ox::load in workbook, as apparently workbook.xml could not be loaded under windows using that method
-Minor typos corrected, added gemspec
+ * Fixed serious regression which was preventing the copy-merge routine from properly run (cols and rows were flipped). Fixed smaller bug which caused comments to be inserted as a 1-element array of hashes instead of plain text.
+ Thu Oct 10 23:44:39 2013 +0200
+ * Fixed major bug which prevented the comments to be pulled from the XML files.
+ Thu Oct 10 20:12:56 2013 +0200
+ * Fixed serious bug concerning the loading of the worksheets. Oxcelix will now correctly guess the filenames of the XML files describing the sheets
+ Thu Oct 10 18:22:39 2013 +0200
+ * Update workbook.rb Wed Oct 9 19:10:39 2013 +0200
+ * Changed another instance of Ox::load_file, as it won't work under windows Wed Oct 9 18:59:50 2013 +0200
+ * The sheet class now inherits Matrix. Sheet can return a cell based on its excel name. Sheet::data is obsolete - deleted. Moved r, v, s to the Cellvalues module - they are not needed elsewhere but the Cell class. Documentation changes. .yardopts file added.
+ Tue Oct 8 23:10:25 2013 +0200
+ * The sheet class now inherits Matrix. Sheet can return a cell based on its excel name. Sheet::data is obsolete - deleted. Moved r, v, s to the Cellvalues module - they are not needed elsewhere but the Cell class. Documentation changes. .yardopts file added.
+ Tue Oct 8 23:07:10 2013 +0200
+ * slight documentation changes, yard options added to (protected and private methods docs are now readable)
+ Tue Oct 8 20:17:29 2013 +0200
+ * Changed gem version Mon Oct 7 22:12:34 2013 +0200
+ * Removed sharedstrings and sheetbase properties as they were useless. Docs updated with the change. Mon Oct 7 18:15:44 2013 +0200
+ * Update oxcelix.gemspec Mon Oct 7 17:48:14 2013 +0200
+ * Update oxcelix.gemspec
+
+Raised visibility in rdoc, so that all method documentation gets readable. Mon Oct 7 17:47:50 2013 +0200
+ * Update workbook.rb
+
+replaced Ox::load_file with IO.read + Ox::load in workbook, as apparently workbook.xml could not be loaded under windows using that method Mon Oct 7 17:37:39 2013 +0200
+ * Minor typos corrected, added gemspec
+ Sun Oct 6 16:52:54 2013 +0200
+ * oxcelix.rb was not added to previous commit
+ Sun Oct 6 12:29:37 2013 +0200
+ * Broke down oxcelix.rb. Improved YARD documentation.
+ Sun Oct 6 12:25:59 2013 +0200
+ * Removed unneeded method from Xlsheet. Started converting docs to YARD
+ Sat Oct 5 09:20:31 2013 +0200
+ * Merge branch 'master' of https://github.com/gbiczo/oxcelix
+ Wed Oct 2 00:19:54 2013 +0200
+ * Repeating commit as the sheetdata method code was not included. Now it will simply do some Array magic to return the list of active sheets.
+ Wed Oct 2 00:19:18 2013 +0200
+ * Update README.md
+
+Fixed typos Wed Oct 2 00:08:00 2013 +0200
+ * Merge branch 'master' of https://github.com/gbiczo/oxcelix
+ Tue Oct 1 23:51:13 2013 +0200
+ * Moved source to lib directory.
+ Tue Oct 1 23:43:53 2013 +0200
+ * Added README
+ Tue Oct 1 23:42:27 2013 +0200
+ * Added tests, recreated include-exclude code, now it works fine. Created README.rdoc
+ Tue Oct 1 23:42:00 2013 +0200
+ * Update README.md
+
+Corrected typo Tue Oct 1 23:32:22 2013 +0200
+ * Update README.md Tue Oct 1 23:31:47 2013 +0200
+ * Initial commit
+ Tue Oct 1 14:21:10 2013 -0700
+ * Really deleted the last few lines of code.
+ Sat Sep 28 15:49:06 2013 +0200
+ * Wrapper module Oxcelix created. String, Matrix, Fixnum are not included. Sheet objects are now created as a last step instead og the simple hashes. Workbookhelper module added, with one method, [](sheetname), which accepts a string parameter and returns the sheet named sheetname. Code cleanups (especially the last lines of the code which were there only for testing purposes.)
+ Sat Sep 28 15:46:56 2013 +0200
+ * Corrected Cellhelper::x() and Cellhelper::y() methods, now both return correct values. RDoc documentation added.
+ Wed Sep 25 23:44:07 2013 +0200
+ * Added support for sheet inclusion and exclusion. Workbook#new now accepts a hash of parameters, which may contain: :copymerge (Bool), :include_sheets (Ary), :exclude_sheets (Ary)
+ Wed Sep 25 09:49:42 2013 +0200
+ * Added col_name to display excel column names. Style data of cell is now included. X and Y may get parameters. The Workbook constructor will now unzip and process the excel file. All sheets get converted to matrices. Upon the Array->Matrix conversion, the merged cells max be omitted or repeated.
+ Mon Sep 23 20:32:25 2013 +0200
+ * First gitted version.
+ Thu Aug 29 09:14:59 2013 +0200

data/lib/lofaszka.rb

@@ -0,0 +1,6 @@
+require './oxcelix.rb'
+require 'ruby-debug'
+debugger
+w=Oxcelix::Workbook.new('../Schedules.xlsx', :copymerge=>true)
+#w=Oxcelix::Workbook.new('../Schedules.xlsx')
+puts "kesz"

data/lib/oxcelix/workbook.rb

@@ -55,18 +55,20 @@ module Oxcelix
       @sheets=[]
       @sheetbase={}
       @sharedstrings=[]
+      
       f=IO.read(@destination+'/xl/workbook.xml')
       @a=Ox::load(f)
       
       sheetdata(options); commentsrel; shstrings;
+
       @sheets.each do |x|
-        sname="sheet#{x[:sheetId]}"
+
         @sheet = Xlsheet.new()
-        File.open(@destination+"/xl/worksheets/#{sname}.xml", 'r') do |f|
+
+        File.open(@destination+"/xl/#{x[:filename]}", 'r') do |f|
           Ox.sax_parse(@sheet, f)
         end
-        comments=
-        mkcomments(x[:comments])
+        comments = mkcomments(x[:comments])
         @sheet.cellarray.each do |sh|
           if sh.type=="s"
             sh.value = @sharedstrings[sh.value.to_i]
@@ -74,7 +76,7 @@ module Oxcelix
           if !comments.nil?
             comm=comments.select {|c| c[:ref]==(sh.xlcoords)}
             if comm.size > 0
-              sh.comment=comm
+              sh.comment=comm[0][:comment]
             end
             comments.delete_if{|c| c[:ref]==(sh.xlcoords)}
           end
@@ -101,6 +103,24 @@ module Oxcelix
         @sheetbase[:name] = x[:name]
         @sheetbase[:sheetId] = x[:sheetId]
         @sheetbase[:relationId] = x[:"r:id"]
+
+        relationshipfile=nil
+        fname=nil
+        unless Dir[@destination + '/xl/_rels'].empty?
+          Find.find(@destination + '/xl/_rels') do |path|
+            if File.basename(path).split(".").last=='rels'
+              g=IO.read(path)
+              relationshipfile=Ox::load(g)
+            end
+          end
+        end
+        relationshipfile.locate("Relationships/*").each do |rship|
+          if rship[:Id] == x[:"r:id"]
+            @sheetbase[:filename]=rship[:Target]
+          end
+        end
+
+
         @sheets << @sheetbase
         @sheetbase=Hash.new
       end
@@ -116,17 +136,16 @@ module Oxcelix
     
     # Build the relationship between sheets and the XML files storing the comments
     # to the actual sheet.
-    def commentsrel #!!!MI VAN HA NINCS KOMMENT???????
+    def commentsrel
      unless Dir[@destination + '/xl/worksheets/_rels'].empty?
       Find.find(@destination + '/xl/worksheets/_rels') do |path|
         if File.basename(path).split(".").last=='rels'
-#          f=Ox.load_file(path)
-          a=IO.read(@destination+'/xl/workbook.xml')
+          a=IO.read(path)
           f=Ox::load(a)
           f.locate("Relationships/*").each do |x|
             if x[:Target].include?"comments"
               @sheets.each do |s|
-                if File.basename(path,".rels")=="sheet"+s[:sheetId]+".xml"
+                if "worksheets/" + File.basename(path,".rels")==s[:filename]
                   s[:comments]=x[:Target]
                 end
               end
@@ -182,7 +201,6 @@ module Oxcelix
     #  into every merged cell
     def matrixto(copymerge)
       @sheets.each_with_index do |sheet, i|
-        #m=Matrix.build(sheet[:cells].last.y+1, sheet[:cells].last.x+1) {nil}
         m=Sheet.build(sheet[:cells].last.y+1, sheet[:cells].last.x+1) {nil}
         sheet[:cells].each do |c|
           m[c.y, c.x]=c
@@ -200,11 +218,11 @@ module Oxcelix
               (y1..y2).each do |row|
                 if valuecell != nil
                   valuecell.xlcoords=(col.col_name)+(row+1).to_s
-                  m[col, row]=valuecell
+                  m[row, col]=valuecell
                 else
                   valuecell=Cell.new
                   valuecell.xlcoords=(col.col_name)+(row+1).to_s
-                  m[col, row]=valuecell
+                  m[row, col]=valuecell
                 end
               end
             end

data/oxcelix.gemspec

@@ -3,8 +3,8 @@
 require 'rake'
 Gem::Specification.new do |s|
   s.name	= 'oxcelix'
-  s.version	= '0.2.2'
-  s.date	= '2013-10-09'
+  s.version	= '0.2.4'
+  s.date	= '2013-10-10'
   s.summary	= 'A fast Excel 2007/2010 file parser'
   s.description	= 'A fast .xlsx file  parser that returns a collection of Matrix objects'
   s.authors	= 'Giovanni Biczo'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oxcelix
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ox
@@ -52,22 +52,23 @@ files:
 - LICENSE
 - README.rdoc
 - README.md
+- lib/lofaszka.rb
 - lib/oxcelix.rb
 - lib/oxcelix/cell.rb
-- lib/oxcelix/cellhelper.rb
-- lib/oxcelix/sheet.rb
 - lib/oxcelix/workbook.rb
-- lib/oxcelix/sax/comments.rb
+- lib/oxcelix/sheet.rb
+- lib/oxcelix/cellhelper.rb
 - lib/oxcelix/sax/sharedstrings.rb
 - lib/oxcelix/sax/xlsheet.rb
+- lib/oxcelix/sax/comments.rb
 - oxcelix.gemspec
-- spec/cell_spec.rb
+- spec/test.xlsx
+- spec/spec_helper.rb
 - spec/fixnum_spec.rb
-- spec/matrix_spec.rb
 - spec/oxcelix_spec.rb
-- spec/spec_helper.rb
+- spec/cell_spec.rb
+- spec/matrix_spec.rb
 - spec/string_spec.rb
-- spec/test.xlsx
 - .yardopts
 - CHANGES
 homepage: http://github.com/gbiczo/oxcelix
@@ -92,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: oxcelix
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A fast Excel 2007/2010 file parser