ods 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42adc8c8dec7bc687e86198883d2616891e2fe88
-  data.tar.gz: a2015c1269f31acf444ca3a4fee01850e718afeb
+  metadata.gz: d576b00862b3c7930a90bde429c4811f62888e7e
+  data.tar.gz: 66c1c954cf7ffc8f2000d6b4909691b0655144ff
 SHA512:
-  metadata.gz: 441b4d3d76316a7761532d3f54524fd0236ee2524b7c5e00bb4009044a6c7b1113c3fbe33a875b3c2e674fe9d8ecb88098012e6ce46e568c507a80cc528c89ef
-  data.tar.gz: 261923e9398914e2ba64c38b4acab295a53bd63f56676a128cb24f9791e2291bbb774264d90f85cc3f8ecd095aa0c6fde518bdb868120417e19cc8d021529788
+  metadata.gz: 60555f224e2bb4b45e398daf13a267630d68659fb275d69f8d0bba78297d1d0b6662a8a0f45f85d7a6a7a9edca054cb57262cb07d220aca4f620b4ee569a3000
+  data.tar.gz: 169d2db2864c75d62468537af58f45074db4bd3b3e5648cb4968737e2483a84311e57bec89c9c81835bb8a00c559c87eca8b85188de355fbbcf075a75077e705

data/lib/ods/row.rb

@@ -7,6 +7,10 @@ module Ods
       @sheet = sheet
     end
 
+    def [](index)
+      data[index]
+    end
+
     def cols
       return @cols if @cols
       @cols = []
@@ -19,5 +23,19 @@ module Ods
       end
       @cols
     end
+
+    def data
+      @data ||= begin
+        values = if cols.last.value == ''
+                   cols.reject { |col| col == cols.last }
+                 else
+                   cols
+                 end.map(&:value)
+        while values.length > 0 && values.last == ''
+          values.pop
+        end
+        values
+      end
+    end
   end
-end
+end

data/lib/ods/sheet.rb

@@ -12,32 +12,32 @@ module Ods
 
     # access by (0,0) = top left
     def [](row_index, col_index)
-      row = rows[row_index]
-      if row.kind_of?(Array)
-        puts "bad #{row_index} #{col_index}"
-        #puts row
-      end
-      row.nil? ? nil : row.cols[col_index]
+      row = data[row_index]
+      row && row[col_index]
     end
 
     def rows
       return @rows if @rows
       @rows = []
       content.xpath('descendant::table:table-row').each do |node|
-        a_row =  Row.new(node, self)
-        repeat = node['table:number-rows-repeated'] || 1
-        repeat.to_i.times do
-          @rows << a_row
+        a_row = Row.new(node, self)
+        if a_row.data.length > 0
+          repeat = node['table:number-rows-repeated'] || 1
+          repeat.to_i.times do
+            @rows << a_row
+          end
         end
       end
       @rows
     end
 
+    def data
+      @data ||= rows.map(&:data).reject { |row| row.length == 0 }
+    end
+
     def csv
       CSV do |csv|
-        rows.each do |row|
-          csv << row.cols.map(&:value)
-        end
+        data.each { |row| csv << row }
       end
     end
   end

data/lib/ods/version.rb

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

data/spec/sheet_spec.rb

@@ -16,63 +16,63 @@ describe Ods::Sheet do
 
     context "basic navigation" do
       context "first row" do
-        it { sheet[0,0].value.should == 'A' }
-        it { sheet[0,0].value.should be_kind_of(String) }
+        it { sheet[0, 0].should == 'A' }
+        it { sheet[0, 0].should be_kind_of(String) }
         it "have 4 columns" do
           sheet.rows[0].cols.count.should == 4
         end
         it "contains" do
           %w(A row of strings).each_with_index do |s, i|
-            sheet[0, i].value.should == s
+            sheet[0, i].should == s
           end
         end
       end
 
       context "second row" do
         (1..4).each do |i|
-          it { sheet[1,i-1].value.should == Date.new(2011, 1, i) }
-          it { sheet[1,i-1].value.should be_kind_of(Date) }
+          it { sheet[1, i-1].should == Date.new(2011, 1, i) }
+          it { sheet[1, i-1].should be_kind_of(Date) }
         end
       end
 
       context "third row integers" do
         (1..4).each do |i|
-          it { sheet[2,i-1].value.should == i }
-          it { sheet[2,i-1].value.should be_kind_of(Fixnum) }
+          it { sheet[2, i-1].should == i }
+          it { sheet[2, i-1].should be_kind_of(Fixnum) }
         end
       end
 
       context "forth row matches third row" do
         (1..4).each do |i|
-          it { sheet[3,i-1].value.should == i }
-          it { sheet[3,i-1].value.should be_kind_of(Fixnum) }
+          it { sheet[3, i-1].should == i }
+          it { sheet[3, i-1].should be_kind_of(Fixnum) }
         end
       end
 
       context "row five has mixed float&ints" do
-        it { sheet[4,0].value.should == 0 }
-        it { sheet[4,0].value.should be_kind_of(Fixnum) }
+        it { sheet[4, 0].should == 0 }
+        it { sheet[4, 0].should be_kind_of(Fixnum) }
 
-        it { sheet[4,1].value.should == -1.1 }
-        it { sheet[4,1].value.should be_kind_of(Float) }
+        it { sheet[4, 1].should == -1.1 }
+        it { sheet[4, 1].should be_kind_of(Float) }
 
-        it { sheet[4,2].value.should == 2.2 }
-        it { sheet[4,2].value.should be_kind_of(Float) }
+        it { sheet[4, 2].should == 2.2 }
+        it { sheet[4, 2].should be_kind_of(Float) }
 
-        it { sheet[4,3].value.should == 3 }
-        it { sheet[4,3].value.should be_kind_of(Fixnum) }
+        it { sheet[4, 3].should == 3 }
+        it { sheet[4, 3].should be_kind_of(Fixnum) }
       end
 
       context "row 6 has booleans" do
-        it { sheet[5,0].value.should == true }
-        it { sheet[5,0].value.should be_kind_of(TrueClass) }
+        it { sheet[5, 0].should == true }
+        it { sheet[5, 0].should be_kind_of(TrueClass) }
 
-        it { sheet[5,1].value.should == false }
-        it { sheet[5,1].value.should be_kind_of(FalseClass) }
+        it { sheet[5, 1].should == false }
+        it { sheet[5, 1].should be_kind_of(FalseClass) }
       end
 
       context "out of bounds" do
-        it { sheet[1000,100].should_not be }
+        it { sheet[1000, 100].should_not be }
       end
     end
   end
@@ -85,15 +85,15 @@ describe Ods::Sheet do
     context "column A" do
       (0..9).each do |row|
         context "row #{row}" do
-          it { sheet[row, 0].value.should == "A#{row+1}" }
+          it { sheet[row, 0].should == "A#{row+1}" }
         end
       end
 
-      it { sheet[10,0].should_not be }
+      it { sheet[10, 0].should_not be }
     end
 
     context "bottom right" do
-      it { sheet[9, 3].value.should == 'D10' }
+      it { sheet[9, 3].should == 'D10' }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ods
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Mike Park