open_xml_package 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b72f5c67d5a18d27b73e969c287d3901d5180ae
-  data.tar.gz: 3136fa54c21681c6f1d7025480befbf286313ddf
+  metadata.gz: e0c48c674659490cb99dd732878aed3b4f0425cb
+  data.tar.gz: db6e4f5b6a5e3275759ab1128acaadbe3157e410
 SHA512:
-  metadata.gz: 5fe55147d26a022c6be62eae2cfb5b292198999cd4f0cfa8438c8bcb0019d6af798b7889597b544d92149c44081335425a9076a2716d73a0461180b8f4c0ec27
-  data.tar.gz: 227b72c1f194c1bdba20b656522b7d6c4c2dd6f742d7b1e2b47e019286f9a5956b3b932b2d80185ba3faff2e39f44ca5ca04d597440cb9bb2e00f52e6974a461
+  metadata.gz: 32b928ff33b063c806d10de43e521499c05fb890ff2164a351ace3633450676f2afd1e87eda4e2e648036453df8eeb09eec32da245080047deffd6f5f347f708
+  data.tar.gz: d20a4f7eeb74dfbc4ee8bab6dbd42c4b4aabf65c54bd8472a288055ae47ae64ecae59b1c48154d0c719411ad13ee11f1cb8c2e07b531c87e27a7c8aaab4f2264

data/lib/open_xml_package.rb

@@ -1,4 +1,5 @@
 require "open_xml_package/part"
+require "open_xml_package/rubyzip_fix"
 require "open_xml_package/version"
 require "zip"
 
@@ -16,6 +17,22 @@ class OpenXmlPackage
     end
   end
 
+  def self.from_stream(stream)
+    stream = StringIO.new(stream) if stream.is_a?(String)
+    
+    # Hack: Zip::Entry.read_c_dir_entry initializes
+    # a new Zip::Entry by calling `io.path`. Zip::Entry
+    # uses this to open the original zipfile; but in
+    # this case, the StringIO _is_ the original.
+    def stream.path
+      self
+    end
+    
+    zipfile = ::Zip::File.new("", true, true)
+    zipfile.read_from_stream(stream)
+    new(zipfile)
+  end
+
   def initialize(zipfile=nil)
     @zipfile = zipfile
     @parts = []

data/lib/open_xml_package/rubyzip_fix.rb

@@ -0,0 +1,17 @@
+require "zip"
+
+module Zip
+  class InputStream
+  protected
+    
+    # The problem in RubyZip 1.1.0 is that we only call `seek`
+    # when `io` is a File. We need to move the cursor to the
+    # right position when `io` is a StringIO as well.
+    def get_io(io, offset = 0)
+      io = ::File.open(io, "rb") unless io.is_a?(IO) || io.is_a?(StringIO)
+      io.seek(offset, ::IO::SEEK_SET)
+      io
+    end
+    
+  end
+end

data/lib/open_xml_package/version.rb

@@ -1,3 +1,3 @@
 class OpenXmlPackage
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/open_xml_package_test.rb

@@ -50,7 +50,6 @@ class OpenXmlPackageTest < ActiveSupport::TestCase
     context "Given a sample Word document" do
       setup do
         @temp_file = expand_path "./support/sample.docx"
-        @package = OpenXmlPackage.open(temp_file)
         @expected_contents = Set[
           "[Content_Types].xml",
           "_rels/.rels",
@@ -68,16 +67,36 @@ class OpenXmlPackageTest < ActiveSupport::TestCase
           "word/webSettings.xml" ]
       end
       
-      teardown do
-        package.close
+      context ".open" do
+        setup do
+          @package = OpenXmlPackage.open(temp_file)
+        end
+        
+        teardown do
+          package.close
+        end
+        
+        should "discover the expected parts" do
+          assert_equal @expected_contents, package.parts.map(&:path).to_set
+        end
+        
+        should "read their content on-demand" do
+          assert_equal web_settings_content, package.get_part("word/webSettings.xml").content
+        end
       end
       
-      should "discover the expected parts" do
-        assert_equal @expected_contents, package.parts.map(&:path).to_set
-      end
-      
-      should "read their content on-demand" do
-        assert_equal web_settings_content, package.get_part("word/webSettings.xml").content
+      context ".from_stream" do
+        setup do
+          @package = OpenXmlPackage.from_stream(File.open(temp_file, "rb", &:read))
+        end
+        
+        should "also discover the expected parts" do
+          assert_equal @expected_contents, package.parts.map(&:path).to_set
+        end
+        
+        should "read their content" do
+          assert_equal web_settings_content, package.get_part("word/webSettings.xml").content
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: open_xml_package
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Bob Lail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2014-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -156,6 +156,7 @@ files:
 - Rakefile
 - lib/open_xml_package.rb
 - lib/open_xml_package/part.rb
+- lib/open_xml_package/rubyzip_fix.rb
 - lib/open_xml_package/version.rb
 - open_xml_package.gemspec
 - test/open_xml_package_test.rb