rack-archive-zip-extract 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07bea84e8dd599718d60edf93979698acfa2ca84
-  data.tar.gz: 755f333cee8ead09814ef8d2253016ad5b9a4d0e
+  metadata.gz: 9a22645366df92782010048441902b26effc0112
+  data.tar.gz: 60eb6ea71ff64cc4a268f7e96e05c4b7c89e86b4
 SHA512:
-  metadata.gz: 7d5e00114d0e8638ae5c7894ba507e5600c500d25be33f3f9528b5721996d7559501c7cca4983e1c0bbaed8e98e71150ba49a8104a7620c22fa80bbf66b85235
-  data.tar.gz: 661f0577924ef2c25f5199cfab991f4705f76b5d83dba65a0b243b02323ef762720a8c043571fdc9f2853521e7f655fbc8f056b4cb050aa81e6c40e3cca6f236
+  metadata.gz: f5fbc79aa06160b54f2007bda4b6ffa4ab6b3a5176cd438e1570cd83a6987e80452e04a36eb89f32207c592faef44756fce6c5a12bbc52a9f3f3d6f8781fa814
+  data.tar.gz: aaa2f76f60a407db7d67d0d996ef466edb5e4dc6d26b9ce973cf35cb3828b15d09560e8744c14d896e2e958ae3a83f6dd9c21347e2a35716eb07325589218d88

data/CHANGELOG.markdown

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+0.0.6
+-----
+
+* Make Content-Type header customizable
+
 0.0.5
 -----
 

data/README.markdown

@@ -47,6 +47,16 @@ You can tell the app extensions by option argument:
 
     run Rack::Archive::Zip::Extract.new('path/to/docroot', extensions: ['.epub', '.zip'])
 
+### Mime types
+
+By default, Rack::Archive::Zip::Extract uses [`Rack::Mime::MIME_TYPES`][mime_types] as a mime type table. You can add and/or update mime type settings by passing hash table to initializer:
+
+    run Rack::Archive::Zip::Extract.new('path/to/docroot', mime_types: {'.html' => 'application/xhtml+xml', '.apk => 'application/vnd.android.package-archive'})
+
+In example above, Rack::Archive::Zip::Example sends "`Content-Type: application/xhtml+xml`" header for access to path with extension "`.html`" instead of "`text/html`" and "`application/vnd.android.package-archive`" for "`*.apk`" instead of default "`application/octet-stream`".
+
+[mime_types]: http://rack.rubyforge.org/doc/Rack/Mime.html#MIME_TYPES
+
 ### Buffer size
 
 Buffer size for reading file in zip archive is set to {Rack::Archive::Zip::Extract::ExtractedFile::BUFFER_SIZE 8192} bytes by default.

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

@@ -31,15 +31,18 @@ module Rack::Archive
       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), {}, []]
+      DEFAULT_CONTENT_TYPE = 'application/octet-stream'.freeze
 
       # @param root [Pathname, #to_path, String] path to document root
       # @param extensions [Array<String>] extensions which is recognized as a zip file
+      # @param mime_types [Hash{String => String}] pairs of extesion and content type
       # @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)
+      def initialize(root, extensions: %w[.zip], mime_types: {}, buffer_size: ExtractedFile::BUFFER_SIZE)
         @root = root.kind_of?(Pathname) ? root : Pathname(root)
         @root = @root.expand_path
         @extensions = extensions.map {|extention| extention.dup.freeze}.lazy
+        @mime_types = Rack::Mime::MIME_TYPES.merge(mime_types)
         @buffer_size = buffer_size
         raise ArgumentError, "Not a directory: #{@root}" unless @root.directory?
       end
@@ -54,24 +57,20 @@ module Rack::Archive
         }.select {|file| file}.first
         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_modified_since = Time.parse(env[IF_MODIFIED_SINCE]) rescue Time.new(0)
         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
+        if file.mtime <= if_modified_since or env[IF_NONE_MATCH] == file.etag
           file.close
           NOT_MODIFIED
         else
           [
             status_code(:ok),
             {
-              CONTENT_TYPE => Rack::Mime.mime_type(::File.extname(path_info)),
+              CONTENT_TYPE => @mime_types.fetch(::File.extname(path_info), DEFAULT_CONTENT_TYPE),
               CONTENT_LENGTH => file.size.to_s,
               LAST_MODIFIED => file.mtime.httpdate,
-              ETAG => etag
+              ETAG => file.etag
             },
             file
           ]
@@ -124,6 +123,8 @@ module Rack::Archive
       class ExtractedFile
         BUFFER_SIZE = 8192
 
+        attr_reader :etag, :mtime, :size
+
         # @param archive [Zip::Archive]
         # @param path [String]
         # @param buffer_size [Integer]
@@ -132,6 +133,9 @@ module Rack::Archive
           raise ArgumentError, 'archive already closed' unless archive.open?
           @archive = archive
           @file = @archive.fopen(path)
+          @mtime = @file.mtime
+          @size = @file.size
+          @etag = @file.name.hash.to_s(16) + @mtime.hash.to_s(16) + @size.hash.to_s(16)
           @buffer_size = buffer_size
         end
 
@@ -141,18 +145,6 @@ module Rack::Archive
           end
         end
 
-        def name
-          @file.name
-        end
-
-        def mtime
-          @file.mtime
-        end
-
-        def size
-          @file.size
-        end
-
         def close
           @file.close
           @archive.close

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

@@ -95,6 +95,13 @@ class TestRackArchiveZipExtract < Test::Unit::TestCase
 
       assert_equal content_type, response['Content-Type']
     end
+
+    def test_mime_types_can_be_added
+      mime_types = Rack::Archive::Zip::Extract.new(__dir__, mime_types: {'.html' => 'application/xhtml+xml'})
+      response = request('/sample/sample.html', mime_types)
+
+      assert_equal 'application/xhtml+xml', response['Content-Type']
+    end
   end
 
   def test_extension_of_file_can_be_changed

metadata

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