sinatra 1.1.a → 1.1.b

data/CHANGES

@@ -49,10 +49,10 @@
  * 599 now is a legal status code. (Steve Shreeve)
 
  * This release is compatible with Ruby 1.9.2. Sinatra was trying to read
-   none existent files Ruby added to the call stack. (Shota Fukumori,
+   non existent files Ruby added to the call stack. (Shota Fukumori,
    Konstantin Haase)
 
- * Prevents a memory leak on 1.8.6 is production mode. Note, however, that
+ * Prevents a memory leak on 1.8.6 in production mode. Note, however, that
    this is due to a bug in 1.8.6 and request will have the additional overhead
    of parsing templates again on that version. It is recommended to use at
    least Ruby 1.8.7. (Konstantin Haase)

data/README.es.rdoc

@@ -247,7 +247,7 @@ Renderiza <tt>./views/index.nokogiri</tt>.
 
 === Plantillas Sass
 
-La gem/librería sass es necesaria para renderizar plantillas Sass:
+La gem/librería haml es necesaria para renderizar plantillas Sass:
 
   ## Vas a necesitar requerir haml o sass en tu app
   require 'sass'
@@ -271,7 +271,7 @@ y reemplazadas individualmente.
 
 === Plantillas Scss
 
-La gem/librería sass es necesaria para renderizar plantillas Scss:
+La gem/librería haml es necesaria para renderizar plantillas Scss:
 
   ## Vas a necesitar requerir haml o sass en tu app
   require 'sass'

data/README.fr.rdoc

@@ -244,7 +244,7 @@ Utilisera le template: <tt>./views/index.nokogiri</tt>.
 
 === Templates Sass
 
-Le gem sass est nécessaire pour utiliser la fonction de rendu Sass:
+Le gem haml est nécessaire pour utiliser la fonction de rendu Sass:
 
   ## Chargez la bibliothèque haml ou sass dans votre application
   require 'sass'
@@ -268,7 +268,7 @@ et supportent aussi la réécriture (surcharge) comme dans cet exemple.
 
 === Scss Templates
 
-Le gem sass est nécessaire pour utiliser la fonction de rendu Scss:
+Le gem haml est nécessaire pour utiliser la fonction de rendu Scss:
 
   ## Chargez la bibliothèque haml ou sass dans votre application
   require 'sass'

data/README.hu.rdoc

@@ -171,7 +171,7 @@ Ez pedig a <tt>./views/index.builder</tt> állományt fogja renderelni.
 
 === Sass sablonok
 
-Sass sablonok használatához szükség lesz a sass gem-re vagy könyvtárra:
+Sass sablonok használatához szükség lesz a haml gem-re vagy könyvtárra:
 
   ## Be kell importálni a haml, vagy a sass könyvtárat
   require 'sass'

data/README.rdoc

@@ -245,7 +245,7 @@ Renders <tt>./views/index.nokogiri</tt>.
 
 === Sass Templates
 
-The sass gem/library is required to render Sass templates:
+The haml gem/library is required to render Sass templates:
 
   ## You'll need to require haml or sass in your app
   require 'sass'
@@ -269,7 +269,7 @@ and overridden on an individual basis.
 
 === Scss Templates
 
-The sass gem/library is required to render Scss templates:
+The haml gem/library is required to render Scss templates:
 
   ## You'll need to require haml or sass in your app
   require 'sass'

data/Rakefile

@@ -16,7 +16,7 @@ end
 if !ENV['NO_TEST_FIX'] and RUBY_VERSION == '1.9.2' and RUBY_PATCHLEVEL == 0
   # Avoids seg fault
   task(:test) do
-    second_run  = %w[settings rdoc markaby].map { |l| "test/#{l}_test.rb" }
+    second_run  = %w[settings rdoc markaby templates static textile].map { |l| "test/#{l}_test.rb" }
     first_run   = Dir.glob('test/*_test.rb') - second_run
     [first_run, second_run].each { |f| sh "testrb #{f.join ' '}" }
   end
@@ -124,4 +124,16 @@ if defined?(Gem)
     File.open(f.name, 'w') { |io| io.write(spec) }
     puts "updated #{f.name}"
   end
+
+  task 'release' => package('.gem') do
+    sh <<-SH
+      gem install #{package('.gem')} --local &&
+      gem push #{package('.gem')}  &&
+      git add sinatra.gemspec &&
+      git commit --allow-empty -m 'Release #{source_version}'  &&
+      git -s #{source_version} -m 'Release #{source_version}'  &&
+      git push && (git push sinatra || true) &&
+      git push --tags && (git push sinatra --tags || true)
+    SH
+  end
 end

data/lib/sinatra/base.rb

@@ -7,7 +7,7 @@ require 'sinatra/showexceptions'
 require 'tilt'
 
 module Sinatra
-  VERSION = '1.1.a'
+  VERSION = '1.1.b'
 
   # The request object. See Rack::Request for more info:
   # http://rack.rubyforge.org/doc/classes/Rack/Request.html
@@ -130,13 +130,8 @@ module Sinatra
     def content_type(type, params={})
       mime_type = mime_type(type)
       fail "Unknown media type: %p" % type if mime_type.nil?
-      params[:charset] ||= defined?(Encoding) ? Encoding.default_external.to_s.downcase : 'utf-8'
-      if params.any?
-        params = params.collect { |kv| "%s=%s" % kv }.join(', ')
-        response['Content-Type'] = [mime_type, params].join(";")
-      else
-        response['Content-Type'] = mime_type
-      end
+      params[:charset] ||= params.delete('charset') || settings.default_encoding
+      response['Content-Type'] = "#{mime_type};#{params.map { |kv| kv.join('=') }.join(', ')}"
     end
 
     # Set the Content-Disposition to "attachment" with the specified filename,
@@ -154,9 +149,8 @@ module Sinatra
       stat = File.stat(path)
       last_modified stat.mtime
 
-      content_type mime_type(opts[:type]) ||
-        opts[:type] ||
-        mime_type(File.extname(path)) ||
+      content_type opts[:type] ||
+        File.extname(path) ||
         response['Content-Type'] ||
         'application/octet-stream'
 
@@ -1216,15 +1210,10 @@ module Sinatra
     # The latter might not be necessary if Rack handles it one day.
     # Keep an eye on Rack's LH #100.
     if defined? Encoding
-      if Encoding.default_external.to_s =~ /^ASCII/
-        Encoding.default_external = "UTF-8"
-      end
-      Encoding.default_internal ||= Encoding.default_external
-
       def force_encoding(data)
         return if data == self || data.is_a?(Tempfile)
         if data.respond_to? :force_encoding
-          data.force_encoding(Encoding.default_external)
+          data.force_encoding settings.default_encoding
         elsif data.respond_to? :each_value
           data.each_value { |v| force_encoding(v) }
         elsif data.respond_to? :each
@@ -1235,7 +1224,6 @@ module Sinatra
       def force_encoding(*) end
     end
 
-
     reset!
 
     set :environment, (ENV['RACK_ENV'] || :development).to_sym
@@ -1245,6 +1233,7 @@ module Sinatra
     set :sessions, false
     set :logging, false
     set :method_override, false
+    set :default_encoding, "utf-8"
 
     class << self
       alias_method :methodoverride?, :method_override?

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 = '1.1.a'
-  s.date = '2010-10-19'
+  s.version = '1.1.b'
+  s.date = '2010-10-23'
 
   s.description = "Classy web-development dressed in a DSL"
   s.summary     = "Classy web-development dressed in a DSL"

data/test/encoding_test.rb

@@ -8,7 +8,8 @@ class BaseTest < Test::Unit::TestCase
   end
 
   it 'allows unicode strings in ascii templates per default (1.9)' do
-    @base.new.haml(:ascii, {}, :value => "åkej")
+    next unless defined? Encoding
+    @base.new.haml(File.read(@base.views + "/ascii.haml").encode("ASCII"), {}, :value => "åkej")
   end
 
   it 'allows ascii strings in unicode templates per default (1.9)' do

data/test/static_test.rb

@@ -91,7 +91,7 @@ class StaticTest < Test::Unit::TestCase
     assert not_found?
   end
 
-  def test_valid_range(http_range, range, path, file)
+  def assert_valid_range(http_range, range, path, file)
     request = Rack::MockRequest.new(@app)
     response = request.get("/#{File.basename(path)}", 'HTTP_RANGE' => http_range)
 
@@ -113,23 +113,23 @@ class StaticTest < Test::Unit::TestCase
     assert length > 9000, "The test file #{path} is too short (#{length} bytes) to run these tests"
 
     [0..0, 42..88, 1234..1234, 100..9000, 0..(length-1), (length-1)..(length-1)].each do |range|
-      test_valid_range("bytes=#{range.begin}-#{range.end}", range, path, file)
+      assert_valid_range("bytes=#{range.begin}-#{range.end}", range, path, file)
     end
 
     [0, 100, length-100, length-1].each do |start|
-      test_valid_range("bytes=#{start}-", (start..length-1), path, file)
+      assert_valid_range("bytes=#{start}-", (start..length-1), path, file)
     end
 
     [1, 100, length-100, length-1, length].each do |range_length|
-      test_valid_range("bytes=-#{range_length}", (length-range_length..length-1), path, file)
+      assert_valid_range("bytes=-#{range_length}", (length-range_length..length-1), path, file)
     end
 
     # Some valid ranges that exceed the length of the file:
-    test_valid_range("bytes=100-999999", (100..length-1), path, file)
-    test_valid_range("bytes=100-#{length}", (100..length-1), path, file)
-    test_valid_range("bytes=-#{length}", (0..length-1), path, file)
-    test_valid_range("bytes=-#{length+1}", (0..length-1), path, file)
-    test_valid_range("bytes=-999999", (0..length-1), path, file)
+    assert_valid_range("bytes=100-999999", (100..length-1), path, file)
+    assert_valid_range("bytes=100-#{length}", (100..length-1), path, file)
+    assert_valid_range("bytes=-#{length}", (0..length-1), path, file)
+    assert_valid_range("bytes=-#{length+1}", (0..length-1), path, file)
+    assert_valid_range("bytes=-999999", (0..length-1), path, file)
   end
 
   it 'correctly ignores syntactically invalid range requests' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra
 version: !ruby/object:Gem::Version 
-  hash: 118
+  hash: 119
   prerelease: true
   segments: 
   - 1
   - 1
-  - a
-  version: 1.1.a
+  - b
+  version: 1.1.b
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-19 00:00:00 +02:00
+date: 2010-10-23 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency