sinatra-sinatra 0.8.10 → 0.9.0

data/CHANGES

@@ -1,4 +1,4 @@
-= 0.9.0 (unreleased)
+= 0.9.0 / 2009-01-18
 
  * Works with and requires Rack >= 0.9.1
 
@@ -45,6 +45,10 @@
    has the status code specified. It's also possible to register an error
    page for a range of status codes: "error(500..599)".
 
+ * In-file templates are now automatically imported from the file that
+   requires 'sinatra'. The use_in_file_templates! method is still available
+   for loading templates from other files.
+
  * Sinatra's testing support is no longer dependent on Test::Unit. Requiring
    'sinatra/test' adds the Sinatra::Test module and Sinatra::TestHarness
    class, which can be used with any test framework. The 'sinatra/test/unit',

data/README.rdoc

@@ -165,12 +165,13 @@ other templates.
 
 Templates may be defined at the end of the source file:
 
+  require 'rubygems'
+  require 'sinatra'
+
   get '/' do
     haml :index
   end
 
-  use_in_file_templates!
-
   __END__
 
   @@ layout
@@ -180,6 +181,11 @@ Templates may be defined at the end of the source file:
   @@ index
   %div.title Hello world!!!!!
 
+NOTE:  Sinatra will automaticly load any in-file-templates in the
+source file that first required sinatra.  If you have in-file-templates
+in another source file you will need to explicitly call
++use_in_file_templates! on main in that file.
+
 It's also possible to define named templates using the top-level template
 method:
 

data/Rakefile

@@ -57,7 +57,12 @@ file package('.gem') => %w[dist/ sinatra.gemspec] + spec.files do |f|
 end
 
 file package('.tar.gz') => %w[dist/] + spec.files do |f|
-  sh "git archive --format=tar HEAD | gzip > #{f.name}"
+  sh <<-SH
+    git archive \
+      --prefix=sinatra-#{source_version}/ \
+      --format=tar \
+      HEAD | gzip > #{f.name}
+  SH
 end
 
 # Rubyforge Release / Publish Tasks ==================================

data/lib/sinatra.rb

@@ -1,4 +1,8 @@
-$LOAD_PATH.unshift File.dirname(__FILE__)
+libdir = File.dirname(__FILE__)
+$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
+
 require 'sinatra/base'
 require 'sinatra/main'
 require 'sinatra/compat'
+
+use_in_file_templates!

data/lib/sinatra/base.rb

@@ -4,7 +4,7 @@ require 'rack'
 require 'rack/builder'
 
 module Sinatra
-  VERSION = '0.8.10'
+  VERSION = '0.9.0'
 
   class Request < Rack::Request
     def user_agent
@@ -380,14 +380,8 @@ module Sinatra
       Hash.new {|hash,key| hash[key.to_s] if Symbol === key }
     end
 
-    def invoke(handler)
-      res = catch(:halt) {
-        if handler.respond_to?(:call)
-          instance_eval(&handler)
-        else
-          send(handler)
-        end
-      }
+    def invoke(block)
+      res = catch(:halt) { instance_eval(&block) }
       case
       when res.respond_to?(:to_str)
         @response.body = [res]
@@ -499,8 +493,13 @@ module Sinatra
       end
 
       def use_in_file_templates!
-        line = caller.detect { |s| s !~ /lib\/sinatra.*\.rb/ &&
-          s !~ /\(.*\)/ }
+        line = caller.detect do |s|
+          [
+           /lib\/sinatra.*\.rb/,
+           /\(.*\)/,
+           /rubygems\/custom_require\.rb/
+          ].all? { |x| s !~ x }
+        end
         file = line.sub(/:\d+.*$/, '')
         if data = ::IO.read(file).split('__END__')[1]
           data.gsub!(/\r\n/, "\n")
@@ -562,10 +561,10 @@ module Sinatra
 
       def get(path, opts={}, &block)
         conditions = @conditions.dup
-        _, _, _, method_name = route('GET', path, opts, &block)
+        route('GET', path, opts, &block)
 
         @conditions = conditions
-        head(path, opts) { invoke(method_name) ; [] }
+        head(path, opts) { invoke(block) ; [] }
       end
 
       def put(path, opts={}, &bk); route 'PUT', path, opts, &bk; end
@@ -574,21 +573,20 @@ module Sinatra
       def head(path, opts={}, &bk); route 'HEAD', path, opts, &bk; end
 
     private
-      def route(method, path, opts={}, &block)
+      def route(verb, path, opts={}, &block)
         host_name  opts[:host]  if opts.key?(:host)
         user_agent opts[:agent] if opts.key?(:agent)
         accept_mime_types opts[:provides] if opts.key?(:provides)
 
         pattern, keys = compile(path)
         conditions, @conditions = @conditions, []
-        method_name = "route { #{method} #{path} }"
-        nmethods = instance_methods.grep(rx = /#{Regexp.escape(method_name)}/).size
-        method_name += " [#{nmethods}]"
 
-        define_method(method_name, &block)
+        define_method "#{verb} #{path}", &block
+        unbound_method = instance_method("#{verb} #{path}")
+        block = lambda { unbound_method.bind(self).call }
 
-        (routes[method] ||= []).
-          push([pattern, keys, conditions, method_name]).last
+        (routes[verb] ||= []).
+          push([pattern, keys, conditions, block]).last
       end
 
       def compile(path)
@@ -805,6 +803,7 @@ module Sinatra
     def self.reload!
       @reloading = true
       superclass.send :inherited, self
+      $LOADED_FEATURES.delete("sinatra.rb")
       ::Kernel.load app_file
       @reloading = false
     end

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 = '0.8.10'
-  s.date = '2009-01-16'
+  s.version = '0.9.0'
+  s.date = '2009-01-18'
 
   s.description = "Classy web-development dressed in a DSL"
   s.summary     = "Classy web-development dressed in a DSL"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-sinatra
 version: !ruby/object:Gem::Version 
-  version: 0.8.10
+  version: 0.9.0
 platform: ruby
 authors: 
 - Blake Mizerany
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-16 00:00:00 -08:00
+date: 2009-01-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency