rack-archive-zip-extract 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 367946e3ae493b7beb2c8a894a737861d8819a44
-  data.tar.gz: 1b2509141f86cde9c02afb4ce3174136db6d57fd
+  metadata.gz: 72114a73a80de1f5a42ba4439d0de4d8bd490be9
+  data.tar.gz: 1b0f2ca04e99752201464ac5f7e5e113df7c441d
 SHA512:
-  metadata.gz: 0200cd1fa15c0182d6597d21dd25796c5c928753d252060a44d1255a0c10d1aa5a91ad910387321b8073e2b12773066322b06bf43dc49f705cf27e4e3ec1364d
-  data.tar.gz: 36807535e98a5b0947fef9066be63b5d47ad09a951854b211ea894960ddc92c61f92a1d57448a4141412e73170122a04750aa38ee4a4ce065201f874ee9e1d42
+  metadata.gz: 7256c9a7a0cc5fde2f603e04ad495a46ad20af2858afa32707e7afd1576a7faf9dd1ec4c6050869d87827535e0484ee2bbeb4cd5ab79fe77c9d60f1dbb28b503
+  data.tar.gz: c49eebd140a6258aad2987ed476af758dbd634515fb7f823c2bee7999eb0faab722625f1554b1bffd84ec48e8fd0f2d61cc81df6ec700c1de1dd9fee6e5bc62a

data/lib/rack/archive/zip/extract.rb

@@ -45,30 +45,27 @@ module Rack::Archive
         return [status_code(:method_not_allowd), {ALLOW => ALLOWED_VERBS.join(COMMA)}, []] unless ALLOWED_VERBS.include? env[REQUEST_METHOD]
 
         path_info = unescape(env[PATH_INFO])
-        if_modified_since = env[IF_MODIFIED_SINCE]
-        if_modified_since = Time.parse(if_modified_since) if if_modified_since
-        zip_file = nil
-        body = nil
-        file_size = nil
-        mtime = nil
+        file = nil
         @extensions.each do |ext|
           zip_file, inner_path = find_zip_file_and_inner_path(path_info, ext)
-          body, file_size, mtime = extract_content(zip_file, inner_path, if_modified_since)
-          break if mtime
+          file = extract_content(zip_file, inner_path)
+          break if file
         end
-        return [status_code(:not_found), {}, []] if mtime.nil?
+        return [status_code(:not_found), {}, []] if file.nil?
 
-        if if_modified_since and mtime <= if_modified_since
+        if_modified_since = env[IF_MODIFIED_SINCE]
+        if_modified_since = Time.parse(if_modified_since) if if_modified_since
+        if if_modified_since and file.mtime <= if_modified_since
           [status_code(:not_modified), {}, []]
         else
           [
             status_code(:ok),
             {
               CONTENT_TYPE => Rack::Mime.mime_type(::File.extname(path_info)),
-              CONTENT_LENGTH => file_size.to_s,
-              LAST_MODIFIED => mtime.httpdate
+              CONTENT_LENGTH => file.size.to_s,
+              LAST_MODIFIED => file.mtime.httpdate
             },
-            [body]
+            file
           ]
         end
       end
@@ -89,20 +86,17 @@ module Rack::Archive
 
       # @param zip_file_path [Pathname] path to zip file
       # @param inner_path [String] path to file in zip archive
-      # @return [String] content
+      # @return [Zip::File]
       # @return [nil] if +zip_file_path+ is nil or +inner_path+ is empty
       # @return [nil] if +inner_path+ doesn't exist in zip archive
-      def extract_content(zip_file_path, inner_path, if_modified_since)
+      def extract_content(zip_file_path, inner_path)
         return if zip_file_path.nil? or inner_path.empty?
-        ::Zip::Archive.open zip_file_path.to_path do |archive|
-          return if archive.locate_name(inner_path) < 0
-          archive.fopen inner_path do |file|
-            if if_modified_since and file.mtime <= if_modified_since
-              return nil, nil, file.mtime
-            else
-              return file.read, file.size, file.mtime
-            end
-          end
+        archive = ::Zip::Archive.open(zip_file_path.to_path)
+        if archive.locate_name(inner_path) < 0
+          archive.close
+          nil
+        else
+          ExtractedFile.new(archive, archive.fopen(inner_path))
         end
       end
 
@@ -118,6 +112,33 @@ module Rack::Archive
         end
         clean
       end
+
+      class ExtractedFile
+        # @param archive [Zip::Archive]
+        # @param file [Zip::File]
+        def initialize(archive, file)
+          @archive, @file = archive, file
+        end
+
+        def each
+          @file.read do |chunk|
+            yield chunk
+          end
+        end
+
+        def mtime
+          @file.mtime
+        end
+
+        def size
+          @file.size
+        end
+
+        def close
+          @file.close
+          @archive.close
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-archive-zip-extract
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - KITAITI Makoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-05 00:00:00.000000000 Z
+date: 2014-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack