sinatra-sinatra 0.9.2 → 0.10.0

data/CHANGES

@@ -1,4 +1,4 @@
-= 0.9.2 / unreleased
+= 0.9.2 / 2009-05-18
 
  * This version is compatible with Rack 1.0. [Rein Henrichs]
 

data/README.rdoc

@@ -45,7 +45,7 @@ Route patterns may include named parameters, accessible via the
 <tt>params</tt> hash:
 
   get '/hello/:name' do
-    # matches "GET /foo" and "GET /bar"
+    # matches "GET /hello/foo" and "GET /hello/bar"
     # params[:name] is 'foo' or 'bar'
     "Hello #{params[:name]}!"
   end

data/Rakefile

@@ -2,35 +2,16 @@ require 'rake/clean'
 require 'rake/testtask'
 require 'fileutils'
 
-task :default => [:test, :compat]
+task :default => :test
 task :spec => :test
 
 # SPECS ===============================================================
 
-task(:test) { puts "==> Running main test suite" }
-
 Rake::TestTask.new(:test) do |t|
   t.test_files = FileList['test/*_test.rb']
   t.ruby_opts = ['-rubygems'] if defined? Gem
 end
 
-desc "Run < 0.9.x compatibility specs"
-task :compat do
-  begin
-    require 'mocha'
-    require 'test/spec'
-    at_exit { exit 0 } # disable test-spec at_exit runner
-
-    puts "==> Running compat test suite"
-    Rake::TestTask.new(:compat) do |t|
-      t.test_files = FileList['compat/*_test.rb']
-      t.ruby_opts = ['-rubygems'] if defined? Gem
-    end
-  rescue LoadError
-    warn 'Skipping compat tests. mocha and/or test-spec gems not installed.'
-  end
-end
-
 # PACKAGING ============================================================
 
 # Load the gemspec using the same limitations as github

data/lib/sinatra.rb

@@ -3,6 +3,5 @@ $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
 require 'sinatra/base'
 require 'sinatra/main'
-require 'sinatra/compat'
 
 use_in_file_templates!

data/lib/sinatra/base.rb

@@ -6,7 +6,7 @@ require 'rack/builder'
 require 'sinatra/showexceptions'
 
 module Sinatra
-  VERSION = '0.9.2'
+  VERSION = '0.10.0'
 
   # The request object. See Rack::Request for more info:
   # http://rack.rubyforge.org/doc/classes/Rack/Request.html
@@ -43,7 +43,7 @@ module Sinatra
         body = [body] if body.respond_to? :to_str
         if body.respond_to?(:to_ary)
           header["Content-Length"] = body.to_ary.
-            inject(0) { |len, part| len + part.bytesize }.to_s
+            inject(0) { |len, part| len + Rack::Utils.bytesize(part) }.to_s
         end
         [status.to_i, header.to_hash, body]
       end
@@ -223,27 +223,19 @@ module Sinatra
   #                 in the template
   module Templates
     def erb(template, options={}, locals={})
-      require_warn('ERB') unless defined?(::ERB)
-
       render :erb, template, options, locals
     end
 
     def haml(template, options={}, locals={})
-      require_warn('Haml') unless defined?(::Haml::Engine)
-
       render :haml, template, options, locals
     end
 
     def sass(template, options={}, locals={})
-      require_warn('Sass') unless defined?(::Sass::Engine)
-
       options[:layout] = false
       render :sass, template, options, locals
     end
 
     def builder(template=nil, options={}, locals={}, &block)
-      require_warn('Builder') unless defined?(::Builder)
-
       options, template = template, nil if template.is_a?(Hash)
       template = lambda { block } if template.nil?
       render :builder, template, options, locals
@@ -268,7 +260,7 @@ module Sinatra
       if layout
         data, options[:filename], options[:line] = lookup_layout(engine, layout, views)
         if data
-          output = __send__("render_#{engine}", layout, data, options, {}) { output }
+          output = __send__("render_#{engine}", layout, data, options, locals) { output }
         end
       end
 
@@ -339,11 +331,6 @@ module Sinatra
       end
       xml.target!
     end
-
-    def require_warn(engine)
-      warn "Auto-require of #{engine} is deprecated; add require '#{engine}' to your app."
-      require engine.downcase
-    end
   end
 
   # Base class for all Sinatra applications and middleware.
@@ -922,7 +909,7 @@ module Sinatra
         servers = Array(self.server)
         servers.each do |server_name|
           begin
-            return Rack::Handler.get(server_name.capitalize)
+            return Rack::Handler.get(server_name.downcase)
           rescue LoadError
           rescue NameError
           end
@@ -1106,13 +1093,3 @@ module Sinatra
     Default.helpers(*extensions, &block)
   end
 end
-
-class String #:nodoc:
-  # Define String#each under 1.9 for Rack compatibility. This should be
-  # removed once Rack is fully 1.9 compatible.
-  alias_method :each, :each_line  unless ''.respond_to? :each
-
-  # Define String#bytesize as an alias to String#length for Ruby 1.8.6 and
-  # earlier.
-  alias_method :bytesize, :length unless ''.respond_to? :bytesize
-end

data/sinatra.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
   s.name = 'sinatra'
-  s.version = '0.9.2'
-  s.date = '2009-05-18'
+  s.version = '0.10.0'
+  s.date = '2009-06-05'
 
   s.description = "Classy web-development dressed in a DSL"
   s.summary     = "Classy web-development dressed in a DSL"
@@ -19,53 +19,12 @@ Gem::Specification.new do |s|
     LICENSE
     README.rdoc
     Rakefile
-    compat/app_test.rb
-    compat/application_test.rb
-    compat/builder_test.rb
-    compat/compat_test.rb
-    compat/custom_error_test.rb
-    compat/erb_test.rb
-    compat/events_test.rb
-    compat/filter_test.rb
-    compat/haml_test.rb
-    compat/helper.rb
-    compat/mapped_error_test.rb
-    compat/pipeline_test.rb
-    compat/public/foo.xml
-    compat/sass_test.rb
-    compat/sessions_test.rb
-    compat/streaming_test.rb
-    compat/sym_params_test.rb
-    compat/template_test.rb
-    compat/use_in_file_templates_test.rb
-    compat/views/foo.builder
-    compat/views/foo.erb
-    compat/views/foo.haml
-    compat/views/foo.sass
-    compat/views/foo_layout.erb
-    compat/views/foo_layout.haml
-    compat/views/layout_test/foo.builder
-    compat/views/layout_test/foo.erb
-    compat/views/layout_test/foo.haml
-    compat/views/layout_test/foo.sass
-    compat/views/layout_test/layout.builder
-    compat/views/layout_test/layout.erb
-    compat/views/layout_test/layout.haml
-    compat/views/layout_test/layout.sass
-    compat/views/no_layout/no_layout.builder
-    compat/views/no_layout/no_layout.haml
     lib/sinatra.rb
     lib/sinatra/base.rb
-    lib/sinatra/compat.rb
     lib/sinatra/images/404.png
     lib/sinatra/images/500.png
     lib/sinatra/main.rb
     lib/sinatra/showexceptions.rb
-    lib/sinatra/test.rb
-    lib/sinatra/test/bacon.rb
-    lib/sinatra/test/rspec.rb
-    lib/sinatra/test/spec.rb
-    lib/sinatra/test/unit.rb
     sinatra.gemspec
     test/base_test.rb
     test/builder_test.rb
@@ -91,11 +50,11 @@ Gem::Specification.new do |s|
     test/sinatra_test.rb
     test/static_test.rb
     test/templates_test.rb
-    test/test_test.rb
     test/views/error.builder
     test/views/error.erb
     test/views/error.haml
     test/views/error.sass
+    test/views/foo/hello.test
     test/views/hello.builder
     test/views/hello.erb
     test/views/hello.haml
@@ -111,7 +70,7 @@ Gem::Specification.new do |s|
   s.test_files = s.files.select {|path| path =~ /^test\/.*_test.rb/}
 
   s.extra_rdoc_files = %w[README.rdoc LICENSE]
-  s.add_dependency 'rack',    '>= 0.9.1'
+  s.add_dependency 'rack',    '>= 1.0'
   s.add_development_dependency 'shotgun', '>= 0.2',   '< 1.0'
   s.add_development_dependency 'rack-test', '>= 0.3.0'
 

data/test/server_test.rb

@@ -1,17 +1,21 @@
 require File.dirname(__FILE__) + '/helper'
 
-class Rack::Handler::Mock
-  extend Test::Unit::Assertions
-
-  def self.run(app, options={})
-    assert(app < Sinatra::Base)
-    assert_equal 9001, options[:Port]
-    assert_equal 'foo.local', options[:Host]
-    yield new
+module Rack::Handler
+  class Mock
+    extend Test::Unit::Assertions
+
+    def self.run(app, options={})
+      assert(app < Sinatra::Base)
+      assert_equal 9001, options[:Port]
+      assert_equal 'foo.local', options[:Host]
+      yield new
+    end
+
+    def stop
+    end
   end
 
-  def stop
-  end
+  register 'mock', 'Rack::Handler::Mock'
 end
 
 class ServerTest < Test::Unit::TestCase

data/test/templates_test.rb

@@ -76,6 +76,12 @@ class TemplatesTest < Test::Unit::TestCase
     assert_equal "X\n= yield\nX\n", @app.templates[:layout][:template]
   end
 
+  it 'loads templates from specified views directory' do
+    render_app { render :test, :hello, :views => options.views + '/foo' }
+
+    assert_equal "from another views directory\n", body
+  end
+
   test 'use_in_file_templates simply ignores IO errors' do
     assert_nothing_raised {
       mock_app {
@@ -85,6 +91,22 @@ class TemplatesTest < Test::Unit::TestCase
 
     assert @app.templates.empty?
   end
+
+  it 'passes locals to the layout' do
+    mock_app {
+      template :my_layout do
+        'Hello <%= name %>!<%= yield %>'
+      end
+
+      get '/' do
+        erb '<p>content</p>', { :layout => :my_layout }, { :name => 'Mike'}
+      end
+    }
+
+    get '/'
+    assert ok?
+    assert_equal 'Hello Mike!<p>content</p>', body
+  end
 end
 
 # __END__ : this is not the real end of the script.

data/test/views/foo/hello.test

@@ -0,0 +1 @@
+from another views directory

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-sinatra
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-18 00:00:00 -07:00
+date: 2009-06-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.1
+        version: "1.0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: shotgun
@@ -60,53 +60,12 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
-- compat/app_test.rb
-- compat/application_test.rb
-- compat/builder_test.rb
-- compat/compat_test.rb
-- compat/custom_error_test.rb
-- compat/erb_test.rb
-- compat/events_test.rb
-- compat/filter_test.rb
-- compat/haml_test.rb
-- compat/helper.rb
-- compat/mapped_error_test.rb
-- compat/pipeline_test.rb
-- compat/public/foo.xml
-- compat/sass_test.rb
-- compat/sessions_test.rb
-- compat/streaming_test.rb
-- compat/sym_params_test.rb
-- compat/template_test.rb
-- compat/use_in_file_templates_test.rb
-- compat/views/foo.builder
-- compat/views/foo.erb
-- compat/views/foo.haml
-- compat/views/foo.sass
-- compat/views/foo_layout.erb
-- compat/views/foo_layout.haml
-- compat/views/layout_test/foo.builder
-- compat/views/layout_test/foo.erb
-- compat/views/layout_test/foo.haml
-- compat/views/layout_test/foo.sass
-- compat/views/layout_test/layout.builder
-- compat/views/layout_test/layout.erb
-- compat/views/layout_test/layout.haml
-- compat/views/layout_test/layout.sass
-- compat/views/no_layout/no_layout.builder
-- compat/views/no_layout/no_layout.haml
 - lib/sinatra.rb
 - lib/sinatra/base.rb
-- lib/sinatra/compat.rb
 - lib/sinatra/images/404.png
 - lib/sinatra/images/500.png
 - lib/sinatra/main.rb
 - lib/sinatra/showexceptions.rb
-- lib/sinatra/test.rb
-- lib/sinatra/test/bacon.rb
-- lib/sinatra/test/rspec.rb
-- lib/sinatra/test/spec.rb
-- lib/sinatra/test/unit.rb
 - sinatra.gemspec
 - test/base_test.rb
 - test/builder_test.rb
@@ -132,11 +91,11 @@ files:
 - test/sinatra_test.rb
 - test/static_test.rb
 - test/templates_test.rb
-- test/test_test.rb
 - test/views/error.builder
 - test/views/error.erb
 - test/views/error.haml
 - test/views/error.sass
+- test/views/foo/hello.test
 - test/views/hello.builder
 - test/views/hello.erb
 - test/views/hello.haml
@@ -199,4 +158,3 @@ test_files:
 - test/sinatra_test.rb
 - test/static_test.rb
 - test/templates_test.rb
-- test/test_test.rb

data/compat/app_test.rb

@@ -1,282 +0,0 @@
-require File.dirname(__FILE__) + '/helper'
-
-context "Sinatra" do
-
-  setup do
-    Sinatra.application = nil
-  end
-
-  specify "should put all DSL methods on (main)" do
-    object = Object.new
-    methods = %w[get put post head delete configure template helpers set]
-    methods.each do |method|
-      object.private_methods.map { |m| m.to_sym }.should.include(method.to_sym)
-    end
-  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 "handles splats" do
-    get '/hi/*' do
-      params["splat"].kind_of?(Array).should.equal true
-      params["splat"].first
-    end
-
-    get_it '/hi/Blake'
-
-    should.be.ok
-    body.should.equal 'Blake'
-  end
-
-  specify "handles multiple splats" do
-    get '/say/*/to/*' do
-      params["splat"].join(' ')
-    end
-
-    get_it '/say/hello/to/world'
-
-    should.be.ok
-    body.should.equal 'hello world'
-  end
-
-  specify "allow empty splats" do
-    get '/say/*/to*/*' do
-      params["splat"].join(' ')
-    end
-
-    get_it '/say/hello/to/world'
-
-    should.be.ok
-    body.should.equal 'hello  world' # second splat is empty
-
-    get_it '/say/hello/tomy/world'
-
-    should.be.ok
-    body.should.equal 'hello my world'
-  end
-
-  specify "gives access to underlying response header Hash" do
-    get '/' do
-      header['X-Test'] = 'Is this thing on?'
-      headers 'X-Test2' => 'Foo', 'X-Test3' => 'Bar'
-      ''
-    end
-
-    get_it '/'
-    should.be.ok
-    headers.should.include 'X-Test'
-    headers['X-Test'].should.equal 'Is this thing on?'
-    headers.should.include 'X-Test3'
-    headers['X-Test3'].should.equal 'Bar'
-  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
-    helpers do
-      def foo ; 'blah' ; end
-    end
-    get "/" do
-      redirect 'foo', :foo
-    end
-    get_it '/'
-    should.be.redirection
-    headers['Location'].should.equal 'foo'
-    body.should.equal 'blah'
-  end
-
-  specify "redirects permanently with 301 status code" do
-    get "/" do
-      redirect 'foo', 301
-    end
-    get_it '/'
-    should.be.redirection
-    headers['Location'].should.equal 'foo'
-    status.should.equal 301
-    body.should.be.empty
-  end
-
-  specify "stop sets content and ends event" do
-    get '/set_body' do
-      stop 'Hello!'
-      stop 'World!'
-      fail 'stop should have halted'
-    end
-
-    get_it '/set_body'
-
-    should.be.ok
-    body.should.equal 'Hello!'
-
-  end
-
-  specify "should easily set response Content-Type" do
-    get '/foo.html' do
-      content_type 'text/html', :charset => 'utf-8'
-      "<h1>Hello, World</h1>"
-    end
-
-    get_it '/foo.html'
-    should.be.ok
-    headers['Content-Type'].should.equal 'text/html;charset=utf-8'
-    body.should.equal '<h1>Hello, World</h1>'
-
-    get '/foo_test.xml' do
-      content_type :xml
-      "<feed></feed>"
-    end
-
-    get_it '/foo_test.xml'
-    should.be.ok
-    headers['Content-Type'].should.equal 'application/xml'
-    body.should.equal '<feed></feed>'
-  end
-
-  specify "supports conditional GETs with last_modified" do
-    modified_at = Time.now
-    get '/maybe' do
-      last_modified modified_at
-      'response body, maybe'
-    end
-
-    get_it '/maybe'
-    should.be.ok
-    body.should.equal 'response body, maybe'
-
-    get_it '/maybe', :env => { 'HTTP_IF_MODIFIED_SINCE' => modified_at.httpdate }
-    status.should.equal 304
-    body.should.equal ''
-  end
-
-  specify "supports conditional GETs with entity_tag" do
-    get '/strong' do
-      entity_tag 'FOO'
-      'foo response'
-    end
-
-    get_it '/strong'
-    should.be.ok
-    body.should.equal 'foo response'
-
-    get_it '/strong', {},
-      'HTTP_IF_NONE_MATCH' => '"BAR"'
-    should.be.ok
-    body.should.equal 'foo response'
-
-    get_it '/strong', {},
-      'HTTP_IF_NONE_MATCH' => '"FOO"'
-    status.should.equal 304
-    body.should.equal ''
-
-    get_it '/strong', {},
-      'HTTP_IF_NONE_MATCH' => '"BAR", *'
-    status.should.equal 304
-    body.should.equal ''
-  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 "supports PUT" do
-    put '/' do
-      'puted'
-    end
-    put_it '/'
-    assert_equal 'puted', body
-  end
-
-  specify "rewrites POSTs with _method param to PUT" do
-    put '/' do
-      'puted'
-    end
-    post_it '/', :_method => 'PUT'
-    assert_equal 'puted', body
-  end
-
-  specify "rewrites POSTs with lowercase _method param to PUT" do
-    put '/' do
-      'puted'
-    end
-    post_it '/', :_method => 'put'
-    body.should.equal 'puted'
-  end
-
-  specify "does not rewrite GETs with _method param to PUT" do
-    get '/' do
-      'getted'
-    end
-    get_it '/', :_method => 'put'
-    should.be.ok
-    body.should.equal 'getted'
-  end
-
-  specify "ignores _method query string parameter on non-POST requests" do
-    post '/' do
-      'posted'
-    end
-    put '/' do
-      'booo'
-    end
-    post_it "/?_method=PUT"
-    should.be.ok
-    body.should.equal 'posted'
-  end
-
-  specify "does not read body if content type is not url encoded" do
-    post '/foo.xml' do
-      request.env['CONTENT_TYPE'].should.be == 'application/xml'
-      request.content_type.should.be == 'application/xml'
-      request.body.read
-    end
-
-    post_it '/foo.xml', '<foo></foo>', :content_type => 'application/xml'
-    @response.should.be.ok
-    @response.body.should.be == '<foo></foo>'
-  end
-
-end