sinatra 0.9.0.5 → 0.9.1

data/test/extensions_test.rb

@@ -0,0 +1,84 @@
+require File.dirname(__FILE__) + '/helper'
+
+describe 'Registering extensions' do
+  module FooExtensions
+    def foo
+    end
+
+    private
+      def im_hiding_in_ur_foos
+      end
+  end
+
+  module BarExtensions
+    def bar
+    end
+  end
+
+  module BazExtensions
+    def baz
+    end
+  end
+
+  module QuuxExtensions
+    def quux
+    end
+  end
+
+  it 'will add the methods to the DSL for the class in which you register them and its subclasses' do
+    Sinatra::Base.register FooExtensions
+    assert Sinatra::Base.respond_to?(:foo)
+
+    Sinatra::Default.register BarExtensions
+    assert Sinatra::Default.respond_to?(:bar)
+    assert Sinatra::Default.respond_to?(:foo)
+    assert !Sinatra::Base.respond_to?(:bar)
+  end
+
+  it 'allows extending by passing a block' do
+    Sinatra::Base.register {
+      def im_in_ur_anonymous_module; end
+    }
+    assert Sinatra::Base.respond_to?(:im_in_ur_anonymous_module)
+  end
+
+  it 'will make sure any public methods added via Default#register are delegated to Sinatra::Delegator' do
+    Sinatra::Default.register FooExtensions
+    assert Sinatra::Delegator.private_instance_methods.
+      map { |m| m.to_sym }.include?(:foo)
+    assert !Sinatra::Delegator.private_instance_methods.
+      map { |m| m.to_sym }.include?(:im_hiding_in_ur_foos)
+  end
+
+  it 'will not delegate methods on Base#register' do
+    Sinatra::Base.register QuuxExtensions
+    assert !Sinatra::Delegator.private_instance_methods.include?("quux")
+  end
+
+  it 'will extend the Sinatra::Default application by default' do
+    Sinatra.register BazExtensions
+    assert !Sinatra::Base.respond_to?(:baz)
+    assert Sinatra::Default.respond_to?(:baz)
+  end
+
+  module BizzleExtension
+    def bizzle
+      bizzle_option
+    end
+
+    def self.registered(base)
+      fail "base should be BizzleApp" unless base == BizzleApp
+      fail "base should have already extended BizzleExtension" unless base.respond_to?(:bizzle)
+      base.set :bizzle_option, 'bizzle!'
+    end
+  end
+
+  class BizzleApp < Sinatra::Base
+  end
+
+  it 'sends .registered to the extension module after extending the class' do
+    BizzleApp.register BizzleExtension
+    assert_equal 'bizzle!', BizzleApp.bizzle_option
+    assert_equal 'bizzle!', BizzleApp.bizzle
+  end
+end

data/test/helper.rb

@@ -1,25 +1,81 @@
 begin
-  require 'test/spec'
+  require 'rack'
 rescue LoadError
   require 'rubygems'
-  require 'test/spec'
+  require 'rack'
 end
 
-$:.unshift File.dirname(File.dirname(__FILE__)) + '/lib'
-require 'sinatra/base'
+libdir = File.dirname(File.dirname(__FILE__)) + '/lib'
+$LOAD_PATH.unshift libdir unless $LOAD_PATH.include?(libdir)
+
+require 'test/unit'
 require 'sinatra/test'
-require 'sinatra/test/spec'
 
-module Sinatra::Test
+class Sinatra::Base
+  # Allow assertions in request context
+  include Test::Unit::Assertions
+end
+
+class Test::Unit::TestCase
+  include Sinatra::Test
+
   # Sets up a Sinatra::Base subclass defined with the block
   # given. Used in setup or individual spec methods to establish
   # the application.
   def mock_app(base=Sinatra::Base, &block)
     @app = Sinatra.new(base, &block)
   end
+
+  def restore_default_options
+    Sinatra::Default.set(
+      :environment => :development,
+      :raise_errors => Proc.new { test? },
+      :dump_errors => true,
+      :sessions => false,
+      :logging => Proc.new { ! test? },
+      :methodoverride => true,
+      :static => true,
+      :run => Proc.new { ! test? }
+    )
+  end
 end
 
-class Sinatra::Base
-  # Allow assertions in request context
-  include Test::Unit::Assertions
+##
+# test/spec/mini
+# http://pastie.caboo.se/158871
+# chris@ozmm.org
+#
+def describe(*args, &block)
+  return super unless (name = args.first.capitalize) && block
+  name = "#{name.gsub(/\W/, '')}Test"
+  Object.send :const_set, name, Class.new(Test::Unit::TestCase)
+  klass = Object.const_get(name)
+  klass.class_eval do
+    def self.it(name, &block)
+      define_method("test_#{name.gsub(/\W/,'_').downcase}", &block)
+    end
+    def self.xspecify(*args) end
+    def self.before(&block) define_method(:setup, &block)    end
+    def self.after(&block)  define_method(:teardown, &block) end
+  end
+  klass.class_eval &block
+  klass
+end
+
+def describe_option(name, &block)
+  klass = describe("Option #{name}", &block)
+  klass.before do
+    restore_default_options
+    @base    = Sinatra.new
+    @default = Class.new(Sinatra::Default)
+  end
+  klass
+end
+
+# Do not output warnings for the duration of the block.
+def silence_warnings
+  $VERBOSE, v = nil, $VERBOSE
+  yield
+ensure
+  $VERBOSE = v
 end