padrino-core 0.9.9 → 0.9.10

data/test/test_routing.rb

@@ -71,10 +71,10 @@ class TestRouting < Test::Unit::TestCase
 
   should 'generate url with format' do
     mock_app do
-      get(:a, :respond_to => :any){ url(:a, :format => :json) }
-      get(:b, :respond_to => :js){ url(:b, :format => :js) }
-      get(:c, :respond_to => [:js, :json]){ url(:c, :format => :json) }
-      get(:d, :respond_to => [:html, :js]){ url(:d, :format => :js, :foo => :bar) }
+      get(:a, :provides => :any){ url(:a, :format => :json) }
+      get(:b, :provides => :js){ url(:b, :format => :js) }
+      get(:c, :provides => [:js, :json]){ url(:c, :format => :json) }
+      get(:d, :provides => [:html, :js]){ url(:d, :format => :js, :foo => :bar) }
     end
     get "/a.js"
     assert_equal "/a.json", body
@@ -98,7 +98,7 @@ class TestRouting < Test::Unit::TestCase
 
   should "generate routes for format simple" do
     mock_app do
-      get(:foo, :respond_to => [:html, :rss]) { render :haml, "Test" }
+      get(:foo, :provides => [:html, :rss]) { render :haml, "Test" }
     end
     get "/foo"
     assert_equal "Test\n", body
@@ -109,8 +109,8 @@ class TestRouting < Test::Unit::TestCase
   should "generate routes for format with controller" do
     mock_app do
       controller :posts do
-        get(:index, :respond_to => [:html, :rss, :atom, :js]) { render :haml, "Index.#{content_type}" }
-        get(:show,  :with => :id, :respond_to => [:html, :rss, :atom]) { render :haml, "Show.#{content_type}" }
+        get(:index, :provides => [:html, :rss, :atom, :js]) { render :haml, "Index.#{content_type}" }
+        get(:show,  :with => :id, :provides => [:html, :rss, :atom]) { render :haml, "Show.#{content_type}" }
       end
     end
     get "/posts"
@@ -150,6 +150,15 @@ class TestRouting < Test::Unit::TestCase
     assert_equal "accounts", body
   end
 
+  should 'remove index from path with params' do
+    mock_app do
+      get(:index, :with => :name){ "index with #{params[:name]}" }
+    end
+    get "/bobby"
+    assert_equal "index with bobby", body
+    assert_equal "/john", @app.url(:index, :name => "john")
+  end
+
   should 'parse named params' do
     mock_app do
       get(:print, :with => :id){ "Im #{params[:id]}" }
@@ -161,10 +170,10 @@ class TestRouting < Test::Unit::TestCase
 
   should 'respond to' do
     mock_app do
-      get(:a, :respond_to => :js){ "js" }
-      get(:b, :respond_to => :any){ "any" }
-      get(:c, :respond_to => [:js, :json]){ "js,json" }
-      get(:d, :respond_to => [:html, :js]){ "html,js"}
+      get(:a, :provides => :js){ "js" }
+      get(:b, :provides => :any){ "any" }
+      get(:c, :provides => [:js, :json]){ "js,json" }
+      get(:d, :provides => [:html, :js]){ "html,js"}
     end
     get "/a"
     assert_equal 404, status
@@ -172,27 +181,23 @@ class TestRouting < Test::Unit::TestCase
     assert_equal "js", body
     get "/b"
     assert_equal "any", body
-    get "/b.foo"
-    assert_equal "any", body
+    assert_raise(RuntimeError) { get "/b.foo" }
     get "/c"
     assert_equal 404, status
-    get "/c.fo"
-    assert_equal 404, status
     get "/c.js"
     assert_equal "js,json", body
     get "/c.json"
     assert_equal "js,json", body
     get "/d"
     assert_equal "html,js", body
-    get "/d.fo"
-    assert_equal 404, status
     get "/d.js"
     assert_equal "html,js", body
   end
 
   should 'respond_to and set content_type' do
+    Rack::Mime::MIME_TYPES['.foo'] = 'application/foo'
     mock_app do
-      get :a, :respond_to => :any do
+      get :a, :provides => :any do
         case content_type
           when :js    then "js"
           when :json  then "json"
@@ -209,7 +214,7 @@ class TestRouting < Test::Unit::TestCase
     assert_equal 'application/json;charset=utf-8', response["Content-Type"]
     get "/a.foo"
     assert_equal "foo", body
-    assert_equal 'application/octet-stream', response["Content-Type"]
+    assert_equal 'application/foo;charset=utf-8', response["Content-Type"]
     get "/a"
     assert_equal "html", body
     assert_equal 'text/html;charset=utf-8', response["Content-Type"]
@@ -326,4 +331,143 @@ class TestRouting < Test::Unit::TestCase
     assert_equal "show 3 1 2", body
   end
 
+  should "use default values" do
+    mock_app do
+      controller :lang => :it do
+        get(:index, :map => "/:lang") { "lang is #{params[:lang]}" }
+      end
+      assert_equal "/it", url(:index)
+      # This is only for be sure that default values
+      # work only for the given controller
+      get(:foo, :map => "/foo") {}
+      assert_equal "/foo", url(:foo)
+    end
+    get "/en"
+    assert_equal "lang is en", body
+  end
+
+  should "transitions to the next matching route on pass" do
+    mock_app do
+      get '/:foo' do
+        pass
+        'Hello Foo'
+      end
+      get '/:bar' do
+        'Hello World'
+      end
+    end
+
+    get '/za'
+    assert_equal 'Hello World', body
+  end
+
+  should "filters by accept header" do
+    mock_app do
+      get '/foo', :provides => [:xml, :js] do
+        request.env['HTTP_ACCEPT']
+      end
+    end
+
+    get '/foo', {}, { 'HTTP_ACCEPT' => 'application/xml' }
+    assert ok?
+    assert_equal 'application/xml', body
+    assert_equal 'application/xml;charset=utf-8', response.headers['Content-Type']
+
+    get '/foo.xml'
+    assert ok?
+    assert_equal 'application/xml;charset=utf-8', response.headers['Content-Type']
+
+    get '/foo', {}, { 'HTTP_ACCEPT' => 'application/javascript' }
+    assert ok?
+    assert_equal 'application/javascript', body
+    assert_equal 'application/javascript;charset=utf-8', response.headers['Content-Type']
+
+    get '/foo.js'
+    assert ok?
+    assert_equal 'application/javascript;charset=utf-8', response.headers['Content-Type']
+
+    get '/foo', {}, { :accept => 'text/html' }
+    assert not_found?
+  end
+
+  should "works allow global provides" do
+    mock_app do
+      provides :xml
+
+      get("/foo"){ "Foo in #{content_type}" }
+      get("/bar"){ "Bar in #{content_type}" }
+    end
+
+    get '/foo', {}, { 'HTTP_ACCEPT' => 'application/xml' }
+    assert_equal 'Foo in xml', body
+    get '/foo'
+    assert not_found?
+
+    get '/bar', {}, { 'HTTP_ACCEPT' => 'application/xml' }
+    assert_equal 'Bar in html', body
+  end
+
+  should 'allows custom route-conditions to be set via route options' do
+    protector = Module.new {
+      def protect(*args)
+        condition {
+          unless authorize(params["user"], params["password"])
+            halt 403, "go away"
+          end
+        }
+      end
+    }
+
+    mock_app do
+      register protector
+
+      helpers do
+        def authorize(username, password)
+          username == "foo" && password == "bar"
+        end
+      end
+
+      get "/", :protect => true do
+        "hey"
+      end
+    end
+
+    get "/"
+    assert forbidden?
+    assert_equal "go away", body
+
+    get "/", :user => "foo", :password => "bar"
+    assert ok?
+    assert_equal "hey", body
+  end
+
+  should 'scope filters in the given controller' do
+    mock_app do
+      before { @global = 'global' }
+      after { @global = nil }
+
+      controller :foo do
+        before { @foo = :foo }
+        after { @foo = nil }
+        get("/") { [@foo, @bar, @global].compact.join(" ") }
+      end
+
+      get("/") { [@foo, @bar, @global].compact.join(" ") }
+
+      controller :bar do
+        before { @bar = :bar }
+        after { @bar = nil }
+        get("/") { [@foo, @bar, @global].compact.join(" ") }
+      end
+    end
+
+    get "/bar"
+    assert_equal "bar global", body
+
+    get "/foo"
+    assert_equal "foo global", body
+
+    get "/"
+    assert_equal "global", body
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 9
-  version: 0.9.9
+  - 10
+  version: 0.9.10
 platform: ruby
 authors: 
 - Padrino Team
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-29 00:00:00 -07:00
+date: 2010-04-22 00:00:00 +02:00
 default_executable: padrino
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -188,7 +188,6 @@ files:
 - LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - bin/padrino
 - lib/padrino-core.rb
 - lib/padrino-core/application.rb
@@ -204,11 +203,16 @@ files:
 - lib/padrino-core/images/404.png
 - lib/padrino-core/images/500.png
 - lib/padrino-core/loader.rb
+- lib/padrino-core/locale/da.yml
 - lib/padrino-core/locale/de.yml
 - lib/padrino-core/locale/en.yml
+- lib/padrino-core/locale/fr.yml
 - lib/padrino-core/locale/it.yml
+- lib/padrino-core/locale/pt_br.yml
+- lib/padrino-core/locale/ru.yml
 - lib/padrino-core/logger.rb
 - lib/padrino-core/reloader.rb
+- lib/padrino-core/router.rb
 - lib/padrino-core/server.rb
 - lib/padrino-core/support_lite.rb
 - lib/padrino-core/tasks.rb
@@ -230,6 +234,7 @@ files:
 - test/test_reloader_complex.rb
 - test/test_reloader_simple.rb
 - test/test_rendering.rb
+- test/test_router.rb
 - test/test_routing.rb
 - test/test_server.rb
 has_rdoc: true

data/VERSION

@@ -1 +0,0 @@
-0.9.9