rack-try_static 0.0.4 → 0.1.1

data/Rakefile

@@ -0,0 +1,26 @@
+require 'rake/rdoctask'
+require 'rake/testtask'
+
+desc "Run all the tests"
+task :default => [:test]
+
+desc "Generate RDox"
+task "RDOX" do
+  sh "specrb -Ilib:test -a --rdox >RDOX"
+end
+
+desc "Run specs with test/unit style output"
+task :test do
+  sh "specrb -Ilib:test -w #{ENV['TEST'] || '-a'} #{ENV['TESTOPTS']}"
+end
+
+desc "Run specs with specdoc style output"
+task :spec do
+  sh "specrb -Ilib:test -s -w #{ENV['TEST'] || '-a'} #{ENV['TESTOPTS']}"
+end
+
+desc "Run all the tests"
+task :fulltest do
+  sh "specrb -Ilib:test -w #{ENV['TEST'] || '-a'} #{ENV['TESTOPTS']}"
+end
+

data/lib/rack/contrib/try_static.rb

@@ -1,24 +1,24 @@
 require 'rack/static'
 
 module ::Rack
-  class TryStatic < Static
+  class TryStatic
 
     def initialize(app, options)
-      super
-      @try = ([''] + Array(options.delete(:try)) + [''])
+      @app = app
+      @try = ['', *options.delete(:try)]
+      @static = ::Rack::Static.new(
+        lambda { [404, {}, []] }, 
+        options)
     end
 
     def call(env)
-      @next = 0
-      while @next < @try.size && 404 == (resp = super(try_next(env)))[0] 
-        @next += 1
-      end
-      404 == resp[0] ? @app.call : resp
-    end
-
-    private
-    def try_next(env)
-      env.merge('PATH_INFO' => env['PATH_INFO'] + @try[@next])
+      orig_path = env['PATH_INFO']
+      found = nil
+      @try.each do |path|
+        resp = @static.call(env.merge!({'PATH_INFO' => orig_path + path}))
+        break if 404 != resp[0] && found = resp
+      end 
+      found or @app.call(env.merge!('PATH_INFO' => orig_path))
     end
   end
 end

data/rack-try_static.gemspec

@@ -0,0 +1,49 @@
+#!/usr/bin/env gem build
+# encoding: utf-8
+# vim: ft=ruby
+
+require "base64"
+
+Gem::Specification.new do |s|
+  s.name = "rack-try_static"
+  s.version = "0.1.1"
+  s.date = Time.now.strftime '%Y-%m-%d'
+
+  s.authors = ["gmarik"]
+  s.email = Base64.decode64("Z21hcmlrQGdtYWlsLmNvbQ==\n")
+
+  s.homepage = "http://github.com/gmarik/rack-try_static"
+  s.summary = "rack middleware to serve static files with specified patterns"
+  s.description = "#{s.summary}. Check out http://gmarik.info/blog/2010/05/10/blogging-with-jekyll-and-heroku-for-free for more..."
+
+  s.cert_chain = nil
+
+  # files
+  s.files = `git ls-files`.split("\n")
+
+  #Dir["bin/*"].map(&File.method(:basename))
+  #s.default_executable = "example"
+  s.require_paths = ["lib"]
+
+  # Ruby version
+  s.required_ruby_version = ::Gem::Requirement.new(">= 1.8.6")
+
+  # dependencies
+  # RubyGems has runtime dependencies (add_dependency) and
+  s.add_dependency 'rack', '1.1.0'
+
+  s.has_rdoc = false
+  #s.extra_rdoc_files = %w[README.rdoc COPYING]
+
+  # development dependencies (add_development_dependency)
+  s.add_development_dependency "test-spec"
+
+  s.require_paths = %w[lib]
+  s.test_files = s.files.select {|path| path =~ /^test\/spec_.*\.rb/}
+
+  #s.post_install_message = s.name + ' installed'
+
+  # RubyForge
+  #s.rubyforge_project = "example"
+end
+

data/test/documents/index.htm

@@ -0,0 +1 @@
+index.htm

data/test/documents/index.html

@@ -0,0 +1 @@
+index.html

data/test/spec_rack_try_static.rb

@@ -0,0 +1,51 @@
+require 'test/spec'
+
+require 'rack'
+require 'rack/contrib/try_static'
+require 'rack/mock'
+
+class DummyApp
+  def call(env)
+    [200, {}, ["Hello World"]]
+  end
+end
+
+
+def request(options = {})
+  options.merge!({
+    :urls => %w[/],
+    :root => ::File.expand_path(::File.dirname(__FILE__)),
+  })
+
+  @request = 
+    Rack::MockRequest.new(
+      Rack::TryStatic.new( 
+        DummyApp.new, options))
+end
+
+describe "Rack::TryStatic" do
+  context 'when tries fail' do
+    it 'should not serve' do
+      res = request(:try => ['html']).get('/documents')
+      res.should.be.ok
+      res.body.should == "Hello World"
+    end
+  end
+
+  context 'when tries succeed' do
+    it 'should serve first found' do
+      res = request(:try => ['.html', '/index.html', '/index.htm']).get('/documents')
+      res.should.be.ok
+      res.body.strip.should == "index.html"
+    end
+  end
+
+  context 'when tries not needed' do
+    it 'should serve existing' do
+      res = request(:try => ['/index.html']).get('/documents/existing.html')
+      res.should.be.ok
+      res.body.strip.should == "existing.html"
+    end
+  end
+
+end

metadata

@@ -1,20 +1,20 @@
 --- !ruby/object:Gem::Specification 
 name: rack-try_static
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 25
   prerelease: false
   segments: 
   - 0
-  - 0
-  - 4
-  version: 0.0.4
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - gmarik
 autorequire: 
 bindir: bin
 cert_chain: 
-date: 2010-09-18 00:00:00 -05:00
+date: 2010-09-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,7 +34,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: test-spec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -57,7 +57,12 @@ extra_rdoc_files: []
 
 files: 
 - README.md
+- Rakefile
 - lib/rack/contrib/try_static.rb
+- rack-try_static.gemspec
+- test/documents/index.htm
+- test/documents/index.html
+- test/spec_rack_try_static.rb
 has_rdoc: true
 homepage: http://github.com/gmarik/rack-try_static
 licenses: []
@@ -94,5 +99,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: rack middleware to serve static files with specified patterns
-test_files: []
-
+test_files: 
+- test/spec_rack_try_static.rb