rack-archive-zip-extract 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d1d1fdef39fc5a5b020441ab5e3016d4ceb278e
-  data.tar.gz: 9c122a1f1cd9c251625211a264e49ec4779fddc7
+  metadata.gz: 367946e3ae493b7beb2c8a894a737861d8819a44
+  data.tar.gz: 1b2509141f86cde9c02afb4ce3174136db6d57fd
 SHA512:
-  metadata.gz: 281a9e3aabf364311f5600e8857e579fcd2ddcccbdbb622b9bf2ccb16564bf12ec01c057660e11e5d3bb83bbd126eeda9d1892ee0218db272ddf9598dde5b5e0
-  data.tar.gz: 57c7a6d86e25a58b13b23d3d6e16c1241f2094a23de109357443a7014d140934ba2e3d967bebd2abaa06e7313f443976900acd1ea9b32c5a0ff899a08513f75b
+  metadata.gz: 0200cd1fa15c0182d6597d21dd25796c5c928753d252060a44d1255a0c10d1aa5a91ad910387321b8073e2b12773066322b06bf43dc49f705cf27e4e3ec1364d
+  data.tar.gz: 36807535e98a5b0947fef9066be63b5d47ad09a951854b211ea894960ddc92c61f92a1d57448a4141412e73170122a04750aa38ee4a4ce065201f874ee9e1d42

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

@@ -4,18 +4,30 @@ require 'rack/file'
 require 'rack/mime'
 require 'zipruby'
 
-# {Rack::Archive::Zip::Extract Rack::Archive::Zip::Extract} is a Rack application which serves files in zip archives.
-# @example
-#   run Rack::Archive::Zip::Extract.new('path/to/docroot')
-# @example
-#   run Rack::Archive::Zip::Extract.new('path/to/docroot', extensions: %w[.epub .zip .jar .odt .docx])
-# @note
-#   {Rack::Archive::Zip::Extract Rack::Archive::Zip::Extract} does not serve a zip file itself. Use Rack::File or so to do so.
 module Rack::Archive
   module Zip
+    # {Rack::Archive::Zip::Extract Rack::Archive::Zip::Extract} is a Rack application which serves files in zip archives.
+    # @example
+    #   run Rack::Archive::Zip::Extract.new('path/to/docroot')
+    # @example
+    #   run Rack::Archive::Zip::Extract.new('path/to/docroot', extensions: %w[.epub .zip .jar .odt .docx])
+    # @note
+    #   {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
+
       SEPS = Rack::File::SEPS
+      DOT = '.'.freeze
+      DOUBLE_DOT = '..'.freeze
+      COMMA = ','.freeze
       ALLOWED_VERBS = Rack::File::ALLOWED_VERBS
+      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
+      REQUEST_METHOD = 'REQUEST_METHOD'.freeze
+      PATH_INFO = 'PATH_INFO'.freeze
 
       attr_reader :root
 
@@ -30,40 +42,48 @@ module Rack::Archive
       end
 
       def call(env)
-        return [405, {'Allow' => ALLOWED_VERBS.join(', ')}, []] unless ALLOWED_VERBS.include? env['REQUEST_METHOD']
+        return [status_code(:method_not_allowd), {ALLOW => ALLOWED_VERBS.join(COMMA)}, []] unless ALLOWED_VERBS.include? env[REQUEST_METHOD]
 
-        path_info = Rack::Utils.unescape(env['PATH_INFO'])
+        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
         @extensions.each do |ext|
           zip_file, inner_path = find_zip_file_and_inner_path(path_info, ext)
-          body = extract_content(zip_file, inner_path)
-          break if body
+          body, file_size, mtime = extract_content(zip_file, inner_path, if_modified_since)
+          break if mtime
         end
-        return [404, {}, []] if body.nil?
+        return [status_code(:not_found), {}, []] if mtime.nil?
 
-        [
-          200,
-          {
-            'Content-Type' => Rack::Mime.mime_type(::File.extname(path_info)),
-            'Content-Length' => body.bytesize.to_s,
-            'Last-Modified' => zip_file.mtime.httpdate
-          },
-          [body]
-        ]
+        if if_modified_since and 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
+            },
+            [body]
+          ]
+        end
       end
 
       # @param path_info [String]
       # @param extension [String]
       # @return [Array] a pair of Pathname(zip file) and String(file path in zip archive)
       def find_zip_file_and_inner_path(path_info, extension)
-        path_parts = path_info_to_clean_parts(path_info)
+        segments = path_info_to_clean_segments(path_info)
         current = @root
         zip_file = nil
-        while part = path_parts.shift
-          zip_file = current + "#{part}#{extension}"
-          return zip_file, ::File.join(path_parts) if zip_file.file?
-          current += part
+        while segment = segments.shift
+          zip_file = current + "#{segment}#{extension}"
+          return zip_file, ::File.join(segments) if zip_file.file?
+          current += segment
         end
       end
 
@@ -72,24 +92,29 @@ module Rack::Archive
       # @return [String] content
       # @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)
+      def extract_content(zip_file_path, inner_path, if_modified_since)
         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|
-            return file.read
+            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
         end
       end
 
       # @param path_info [String]
-      # @return [Array<String>] parts of clean path
-      def path_info_to_clean_parts(path_info)
-        parts = path_info.split SEPS
+      # @return [Array<String>] segments of clean path
+      # @see http://rubydoc.info/gems/rack/Rack/File#_call-instance_method Algorithm stolen from Rack::File#_call
+      def path_info_to_clean_segments(path_info)
+        segments = path_info.split SEPS
         clean = []
-        parts.each do |part|
-          next if part.empty? || part == '.'
-          part == '..' ? clean.pop : clean << part
+        segments.each do |segment|
+          next if segment.empty? || segment == DOT
+          segment == DOUBLE_DOT ? clean.pop : clean << segment
         end
         clean
       end

metadata

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