From 4e3ce5786ed1fd6bba3fabb7dd16b0b2ad7577a7 Mon Sep 17 00:00:00 2001
From: Edgars Beigarts <edgars.beigarts@gmail.com>
Date: Thu, 26 Mar 2015 12:50:38 +0200
Subject: [PATCH] Support inline strings

---
 lib/saxlsx/rows_collection_parser.rb |  14 +++++++-------
 spec/data/SpecInlineStrings.xlsx     | Bin 0 -> 3499 bytes
 spec/sheet_spec.rb                   |  14 ++++++++++++++
 3 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 spec/data/SpecInlineStrings.xlsx

diff --git a/lib/saxlsx/rows_collection_parser.rb b/lib/saxlsx/rows_collection_parser.rb
index 7fb6372..5c3a4e6 100644
--- a/lib/saxlsx/rows_collection_parser.rb
+++ b/lib/saxlsx/rows_collection_parser.rb
@@ -48,13 +48,11 @@ def initialize(workbook, &block)
 
     def start_element(name)
       @current_element = name
-
-      if name == :row
+      case name
+      when :row
         @current_row = []
         @next_column = 'A'
-      end
-
-      if name == :c
+      when :c
         @current_type = nil
         @current_number_format = nil
       end
@@ -81,7 +79,7 @@ def attr(name, value)
     end
 
     def text(value)
-      if @current_row && @current_element == :v
+      if @current_row && (@current_element == :v || @current_element == :t)
         while @next_column != @current_column
           @current_row << nil
           @next_column = ColumnNameGenerator.next_to(@next_column)
@@ -96,7 +94,9 @@ def text(value)
     def value_of(text)
       case @current_type
       when 's'
-        @shared_strings[text.to_i] || text
+        @shared_strings[text.to_i]
+      when 'inlineStr'
+        text
       when 'b'
         BooleanParser.parse text
       else
diff --git a/spec/data/SpecInlineStrings.xlsx b/spec/data/SpecInlineStrings.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..a5091d5758d7f4443b9fedd82aad4e592ec2edf0
GIT binary patch
literal 3499
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
Y+!iJb5)9e;ayM|Hf!rBx{fmMA1N<zoj{pDw

literal 0
HcmV?d00001

diff --git a/spec/sheet_spec.rb b/spec/sheet_spec.rb
index f89cbb3..f5a9826 100644
--- a/spec/sheet_spec.rb
+++ b/spec/sheet_spec.rb
@@ -104,4 +104,18 @@
       end
     end
   end
+
+  context 'with inline strings' do
+    let(:filename) { "#{File.dirname(__FILE__)}/data/SpecInlineStrings.xlsx" }
+
+    it 'should read inline strings' do
+      Workbook.open filename do |w|
+        w.sheets[0].tap do |s|
+          s.rows[0].should eq [
+            'Test'
+          ]
+        end
+      end
+    end
+  end
 end
\ No newline at end of file