RubyGems - sinatra-base - Versions diffs - 1.0 → 1.4.0 - Mend

sinatra-base 1.0 → 1.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (101) hide show

data/.yardopts +4 -0
data/AUTHORS +15 -0
data/CHANGES +524 -1
data/Gemfile +82 -0
data/LICENSE +1 -1
data/README.de.rdoc +2093 -0
data/README.es.rdoc +2091 -0
data/README.fr.rdoc +2116 -0
data/README.hu.rdoc +607 -0
data/README.jp.rdoc +514 -23
data/README.pt-br.rdoc +647 -0
data/README.pt-pt.rdoc +646 -0
data/README.rdoc +1580 -205
data/README.ru.rdoc +2015 -0
data/README.zh.rdoc +1816 -0
data/Rakefile +110 -44
data/examples/chat.rb +61 -0
data/examples/simple.rb +3 -0
data/examples/stream.ru +26 -0
data/lib/sinatra.rb +0 -3
data/lib/sinatra/base.rb +923 -393
data/lib/sinatra/main.rb +9 -7
data/lib/sinatra/showexceptions.rb +37 -4
data/lib/sinatra/version.rb +3 -0
data/sinatra-base.gemspec +15 -91
data/test/base_test.rb +2 -2
data/test/builder_test.rb +32 -2
data/test/coffee_test.rb +92 -0
data/test/contest.rb +62 -28
data/test/creole_test.rb +65 -0
data/test/delegator_test.rb +162 -0
data/test/encoding_test.rb +20 -0
data/test/erb_test.rb +25 -2
data/test/extensions_test.rb +1 -1
data/test/filter_test.rb +226 -8
data/test/haml_test.rb +8 -2
data/test/helper.rb +47 -0
data/test/helpers_test.rb +1287 -80
data/test/integration/app.rb +62 -0
data/test/integration_helper.rb +208 -0
data/test/integration_test.rb +82 -0
data/test/less_test.rb +36 -6
data/test/liquid_test.rb +59 -0
data/test/mapped_error_test.rb +84 -7
data/test/markaby_test.rb +80 -0
data/test/markdown_test.rb +81 -0
data/test/middleware_test.rb +1 -1
data/test/nokogiri_test.rb +69 -0
data/test/rack_test.rb +45 -0
data/test/radius_test.rb +59 -0
data/test/rdoc_test.rb +66 -0
data/test/readme_test.rb +136 -0
data/test/request_test.rb +13 -1
data/test/response_test.rb +21 -2
data/test/result_test.rb +5 -5
data/test/route_added_hook_test.rb +1 -1
data/test/routing_test.rb +328 -13
data/test/sass_test.rb +48 -18
data/test/scss_test.rb +88 -0
data/test/server_test.rb +4 -3
data/test/settings_test.rb +191 -21
data/test/sinatra_test.rb +5 -1
data/test/slim_test.rb +88 -0
data/test/static_test.rb +89 -5
data/test/streaming_test.rb +140 -0
data/test/templates_test.rb +143 -4
data/test/textile_test.rb +65 -0
data/test/views/a/in_a.str +1 -0
data/test/views/ascii.erb +2 -0
data/test/views/b/in_b.str +1 -0
data/test/views/calc.html.erb +1 -0
data/test/views/explicitly_nested.str +1 -0
data/test/views/hello.coffee +1 -0
data/test/views/hello.creole +1 -0
data/test/views/hello.liquid +1 -0
data/test/views/hello.mab +1 -0
data/test/views/hello.md +1 -0
data/test/views/hello.nokogiri +1 -0
data/test/views/hello.radius +1 -0
data/test/views/hello.rdoc +1 -0
data/test/views/hello.sass +1 -1
data/test/views/hello.scss +3 -0
data/test/views/hello.slim +1 -0
data/test/views/hello.str +1 -0
data/test/views/hello.textile +1 -0
data/test/views/hello.yajl +1 -0
data/test/views/layout2.liquid +2 -0
data/test/views/layout2.mab +2 -0
data/test/views/layout2.nokogiri +3 -0
data/test/views/layout2.radius +2 -0
data/test/views/layout2.slim +3 -0
data/test/views/layout2.str +2 -0
data/test/views/nested.str +1 -0
data/test/views/utf8.erb +2 -0
data/test/yajl_test.rb +80 -0
metadata +126 -91
data/lib/sinatra/tilt.rb +0 -746
data/test/erubis_test.rb +0 -82
data/test/views/error.erubis +0 -3
data/test/views/hello.erubis +0 -1
data/test/views/layout2.erubis +0 -2

data/lib/sinatra/main.rb CHANGED

@@ -8,16 +8,16 @@ module Sinatra
     # on this path by default.
     set :app_file, caller_files.first || $0
-    set :run, Proc.new { $0 == app_file }
+    set :run, Proc.new { File.expand_path($0) == File.expand_path(app_file) }
     if run? && ARGV.any?
       require 'optparse'
       OptionParser.new { |op|
-        op.on('-x')        {       set :lock, true }
-        op.on('-e env')    { |val| set :environment, val.to_sym }
-        op.on('-s server') { |val| set :server, val }
-        op.on('-p port')   { |val| set :port, val.to_i }
-        op.on('-o addr')   { |val| set :bind, val }
+        op.on('-p port',   'set the port (default is 4567)')                { |val| set :port, Integer(val) }
+        op.on('-o addr',   'set the host (default is 0.0.0.0)')             { |val| set :bind, val }
+        op.on('-e env',    'set the environment (default is development)')  { |val| set :environment, val.to_sym }
+        op.on('-s server', 'specify rack server/handler (default is thin)') { |val| set :server, val }
+        op.on('-x',        'turn on the mutex lock (default is off)')       {       set :lock, true }
       }.parse!(ARGV.dup)
     end
   end
@@ -25,4 +25,6 @@ module Sinatra
   at_exit { Application.run! if $!.nil? && Application.run? }
 end
-include Sinatra::Delegator
+# include would include the module in Object
+# extend only extends the `main` object
+extend Sinatra::Delegator

data/lib/sinatra/showexceptions.rb CHANGED

@@ -1,12 +1,45 @@
 require 'rack/showexceptions'
 module Sinatra
+  # Sinatra::ShowExceptions catches all exceptions raised from the app it
+  # wraps. It shows a useful backtrace with the sourcefile and clickable
+  # context, the whole Rack environment and the request data.
+  #
+  # Be careful when you use this on public-facing sites as it could reveal
+  # information helpful to attackers.
   class ShowExceptions < Rack::ShowExceptions
+    @@eats_errors = Object.new
+    def @@eats_errors.flush(*) end
+    def @@eats_errors.puts(*) end
     def initialize(app)
       @app      = app
       @template = ERB.new(TEMPLATE)
     end
+    def call(env)
+      @app.call(env)
+    rescue Exception => e
+      errors, env["rack.errors"] = env["rack.errors"], @@eats_errors
+      if respond_to?(:prefers_plain_text?) and prefers_plain_text?(env)
+        content_type = "text/plain"
+        body = [dump_exception(e)]
+      else
+        content_type = "text/html"
+        body = pretty(env, e)
+      end
+      env["rack.errors"] = errors
+      [500,
+       {"Content-Type" => content_type,
+        "Content-Length" => Rack::Utils.bytesize(body.join).to_s},
+       body]
+    end
+    private
     def frame_class(frame)
       if frame.filename =~ /lib\/sinatra.*\.rb/
         "framework"
@@ -18,7 +51,7 @@ module Sinatra
       end
     end
-TEMPLATE = <<HTML
+TEMPLATE = <<-HTML # :nodoc:
 <!DOCTYPE html>
 <html>
 <head>
@@ -141,7 +174,7 @@ TEMPLATE = <<HTML
 <body>
   <div id="wrap">
     <div id="header">
-      <img src="/__sinatra__/500.png" alt="application error" height="161" width="313" />
+      <img src="<%= env['SCRIPT_NAME'] %>/__sinatra__/500.png" alt="application error" height="161" width="313" />
       <div id="summary">
         <h1><strong><%=h exception.class %></strong> at <strong><%=h path %>
           </strong></h1>
@@ -219,7 +252,7 @@ TEMPLATE = <<HTML
     <div id="get">
       <h3 id="get-info">GET</h3>
-      <% unless req.GET.empty? %>
+      <% if req.GET and not req.GET.empty? %>
         <table class="req">
           <tr>
             <th>Variable</th>
@@ -240,7 +273,7 @@ TEMPLATE = <<HTML
     <div id="post">
       <h3 id="post-info">POST</h3>
-      <% unless req.POST.empty? %>
+      <% if req.POST and not req.POST.empty? %>
         <table class="req">
           <tr>
             <th>Variable</th>

data/lib/sinatra/version.rb ADDED

@@ -0,0 +1,3 @@
+module Sinatra
+  VERSION = '1.4.0'
+end

data/sinatra-base.gemspec CHANGED

@@ -1,94 +1,18 @@
-Gem::Specification.new do |s|
-  s.specification_version = 2 if s.respond_to? :specification_version=
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+require 'sinatra/version'
-  s.name = 'sinatra-base'
-  s.version = '1.0'
-  s.date = '2010-03-23'
+Gem::Specification.new 'sinatra-base', Sinatra::VERSION do |s|
+  s.description       = "Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort."
+  s.summary           = "Classy web-development dressed in a DSL"
+  s.authors           = ["Blake Mizerany", "Ryan Tomayko", "Simon Rozet", "Konstantin Haase"]
+  s.email             = "sinatrarb@googlegroups.com"
+  s.homepage          = "http://www.sinatrarb.com/"
+  s.files             = `git ls-files`.split("\n") - %w[.gitignore .travis.yml]
+  s.test_files        = s.files.select { |p| p =~ /^test\/.*_test.rb/ }
+  s.extra_rdoc_files  = s.files.select { |p| p =~ /^README/ } << 'LICENSE'
+  s.rdoc_options      = %w[--line-numbers --inline-source --title Sinatra --main README.rdoc]
-  s.description = "Classy web-development dressed in a DSL"
-  s.summary     = "Classy web-development dressed in a DSL"
-  s.authors = ["Blake Mizerany", "Ryan Tomayko", "Simon Rozet"]
-  s.email = "sinatrarb@googlegroups.com"
-  # = MANIFEST =
-  s.files = %w[
-    AUTHORS
-    CHANGES
-    LICENSE
-    README.jp.rdoc
-    README.rdoc
-    Rakefile
-    lib/sinatra.rb
-    lib/sinatra/base.rb
-    lib/sinatra/images/404.png
-    lib/sinatra/images/500.png
-    lib/sinatra/main.rb
-    lib/sinatra/showexceptions.rb
-    lib/sinatra/tilt.rb
-    sinatra-base.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
-    test/helper.rb
-    test/helpers_test.rb
-    test/less_test.rb
-    test/mapped_error_test.rb
-    test/middleware_test.rb
-    test/public/favicon.ico
-    test/request_test.rb
-    test/response_test.rb
-    test/result_test.rb
-    test/route_added_hook_test.rb
-    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/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.less
-    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
-  ]
-  # = MANIFEST =
-  s.test_files = s.files.select {|path| path =~ /^test\/.*_test.rb/}
-  s.extra_rdoc_files = %w[README.rdoc LICENSE]
-  s.add_dependency 'rack',    '>= 1.0'
-  s.add_development_dependency 'shotgun', '>= 0.6',   '< 1.0'
-  s.add_development_dependency 'rack-test', '>= 0.3.0'
-  s.add_development_dependency 'haml'
-  s.add_development_dependency 'builder'
-  s.add_development_dependency 'erubis'
-  s.add_development_dependency 'less'
-  s.has_rdoc = true
-  s.homepage = "http://sinatra.rubyforge.org"
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Sinatra", "--main", "README.rdoc"]
-  s.require_paths = %w[lib]
-  s.rubyforge_project = 'sinatra'
-  s.rubygems_version = '1.1.1'
+  s.add_dependency 'rack',            '~> 1.3', '>= 1.3.6'
+  s.add_dependency 'rack-protection', '~> 1.2'
+  s.add_dependency 'tilt',            '~> 1.3', '>= 1.3.3'
 end

data/test/base_test.rb CHANGED

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 class BaseTest < Test::Unit::TestCase
   def test_default
@@ -71,7 +71,7 @@ class BaseTest < Test::Unit::TestCase
     end
     it 'exposes the downstream app' do
-      middleware = TestMiddleware.new(app)
+      middleware = TestMiddleware.new!(app)
       assert_same app, middleware.app
     end

data/test/builder_test.rb CHANGED

@@ -1,10 +1,13 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
+begin
 require 'builder'
 class BuilderTest < Test::Unit::TestCase
-  def builder_app(&block)
+  def builder_app(options = {}, &block)
     mock_app {
       set :views, File.dirname(__FILE__) + '/views'
+      set options
       get '/', &block
     }
     get '/'
@@ -16,6 +19,29 @@ class BuilderTest < Test::Unit::TestCase
     assert_equal %{<?xml version="1.0" encoding="UTF-8"?>\n}, body
   end
+  it 'defaults content type to xml' do
+    builder_app { builder 'xml.instruct!' }
+    assert ok?
+    assert_equal "application/xml;charset=utf-8", response['Content-Type']
+  end
+  it 'defaults allows setting content type per route' do
+    builder_app do
+      content_type :html
+      builder 'xml.instruct!'
+    end
+    assert ok?
+    assert_equal "text/html;charset=utf-8", response['Content-Type']
+  end
+  it 'defaults allows setting content type globally' do
+    builder_app(:builder => { :content_type => 'html' }) do
+      builder 'xml.instruct!'
+    end
+    assert ok?
+    assert_equal "text/html;charset=utf-8", response['Content-Type']
+  end
   it 'renders inline blocks' do
     builder_app {
       @name = "Frank & Mary"
@@ -63,3 +89,7 @@ class BuilderTest < Test::Unit::TestCase
     assert_raise(Errno::ENOENT) { get('/') }
   end
 end
+rescue LoadError
+  warn "#{$!.to_s}: skipping builder tests"
+end

data/test/coffee_test.rb ADDED

@@ -0,0 +1,92 @@
+require File.expand_path('../helper', __FILE__)
+begin
+require 'coffee-script'
+require 'execjs'
+begin
+  ExecJS.compile '1'
+rescue Exception
+  raise LoadError, 'unable to execute JavaScript'
+end
+class CoffeeTest < Test::Unit::TestCase
+  def coffee_app(options = {}, &block)
+    mock_app {
+      set :views, File.dirname(__FILE__) + '/views'
+      set(options)
+      get '/', &block
+    }
+    get '/'
+  end
+  it 'renders inline Coffee strings' do
+    coffee_app { coffee "alert 'Aye!'\n" }
+    assert ok?
+    assert body.include?("alert('Aye!');")
+  end
+  it 'defaults content type to javascript' do
+    coffee_app { coffee "alert 'Aye!'\n" }
+    assert ok?
+    assert_equal "application/javascript;charset=utf-8", response['Content-Type']
+  end
+  it 'defaults allows setting content type per route' do
+    coffee_app do
+      content_type :html
+      coffee "alert 'Aye!'\n"
+    end
+    assert ok?
+    assert_equal "text/html;charset=utf-8", response['Content-Type']
+  end
+  it 'defaults allows setting content type globally' do
+    coffee_app(:coffee => { :content_type => 'html' }) do
+      coffee "alert 'Aye!'\n"
+    end
+    assert ok?
+    assert_equal "text/html;charset=utf-8", response['Content-Type']
+  end
+  it 'renders .coffee files in views path' do
+    coffee_app { coffee :hello }
+    assert ok?
+    assert_include body, "alert(\"Aye!\");"
+  end
+  it 'ignores the layout option' do
+    coffee_app { coffee :hello, :layout => :layout2 }
+    assert ok?
+    assert_include body, "alert(\"Aye!\");"
+  end
+  it "raises error if template not found" do
+    mock_app {
+      get('/') { coffee :no_such_template }
+    }
+    assert_raise(Errno::ENOENT) { get('/') }
+  end
+  it "passes coffee options to the coffee engine" do
+    coffee_app { coffee "alert 'Aye!'\n", :no_wrap => true }
+    assert ok?
+    assert_body "alert('Aye!');"
+  end
+  it "passes default coffee options to the coffee engine" do
+    mock_app do
+      set :coffee, :no_wrap => true # default coffee style is :nested
+      get '/' do
+        coffee "alert 'Aye!'\n"
+      end
+    end
+    get '/'
+    assert ok?
+    assert_body "alert('Aye!');"
+  end
+end
+rescue LoadError
+  warn "#{$!.to_s}: skipping coffee tests"
+end

data/test/contest.rb CHANGED

@@ -1,38 +1,67 @@
+# Copyright (c) 2009 Damian Janowski and Michel Martens for Citrusbyte
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 require "test/unit"
-# Test::Unit loads a default test if the suite is empty, and the only
-# purpose of that test is to fail. As having empty contexts is a common
-# practice, we decided to overwrite TestSuite#empty? in order to
-# allow them. Having a failure when no tests have been defined seems
-# counter-intuitive.
+# Test::Unit loads a default test if the suite is empty, whose purpose is to
+# fail. Since having empty contexts is a common practice, we decided to
+# overwrite TestSuite#empty? in order to allow them. Having a failure when no
+# tests have been defined seems counter-intuitive.
 class Test::Unit::TestSuite
-  unless method_defined?(:empty?)
-    def empty?
-      false
-    end
+  def empty?
+    false
   end
 end
-# We added setup, test and context as class methods, and the instance
-# method setup now iterates on the setup blocks. Note that all setup
-# blocks must be defined with the block syntax. Adding a setup instance
-# method defeats the purpose of this library.
+# Contest adds +teardown+, +test+ and +context+ as class methods, and the
+# instance methods +setup+ and +teardown+ now iterate on the corresponding
+# blocks. Note that all setup and teardown blocks must be defined with the
+# block syntax. Adding setup or teardown instance methods defeats the purpose
+# of this library.
 class Test::Unit::TestCase
-  def self.setup(&block)
-    setup_blocks << block
+  def self.setup(&block)     setup_blocks    << block  end
+  def self.teardown(&block)  teardown_blocks << block  end
+  def self.setup_blocks()    @setup_blocks    ||= []   end
+  def self.teardown_blocks() @teardown_blocks ||= []   end
+  def setup_blocks(base = self.class)
+    setup_blocks base.superclass if base.superclass.respond_to? :setup_blocks
+    base.setup_blocks.each do |block|
+      instance_eval(&block)
+    end
   end
-  def setup
-    self.class.setup_blocks.each do |block|
+  def teardown_blocks(base = self.class)
+    teardown_blocks base.superclass if base.superclass.respond_to? :teardown_blocks
+    base.teardown_blocks.each do |block|
       instance_eval(&block)
     end
   end
-  def self.context(name, &block)
-    subclass = Class.new(self.superclass)
-    subclass.setup_blocks.unshift(*setup_blocks)
-    subclass.class_eval(&block)
-    const_set(context_name(name), subclass)
+  alias setup setup_blocks
+  alias teardown teardown_blocks
+  def self.context(*name, &block)
+    subclass = Class.new(self)
+    remove_tests(subclass)
+    subclass.class_eval(&block) if block_given?
+    const_set(context_name(name.join(" ")), subclass)
   end
   def self.test(name, &block)
@@ -46,12 +75,10 @@ class Test::Unit::TestCase
 private
-  def self.setup_blocks
-    @setup_blocks ||= []
-  end
   def self.context_name(name)
-    "Test#{sanitize_name(name).gsub(/(^| )(\w)/) { $2.upcase }}".to_sym
+    # "Test#{sanitize_name(name).gsub(/(^| )(\w)/) { $2.upcase }}".to_sym
+    name = "Test#{sanitize_name(name).gsub(/(^| )(\w)/) { $2.upcase }}"
+    name.tr(" ", "_").to_sym
   end
   def self.test_name(name)
@@ -59,6 +86,13 @@ private
   end
   def self.sanitize_name(name)
-    name.gsub(/\W+/, ' ').strip
+    # name.gsub(/\W+/, ' ').strip
+    name.gsub(/\W+/, ' ')
+  end
+  def self.remove_tests(subclass)
+    subclass.public_instance_methods.grep(/^test_/).each do |meth|
+      subclass.send(:undef_method, meth.to_sym)
+    end
   end
 end