dullard 0.0.1 → 0.0.2

data/lib/dullard/dullard.rb

@@ -20,16 +20,15 @@ class Dullard::Workbook
 
   def read_string_table
     @string_table = []
-    state = :top
+    state = :entry
+    entry = ''
     Nokogiri::XML::Reader(@zipfs.file.open("xl/sharedStrings.xml")).each do |node|
-      case state
-      when :top
-        if node.name == "t"
-          state = :entry
-        end
-      when :entry
-        @string_table << node.value
-        state = :top
+      if node.name == "si" and node.node_type == Nokogiri::XML::Reader::TYPE_ELEMENT
+        entry = ''
+      elsif node.name == "si" and node.node_type == Nokogiri::XML::Reader::TYPE_END_ELEMENT
+        @string_table << entry
+      elsif node.value?
+        entry << node.value
       end
     end
     @string_table
@@ -56,27 +55,18 @@ class Dullard::Sheet
     Enumerator.new do |y|
       state = :top
       shared = false
-      row = []
+      row = nil
       Nokogiri::XML::Reader(@workbook.zipfs.file.open("xl/worksheets/sheet#{@id}.xml")).each do |node|
-        case state
-        when :top
-          if node.name == "row"
-            state = :row 
-          end
-        when :row
-          if node.name == "row"
-            y << row
-            row = []
-          else
-            state = :cell
+        if node.name == "row" and node.node_type == Nokogiri::XML::Reader::TYPE_ELEMENT
+          row = []
+        elsif node.name == "row" and node.node_type == Nokogiri::XML::Reader::TYPE_END_ELEMENT
+          y << row
+        elsif node.name == "c" and node.node_type == Nokogiri::XML::Reader::TYPE_ELEMENT
             shared = (node.attribute("t") == "s")
-          end
-        when :cell
-          row << (shared ? string_lookup(node.value.to_i) : node.value)
-          state = :row
+        elsif node.value?
+            row << (shared ? string_lookup(node.value.to_i) : node.value)
         end
       end
-      y << row
     end
   end
 end

data/lib/dullard/version.rb

@@ -1,3 +1,3 @@
 module Dullard
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dullard
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70212465314540 !ruby/object:Gem::Requirement
+  requirement: &70358439744940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70212465314540
+  version_requirements: *70358439744940
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70212465295320 !ruby/object:Gem::Requirement
+  requirement: &70358439744040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70212465295320
+  version_requirements: *70358439744040
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70212465295080 !ruby/object:Gem::Requirement
+  requirement: &70358439743400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 0.9.6
   type: :runtime
   prerelease: false
-  version_requirements: *70212465295080
+  version_requirements: *70358439743400
 description: 
 email:
 - ted@shlashdot.org