rack-zippy 1.0.0 → 1.0.1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.1 / 2013-09-06
+-  Fix error on request for assets root dir (fixes [#2](https://github.com/eliotsykes/rack-zippy/issues/2))
+-  Add MIT license to gemspec (fixes [#1](https://github.com/eliotsykes/rack-zippy/issues/1))
+
 ## 1.0.0 / 2013-08-22
 
 Production-ready release

data/lib/rack-zippy.rb

@@ -17,7 +17,7 @@ module Rack
 
           file_path = "#{@asset_root}#{path_info}"
 
-          if ::File.exists?(file_path)
+          if ::File.file?(file_path)
             headers = { 'Content-Type'  => Rack::Mime.mime_type(::File.extname(path_info)) }
             headers.merge! cache_headers(path_info)
 
@@ -57,7 +57,7 @@ module Rack
 
       STATIC_EXTENSION_REGEX = /\.(?:css|js|html|htm|txt|ico|png|jpg|jpeg|gif|pdf|svg|zip|gz|eps|psd|ai)\z/i
 
-      PRECOMPILED_ASSETS_SUBDIR_REGEX = /\A\/assets\//
+      PRECOMPILED_ASSETS_SUBDIR_REGEX = /\A\/assets(?:\/|\z)/
 
       ACCEPTS_GZIP_REGEX = /\bgzip\b/
 
@@ -85,8 +85,8 @@ module Rack
       end
 
       def serve?(path_info)
-        is_compilable_asset = (path_info =~ PRECOMPILED_ASSETS_SUBDIR_REGEX)
-        if is_compilable_asset
+        is_assets_dir_or_below = (path_info =~ PRECOMPILED_ASSETS_SUBDIR_REGEX)
+        if is_assets_dir_or_below
           return should_assets_be_compiled_already?
         end
         return has_static_extension?(path_info)

data/lib/rack-zippy/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module Zippy
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

data/rack-zippy.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |gem|
   gem.description   = %q{Rack middleware for serving static gzipped assets generated by the Rails asset pipeline}
   gem.summary       = %q{Rack middleware for serving static gzipped assets generated by the Rails asset pipeline}
   gem.homepage      = "https://github.com/eliotsykes/rack-zippy"
+  gem.license       = 'MIT'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/test/asset_server_test.rb

@@ -20,6 +20,36 @@ class Rack::Zippy::AssetServerTest < Test::Unit::TestCase
     Rack::Zippy::AssetServer.new(rack_app)
   end
 
+  def test_request_for_non_asset_path_beginning_with_assets_dir_name_bypasses_middleware
+    get '/assets-are-great-but-im-not-one'
+    assert_underlying_app_responded
+  end
+
+  def test_request_for_subdir_of_assets_responds_404_not_found
+    ['/assets/blog', '/assets/blog/logos/'].each do |path|
+      local_path = "public#{path}"
+      assert File.directory?(local_path)
+      get path
+      assert_not_found
+    end
+  end
+
+  def test_request_for_non_existent_subdir_of_assets_responds_404_not_found
+    ['/assets/ghost', '/assets/does/not/exist', '/assets/nothing-here/with-trailing-slash/'].each do |path|
+      local_path = "public#{path}"
+      assert !File.exists?(local_path)
+      get path
+      assert_not_found
+    end
+  end
+
+  def test_request_for_assets_root_responds_404_not_found
+    ['/assets/', '/assets'].each do |assets_root|
+      get assets_root
+      assert_not_found "'#{assets_root}' assets root request should not be found"
+    end
+  end
+
   def test_cache_friendly_last_modified_is_not_set_for_files_outside_of_assets_subdir
     get '/robots.txt'
     assert_response_ok
@@ -35,8 +65,7 @@ class Rack::Zippy::AssetServerTest < Test::Unit::TestCase
   def test_does_not_serve_assets_subdir_request_when_assets_compile_enabled
     ::Rails.configuration.assets.compile = true
     get '/assets/application.css'
-    assert_response_ok
-    assert_equal 'Up above the streets and houses', last_response.body
+    assert_underlying_app_responded
   end
 
   def test_serve_returns_true_if_request_has_static_extension
@@ -278,9 +307,9 @@ class Rack::Zippy::AssetServerTest < Test::Unit::TestCase
     assert_equal ::File.size(path).to_s, last_response.headers['content-length']
   end
 
-  def assert_not_found
-    assert_equal 404, last_response.status
-    assert_equal 'Not Found', last_response.body
+  def assert_not_found(msg=nil)
+    assert_equal 404, last_response.status, msg
+    assert_equal 'Not Found', last_response.body, msg
   end
 
   def ensure_correct_working_directory

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-zippy
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies: []
 description: Rack middleware for serving static gzipped assets generated by the Rails
   asset pipeline
@@ -33,6 +33,7 @@ files:
 - test/public/assets/application.css.gz
 - test/public/assets/application.js
 - test/public/assets/application.js.gz
+- test/public/assets/blog/logos/logo1.png
 - test/public/assets/favicon.ico
 - test/public/assets/rails.png
 - test/public/favicon.ico
@@ -40,7 +41,8 @@ files:
 - test/public/thanks.html
 - test/test_helper.rb
 homepage: https://github.com/eliotsykes/rack-zippy
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -51,12 +53,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3051334136221018269
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3051334136221018269
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -70,6 +78,7 @@ test_files:
 - test/public/assets/application.css.gz
 - test/public/assets/application.js
 - test/public/assets/application.js.gz
+- test/public/assets/blog/logos/logo1.png
 - test/public/assets/favicon.ico
 - test/public/assets/rails.png
 - test/public/favicon.ico