sinatra 0.9.6 → 1.0.a

data/test/views/error.erubis

@@ -0,0 +1,3 @@
+Hello <%= 'World' %>
+<% raise 'Goodbye' unless defined?(french) && french %>
+<% raise 'Au revoir' if defined?(french) && french %>

data/test/views/hello.erubis

@@ -0,0 +1 @@
+Hello <%= 'World' %>

data/test/views/layout2.erubis

@@ -0,0 +1,2 @@
+ERubis Layout!
+<%= yield %>

metadata

@@ -1,69 +1,82 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 9
-  - 6
-  version: 0.9.6
+  version: 1.0.a
 platform: ruby
 authors: 
 - Blake Mizerany
+- Ryan Tomayko
+- Simon Rozet
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-03-07 00:00:00 -08:00
+date: 2010-01-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 1
-        version: 0.9.1
-  type: :runtime
-  version_requirements: *id001
+        version: "1.0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: shotgun
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        version: "0.2"
+        version: "0.6"
     - - <
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
         version: "1.0"
-  type: :development
-  version_requirements: *id002
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rack-test
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 0
         version: 0.3.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: haml
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: builder
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: erubis
   type: :development
-  version_requirements: *id003
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: Classy web-development dressed in a DSL
 email: sinatrarb@googlegroups.com
 executables: []
@@ -77,60 +90,22 @@ files:
 - AUTHORS
 - CHANGES
 - LICENSE
+- README.jp.rdoc
 - 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
+- lib/sinatra/tilt.rb
 - sinatra.gemspec
 - test/base_test.rb
 - test/builder_test.rb
 - test/contest.rb
 - test/erb_test.rb
+- test/erubis_test.rb
 - test/extensions_test.rb
 - test/filter_test.rb
 - test/haml_test.rb
@@ -138,9 +113,7 @@ files:
 - test/helpers_test.rb
 - test/mapped_error_test.rb
 - test/middleware_test.rb
-- test/options_test.rb
 - test/public/favicon.ico
-- test/render_backtrace_test.rb
 - test/request_test.rb
 - test/response_test.rb
 - test/result_test.rb
@@ -148,22 +121,25 @@ files:
 - test/routing_test.rb
 - test/sass_test.rb
 - test/server_test.rb
+- test/settings_test.rb
 - 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.erubis
 - test/views/error.haml
 - test/views/error.sass
 - test/views/foo/hello.test
 - test/views/hello.builder
 - test/views/hello.erb
+- test/views/hello.erubis
 - test/views/hello.haml
 - test/views/hello.sass
 - test/views/hello.test
 - test/views/layout2.builder
 - test/views/layout2.erb
+- test/views/layout2.erubis
 - test/views/layout2.haml
 - test/views/layout2.test
 has_rdoc: true
@@ -184,20 +160,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+      version: 1.3.1
+  version: 
 requirements: []
 
 rubyforge_project: sinatra
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Classy web-development dressed in a DSL
@@ -205,14 +179,13 @@ test_files:
 - test/base_test.rb
 - test/builder_test.rb
 - test/erb_test.rb
+- test/erubis_test.rb
 - test/extensions_test.rb
 - test/filter_test.rb
 - test/haml_test.rb
 - test/helpers_test.rb
 - test/mapped_error_test.rb
 - test/middleware_test.rb
-- test/options_test.rb
-- test/render_backtrace_test.rb
 - test/request_test.rb
 - test/response_test.rb
 - test/result_test.rb
@@ -220,7 +193,7 @@ test_files:
 - test/routing_test.rb
 - test/sass_test.rb
 - test/server_test.rb
+- test/settings_test.rb
 - 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