loe-hypodermic 0.1.1 → 0.1.2

data/lib/hypodermic.rb

@@ -38,15 +38,29 @@ class Hypodermic
   end
   
   def self.xml_from_word(path)
-    Zip::ZipFile.open(path) { |z| z.read('word/document.xml') }
+    Zip::ZipFile.open(path) do |z|
+      z.read('word/document.xml')
+    end
   end
   
   def self.xml_from_excel(path)
-    Zip::ZipInputStream::open(path) { |io| while(entry = io.get_next_entry); xml = io.read if entry.name =~ /(xl\/worksheets\/)|(xl\/sharedStrings.xml)/; end; xml }      
+    Zip::ZipInputStream::open(path) do |io|
+      xml = ''
+      while(entry = io.get_next_entry)
+        xml << io.read if entry.name =~ /(xl\/worksheets)|(sharedStrings.xml)/
+      end
+      xml
+    end      
   end
   
   def self.xml_from_powerpoint(path)
-    Zip::ZipInputStream::open(path) { |io| while(entry = io.get_next_entry); xml = io.read if entry.name =~ /(ppt\/slides\/)|(ppt\/presentation.xml)/; end; xml }
+    Zip::ZipInputStream::open(path) do |io|
+      xml = ''
+      while(entry = io.get_next_entry)
+        xml << io.read if entry.name =~ /(ppt\/slides)|(presentation.xml)/
+      end
+      xml
+    end
   end
   
   def self.thumbnail(path)

data/lib/hypodermic/version.rb

@@ -1,3 +1,3 @@
 module Hypodermic
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/hypodermic/hypodermic_spec.rb

@@ -35,41 +35,26 @@ describe Hypodermic do
     end
     
     it "should not raise an error if you pass a path" do
-      lambda { Hypodermic.extract("path") }.should_not raise_error
+      lambda { Hypodermic.extract("path.docx",) }.should_not raise_error
     end
     
     it "should not raise an error if you also want a thumbnail" do
-      lambda { Hypodermic.extract("path", :thumbnail => true) }.should_not raise_error
+      lambda { Hypodermic.extract("path.docx", :thumbnail => true) }.should_not raise_error
     end
     
   end  
   
-  describe ".xml_from_word" do
-    before(:each) do
-      stub_word_document
-    end
-    
-    it "should not raise an error, given a path argument" do
-      lambda { Hypodermic.send(:document_xml, "path") }.should_not raise_error
-    end
-    
-    it "should return the document.xml" do
-      result = Hypodermic.send(:document_xml, "path")
-      result.should == File.read(@document_path)
-    end
-  end
-  
   describe ".document" do
     before(:each) do
       stub_word_document
     end
     
     it "should not raise an error" do
-      lambda { Hypodermic.send(:document, "path") }.should_not raise_error
+      lambda { Hypodermic.send(:document, "path.docx") }.should_not raise_error
     end
     
     it "should return the file without tags" do
-      result = Hypodermic.send(:document, "path")
+      result = Hypodermic.send(:document, "path.docx")
       result.should == File.read(@word_document_path).gsub(/<.*?>/, ' ')
     end
   end
@@ -80,13 +65,28 @@ describe Hypodermic do
     end
     
     it "should not raise an error, given the path argument" do
-      lambda { Hypodermic.send(:thumbnail, "path") }
+      lambda { Hypodermic.send(:thumbnail, "path.docx") }
     end
     
     it "should return thumbnail.jpeg" do
-      result = Hypodermic.send(:thumbnail, "path")
+      result = Hypodermic.send(:thumbnail, "path.docx")
       result.should == File.read(@thumbnail_path)
     end
   end
   
+  describe ".xml_from_word" do
+    before(:each) do
+      stub_word_document
+    end
+    
+    it "should not raise an error, given a path argument" do
+      lambda { Hypodermic.send(:xml_from_word, "path.docx") }.should_not raise_error
+    end
+    
+    it "should return the document.xml" do
+      result = Hypodermic.send(:xml_from_word, "path.docx")
+      result.should == File.read(@word_document_path)
+    end
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: loe-hypodermic
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - W. Andrew Loe III
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2006-06-06 00:00:00 -07:00
+date: 2006-06-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,6 +33,33 @@ files:
 - lib/hypodermic.rb
 - lib/hypodermic
 - lib/hypodermic/version.rb
+has_rdoc: false
+homepage: http://github.com/loe/hypodermic
+post_install_message: 
+rdoc_options: []
+
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: 
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: Opens a .docx file and returns a plain text string of the contents and optionally returns the thumbnail.
+test_files: 
 - spec/helper.rb
 - spec/hypodermic
 - spec/hypodermic/hypodermic_spec.rb
@@ -120,31 +147,3 @@ files:
 - spec/hypodermic/foo.xlsx/docProps/thumbnail.jpeg
 - spec/hypodermic/foo.xlsx/docProps/core.xml
 - spec/hypodermic/foo.xlsx/docProps/app.xml
-has_rdoc: false
-homepage: http://github.com/loe/hypodermic
-post_install_message: 
-rdoc_options: []
-
-require_paths: 
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.0.1
-signing_key: 
-specification_version: 2
-summary: Opens a .docx file and returns a plain text string of the contents and optionally returns the thumbnail.
-test_files: []
-