officex2str 0.0.6 → 0.0.7

data/.gitignore

@@ -15,3 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.DS_Store
+**/.DS_Store

data/lib/officex2str/version.rb

@@ -1,3 +1,3 @@
 class Officex2str
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/officex2str.rb

@@ -56,9 +56,18 @@ private
     xml_text
   end
 
-  def xml_to_str xml_text
+  def xml_to_str xmls
     text = ""
-    xml_text.each{|xml_t| text << Nokogiri.XML(xml_t.toutf8, nil, 'utf8').to_str } unless xml_text.empty?
+    unless xmls.empty?
+      if content_type == XLSX_CONTENT_TYPE
+        xmls.map do |xml|
+          doc = Nokogiri.XML(xml.toutf8)
+          text += doc.search("t").map{|node| node.children.to_s}.join(' ')
+        end
+      else
+        xmls.each{|xml| text << Nokogiri.XML(xml.toutf8, nil, 'utf8').to_str }
+      end
+    end
     text
   end
 end

data/officex2str.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "rake", ["= 0.9.2"]
   gem.add_development_dependency "rspec", ["= 2.10.0"]
-  gem.add_runtime_dependency "nokogiri", [">= 1.5.5"]
+  gem.add_runtime_dependency "nokogiri", [">= 1.4.7"]
   gem.add_runtime_dependency "zipruby", ["= 0.3.6"]
   gem.add_runtime_dependency "mime-types", [">= 1.17.2"]
 

data/spec/officex2str_spec.rb

@@ -58,6 +58,8 @@ describe Officex2str do
         subject.should include("ＳＯＮＩＣＧＡＲＤＥＮ")
         subject.should include("株式会社")
         subject.should include("コメント")
+        subject.should include("STG001")
+        subject.should include("STG003")
         subject.should_not include("sonicgarden")
         subject.should_not include("sheet")
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: officex2str
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-16 00:00:00.000000000 Z
+date: 2013-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: 1.4.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: 1.4.7
 - !ruby/object:Gem::Dependency
   name: zipruby
   requirement: !ruby/object:Gem::Requirement
@@ -124,18 +124,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2240468863005458128
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2240468863005458128
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23