padrino-core 0.9.22 → 0.9.23

data/lib/padrino-core/application.rb

@@ -132,6 +132,7 @@ module Padrino
           set :reload, true if development?
           set :logging, false
           set :padrino_logging, true
+          set :method_override, true
           set :sessions, false
           set :public, Proc.new { Padrino.root('public', self.uri_root) }
           # Padrino specific

data/lib/padrino-core/application/rendering.rb

@@ -170,8 +170,8 @@ module Padrino
 
           # Resolve view path and options
           options.reverse_merge!(DEFAULT_RENDERING_OPTIONS)
-          view_path = options.delete(:views) || settings.views || settings.views || "./views"
-          target_extension = File.extname(template_path)[1..-1] || "none" # retrieves explicit template extension
+          view_path = options.delete(:views) || settings.views || "./views"
+          target_extension = File.extname(template_path)[1..-1] || "none" # explicit template extension
           template_path = template_path.chomp(".#{target_extension}")
 
           # Generate potential template candidates
@@ -181,20 +181,20 @@ module Padrino
             [template_file, template_engine] unless IGNORE_FILE_PATTERN.any? { |pattern| template_engine.to_s =~ pattern }
           end
 
-          # Check if we have a valid content type
-          valid_content_type = [:html, :plain].include?(content_type)
+          # Check if we have a simple content type
+          simple_content_type = [:html, :plain].include?(content_type)
 
           # Resolve final template to render
           located_template =
             templates.find { |file, e| file.to_s == "#{template_path}.#{locale}.#{content_type}" } ||
-            templates.find { |file, e| file.to_s == "#{template_path}.#{locale}" && valid_content_type } ||
+            templates.find { |file, e| file.to_s == "#{template_path}.#{locale}" && simple_content_type } ||
             templates.find { |file, e| File.extname(file.to_s) == ".#{target_extension}" or e.to_s == target_extension.to_s } ||
             templates.find { |file, e| file.to_s == "#{template_path}.#{content_type}" } ||
-            templates.find { |file, e| file.to_s == "#{template_path}" && valid_content_type } ||
-            templates.any? && !options[:strict_format] && templates.first # If not strict, fall back to the first located template
+            templates.find { |file, e| file.to_s == "#{template_path}" && simple_content_type } ||
+            (!options[:strict_format] && templates.first) # If not strict, fall back to the first located template
 
+          raise TemplateNotFound, "Template '#{template_path}' not found in '#{view_path}'!"  if !located_template && options[:raise_exceptions]
           settings.cache_template_file!(located_template, rendering_options) unless settings.reload_templates?
-          raise TemplateNotFound, "Template path '#{template_path}' could not be located in '#{view_path}'!" if !located_template && options[:raise_exceptions]
           located_template
         end
 

data/lib/padrino-core/application/routing.rb

@@ -246,9 +246,8 @@ module Padrino
       # ==== Examples
       #
       #   url(:show, :id => 1)
+      #   url(:show, :name => 'test', :id => 24)
       #   url(:show, 1)
-      #   url(:show, :name => :test)
-      #   url("/show/:id/:name", :id => 1, :name => foo)
       #
       def url(*args)
         params = args.extract_options!  # parameters is hash at end
@@ -496,7 +495,31 @@ module Padrino
         end
 
         ##
-        # Allow paths for the given request head or request format
+        # Allows routing by MIME-types specified in the URL or ACCEPT header.
+        #
+        # By default, if a non-provided mime-type is specified in a URL, the
+        # route will not match an thus return a 404.
+        #
+        # Setting the :treat_format_as_accept option to true allows treating
+        # missing mime types specified in the URL as if they were specified
+        # in the ACCEPT header and thus return 406.
+        #
+        # If no type is specified, the first in the provides-list will be
+        # returned.
+        #
+        # ==== Examples
+        #   get "/a", :provides => [:html, :js]
+        #      # => GET /a      => :html
+        #      # => GET /a.js   => :js
+        #      # => GET /a.xml  => 404
+        #
+        #   get "/b", :provides => [:html]
+        #      # => GET /b; ACCEPT: html => html
+        #      # => GET /b; ACCEPT: js   => 406
+        #
+        #   enable :treat_format_as_accept
+        #   get "/c", :provides => [:html, :js]
+        #      # => GET /c.xml => 406
         #
         def provides(*types)
           @_use_format = true
@@ -505,7 +528,7 @@ module Padrino
             request.path_info =~ /\.([^\.\/]+)$/
             url_format        = $1.to_sym if $1
             accepts           = request.accept.map { |a| a.split(";")[0].strip }
-            
+
             # per rfc2616-sec14:
             # Assume */* if no ACCEPT header is given.
             if accepts.empty? || accepts.any? { |a| a == "*/*" }
@@ -532,7 +555,13 @@ module Padrino
             if !url_format && !accepts.empty? && !matched_format
               halt 406
             end
-            
+
+            if settings.respond_to?(:treat_format_as_accept) && settings.treat_format_as_accept
+              if url_format && !matched_format
+                halt 406
+              end
+            end
+
             if matched_format
               @_content_type = url_format || accept_format || :html
               content_type(@_content_type, :charset => 'utf-8')
@@ -551,9 +580,14 @@ module Padrino
       #
       #   url(:show, :id => 1)
       #   url(:show, :name => :test)
-      #   url("/show/:id/:name", :id => 1, :name => foo)
+      #   url(:show, 1)
+      #   url("/foo")
       #
       def url(*args)
+        # Delegate to Sinatra 1.2 for simple url("/foo")
+        # http://www.sinatrarb.com/intro#Generating%20URLs
+        return super if args.first.is_a?(String) && !args[1].is_a?(Hash)
+        # Delegate to Padrino named route url generation
         self.class.url(*args)
       end
       alias :url_for :url

data/lib/padrino-core/version.rb

@@ -5,7 +5,7 @@
 # without include full padrino core.
 #
 module Padrino
-  VERSION = '0.9.22' unless defined?(Padrino::VERSION)
+  VERSION = '0.9.23' unless defined?(Padrino::VERSION)
   ##
   # Return the current Padrino version
   #

data/padrino-core.gemspec

@@ -17,9 +17,9 @@ Gem::Specification.new do |s|
   s.files = %w(.document .gitignore LICENSE README.rdoc Rakefile padrino-core.gemspec) + Dir.glob("{bin,lib,test}/**/*")
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_path = "lib"
-  s.add_dependency("sinatra", "~> 1.1.0")
+  s.add_dependency("sinatra", "~> 1.2.0")
   s.add_dependency("http_router", "~> 0.5.4")
   s.add_dependency("thor", ">=0.14.3")
   s.add_dependency("activesupport", ">= 3.0.0")
   s.add_dependency("tzinfo")
-end
+end

data/test/test_routing.rb

@@ -4,6 +4,11 @@ class FooError < RuntimeError; end
 
 
 class TestRouting < Test::Unit::TestCase
+  should 'use padrinos url method' do
+    mock_app { }
+    assert_equal @app.method(:url).owner, Padrino::Routing::ClassMethods
+  end
+
   should 'ignore trailing delimiters for basic route' do
     mock_app do
       get("/foo"){ "okey" }
@@ -20,16 +25,33 @@ class TestRouting < Test::Unit::TestCase
   end
 
   should 'fail with unrecognized route exception when not found' do
-    unrecognized_app = mock_app do
+    mock_app do
       get(:index){ "okey" }
     end
-    assert_nothing_raised { get unrecognized_app.url_for(:index) }
+    assert_nothing_raised { get @app.url_for(:index) }
     assert_equal "okey", body
     assert_raises(Padrino::Routing::UnrecognizedException) {
-      get unrecognized_app.url_for(:fake)
+      get @app.url_for(:fake)
     }
   end
 
+  should_eventually 'generate a url using route string with params' do
+    mock_app do
+      get("/show/:id/:name"){ "okey" }
+    end
+
+    assert_equal "/show/1/foo", @app.url_for("/show/:id/:name", :id => 1, :name => "foo")
+  end
+
+  should 'work correctly with sinatra redirects' do
+    mock_app do
+      get(:index){ redirect url(:index) }
+    end
+
+    get "/"
+    assert_equal "http://example.org/", headers['Location']
+  end
+
   should 'accept regexp routes' do
     mock_app do
       get(%r{/fob|/baz}) { "regexp" }
@@ -170,6 +192,29 @@ class TestRouting < Test::Unit::TestCase
     assert_equal 404, status
   end
 
+  should 'use padrino url method' do
+    mock_app do
+    end
+
+    assert_equal @app.method(:url).owner, Padrino::Routing::ClassMethods
+  end
+
+  should 'work correctly with sinatra redirects' do
+    mock_app do
+      get(:index)  { redirect url(:index) }
+      get(:google) { redirect "http://google.com" }
+      get("/foo")  { redirect "/bar" }
+      get("/bar")  { "Bar" }
+    end
+
+    get "/"
+    assert_equal "http://example.org/", headers['Location']
+    get "/google"
+    assert_equal "http://google.com", headers['Location']
+    get "/foo"
+    assert_equal "http://example.org/bar", headers['Location']
+  end
+
   should "return 406 on Accept-Headers it does not provide" do
     mock_app do
       get(:a, :provides => [:html, :js]){ content_type }
@@ -178,16 +223,35 @@ class TestRouting < Test::Unit::TestCase
     get "/a", {}, {"HTTP_ACCEPT" => "application/yaml"}
     assert_equal 406, status
   end
-  
+
+  should "return 406 on file extensions it does not provide and flag is set" do
+    mock_app do
+      enable :treat_format_as_accept
+      get(:a, :provides => [:html, :js]){ content_type }
+    end
+
+    get "/a.xml", {}, {}
+    assert_equal 406, status
+  end
+
+  should "return 404 on file extensions it does not provide and flag is not set" do
+    mock_app do
+      get(:a, :provides => [:html, :js]){ content_type }
+    end
+
+    get "/a.xml", {}, {}
+    assert_equal 404, status
+  end
+
   should "not set content_type to :html if Accept */* and html not in provides" do
     mock_app do
       get("/foo", :provides => [:json, :xml]) { content_type.to_s }
     end
-    
+
     get '/foo', {}, { 'HTTP_ACCEPT' => '*/*;q=0.5' }
     assert_equal 'json', body
   end
-  
+
   should "return the first content type in provides if accept header is empty" do
     mock_app do
       get(:a, :provides => [:js]){ content_type.to_s }
@@ -769,7 +833,7 @@ class TestRouting < Test::Unit::TestCase
     assert_equal 'Foo in xml', body
     get '/foo'
     assert_equal 'Foo in xml', body
-    
+
     get '/bar', {}, { 'HTTP_ACCEPT' => 'application/xml' }
     assert_equal 'Bar in html', body
   end
@@ -1257,4 +1321,13 @@ class TestRouting < Test::Unit::TestCase
     assert_equal 500, status
     assert_equal 'Foo!', body
   end
+
+  should 'have MethodOverride middleware' do
+    mock_app do
+      put('/') { 'okay' }
+    end
+    post '/', {'_method'=>'PUT'}, {}
+    assert_equal 200, status
+    assert_equal 'okay', body
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-core
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 9
-  - 22
-  version: 0.9.22
+  - 23
+  version: 0.9.23
 platform: ruby
 authors: 
 - Padrino Team
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-04 00:00:00 -08:00
+date: 2011-03-07 00:00:00 +01:00
 default_executable: padrino
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,12 +29,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 31
         segments: 
         - 1
-        - 1
+        - 2
         - 0
-        version: 1.1.0
+        version: 1.2.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -205,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: padrino-core
-rubygems_version: 1.6.0
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: The required Padrino core gem