cehoffman-sinatra-respond_to 0.3.1 → 0.3.2

data/README.markdown

@@ -5,7 +5,6 @@
 
     require 'sinatra'
     require 'sinatra/respond_to'
-    register Sinatra::RespondTo         # => Due to bug in sinatra for classic applications and extensions, see Issues
     
     get '/posts' do
       @posts = Post.recent
@@ -80,8 +79,8 @@ If you want to ensure the route only gets called for css requests try this
 ## Issues
 
 Sinatra has a bug that affects Classic style applications and extensions see [#215][215] and [#180][180].
-For this reason you'll have explicitly register Sinatra::RespondTo for classic applications just like for
-non-classic applications.
+I have worked around this by explicitly registering RespondTo with the top level Sinatra::Application when
+requiring sinatra/respond\_to.
 
 [215]: https://sinatra.lighthouseapp.com/projects/9779/tickets/215-extensions-cannot-define-before-filters-for-classic-apps "Extensions cannot define before filters for classic apps"
 [180]: https://sinatra.lighthouseapp.com/projects/9779/tickets/180-better-route-inheritence "Better route inheritence"

data/Rakefile

@@ -7,7 +7,7 @@ begin
     spec.homepage = 'http://github.com/cehoffman/sinatra-respond_to'
     spec.description = spec.summary
     spec.authors = ["Chris Hoffman"]
-    spec.add_dependency('sinatra', '>=0.9.1.3')
+    spec.add_dependency('sinatra-sinatra', '>= 0.9.1.3')
   end
 rescue LoadError
   puts "Jewler not available.  Install it with sugo gem install technicalpickles-jeweler -s http://gems.github.com"

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 1
+:patch: 3
 :major: 0
 :minor: 3

data/lib/sinatra/respond_to.rb

@@ -41,7 +41,7 @@ module Sinatra
         unless options.static? && options.public? && ["GET", "HEAD"].include?(request.request_method) && static_file?(unescape(request.path_info))
           request.path_info.gsub! %r{\.([^\./]+)$}, ''
           format $1 || options.default_content
-          
+
           # For the oh so common case of actually wanting Javascript from an XmlHttpRequest
           format :js if request.xhr? && options.assume_xhr_is_js?
         end
@@ -92,6 +92,7 @@ module Sinatra
 
           engine = request.env['sinatra.error'].message[/\.([^\.]+)$/, 1]
           path = request.path_info[/([^\/]+)$/, 1]
+          path = "root" if path.nil? || path.empty?
 
           layout = case engine
                    when 'haml' then "!!!\n%html\n  %body= yield"
@@ -133,14 +134,21 @@ module Sinatra
 
       app.class_eval do
         private
-          def lookup_template_with_format(*args)
+          def render_with_format(*args)
             args[1] = "#{args[1]}.#{format}".to_sym
-            lookup_template_without_format *args
+            render_without_format *args
           rescue Errno::ENOENT
             raise MissingTemplate, "#{args[1]}.#{args[0]}"
           end
-          alias_method :lookup_template_without_format, :lookup_template
-          alias_method :lookup_template, :lookup_template_with_format
+          alias_method :render_without_format, :render
+          alias_method :render, :render_with_format
+
+          def lookup_layout_with_format(*args)
+            args[1] = "#{args[1]}.#{format}".to_sym if args
+            lookup_layout_without_format *args
+          end
+          alias_method :lookup_layout_without_format, :lookup_layout
+          alias_method :lookup_layout, :lookup_layout_with_format
       end
     end
 
@@ -170,16 +178,16 @@ module Sinatra
 
         handler = wants[format]
         raise UnhandledFormat  if handler.nil?
-        
+
         opts = [format]
         opts << {:charset => options.default_charset} if TEXT_MIME_TYPES.include? format && response['Content-Type'] !~ /charset=/
 
         content_type *opts
-        
+
         handler.call
       end
     end
   end
 
-  register RespondTo
+  Sinatra::Application.register RespondTo
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cehoffman-sinatra-respond_to
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Chris Hoffman
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-11 00:00:00 -07:00
+date: 2009-05-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: sinatra-sinatra
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement