sinatra 0.1.7 → 0.2.0

data/lib/sinatra/test/methods.rb

@@ -0,0 +1,56 @@
+class Rack::MockRequest
+  class << self
+    alias :env_for_without_env :env_for
+    def env_for(uri = "", opts = {})
+      env = { 'HTTP_USER_AGENT' => opts.delete(:agent) }
+      env_for_without_env(uri, opts).merge(env)
+    end
+  end
+end
+
+module Sinatra
+  
+  module Test
+    
+    module Methods
+
+      def easy_env_map
+        {
+          :accept => 'HTTP_ACCEPT',
+          :agent => 'HTTP_AGENT',
+          :host => 'HTTP_POST'
+        }
+      end
+    
+      def map_easys(params)
+        easy_env_map.inject(params.dup) do |m, (from, to)|
+          m[to] = m.delete(from) if m.has_key?(from); m
+        end
+      end
+
+      %w(get head post put delete).each do |m|
+        define_method("#{m}_it") do |path, *args|
+          request = Rack::MockRequest.new(Sinatra.build_application)
+          env, input = if args.size == 2
+            [args.last, args.first]
+          elsif args.size == 1
+            data = args.first
+            data.is_a?(Hash) ? [data.delete(:env), data.to_params] : [nil, data]
+          end
+          @response = request.request(m.upcase, path, {:input => input}.merge(env || {}))
+        end
+      end
+      
+      def follow!
+        get_it(@response.location)
+      end
+
+      def method_missing(name, *args)
+        @response.send(name, *args)
+      end
+      
+    end
+
+  end
+  
+end

data/lib/sinatra/test/spec.rb

@@ -0,0 +1,10 @@
+require File.dirname(__FILE__) + '/unit'
+require 'test/spec'
+
+class Test::Unit::TestCase
+  
+  def should
+    @response.should
+  end
+  
+end

data/lib/sinatra/test/unit.rb

@@ -0,0 +1,13 @@
+require 'test/unit'
+require File.dirname(__FILE__) + '/methods'
+
+Test::Unit::TestCase.send(:include, Sinatra::Test::Methods)
+
+Sinatra::Application.default_options.merge!(
+  :env => :test,
+  :run => false,
+  :raise_errors => true,
+  :logging => false
+)
+
+Sinatra.application.options = nil

data/sinatra.gemspec

@@ -1,59 +1,63 @@
 
-# Gem::Specification for Sinatra-0.1.7
+# Gem::Specification for Sinatra-0.2.0
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra}
-  s.version = "0.1.7"
-  s.date = %q{2007-10-23}
-  s.summary = %q{Sinatra is a classy web-framework dressed in a DSL}
-  s.email = %q{blake.mizerany@gmail.com}
-  s.homepage = %q{http://sinatra.rubyforge.org/}
-  s.rubyforge_project = %q{sinatra}
-  s.description = %q{Sinatra is a classy web-framework dressed in a DSL}
-  s.has_rdoc = true
+  s.version = "0.2.0"
+
+  s.specification_version = 2 if s.respond_to? :specification_version=
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Blake Mizerany"]
-  s.files = ["CHANGELOG", "examples/hello/hello.rb", "examples/hello/views/hello.erb", "examples/todo/todo.rb", "files/default_index.erb", "files/error.erb", "files/logo.png", "files/not_found.erb", "lib/sinatra/context/renderer.rb", "lib/sinatra/context.rb", "lib/sinatra/core_ext/array.rb", "lib/sinatra/core_ext/class.rb", "lib/sinatra/core_ext/hash.rb", "lib/sinatra/core_ext/kernel.rb", "lib/sinatra/core_ext/metaid.rb", "lib/sinatra/core_ext/module.rb", "lib/sinatra/core_ext/symbol.rb", "lib/sinatra/dispatcher.rb", "lib/sinatra/dsl.rb", "lib/sinatra/environment.rb", "lib/sinatra/event.rb", "lib/sinatra/irb.rb", "lib/sinatra/loader.rb", "lib/sinatra/logger.rb", "lib/sinatra/options.rb", "lib/sinatra/rack_ext/request.rb", "lib/sinatra/route.rb", "lib/sinatra/server.rb", "lib/sinatra/sessions.rb", "lib/sinatra/test_methods.rb", "lib/sinatra.rb", "LICENSE", "Manifest", "RakeFile", "README", "site/index.htm", "site/index.html", "site/logo.png", "test/helper.rb", "test/sinatra/dispatcher_test.rb", "test/sinatra/event_test.rb", "test/sinatra/renderer_test.rb", "test/sinatra/request_test.rb", "test/sinatra/route_test.rb", "test/sinatra/static_files/foo.txt", "test/sinatra/static_files_test.rb", "test/sinatra/url_test.rb", "vendor/erb/init.rb", "vendor/erb/lib/erb.rb", "vendor/haml/init.rb", "vendor/haml/lib/haml.rb", "Rakefile", "sinatra.gemspec"]
-  s.test_files = ["test/sinatra/dispatcher_test.rb", "test/sinatra/event_test.rb", "test/sinatra/renderer_test.rb", "test/sinatra/request_test.rb", "test/sinatra/route_test.rb", "test/sinatra/static_files_test.rb", "test/sinatra/url_test.rb"]
+  s.date = %q{2008-04-11}
+  s.description = %q{Classy web-development dressed in a DSL}
+  s.email = %q{}
+  s.extra_rdoc_files = ["CHANGELOG", "lib/sinatra/test/methods.rb", "lib/sinatra/test/spec.rb", "lib/sinatra/test/unit.rb", "lib/sinatra.rb", "README.rdoc"]
+  s.files = ["CHANGELOG", "images/404.png", "images/500.png", "index.html", "lib/sinatra/test/methods.rb", "lib/sinatra/test/spec.rb", "lib/sinatra/test/unit.rb", "lib/sinatra.rb", "README.rdoc", "test/app_test.rb", "test/application_test.rb", "test/builder_test.rb", "test/custom_error_test.rb", "test/diddy_test.rb", "test/erb_test.rb", "test/event_context_test.rb", "test/events_test.rb", "test/haml_test.rb", "test/helper.rb", "test/mapped_error_test.rb", "test/public/foo.xml", "test/rest_test.rb", "test/sass_test.rb", "test/sessions_test.rb", "test/streaming_test.rb", "test/sym_params_test.rb", "test/template_test.rb", "test/use_in_file_templates_test.rb", "test/views/foo.builder", "test/views/foo.erb", "test/views/foo.haml", "test/views/foo.sass", "test/views/foo_layout.erb", "test/views/foo_layout.haml", "test/views/layout_test/foo.builder", "test/views/layout_test/foo.erb", "test/views/layout_test/foo.haml", "test/views/layout_test/foo.sass", "test/views/layout_test/layout.builder", "test/views/layout_test/layout.erb", "test/views/layout_test/layout.haml", "test/views/layout_test/layout.sass", "test/views/no_layout/no_layout.builder", "test/views/no_layout/no_layout.haml", "Manifest", "sinatra.gemspec", "Rakefile"]
+  s.has_rdoc = true
+  s.homepage = %q{http://www.sinatrarb.com}
+  s.post_install_message = %q{*** Be sure to checkout the site for helpful tips!  sinatrarb.com ***}
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Sinatra", "--main", "README.rdoc"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{sinatra}
+  s.rubygems_version = %q{1.0.1}
+  s.summary = %q{Classy web-development dressed in a DSL}
+  s.test_files = ["test/app_test.rb", "test/application_test.rb", "test/builder_test.rb", "test/custom_error_test.rb", "test/diddy_test.rb", "test/erb_test.rb", "test/event_context_test.rb", "test/events_test.rb", "test/haml_test.rb", "test/mapped_error_test.rb", "test/rest_test.rb", "test/sass_test.rb", "test/sessions_test.rb", "test/streaming_test.rb", "test/sym_params_test.rb", "test/template_test.rb", "test/use_in_file_templates_test.rb"]
+
   s.add_dependency(%q<mongrel>, [">= 1.0.1"])
-  s.add_dependency(%q<rack>, [">= 0.2.0"])
+  s.add_dependency(%q<rack>, [">= 0", "= 0.3.0"])
 end
 
 
 # # Original Rakefile source (requires the Echoe gem):
 # 
+# require 'rubygems'
 # require 'rake/testtask'
-# require 'ftools'
-# 
-# Version = '0.1.0'
+# require 'rake/rdoctask'
+# require 'echoe'
 # 
-# begin
-#   require 'rubygems'
-#   gem 'echoe'
-#   ENV['RUBY_FLAGS'] = ""
-#   require 'echoe'
+# task :default => :test
 # 
-#   Echoe.new('sinatra') do |p|
-#     p.rubyforge_name = 'sinatra'
-#     p.dependencies = ['mongrel >=1.0.1', 'rack >=0.2.0']    
-#     p.summary = "Sinatra is a classy web-framework dressed in a DSL"
-#     p.description = "Sinatra is a classy web-framework dressed in a DSL"
-#     p.url = "http://sinatra.rubyforge.org/"
-#     p.author = 'Blake Mizerany'
-#     p.email = "blake.mizerany@gmail.com"
-#     p.test_pattern = 'test/**/*_test.rb'
-#     p.include_rakefile = true
-#     p.rdoc_pattern = ['README', 'LICENSE'] + Dir.glob('lib/**/*.rb') + Dir.glob('vendor/**/*.rb')
-#     p.docs_host = "bmizerany@rubyforge.org:/var/www/gforge-projects/"
-#   end
+# Rake::RDocTask.new do |rd|
+#   rd.main = "README.rdoc"
+#   rd.rdoc_files += ["README.rdoc"]
+#   rd.rdoc_files += Dir.glob("lib/**/*.rb")
+#   rd.rdoc_dir = 'doc'
+# end
 # 
-# rescue LoadError
+# Rake::TestTask.new do |t|
+#   ENV['SINATRA_ENV'] = 'test'
+#   t.pattern = File.dirname(__FILE__) + "/test/*_test.rb"
 # end
 # 
-# desc 'Clear all the log files from here down'
-# task :remove_logs do
-#   Dir.glob(Dir.pwd + '/**/*.log') do |logfile|
-#     FileUtils.rm(logfile)
-#     puts 'Removed: %s' % logfile
-#   end
+# Echoe.new("sinatra") do |p|
+#   p.author = "Blake Mizerany"
+#   p.summary = "Classy web-development dressed in a DSL"
+#   p.url = "http://www.sinatrarb.com"
+#   p.docs_host = "sinatrarb.com:/var/www/blakemizerany.com/public/docs/"
+#   p.dependencies = ["mongrel >=1.0.1", "rack >= 0.3.0"]
+#   p.install_message = "*** Be sure to checkout the site for helpful tips!  sinatrarb.com ***"
+#   p.include_rakefile = true
 # end
+# 

data/test/app_test.rb

@@ -0,0 +1,150 @@
+require File.dirname(__FILE__) + '/helper'
+
+context "Sinatra" do
+  
+  setup do
+    Sinatra.application = nil
+  end
+  
+  specify "should handle result of nil" do
+    get '/' do
+      nil
+    end
+    
+    get_it '/'
+    should.be.ok
+    body.should == ''
+  end
+  
+  specify "handles events" do
+    get '/:name' do
+      'Hello ' + params["name"]
+    end
+    
+    get_it '/Blake'
+    
+    should.be.ok
+    body.should.equal 'Hello Blake'
+  end
+  
+  specify "follows redirects" do
+    get '/' do
+      redirect '/blake'
+    end
+    
+    get '/blake' do
+      'Mizerany'
+    end
+    
+    get_it '/'
+    should.be.redirection
+    body.should.equal ''
+    
+    follow!
+    should.be.ok
+    body.should.equal 'Mizerany'
+  end
+  
+  specify "renders a body with a redirect" do
+    Sinatra::EventContext.any_instance.expects(:foo).returns('blah')
+    get "/" do
+      redirect 'foo', :foo
+    end
+    get_it '/'
+    should.be.redirection
+    headers['Location'].should.equal 'foo'
+    body.should.equal 'blah'
+  end
+  
+  specify "body sets content and ends event" do
+    
+    Sinatra::EventContext.any_instance.expects(:foo).never
+    
+    get '/set_body' do
+      stop 'Hello!'
+      stop 'World!'
+      foo
+    end
+    
+    get_it '/set_body'
+    
+    should.be.ok
+    body.should.equal 'Hello!'
+    
+  end
+  
+  specify "should set status then call helper with a var" do
+    Sinatra::EventContext.any_instance.expects(:foo).once.with(1).returns('bah!')
+    
+    get '/set_body' do
+      stop [404, [:foo, 1]]
+    end
+    
+    get_it '/set_body'
+    
+    should.be.not_found
+    body.should.equal 'bah!'
+    
+  end
+
+  specify "delegates HEAD requests to GET handlers" do
+    get '/invisible' do
+      "I am invisible to the world"
+    end
+
+    head_it '/invisible'
+    should.be.ok
+    body.should.not.equal "I am invisible to the world"
+    body.should.equal ''
+  end
+
+  
+  specify "put'n with POST" do
+    put '/' do
+      'puted'
+    end
+    post_it '/', :_method => 'PUT'
+    assert_equal 'puted', body
+  end
+
+  specify "put'n wth PUT" do
+    put '/' do
+      'puted'
+    end
+    put_it '/'
+    assert_equal 'puted', body
+  end
+
+  # Some Ajax libraries downcase the _method parameter value. Make 
+  # sure we can handle that.
+  specify "put'n with POST and lowercase _method param" do
+    put '/' do
+      'puted'
+    end
+    post_it '/', :_method => 'put'
+    body.should.equal 'puted'
+  end
+
+  # Ignore any _method parameters specified in GET requests or on the query string in POST requests.
+  specify "not put'n with GET" do
+    get '/' do
+      'getted'
+    end
+    get_it '/', :_method => 'put'
+    should.be.ok
+    body.should.equal 'getted'
+  end
+
+  specify "_method query string parameter ignored on POST" do
+    post '/' do
+      'posted'
+    end
+    put '/' do
+      'booo'
+    end
+    post_it "/?_method=PUT"
+    should.be.ok
+    body.should.equal 'posted'
+  end
+
+end

data/test/application_test.rb

@@ -0,0 +1,175 @@
+require File.dirname(__FILE__) + '/helper'
+
+require 'uri'
+
+class TesterWithEach
+  def each
+    yield 'foo'
+    yield 'bar'
+    yield 'baz'
+  end
+end
+
+context "Looking up a request" do
+
+  setup do
+    Sinatra.application = nil
+  end
+
+  specify "returns what's at the end" do
+    block = Proc.new { 'Hello' }
+    get '/', &block
+    
+    result = Sinatra.application.lookup(
+      Rack::Request.new(
+        'REQUEST_METHOD' => 'GET',
+        'PATH_INFO' => '/'
+      )
+    )
+    
+    result.should.not.be.nil
+    result.block.should.be block
+  end
+  
+  specify "takes params in path" do
+    block = Proc.new { 'Hello' }
+    get '/:foo', &block
+    
+    result = Sinatra.application.lookup(
+      Rack::Request.new(
+        'REQUEST_METHOD' => 'GET',
+        'PATH_INFO' => '/bar'
+      )
+    )
+    
+    result.should.not.be.nil
+    result.block.should.be block
+    result.params.should.equal "foo" => 'bar'
+  end
+              
+end
+
+context "An app returns" do
+  
+  setup do
+    Sinatra.application = nil
+  end
+    
+  specify "404 if no events found" do
+    request = Rack::MockRequest.new(@app)
+    get_it '/'
+    should.be.not_found
+    body.should.equal '<h1>Not Found</h1>'
+  end
+  
+  specify "200 if success" do
+    get '/' do
+      'Hello World'
+    end
+    get_it '/'
+    should.be.ok
+    body.should.equal 'Hello World'
+  end
+  
+  specify "an objects result from each if it has it" do
+    
+    get '/' do
+      TesterWithEach.new
+    end
+    
+    get_it '/'
+    should.be.ok
+    body.should.equal 'foobarbaz'
+
+  end
+  
+  specify "the body set if set before the last" do
+        
+    get '/' do
+      body 'Blake'
+      'Mizerany'
+    end
+    
+    get_it '/'
+    should.be.ok
+    body.should.equal 'Blake'
+
+  end
+  
+end
+  
+context "Events in an app" do
+  
+  setup do
+    Sinatra.application = nil
+  end
+  
+  specify "evaluate in a clean context" do
+    helpers do
+      def foo
+        'foo'
+      end
+    end
+    
+    get '/foo' do
+      foo
+    end
+    
+    get_it '/foo'
+    should.be.ok
+    body.should.equal 'foo'
+  end
+  
+  specify "get access to request, response, and params" do
+    get '/:foo' do
+      params["foo"] + params["bar"]
+    end
+    
+    get_it '/foo?bar=baz'
+    should.be.ok
+    body.should.equal 'foobaz'
+  end
+  
+  specify "can filters by agent" do
+    
+    get '/', :agent => /Windows/ do
+      request.env['HTTP_USER_AGENT']
+    end
+    
+    get_it '/', :env => { :agent => 'Windows' }
+    should.be.ok
+    body.should.equal 'Windows'
+
+    get_it '/', :agent => 'Mac'
+    should.not.be.ok
+
+  end
+
+  specify "can filters by agent" do
+    
+    get '/', :agent => /Windows (NT)/ do
+      params[:agent].first
+    end
+    
+    get_it '/', :env => { :agent => 'Windows NT' }
+
+    body.should.equal 'NT'
+
+  end
+  
+  specify "can deal with spaces in paths" do
+    
+    path = '/path with spaces'
+    
+    get path do
+      "Look ma, a path with spaces!"
+    end
+    
+    get_it URI.encode(path)
+    
+    body.should.equal "Look ma, a path with spaces!"
+  end
+  
+end
+
+