officex2str 0.0.8 → 0.0.9

data/lib/officex2str.rb

@@ -1,6 +1,6 @@
 require 'nokogiri'
-require 'zipruby'
 require 'mime/types'
+require 'zip'
 
 class Officex2str
   class InvalidFileTypeError < Exception; end
@@ -10,7 +10,7 @@ class Officex2str
   PPTX_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.presentationml.presentation"
   VALID_CONTENT_TYPE = [DOCX_CONTENT_TYPE, XLSX_CONTENT_TYPE, PPTX_CONTENT_TYPE].freeze
 
-  attr_accessor :path, :content_type
+  attr_accessor :path, :content_type, :entries, :xmls
 
   def self.convert(file_path)
     self.new(file_path).convert
@@ -19,14 +19,14 @@ class Officex2str
   def initialize(file_path)
     @path = file_path
     @content_type = MIME::Types.type_for(path).first.content_type
+    @entries = valid_file? ? Zip::File.open(path).entries : []
+    @xmls = []
   end
 
   def convert
     if valid_file?
-      archives   = Zip::Archive.open(path) { |archive| archive.map(&:name) }
-      pages      = pickup_pages(archives)
-      xmls       = extract_xmls(pages)
-      xml_to_str(xmls)
+      extract_xmls
+      xml_to_str
     else
       raise InvalidFileTypeError, "Not recognized file type"
     end
@@ -37,37 +37,25 @@ private
     !!VALID_CONTENT_TYPE.include?(content_type)
   end
 
-  def pickup_pages archives
+  def select_target_entries
     case content_type
     when DOCX_CONTENT_TYPE
-      archives.select{|a| /^word\/document/ =~ a}
+      entries.select{|a| /^word\/document/ =~ a.to_s}
     when XLSX_CONTENT_TYPE
-      archives.select{|a| /^xl\/worksheets\/sheet/ =~ a or /^xl\/sharedStrings/ =~ a or /^xl\/comments/ =~ a }
+      entries.select{|a| /^xl\/worksheets\/sheet/ =~ a.to_s or /^xl\/sharedStrings/ =~ a.to_s or /^xl\/comments/ =~ a.to_s }
     when PPTX_CONTENT_TYPE
-      archives.select{|a| /^ppt\/slides\/slide/ =~ a}
+      entries.select{|a| /^ppt\/slides\/slide/ =~ a.to_s}
     else
       raise InvalidContentTypeError, "Not recognized content type"
     end
   end
 
-  def extract_xmls pages
-    xml_text = []
-    Zip::Archive.open(path) { |archive| pages.each{ |page| archive.fopen(page) { |f| xml_text << f.read } } }
-    xml_text
+  def extract_xmls
+    select_target_entries.map{|entry| xmls << entry.get_input_stream.read }
   end
 
-  def xml_to_str xmls
-    text = ""
-    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
+  def xml_to_str
+    return '' if xmls.empty?
+    xmls.inject(""){|result, xml| result << Nokogiri.XML(xml, nil, 'utf8').to_str }
   end
 end

data/lib/officex2str/version.rb

@@ -1,3 +1,3 @@
 class Officex2str
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/officex2str.gemspec

@@ -18,6 +18,6 @@ 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.4.7"]
-  gem.add_runtime_dependency "zipruby", ["= 0.3.6"]
-  gem.add_runtime_dependency "mime-types", ["= 2.1"]
+  gem.add_runtime_dependency "rubyzip"
+  gem.add_runtime_dependency "mime-types"
 end

data/spec/officex2str_spec.rb

@@ -24,10 +24,9 @@ describe Officex2str do
     end
   end
 
-  context "#pickup_pages" do
+  context "#select_target_entries" do
     subject do
-      archives = Zip::Archive.open(@file_path) { |archive| archive.map(&:name) }
-      Officex2str.new(@file_path).send(:pickup_pages, archives).sort
+      Officex2str.new(@file_path).send(:select_target_entries).map{|entry| entry.to_s}.sort
     end
     context "extname is docx" do
       before { @file_path = "fixtures/sample.docx" }
@@ -43,7 +42,6 @@ describe Officex2str do
       before { @file_path = "fixtures/sample.pptx" }
       it { subject.should == ["ppt/slides/slide1.xml", "ppt/slides/slide2.xml"] }
     end
-
   end
 
   context "#convert" do
@@ -54,7 +52,7 @@ describe Officex2str do
       before { @file_path = "fixtures/sample.xlsx" }
       it do
         subject.should include("複数シート対応")
-        subject.should include("ソニックガーデン")
+        subject.should include("ｿﾆｯｸｶﾞｰﾃﾞﾝ")
         subject.should include("ＳＯＮＩＣＧＡＲＤＥＮ")
         subject.should include("株式会社")
         subject.should include("コメント")

data/spec/spec_helper.rb

@@ -5,7 +5,7 @@ require 'officex2str'
 require "rspec"
 require "rspec/core"
 require 'nokogiri'
-require 'zipruby'
+require 'zip'
 require 'kconv'
 
 # Requires supporting files with custom matchers and macros, etc,

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: officex2str
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
+  prerelease: 
 platform: ruby
 authors:
 - interu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -41,45 +46,51 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.4.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.4.7
 - !ruby/object:Gem::Dependency
-  name: zipruby
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
 description: convert office 2010 files to str
 email:
 - interu@sonicgarden.jp
@@ -103,26 +114,33 @@ files:
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2505515257273957175
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2505515257273957175
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: convert office 2010 files(docx,xlsx,pptx) to str
 test_files:
 - spec/officex2str_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 994b2f27242952785bc69daaa22df68747df9f61
-  data.tar.gz: efd05647dd536e2fe7babb358c57b45bed84bbe7
-SHA512:
-  metadata.gz: 850e295a22e0cc7c83e3d7c93fac038df76b4955f8d6141f51b80bf9ec3f0ed2af22c74889c336db923b95fc728910d8ad8ed6a86a9abef7f567a4838ca508b9
-  data.tar.gz: 6e2c8d08613ffa67389615326ef8ff40656f2e645f93c2a7db76f6c41332241c1dd8167b44ce4decba7c6a43b8cfe920ce1849b9a903dbc2bebfb2e69d1afb9a