sinatra 1.3.0.d → 1.3.0.e

data/test/textile_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 
 begin
 require 'redcloth'

metadata

@@ -1,10 +1,10 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sinatra
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.3.0.e
   prerelease: 6
-  version: 1.3.0.d
 platform: ruby
-authors: 
+authors:
 - Blake Mizerany
 - Ryan Tomayko
 - Simon Rozet
@@ -12,58 +12,49 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-30 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-06-09 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rack
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2156765340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.2"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156765340
+- !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &2156764720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.3"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: shotgun
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.6"
-  type: :development
-  prerelease: false
-  version_requirements: *id003
+  version_requirements: *2156764720
 description: Classy web-development dressed in a DSL
 email: sinatrarb@googlegroups.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README.rdoc
+extra_rdoc_files:
 - README.de.rdoc
-- README.jp.rdoc
-- README.fr.rdoc
 - README.es.rdoc
+- README.fr.rdoc
 - README.hu.rdoc
+- README.jp.rdoc
+- README.pt-br.rdoc
+- README.pt-pt.rdoc
+- README.rdoc
+- README.ru.rdoc
 - README.zh.rdoc
 - LICENSE
-files: 
+files:
+- .gitignore
+- .yardopts
 - AUTHORS
 - CHANGES
 - Gemfile
@@ -84,8 +75,8 @@ files:
 - lib/sinatra/images/404.png
 - lib/sinatra/images/500.png
 - lib/sinatra/main.rb
-- lib/sinatra/rack.rb
 - lib/sinatra/showexceptions.rb
+- lib/sinatra/version.rb
 - sinatra.gemspec
 - test/base_test.rb
 - test/builder_test.rb
@@ -110,6 +101,7 @@ files:
 - test/public/favicon.ico
 - test/radius_test.rb
 - test/rdoc_test.rb
+- test/readme_test.rb
 - test/request_test.rb
 - test/response_test.rb
 - test/result_test.rb
@@ -164,42 +156,37 @@ files:
 - test/views/layout2.test
 - test/views/nested.str
 - test/views/utf8.erb
-homepage: http://sinatra.rubyforge.org
+homepage: http://www.sinatrarb.com/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --title
 - Sinatra
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -3511635882760576003
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
-rubyforge_project: sinatra
-rubygems_version: 1.7.2
+rubyforge_project: 
+rubygems_version: 1.8.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Classy web-development dressed in a DSL
-test_files: 
+test_files:
 - test/base_test.rb
 - test/builder_test.rb
 - test/coffee_test.rb
@@ -220,6 +207,7 @@ test_files:
 - test/nokogiri_test.rb
 - test/radius_test.rb
 - test/rdoc_test.rb
+- test/readme_test.rb
 - test/request_test.rb
 - test/response_test.rb
 - test/result_test.rb

data/lib/sinatra/rack.rb

@@ -1,44 +0,0 @@
-# Rack is rather slow on releases at the moment. Moreover, we cannot upgrade to
-# a new Rack version right away, as this would make us incompatible with Rails.
-# We therefore apply fixes that have not yet made it into a Rack release here.
-#
-# The code in here is extracted from the Rack project.
-#
-# Copyright (C) 2007, 2008, 2009, 2010 Christian Neukirchen <purl.org/net/chneukirchen>
-#
-# Rack is freely distributable under the terms of an MIT-style license.
-# See http://www.opensource.org/licenses/mit-license.php.
-require 'rack'
-
-if Rack.release <= "1.2"
-  require 'rack/request'
-  require 'rack/logger'
-  require 'rack/methodoverride'
-
-  module Rack
-    class Request
-      def ssl?
-        @env['HTTPS'] == 'on' or
-        @env['HTTP_X_FORWARDED_PROTO'] == 'https' or
-        @env['rack.url_scheme'] == 'https'
-      end
-    end
-
-    class Logger
-      # In Rack 1.2 and earlier, Rack::Logger called env['rack.errors'].close,
-      # which is forbidden in the SPEC and made it impossible to use Rack::Lint.
-      # Also, it might close your log file after the first request, potentially
-      # crashing your web server.
-      def call(env)
-        logger = ::Logger.new(env['rack.errors'])
-        logger.level = @level
-        env['rack.logger'] = logger
-        @app.call(env)
-      end
-    end
-
-    class MethodOverride
-      HTTP_METHODS << "PATCH"
-    end
-  end
-end