sinatra 1.4.0.a → 1.4.0.b

data/Rakefile

@@ -126,6 +126,21 @@ task :authors, [:commit_range, :format, :sep] do |t, a|
   puts authors.sort_by { |n,c| -c }.map { |e| a.format % e }.join(a.sep)
 end
 
+desc "generates TOC"
+task :toc, [:readme] do |t, a|
+  a.with_defaults :readme => 'README.md'
+
+  def self.link(title)
+    title.downcase.gsub(/(?!-)\W /, '-').gsub(' ', '-').gsub(/(?!-)\W/, '')
+  end
+
+  puts "* [Sinatra](#sinatra)"
+  title = Regexp.new('(?<=\* )(.*)') # so Ruby 1.8 doesn't complain
+  File.binread(a.readme).scan(/^##.*/) do |line|
+    puts line.gsub(/#(?=#)/, '    ').gsub('#', '*').gsub(title) { "[#{$1}](##{link($1)})" }
+  end
+end
+
 # PACKAGING ============================================================
 
 if defined?(Gem)

data/lib/sinatra/base.rb

@@ -660,6 +660,11 @@ module Sinatra
       render :less, template, options, locals
     end
 
+    def stylus(template, options={}, locals={})
+      options.merge! :layout => false, :default_content_type => :css
+      render :styl, template, options, locals
+    end
+
     def builder(template = nil, options = {}, locals = {}, &block)
       options[:default_content_type] = :xml
       render_ruby(:builder, template, options, locals, &block)

data/lib/sinatra/version.rb

@@ -1,3 +1,3 @@
 module Sinatra
-  VERSION = '1.4.0.a'
+  VERSION = '1.4.0.b'
 end

data/test/stylus_test.rb

@@ -0,0 +1,90 @@
+require File.expand_path('../helper', __FILE__)
+
+begin
+  require 'stylus'
+  require 'stylus/tilt'
+
+  begin
+    Stylus.compile '1'
+  rescue RuntimeError
+    raise LoadError, 'unable to find Stylus compiler'
+  end
+
+  class StylusTest < Test::Unit::TestCase
+    def stylus_app(options = {}, &block)
+      mock_app do
+        set :views, File.dirname(__FILE__) + '/views'
+        set(options)
+        get('/', &block)
+      end
+      get '/'
+    end
+
+    it 'renders inline Stylus strings' do
+      stylus_app { stylus "a\n margin auto\n" }
+      assert ok?
+      assert body.include?("a {\n  margin: auto;\n}\n")
+    end
+
+    it 'defaults content type to css' do
+      stylus_app { stylus :hello }
+      assert ok?
+      assert_equal "text/css;charset=utf-8", response['Content-Type']
+    end
+
+    it 'defaults allows setting content type per route' do
+      stylus_app do
+        content_type :html
+        stylus :hello
+      end
+      assert ok?
+      assert_equal "text/html;charset=utf-8", response['Content-Type']
+    end
+
+    it 'defaults allows setting content type globally' do
+      stylus_app(:styl => { :content_type => 'html' }) do
+        stylus :hello
+      end
+      assert ok?
+      assert_equal "text/html;charset=utf-8", response['Content-Type']
+    end
+
+    it 'renders .styl files in views path' do
+      stylus_app { stylus :hello }
+      assert ok?
+      assert_include body, "a {\n  margin: auto;\n}\n"
+    end
+
+    it 'ignores the layout option' do
+      stylus_app { stylus :hello, :layout => :layout2 }
+      assert ok?
+      assert_include body, "a {\n  margin: auto;\n}\n"
+    end
+
+    it "raises error if template not found" do
+      mock_app {
+        get('/') { stylus :no_such_template }
+      }
+      assert_raise(Errno::ENOENT) { get('/') }
+    end
+
+    it "passes stylus options to the stylus engine" do
+      stylus_app { stylus :hello, :no_wrap => true }
+      assert ok?
+      assert_body "a {\n  margin: auto;\n}\n"
+    end
+
+    it "passes default stylus options to the stylus engine" do
+      mock_app do
+        set :stylus, :no_wrap => true # default stylus style is :nested
+        get('/') { stylus :hello }
+      end
+      get '/'
+      assert ok?
+      assert_body "a {\n  margin: auto;\n}\n"
+    end
+  end
+
+rescue LoadError
+  warn "#{$!.to_s}: skipping stylus tests"
+end

data/test/views/hello.styl

@@ -0,0 +1,2 @@
+a
+  margin auto

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra
 version: !ruby/object:Gem::Version
-  version: 1.4.0.a
+  version: 1.4.0.b
   prerelease: 6
 platform: ruby
 authors:
@@ -158,6 +158,7 @@ files:
 - test/slim_test.rb
 - test/static_test.rb
 - test/streaming_test.rb
+- test/stylus_test.rb
 - test/templates_test.rb
 - test/textile_test.rb
 - test/views/a/in_a.str
@@ -187,6 +188,7 @@ files:
 - test/views/hello.scss
 - test/views/hello.slim
 - test/views/hello.str
+- test/views/hello.styl
 - test/views/hello.test
 - test/views/hello.textile
 - test/views/hello.wlang
@@ -228,7 +230,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 610663960316584040
+      hash: -3758604451509005806
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -280,6 +282,7 @@ test_files:
 - test/slim_test.rb
 - test/static_test.rb
 - test/streaming_test.rb
+- test/stylus_test.rb
 - test/templates_test.rb
 - test/textile_test.rb
 - test/wlang_test.rb