sinatra 1.2.0.c → 1.2.0.d

data/README.ru.rdoc

@@ -445,8 +445,8 @@ Sinatra — это предметно-ориентированный язык (D
 
 <tt>rdoc</tt> gem/библиотека необходима для рендеринга RDoc шаблонов:
 
-  # Вам нужно будет подключить rdoc в приложении
-  require "rdoc"
+  # Вам нужно будет подключить rdoc/markup/to_html в приложении
+  require "rdoc/markup/to_html"
 
   get '/' do
     rdoc :index

data/README.zh.rdoc

@@ -371,8 +371,8 @@ Rack body对象或者HTTP状态码：
 
 需要引入 RDoc gem/library 以渲染RDoc模板：
 
-  # 需要在你的应用中引入rdoc
-  require "rdoc"
+  # 需要在你的应用中引入rdoc/markup/to_html
+  require "rdoc/markup/to_html"
 
   get '/' do
     rdoc :index

data/Rakefile

@@ -9,11 +9,14 @@ task :spec => :test
 CLEAN.include "**/*.rbc"
 
 def source_version
-  line = File.read('lib/sinatra/base.rb')[/^\s*VERSION = .*/]
-  line.match(/.*VERSION = '(.*)'/)[1]
+  @source_version ||= begin
+    line = File.read('lib/sinatra/base.rb')[/^\s*VERSION = .*/]
+    line.match(/.*VERSION = '(.*)'/)[1]
+  end
 end
 
 # SPECS ===============================================================
+
 task :test do
   ENV['LANG'] = 'C'
   ENV.delete 'LC_CTYPE'
@@ -24,19 +27,18 @@ Rake::TestTask.new(:test) do |t|
   t.ruby_opts = ['-rubygems'] if defined? Gem
   t.ruby_opts << '-I.'
 end
+
 # Rcov ================================================================
+
 namespace :test do
   desc 'Mesures test coverage'
   task :coverage do
     rm_f "coverage"
-    rcov = "rcov --text-summary -Ilib"
-    system("#{rcov} --no-html --no-color test/*_test.rb")
+    sh "rcov -Ilib test/*_test.rb"
   end
 end
 
 # Website =============================================================
-# Building docs requires HAML and the hanna gem:
-#   gem install mislav-hanna --source=http://gems.github.com
 
 desc 'Generate RDoc under doc/api'
 task 'doc'     => ['doc:api']
@@ -44,6 +46,7 @@ task('doc:api') { sh "yardoc -o doc/api" }
 CLEAN.include 'doc/api'
 
 # README ===============================================================
+
 task :add_template, [:name] do |t, args|
   Dir.glob('README.*') do |file|
     code = File.read(file)
@@ -123,7 +126,7 @@ if defined?(Gem)
     puts "updated #{f.name}"
   end
 
-  task 'release' => package('.gem') do
+  task 'release' => ['test', package('.gem')] do
     sh <<-SH
       gem install #{package('.gem')} --local &&
       gem push #{package('.gem')}  &&

data/lib/sinatra/base.rb

@@ -7,7 +7,7 @@ require 'sinatra/showexceptions'
 require 'tilt'
 
 module Sinatra
-  VERSION = '1.2.0.c'
+  VERSION = '1.2.0.d'
 
   # The request object. See Rack::Request for more info:
   # http://rack.rubyforge.org/doc/classes/Rack/Request.html
@@ -318,12 +318,12 @@ module Sinatra
     def expires(amount, *values)
       values << {} unless values.last.kind_of?(Hash)
 
-      if amount.respond_to?(:to_time)
-        max_age = amount.to_time - Time.now
-        time = amount.to_time
-      else
+      if Integer === amount
+        time    = Time.now + amount
         max_age = amount
-        time = Time.now + amount
+      else
+        time    = time_for amount
+        max_age = time - Time.now
       end
 
       values.last.merge!(:max_age => max_age)
@@ -341,14 +341,7 @@ module Sinatra
     # with a '304 Not Modified' response.
     def last_modified(time)
       return unless time
-      if time.respond_to?(:to_time)
-          time = time.to_time
-      else
-          ## make a best effort to convert something else to a time object
-          ## if this fails, this should throw an ArgumentError, then the
-          # rescue will result in an http 200, which should be safe
-          time = Time.parse(time.to_s)
-      end
+      time = time_for time
       response['Last-Modified'] = time.httpdate
       # compare based on seconds since epoch
       halt 304 if Time.httpdate(request.env['HTTP_IF_MODIFIED_SINCE']).to_i >= time.to_i
@@ -377,9 +370,39 @@ module Sinatra
       end
     end
 
-    ## Sugar for redirect (example:  redirect back)
-    def back ; request.referer ; end
+    # Sugar for redirect (example:  redirect back)
+    def back
+      request.referer
+    end
+
+    private
 
+    # Ruby 1.8 has no #to_time method.
+    # This can be removed and calls to it replaced with to_time,
+    # if 1.8 support is dropped.
+    def time_for(value)
+      if value.respond_to? :to_time
+        value.to_time
+      elsif Time === value
+        value
+      elsif value.respond_to? :new_offset
+        # DateTime#to_time does the same on 1.9
+        d = value.new_offset 0
+        t = Time.utc d.year, d.mon, d.mday, d.hour, d.min, d.sec + d.sec_fraction
+        t.getlocal
+      elsif value.respond_to? :mday
+        # Date#to_time does the same on 1.9
+        Time.local(value.year, value.mon, value.mday)
+      elsif Numeric === value
+        Time.at value
+      else
+        Time.parse value.to_s
+      end
+    rescue ArgumentError => boom
+      raise boom.to_s
+    rescue Exception
+      raise ArgumentError, "unable to convert #{value.inspect} to a Time object"
+    end
   end
 
   # Template rendering methods. Each method takes the name of a template
@@ -391,10 +414,15 @@ module Sinatra
   # that will be rendered.
   #
   # Possible options are:
-  #   :layout       If set to false, no layout is rendered, otherwise
-  #                 the specified layout is used (Ignored for `sass` and `less`)
-  #   :locals       A hash with local variables that should be available
-  #                 in the template
+  #   :content_type   The content type to use, same arguments as content_type.
+  #   :layout         If set to false, no layout is rendered, otherwise
+  #                   the specified layout is used (Ignored for `sass` and `less`)
+  #   :layout_engine  Engine to use for rendering the layout.
+  #   :locals         A hash with local variables that should be available
+  #                   in the template
+  #   :scope          If set, template is evaluate with the binding of the given
+  #                   object rather than the application instance.
+  #   :views          Views directory to use.
   module Templates
     module ContentTyped
       attr_accessor :content_type

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.2.0.c'
-  s.date = '2011-02-19'
+  s.version = '1.2.0.d'
+  s.date = '2011-02-26'
 
   s.description = "Classy web-development dressed in a DSL"
   s.summary     = "Classy web-development dressed in a DSL"
@@ -17,7 +17,6 @@ Gem::Specification.new do |s|
     AUTHORS
     CHANGES
     Gemfile
-    Gemfile.lock
     LICENSE
     README.de.rdoc
     README.es.rdoc
@@ -74,7 +73,7 @@ Gem::Specification.new do |s|
     test/templates_test.rb
     test/textile_test.rb
     test/views/a/in_a.str
-    test/views/ascii.haml
+    test/views/ascii.erb
     test/views/b/in_b.str
     test/views/calc.html.erb
     test/views/error.builder
@@ -114,7 +113,7 @@ Gem::Specification.new do |s|
     test/views/layout2.str
     test/views/layout2.test
     test/views/nested.str
-    test/views/utf8.haml
+    test/views/utf8.erb
   ]
   # = MANIFEST =
 

data/test/encoding_test.rb

@@ -1,5 +1,6 @@
 # encoding: UTF-8
 require File.dirname(__FILE__) + '/helper'
+require 'erb'
 
 class BaseTest < Test::Unit::TestCase
   setup do
@@ -9,11 +10,11 @@ class BaseTest < Test::Unit::TestCase
 
   it 'allows unicode strings in ascii templates per default (1.9)' do
     next unless defined? Encoding
-    @base.new.haml(File.read(@base.views + "/ascii.haml").encode("ASCII"), {}, :value => "åkej")
+    @base.new.erb(File.read(@base.views + "/ascii.erb").encode("ASCII"), {}, :value => "åkej")
   end
 
   it 'allows ascii strings in unicode templates per default (1.9)' do
     next unless defined? Encoding
-    @base.new.haml(:utf8, {}, :value => "Some Lyrics".encode("ASCII"))
+    @base.new.erb(:utf8, {}, :value => "Some Lyrics".encode("ASCII"))
   end
-end
+end

data/test/helper.rb

@@ -1,6 +1,8 @@
 ENV['RACK_ENV'] = 'test'
 Encoding.default_external = "UTF-8" if defined? Encoding
 
+RUBY_ENGINE = 'ruby' unless defined? RUBY_ENGINE
+
 begin
   require 'rack'
 rescue LoadError

data/test/helpers_test.rb

@@ -460,6 +460,12 @@ class HelpersTest < Test::Unit::TestCase
       assert_equal 'attachment; filename="file.txt"', response['Content-Disposition']
     end
 
+    it "sets the Content-Disposition header when :disposition set to 'inline'" do
+      send_file_app :disposition => 'inline'
+      get '/file.txt'
+      assert_equal 'inline', response['Content-Disposition']
+    end
+
     it "sets the Content-Disposition header when :filename provided" do
       send_file_app :filename => 'foo.txt'
       get '/file.txt'
@@ -501,39 +507,67 @@ class HelpersTest < Test::Unit::TestCase
 
   describe 'cache_control' do
     setup do
-      mock_app {
-        get '/' do
+      mock_app do
+        get '/foo' do
           cache_control :public, :no_cache, :max_age => 60.0
           'Hello World'
         end
-      }
+
+        get '/bar' do
+          cache_control :public, :no_cache
+          'Hello World'
+        end
+      end
     end
 
     it 'sets the Cache-Control header' do
-      get '/'
+      get '/foo'
       assert_equal ['public', 'no-cache', 'max-age=60'], response['Cache-Control'].split(', ')
     end
+
+    it 'last argument does not have to be a hash' do
+      get '/bar'
+      assert_equal ['public', 'no-cache'], response['Cache-Control'].split(', ')
+    end
   end
 
   describe 'expires' do
     setup do
-      mock_app {
-        get '/' do
+      mock_app do
+        get '/foo' do
           expires 60, :public, :no_cache
           'Hello World'
         end
-      }
+
+        get '/bar' do
+          expires Time.now
+        end
+
+        get '/baz' do
+          expires Time.at(0)
+        end
+      end
     end
 
     it 'sets the Cache-Control header' do
-      get '/'
+      get '/foo'
       assert_equal ['public', 'no-cache', 'max-age=60'], response['Cache-Control'].split(', ')
     end
 
     it 'sets the Expires header' do
-      get '/'
+      get '/foo'
+      assert_not_nil response['Expires']
+    end
+
+    it 'allows passing time objects' do
+      get '/bar'
       assert_not_nil response['Expires']
     end
+
+    it 'allows passing time objects' do
+      get '/baz'
+      assert_equal 'Thu, 01 Jan 1970 00:00:00 GMT', response['Expires']
+    end
   end
 
   describe 'last_modified' do
@@ -546,17 +580,18 @@ class HelpersTest < Test::Unit::TestCase
       assert ! response['Last-Modified']
     end
 
-    [Time, DateTime].each do |klass|
-      describe "with #{klass.name}" do
+    [Time.now, DateTime.now, Date.today, Time.now.to_i,
+      Struct.new(:to_time).new(Time.now) ].each do |last_modified_time|
+      describe "with #{last_modified_time.class.name}" do
         setup do
-          last_modified_time = klass.now
           mock_app do
             get '/' do
               last_modified last_modified_time
               'Boo!'
             end
           end
-          @last_modified_time = Time.parse last_modified_time.to_s
+          wrapper = Object.new.extend Sinatra::Helpers
+          @last_modified_time = wrapper.send :time_for, last_modified_time
         end
 
         # fixes strange missing test error when running complete test suite.

data/test/rdoc_test.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/helper'
 
 begin
-require 'rdoc'
+require 'rdoc/markup/to_html'
 
 class RdocTest < Test::Unit::TestCase
   def rdoc_app(&block)

data/test/routing_test.rb

@@ -778,6 +778,11 @@ class RoutingTest < Test::Unit::TestCase
   end
 
   it 'raises an ArgumentError with block arity > 1 and too many values' do
+    if RUBY_ENGINE == "rbx"
+      $stderr.puts "\npending test: #{__method__}, #{__FILE__}:#{__LINE__} "
+      next
+    end
+
     mock_app {
       get '/:foo/:bar/:baz' do |foo, bar|
         'quux'

data/test/views/{ascii.haml → ascii.erb}

@@ -1,2 +1,2 @@
 This file has no unicode in it!
-= value
+<%= value %>

data/test/views/{utf8.haml → utf8.erb}

@@ -1,2 +1,2 @@
-%h1= value
+<h1><%= value %></h1>
 Ingen vill veta var du köpt din tröja.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra
 version: !ruby/object:Gem::Version 
-  hash: 3414817362724122558
+  hash: 41
   prerelease: 6
   segments: 
   - 1
   - 2
   - 0
-  - c
-  version: 1.2.0.c
+  - d
+  version: 1.2.0.d
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-19 00:00:00 +01:00
+date: 2011-02-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -94,7 +94,6 @@ files:
 - AUTHORS
 - CHANGES
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.de.rdoc
 - README.es.rdoc
@@ -151,7 +150,7 @@ files:
 - test/templates_test.rb
 - test/textile_test.rb
 - test/views/a/in_a.str
-- test/views/ascii.haml
+- test/views/ascii.erb
 - test/views/b/in_b.str
 - test/views/calc.html.erb
 - test/views/error.builder
@@ -191,7 +190,7 @@ files:
 - test/views/layout2.str
 - test/views/layout2.test
 - test/views/nested.str
-- test/views/utf8.haml
+- test/views/utf8.erb
 has_rdoc: true
 homepage: http://sinatra.rubyforge.org
 licenses: []

data/Gemfile.lock

@@ -1,74 +0,0 @@
-PATH
-  remote: .
-  specs:
-    sinatra (1.2.0.a)
-      rack (~> 1.1)
-      tilt (>= 1.2.2, < 2.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    RedCloth (4.2.7)
-    RedCloth (4.2.7-java)
-    abstract (1.0.0)
-    builder (3.0.0)
-    coffee-script (2.1.3)
-      coffee-script-source
-    coffee-script-source (1.0.1)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    haml (3.0.25)
-    json (1.5.1)
-    json (1.5.1-java)
-    less (1.2.21)
-      mutter (>= 0.4.2)
-      treetop (>= 1.4.2)
-    liquid (2.2.2)
-    markaby (0.7.1)
-      builder (>= 2.0.0)
-    mutter (0.5.3)
-    nokogiri (1.4.4)
-    nokogiri (1.4.4-java)
-      weakling (>= 0.0.3)
-    polyglot (0.3.1)
-    rack (1.2.1)
-    rack-test (0.5.7)
-      rack (>= 1.0)
-    radius (0.6.1)
-    rake (0.8.7)
-    rdiscount (1.6.8)
-    rdoc (3.5.3)
-    shotgun (0.8)
-      rack (>= 1.0)
-    slim (0.9.0)
-      temple (~> 0.1.7)
-      tilt (~> 1.2)
-    temple (0.1.7)
-    tilt (1.2.2)
-    treetop (1.4.9)
-      polyglot (>= 0.3.1)
-    weakling (0.0.4-java)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  RedCloth
-  builder
-  coffee-script (>= 2.0)
-  erubis
-  haml (>= 3.0)
-  json
-  less
-  liquid
-  markaby
-  nokogiri
-  rack-test (>= 0.5.6)
-  radius
-  rake
-  rdiscount
-  rdoc
-  shotgun (~> 0.6)
-  sinatra!
-  slim