sinatra 0.3.3 → 0.9.0

data/Rakefile

@@ -8,13 +8,19 @@ task :default => :test
 
 desc 'Run specs with story style output'
 task :spec do
-  sh 'specrb --specdox -Ilib:test test/*_test.rb'
+  pattern = ENV['TEST'] || '.*'
+  sh "specrb --testcase '#{pattern}' --specdox -Ilib:test test/*_test.rb"
 end
 
 desc 'Run specs with unit test style output'
-task :test => FileList['test/*_test.rb'] do |t|
-  suite = t.prerequisites.map{|f| "-r#{f.chomp('.rb')}"}.join(' ')
-  sh "ruby -Ilib:test #{suite} -e ''", :verbose => false
+task :test do |t|
+  sh "specrb -Ilib:test test/*_test.rb"
+end
+
+desc 'Run compatibility specs'
+task :compat do |t|
+  pattern = ENV['TEST'] || '.*'
+  sh "specrb --testcase '#{pattern}' -Ilib:test compat/*_test.rb"
 end
 
 # PACKAGING ============================================================
@@ -51,7 +57,12 @@ file package('.gem') => %w[dist/ sinatra.gemspec] + spec.files do |f|
 end
 
 file package('.tar.gz') => %w[dist/] + spec.files do |f|
-  sh "git archive --format=tar HEAD | gzip > #{f.name}"
+  sh <<-SH
+    git archive \
+      --prefix=sinatra-#{source_version}/ \
+      --format=tar \
+      HEAD | gzip > #{f.name}
+  SH
 end
 
 # Rubyforge Release / Publish Tasks ==================================
@@ -141,11 +152,23 @@ task 'doc:book' => ['book/output/sinatra-book.html']
 
 # Gemspec Helpers ====================================================
 
-file 'sinatra.gemspec' => FileList['{lib,test,images}/**','Rakefile'] do |f|
+def source_version
+  line = File.read('lib/sinatra/base.rb')[/^\s*VERSION = .*/]
+  line.match(/.*VERSION = '(.*)'/)[1]
+end
+
+project_files =
+  FileList[
+    '{lib,test,compat,images}/**',
+    'Rakefile', 'CHANGES', 'README.rdoc'
+  ]
+file 'sinatra.gemspec' => project_files do |f|
   # read spec file and split out manifest section
   spec = File.read(f.name)
-  parts = spec.split("  # = MANIFEST =\n")
-  fail 'bad spec' if parts.length != 3
+  head, manifest, tail = spec.split("  # = MANIFEST =\n")
+  # replace version and date
+  head.sub!(/\.version = '.*'/, ".version = '#{source_version}'")
+  head.sub!(/\.date = '.*'/, ".date = '#{Date.today.to_s}'")
   # determine file list from git ls-files
   files = `git ls-files`.
     split("\n").
@@ -155,8 +178,8 @@ file 'sinatra.gemspec' => FileList['{lib,test,images}/**','Rakefile'] do |f|
     map{ |file| "    #{file}" }.
     join("\n")
   # piece file back together and write...
-  parts[1] = "  s.files = %w[\n#{files}\n  ]\n"
-  spec = parts.join("  # = MANIFEST =\n")
+  manifest = "  s.files = %w[\n#{files}\n  ]\n"
+  spec = [head,manifest,tail].join("  # = MANIFEST =\n")
   File.open(f.name, 'w') { |io| io.write(spec) }
   puts "updated #{f.name}"
 end

data/{test → compat}/app_test.rb

@@ -108,7 +108,9 @@ context "Sinatra" do
   end
 
   specify "renders a body with a redirect" do
-    Sinatra::EventContext.any_instance.expects(:foo).returns('blah')
+    helpers do
+      def foo ; 'blah' ; end
+    end
     get "/" do
       redirect 'foo', :foo
     end
@@ -130,13 +132,10 @@ context "Sinatra" do
   end
 
   specify "stop sets content and ends event" do
-
-    Sinatra::EventContext.any_instance.expects(:foo).never
-
     get '/set_body' do
       stop 'Hello!'
       stop 'World!'
-      foo
+      fail 'stop should have halted'
     end
 
     get_it '/set_body'
@@ -146,8 +145,13 @@ context "Sinatra" do
 
   end
 
-  specify "should set status then call helper with a var" do
-    Sinatra::EventContext.any_instance.expects(:foo).once.with(1).returns('bah!')
+  # Deprecated. WTF was going on here? What's the 1 in [:foo, 1] do?
+  xspecify "should set status then call helper with a var" do
+    helpers do
+      def foo
+        'bah!'
+      end
+    end
 
     get '/set_body' do
       stop [404, [:foo, 1]]
@@ -252,8 +256,6 @@ context "Sinatra" do
     assert_equal 'puted', body
   end
 
-  # Some Ajax libraries downcase the _method parameter value. Make
-  # sure we can handle that.
   specify "rewrites POSTs with lowercase _method param to PUT" do
     put '/' do
       'puted'
@@ -262,7 +264,6 @@ context "Sinatra" do
     body.should.equal 'puted'
   end
 
-  # Ignore any _method parameters specified in GET requests or on the query string in POST requests.
   specify "does not rewrite GETs with _method param to PUT" do
     get '/' do
       'getted'

data/{test → compat}/application_test.rb

@@ -16,7 +16,8 @@ context "Looking up a request" do
     Sinatra.application = nil
   end
 
-  specify "returns what's at the end" do
+  # Deprecated. The lookup method is no longer used.
+  xspecify "returns what's at the end" do
     block = Proc.new { 'Hello' }
     get '/', &block
 
@@ -31,7 +32,8 @@ context "Looking up a request" do
     result.block.should.be block
   end
 
-  specify "takes params in path" do
+  # Deprecated. The lookup method is no longer used.
+  xspecify "takes params in path" do
     block = Proc.new { 'Hello' }
     get '/:foo', &block
 
@@ -83,7 +85,8 @@ context "An app returns" do
 
   end
 
-  specify "the body set if set before the last" do
+  # Deprecated. The body method no longer halts.
+  xspecify "the body set if set before the last" do
 
     get '/' do
       body 'Blake'
@@ -142,14 +145,16 @@ end
 
 context "Default Application Configuration" do
 
-  specify "includes 404 and 500 error handlers" do
+  # Sinatra::ServerError is no longer used
+  xspecify "includes 404 and 500 error handlers" do
     Sinatra.application.errors.should.include(Sinatra::ServerError)
     Sinatra.application.errors[Sinatra::ServerError].should.not.be.nil
     Sinatra.application.errors.should.include(Sinatra::NotFound)
     Sinatra.application.errors[Sinatra::NotFound].should.not.be.nil
   end
 
-  specify "includes Static event" do
+  # Deprecated. No such thing as a Static event anymore.
+  xspecify "includes Static event" do
     assert Sinatra.application.events[:get].any? { |e| Sinatra::Static === e }
   end
 

data/compat/builder_test.rb

@@ -0,0 +1,101 @@
+require File.dirname(__FILE__) + '/helper'
+
+context "Builder" do
+
+  setup do
+    Sinatra.application = nil
+  end
+
+  context "without layouts" do
+
+    setup do
+      Sinatra.application = nil
+    end
+
+    specify "should render" do
+
+      get '/no_layout' do
+        builder 'xml.instruct!'
+      end
+
+      get_it '/no_layout'
+      should.be.ok
+      body.should == %(<?xml version="1.0" encoding="UTF-8"?>\n)
+
+    end
+
+    specify "should render inline block" do
+
+      get '/no_layout_and_inlined' do
+        @name = "Frank & Mary"
+        builder do |xml|
+          xml.couple @name
+        end
+      end
+
+      get_it '/no_layout_and_inlined'
+      should.be.ok
+      body.should == %(<couple>Frank &amp; Mary</couple>\n)
+
+    end
+
+  end
+
+
+
+  context "Templates (in general)" do
+
+    setup do
+      Sinatra.application = nil
+    end
+
+    specify "are read from files if Symbols" do
+
+      get '/from_file' do
+        @name = 'Blue'
+        builder :foo, :views_directory => File.dirname(__FILE__) + "/views"
+      end
+
+      get_it '/from_file'
+      should.be.ok
+      body.should.equal %(<exclaim>You rock Blue!</exclaim>\n)
+
+    end
+
+    specify "use layout.ext by default if available" do
+
+      get '/' do
+        builder :foo, :views_directory => File.dirname(__FILE__) + "/views/layout_test"
+      end
+
+      get_it '/'
+      should.be.ok
+      body.should.equal "<layout>\n<this>is foo!</this>\n</layout>\n"
+
+    end
+
+    specify "renders without layout" do
+
+      get '/' do
+        builder :no_layout, :views_directory => File.dirname(__FILE__) + "/views/no_layout"
+      end
+
+      get_it '/'
+      should.be.ok
+      body.should.equal "<foo>No Layout!</foo>\n"
+
+    end
+
+    specify "raises error if template not found" do
+
+      get '/' do
+        builder :not_found
+      end
+
+      lambda { get_it '/' }.should.raise(Errno::ENOENT)
+
+    end
+
+  end
+
+end

data/compat/erb_test.rb

@@ -0,0 +1,136 @@
+require File.dirname(__FILE__) + '/helper'
+
+context "Erb" do
+
+  setup do
+    Sinatra.application = nil
+  end
+
+  context "without layouts" do
+
+    setup do
+      Sinatra.application = nil
+    end
+
+    specify "should render" do
+
+      get '/no_layout' do
+        erb '<%= 1 + 1 %>'
+      end
+
+      get_it '/no_layout'
+      should.be.ok
+      body.should == '2'
+
+    end
+
+    specify "should take an options hash with :locals set with a string" do
+      get '/locals' do
+        erb '<%= foo %>', :locals => {:foo => "Bar"}
+      end
+
+      get_it '/locals'
+      should.be.ok
+      body.should == 'Bar'
+    end
+
+    specify "should take an options hash with :locals set with a complex object" do
+      get '/locals-complex' do
+        erb '<%= foo[0] %>', :locals => {:foo => ["foo", "bar", "baz"]}
+      end
+
+      get_it '/locals-complex'
+      should.be.ok
+      body.should == 'foo'
+    end
+  end
+
+  context "with layouts" do
+
+    setup do
+      Sinatra.application = nil
+    end
+
+    specify "can be inline" do
+
+      layout do
+        %Q{This is <%= yield %>!}
+      end
+
+      get '/lay' do
+        erb 'Blake'
+      end
+
+      get_it '/lay'
+      should.be.ok
+      body.should.equal 'This is Blake!'
+
+    end
+
+    specify "can use named layouts" do
+
+      layout :pretty do
+        %Q{<h1><%= yield %></h1>}
+      end
+
+      get '/pretty' do
+        erb 'Foo', :layout => :pretty
+      end
+
+      get '/not_pretty' do
+        erb 'Bar'
+      end
+
+      get_it '/pretty'
+      body.should.equal '<h1>Foo</h1>'
+
+      get_it '/not_pretty'
+      body.should.equal 'Bar'
+
+    end
+
+    specify "can be read from a file if they're not inlined" do
+
+      get '/foo' do
+        @title = 'Welcome to the Hello Program'
+        erb 'Blake', :layout => :foo_layout,
+                     :views_directory => File.dirname(__FILE__) + "/views"
+      end
+
+      get_it '/foo'
+      body.should.equal "Welcome to the Hello Program\nHi Blake\n"
+
+    end
+
+  end
+
+  context "Templates (in general)" do
+
+    specify "are read from files if Symbols" do
+
+      get '/from_file' do
+        @name = 'Alena'
+        erb :foo, :views_directory => File.dirname(__FILE__) + "/views"
+      end
+
+      get_it '/from_file'
+
+      body.should.equal 'You rock Alena!'
+
+    end
+
+    specify "use layout.ext by default if available" do
+
+      get '/layout_from_file' do
+        erb :foo, :views_directory => File.dirname(__FILE__) + "/views/layout_test"
+      end
+
+      get_it '/layout_from_file'
+      should.be.ok
+      body.should.equal "x This is foo! x \n"
+
+    end
+
+  end
+
+end

data/{test → compat}/events_test.rb

@@ -1,7 +1,6 @@
 require File.dirname(__FILE__) + '/helper'
 
 context "Simple Events" do
-
   def simple_request_hash(method, path)
     Rack::Request.new({
       'REQUEST_METHOD' => method.to_s.upcase,
@@ -9,11 +8,21 @@ context "Simple Events" do
     })
   end
 
+  class MockResult < Struct.new(:block, :params)
+  end
+
   def invoke_simple(path, request_path, &b)
-    event = Sinatra::Event.new(path, &b)
-    event.invoke(simple_request_hash(:get, request_path))
+    params = nil
+    get path do
+      params = self.params
+      b.call if b
+    end
+    get_it request_path
+    MockResult.new(b, params)
   end
 
+  setup { Sinatra.application = nil }
+
   specify "return last value" do
     block = Proc.new { 'Simple' }
     result = invoke_simple('/', '/', &block)
@@ -28,6 +37,7 @@ context "Simple Events" do
     result.params.should.equal "foo" => 'a', "bar" => 'b'
 
     # unscapes
+    Sinatra.application = nil
     result = invoke_simple('/:foo/:bar', '/a/blake%20mizerany')
     result.should.not.be.nil
     result.params.should.equal "foo" => 'a', "bar" => 'blake mizerany'
@@ -38,14 +48,17 @@ context "Simple Events" do
     result.should.not.be.nil
     result.params.should.equal "foo" => 'a', "bar" => 'b'
 
+    Sinatra.application = nil
     result = invoke_simple('/?:foo?/?:bar?', '/a/')
     result.should.not.be.nil
     result.params.should.equal "foo" => 'a', "bar" => nil
 
+    Sinatra.application = nil
     result = invoke_simple('/?:foo?/?:bar?', '/a')
     result.should.not.be.nil
     result.params.should.equal "foo" => 'a', "bar" => nil
 
+    Sinatra.application = nil
     result = invoke_simple('/:foo?/?:bar?', '/')
     result.should.not.be.nil
     result.params.should.equal "foo" => nil, "bar" => nil