rack-archive-zip-extract 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f335e345e79786674c599d49801cfab192613ec
-  data.tar.gz: 05268821dfdf5582e97e7580accbcf2cbe9a187b
+  metadata.gz: 07bea84e8dd599718d60edf93979698acfa2ca84
+  data.tar.gz: 755f333cee8ead09814ef8d2253016ad5b9a4d0e
 SHA512:
-  metadata.gz: 0d32ed10d8c653fbc13463163c94198af348cfdfcd43b9e916cf92762def4eafe2419a47e40e1a2a618ffcfdd41d9f078be5a98202d649e3b3ce3a56511e7f96
-  data.tar.gz: 61a4b7dc23f899ce983976f0d334b8bca21459813a6aab5e43e3b69c7cf41789aefa9bda5f139640b7c455aa48174c7e343b05eb54d0ee016195dc7f99c75ae0
+  metadata.gz: 7d5e00114d0e8638ae5c7894ba507e5600c500d25be33f3f9528b5721996d7559501c7cca4983e1c0bbaed8e98e71150ba49a8104a7620c22fa80bbf66b85235
+  data.tar.gz: 661f0577924ef2c25f5199cfab991f4705f76b5d83dba65a0b243b02323ef762720a8c043571fdc9f2853521e7f655fbc8f056b4cb050aa81e6c40e3cca6f236

data/CHANGELOG.markdown

@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+0.0.5
+-----
+
+* [BUG FIX]Duplicate extensions before freezing
+* Send ETag header
+
 0.0.4
 -----
 

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

@@ -15,52 +15,63 @@ module Rack::Archive
     #   {Rack::Archive::Zip::Extract Rack::Archive::Zip::Extract} does not serve a zip file itself. Use Rack::File or so to do so.
     class Extract
       include Rack::Utils
+      extend Rack::Utils
 
       SEPS = Rack::File::SEPS
       DOT = '.'.freeze
       DOUBLE_DOT = '..'.freeze
-      ALLOWED_METHODS = Rack::File::ALLOWED_VERBS.join(', ').freeze
-      ALLOW = 'Allow'.freeze
       CONTENT_TYPE = 'Content-Type'.freeze
       CONTENT_LENGTH = 'Content-Length'.freeze
       IF_MODIFIED_SINCE = 'HTTP_IF_MODIFIED_SINCE'.freeze
       LAST_MODIFIED = 'Last-Modified'.freeze
+      IF_NONE_MATCH = 'HTTP_IF_NONE_MATCH'.freeze
+      ETAG = 'ETag'.freeze
       REQUEST_METHOD = 'REQUEST_METHOD'.freeze
       PATH_INFO = 'PATH_INFO'.freeze
+      METHOD_NOT_ALLOWED = [status_code(:method_not_allowd), {'Allow'.freeze => Rack::File::ALLOWED_VERBS.join(', ').freeze}, []]
+      NOT_FOUND = [status_code(:not_found), {}, []]
+      NOT_MODIFIED = [status_code(:not_modified), {}, []]
 
       # @param root [Pathname, #to_path, String] path to document root
       # @param extensions [Array<String>] extensions which is recognized as a zip file
+      # @param buffer_size [Integer] buffer size to read content, in bytes
       # @raise [ArgumentError] if +root+ is not a directory
       def initialize(root, extensions: %w[.zip], buffer_size: ExtractedFile::BUFFER_SIZE)
         @root = root.kind_of?(Pathname) ? root : Pathname(root)
         @root = @root.expand_path
-        @extensions = extensions.each {|extention| extention.freeze}.lazy
+        @extensions = extensions.map {|extention| extention.dup.freeze}.lazy
         @buffer_size = buffer_size
         raise ArgumentError, "Not a directory: #{@root}" unless @root.directory?
       end
 
       def call(env)
-        return [status_code(:method_not_allowd), {ALLOW => ALLOWED_METHODS}, []] unless Rack::File::ALLOWED_VERBS.include? env[REQUEST_METHOD]
+        return METHOD_NOT_ALLOWED unless Rack::File::ALLOWED_VERBS.include? env[REQUEST_METHOD]
 
         path_info = unescape(env[PATH_INFO])
         file = @extensions.map {|ext|
           zip_file, inner_path = find_zip_file_and_inner_path(path_info, ext)
           extract_file(zip_file, inner_path)
         }.select {|file| file}.first
-        return [status_code(:not_found), {}, []] if file.nil?
+        return NOT_FOUND if file.nil?
 
         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
+
+        if_none_match = env[IF_NONE_MATCH]
+        etag = file.name.hash.to_s(16) + file.mtime.hash.to_s(16)
+
+        if if_modified_since && file.mtime <= if_modified_since or
+            if_none_match && if_none_match == etag
           file.close
-          [status_code(:not_modified), {}, []]
+          NOT_MODIFIED
         else
           [
             status_code(:ok),
             {
               CONTENT_TYPE => Rack::Mime.mime_type(::File.extname(path_info)),
               CONTENT_LENGTH => file.size.to_s,
-              LAST_MODIFIED => file.mtime.httpdate
+              LAST_MODIFIED => file.mtime.httpdate,
+              ETAG => etag
             },
             file
           ]
@@ -83,7 +94,7 @@ module Rack::Archive
 
       # @param zip_file_path [Pathname] path to zip file
       # @param inner_path [String] path to file in zip archive
-      # @return [Zip::File]
+      # @return [ExtractedFile]
       # @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_file(zip_file_path, inner_path)
@@ -115,6 +126,7 @@ module Rack::Archive
 
         # @param archive [Zip::Archive]
         # @param path [String]
+        # @param buffer_size [Integer]
         # @raise ArgumentError when +archive+ already closed
         def initialize(archive, path, buffer_size=BUFFER_SIZE)
           raise ArgumentError, 'archive already closed' unless archive.open?
@@ -129,6 +141,10 @@ module Rack::Archive
           end
         end
 
+        def name
+          @file.name
+        end
+
         def mtime
           @file.mtime
         end

data/test/test_rack-archive-zip-extract.rb

@@ -43,6 +43,29 @@ class TestRackArchiveZipExtract < Test::Unit::TestCase
     assert_empty response.body
   end
 
+  def test_request_to_file_in_zip_returns_etag
+    response = request('/sample/sample.txt')
+
+    assert_not_nil response['ETag']
+  end
+
+  def test_request_to_old_file_with_etag_returns_not_modified
+    path = '/sample/sample.txt'
+    etag = request(path)['ETag']
+
+    response = request(path, @zip, {'HTTP_IF_NONE_MATCH' => etag})
+
+    assert_equal 304, response.status
+  end
+
+  def test_request_to_old_file_with_etag_returns_no_content
+    path = '/sample/sample.txt'
+    etag = request(path)['ETag']
+    response = request(path, @zip, {'HTTP_IF_NONE_MATCH' => etag})
+
+    assert_empty response.body
+  end
+
   class TestStatusCode < self
     data(
       'file in zip'              => [200, '/sample/sample.txt'],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-archive-zip-extract
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - KITAITI Makoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-26 00:00:00.000000000 Z
+date: 2014-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: test-unit-notify
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ files:
 - test/fixtures/sample-zip/sample.xml
 - test/fixtures/sample-zip/subdir/sample.txt
 - test/test_rack-archive-zip-extract.rb
-homepage: https://github.com/KitaitiMakoto/rack-archive-zip-extract
+homepage: http://rubydoc.info/gems/rack-archive-zip-extract/
 licenses:
 - MIT
 metadata: {}
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Zip file server