padrino-core 0.11.4 → 0.12.0.rc1

data/test/test_router.rb

@@ -17,8 +17,8 @@ describe "Router" do
     }
     map = Padrino::Router.new(
       { :path => '/bar',     :to => app },
-      { :path => '/foo',     :to => app },
-      { :path => '/foo/bar', :to => app }
+      { :path => '/foo/bar', :to => app },
+      { :path => '/foo',     :to => app }
     )
 
     res = Rack::MockRequest.new(map).get("/")
@@ -69,6 +69,125 @@ describe "Router" do
     assert_equal "/", res["X-PathInfo"]
   end
 
+  should "dispatch requests to cascade mounted apps" do
+    app = lambda { |env|
+      scary = !!env['PATH_INFO'].match(/scary/)
+      [scary ? 404 : 200, {
+        'X-ScriptName' => env['SCRIPT_NAME'],
+        'X-PathInfo' => env['PATH_INFO'],
+        'Content-Type' => 'text/plain'
+      }, [""]]
+    }
+    api = lambda { |env|
+      spooky = !!env['QUERY_STRING'].match(/spooky/)
+      [spooky ? 200 : 404, {
+        'X-API' => spooky,
+        'X-ScriptName' => env['SCRIPT_NAME'],
+        'X-PathInfo' => env['PATH_INFO'],
+        'Content-Type' => 'application/json'
+      }, [""]]
+    }
+    map = Padrino::Router.new(
+      { :path => '/bar',     :to => api },
+      { :path => '/bar',     :to => app }
+    )
+
+    res = Rack::MockRequest.new(map).get("/werewolf")
+    assert_equal 404, res.status
+    assert_equal nil, res["X-API"]
+    assert_equal nil, res["X-ScriptName"]
+    assert_equal nil, res["X-PathInfo"]
+
+    res = Rack::MockRequest.new(map).get("/bar/mitzvah")
+    assert res.ok?
+    assert_equal nil, res["X-API"]
+    assert_equal 'text/plain', res["Content-Type"]
+    assert_equal "/bar", res["X-ScriptName"]
+    assert_equal "/mitzvah", res["X-PathInfo"]
+
+    res = Rack::MockRequest.new(map).get("/bar?spooky")
+    assert res.ok?
+    assert_equal true, res["X-API"]
+    assert_equal 'application/json', res["Content-Type"]
+    assert_equal "/bar", res["X-ScriptName"]
+    assert_equal "/", res["X-PathInfo"]
+
+    res = Rack::MockRequest.new(map).get("/bar/scary")
+    assert_equal 404, res.status
+    assert_equal nil, res["X-API"]
+    assert_equal 'text/plain', res["Content-Type"]
+    assert_equal "/bar", res["X-ScriptName"]
+    assert_equal "/scary", res["X-PathInfo"]
+  end
+
+  should "dispatch requests to cascade mounted apps and not cascade ok statuses" do
+
+    api = mock_app do
+      get 'scary' do
+        "1"
+      end
+      set :cascade, true
+    end
+
+    app = mock_app do
+      get 'scary' do
+        "2"
+      end
+      set :cascade, false
+    end
+
+    app2 = mock_app do
+      get 'terrifying' do
+        ""
+      end
+    end
+
+    map = Padrino::Router.new(
+        { :path => '/bar',     :to => api },
+        { :path => '/bar',   :to => app  },
+        { :path => '/bar',     :to => app2 }
+    )
+
+    res = Rack::MockRequest.new(map).get("/bar/scary")
+    assert res.ok?
+    #asserting that on ok we're good to go
+    assert_equal "1", res.body
+
+    res = Rack::MockRequest.new(map).get("/bar/terrifying")
+    assert !res.ok?
+
+  end
+
+  should "dispatch requests to cascade mounted apps until it sees a cascade == false or []g" do
+    app = mock_app do
+      get 'scary' do
+        ""
+      end
+      set :cascade, []
+    end
+
+    app2 = mock_app do
+      get 'terrifying' do
+        ""
+      end
+    end
+
+    map = Padrino::Router.new(
+        { :path => '/bar',   :to => app  },
+        { :path => '/bar',     :to => app2 }
+    )
+
+    request_case = lambda {
+      Rack::MockRequest.new(map).get("/bar/terrifying")
+    }
+
+    app.cascade = false
+    assert !request_case.call.ok?
+
+    app.cascade = true
+    assert request_case.call.ok?
+  end
+
   should "dispatches hosts correctly" do
     map = Padrino::Router.new(
      { :host => "foo.org", :to => lambda { |env|

data/test/test_routing.rb

@@ -1,4 +1,4 @@
-#encoding: utf-8 
+#encoding: utf-8
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 
 class FooError < RuntimeError; end
@@ -56,6 +56,32 @@ describe "Routing" do
     }
   end
 
+  should 'fail with unrecognized route exception when namespace is invalid' do
+    mock_app do
+      controller :foo_bar do
+        get(:index){ "okey" }
+        get(:test_baz){ "okey" }
+      end
+    end
+    assert_equal "/foo_bar", @app.url_for(:foo_bar, :index)
+    assert_raises(Padrino::Routing::UnrecognizedException) {
+      get @app.url_for(:foo, :bar, :index)
+    }
+    assert_raises(Padrino::Routing::UnrecognizedException) {
+      get @app.url_for(:foo, :bar_index)
+    }
+    assert_equal "/foo_bar/test_baz", @app.url_for(:foo_bar, :test_baz)
+    assert_raises(Padrino::Routing::UnrecognizedException) {
+      get @app.url_for(:foo_bar, :test, :baz)
+    }
+    assert_raises(Padrino::Routing::UnrecognizedException) {
+      get @app.url_for(:foo, :bar_test, :baz)
+    }
+    assert_raises(Padrino::Routing::UnrecognizedException) {
+      get @app.url_for(:foo, :bar_test_baz)
+    }
+  end
+
   should 'accept regexp routes' do
     mock_app do
       get(%r./fob|/baz.) { "regexp" }
@@ -102,11 +128,11 @@ describe "Routing" do
   end
 
   should 'parse routes that are encoded' do
-    mock_app do 
+    mock_app do
       get('/щч') { 'success!' }
     end
     get(URI.escape('/щч'))
-    assert_equal 'success!', body    
+    assert_equal 'success!', body
   end
 
   should 'parse routes that include encoded slash' do
@@ -120,9 +146,7 @@ describe "Routing" do
   end
 
   should 'encode params using UTF-8' do
-    skip unless ''.respond_to?(:encoding) # for 1.8.7
-
-    mock_app do 
+    mock_app do
       get('/:foo') { params[:foo].encoding.name }
     end
     get '/bar'
@@ -272,6 +296,24 @@ describe "Routing" do
     assert_equal 'http://example.org/test/foo?id=1', body
   end
 
+  should 'rebase simple string urls to app uri_root' do
+    mock_app do
+      set :uri_root, '/app'
+      get(:a){ url('/foo') }
+      get(:b){ url('bar') }
+      get(:c){ absolute_url('/foo') }
+      get(:d, :map => '/d/e/f'){ absolute_url('bar') }
+    end
+    get "/a"
+    assert_equal "/app/foo", body
+    get "/b"
+    assert_equal "bar", body
+    get "/c"
+    assert_equal "http://example.org/app/foo", body
+    get "/d/e/f"
+    assert_equal "http://example.org/app/d/e/bar", body
+  end
+
   should 'allow regex url with format' do
     mock_app do
       get(/.*/, :provides => :any) { "regexp" }
@@ -354,7 +396,7 @@ describe "Routing" do
       get("/foo"){ content_type(:json); content_type.to_s }
     end
     get "/foo"
-    assert_equal 'application/json;charset=utf-8', content_type
+    assert_equal 'application/json', content_type
     assert_equal 'json', body
   end
 
@@ -367,7 +409,7 @@ describe "Routing" do
   end
 
   should "allow .'s in param values" do
-    skip
+    skip # TODO fix this?
     mock_app do
       get('/id/:email', :provides => [:json]) { |email, format| [email, format] * '/' }
     end
@@ -474,7 +516,7 @@ describe "Routing" do
       end
     end
     get "/posts"
-    assert_equal "posts_index", body
+    assert_equal "posts index", body
   end
 
   should "preserve the format if you set it manually" do
@@ -640,7 +682,7 @@ describe "Routing" do
     assert_equal 'application/javascript;charset=utf-8', response["Content-Type"]
     get "/a.json"
     assert_equal "json", body
-    assert_equal 'application/json;charset=utf-8', response["Content-Type"]
+    assert_equal 'application/json', response["Content-Type"]
     get "/a.foo"
     assert_equal "foo", body
     assert_equal 'application/foo;charset=utf-8', response["Content-Type"]
@@ -676,8 +718,8 @@ describe "Routing" do
     assert_equal "1", body
     get "/admin/show/1"
     assert_equal "show 1", body
-    assert_equal "/admin/1", @app.url(:admin_index, :id => 1)
-    assert_equal "/admin/show/1", @app.url(:admin_show, :id => 1)
+    assert_equal "/admin/1", @app.url(:admin, :index, :id => 1)
+    assert_equal "/admin/show/1", @app.url(:admin, :show, :id => 1)
     get "/foo/bar"
     assert_equal "foo_bar_index", body
   end
@@ -1790,6 +1832,33 @@ describe "Routing" do
     assert ok?
   end
 
+  should 'return params as a HashWithIndifferentAccess object via GET' do
+    mock_app do
+      get('/foo/:bar') { "#{params["bar"]} #{params[:bar]}" }
+      get(:foo, :map => '/prefix/:var') { "#{params["var"]} #{params[:var]}" }
+    end
+
+    get('/foo/some_text')
+    assert_equal "some_text some_text", body
+
+    get('/prefix/var')
+    assert_equal "var var", body
+  end
+
+  should 'return params as a HashWithIndifferentAccess object via POST' do
+    mock_app do
+      post('/user') do
+        "#{params["user"]["full_name"]} #{params[:user][:full_name]}"
+      end
+    end
+
+    post '/user', {:user => {:full_name => 'example user'}}
+    assert_equal "example user example user", body
+
+    post '/user', {"user" => {"full_name" => 'example user'}}
+    assert_equal "example user example user", body
+  end
+
   should 'have MethodOverride middleware with more options' do
     mock_app do
       put('/hi', :provides => [:json]) { 'hi' }
@@ -1840,7 +1909,7 @@ describe "Routing" do
   end
 
   should 'render a custom error page using error method' do
-    skip
+    skip # TODO sinatra bug?
     mock_app do
       error(404) { "custom 404 error" }
     end
@@ -1867,8 +1936,8 @@ describe "Routing" do
       get(:simple, :map => "/simple/:id") { }
       get(:with_format, :with => :id, :provides => :js) { }
     end
-    assert_equal [:foo_bar, { :id => "fantastic" }], @app.recognize_path(@app.url(:foo, :bar, :id => :fantastic))
-    assert_equal [:foo_bar, { :id => "18" }], @app.recognize_path(@app.url(:foo, :bar, :id => 18))
+    assert_equal [:"foo bar", { :id => "fantastic" }], @app.recognize_path(@app.url(:foo, :bar, :id => :fantastic))
+    assert_equal [:"foo bar", { :id => "18" }], @app.recognize_path(@app.url(:foo, :bar, :id => 18))
     assert_equal [:simple, { :id => "bar" }], @app.recognize_path(@app.url(:simple, :id => "bar"))
     assert_equal [:simple, { :id => "true" }], @app.recognize_path(@app.url(:simple, :id => true))
     assert_equal [:simple, { :id => "9" }], @app.recognize_path(@app.url(:simple, :id => 9))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-core
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.12.0.rc1
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2013-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -76,9 +76,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -86,9 +83,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rack-protection
   requirement: !ruby/object:Gem::Requirement
@@ -120,6 +114,7 @@ files:
 - bin/padrino
 - lib/padrino-core.rb
 - lib/padrino-core/application.rb
+- lib/padrino-core/application/authenticity_token.rb
 - lib/padrino-core/application/flash.rb
 - lib/padrino-core/application/rendering.rb
 - lib/padrino-core/application/rendering/extensions/erubis.rb
@@ -162,6 +157,8 @@ files:
 - lib/padrino-core/module.rb
 - lib/padrino-core/mounter.rb
 - lib/padrino-core/reloader.rb
+- lib/padrino-core/reloader/rack.rb
+- lib/padrino-core/reloader/storage.rb
 - lib/padrino-core/router.rb
 - lib/padrino-core/server.rb
 - lib/padrino-core/support_lite.rb
@@ -176,7 +173,16 @@ files:
 - test/fixtures/apps/.components
 - test/fixtures/apps/.gitignore
 - test/fixtures/apps/complex.rb
+- test/fixtures/apps/helpers/system_helpers.rb
+- test/fixtures/apps/kiq.rb
+- test/fixtures/apps/lib/myklass.rb
+- test/fixtures/apps/lib/myklass/mysubklass.rb
+- test/fixtures/apps/models/child.rb
+- test/fixtures/apps/models/parent.rb
+- test/fixtures/apps/render.rb
 - test/fixtures/apps/simple.rb
+- test/fixtures/apps/system.rb
+- test/fixtures/apps/views/blog/post.erb
 - test/fixtures/dependencies/a.rb
 - test/fixtures/dependencies/b.rb
 - test/fixtures/dependencies/c.rb
@@ -197,6 +203,7 @@ files:
 - test/test_mounter.rb
 - test/test_reloader_complex.rb
 - test/test_reloader_simple.rb
+- test/test_reloader_system.rb
 - test/test_rendering.rb
 - test/test_rendering_extensions.rb
 - test/test_restful_routing.rb
@@ -204,7 +211,8 @@ files:
 - test/test_routing.rb
 - test/test_support_lite.rb
 homepage: http://www.padrinorb.com
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
@@ -218,9 +226,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: 1.3.1
 requirements: []
 rubyforge_project: padrino-core
 rubygems_version: 2.0.6
@@ -236,7 +244,16 @@ test_files:
 - test/fixtures/apps/.components
 - test/fixtures/apps/.gitignore
 - test/fixtures/apps/complex.rb
+- test/fixtures/apps/helpers/system_helpers.rb
+- test/fixtures/apps/kiq.rb
+- test/fixtures/apps/lib/myklass.rb
+- test/fixtures/apps/lib/myklass/mysubklass.rb
+- test/fixtures/apps/models/child.rb
+- test/fixtures/apps/models/parent.rb
+- test/fixtures/apps/render.rb
 - test/fixtures/apps/simple.rb
+- test/fixtures/apps/system.rb
+- test/fixtures/apps/views/blog/post.erb
 - test/fixtures/dependencies/a.rb
 - test/fixtures/dependencies/b.rb
 - test/fixtures/dependencies/c.rb
@@ -257,6 +274,7 @@ test_files:
 - test/test_mounter.rb
 - test/test_reloader_complex.rb
 - test/test_reloader_simple.rb
+- test/test_reloader_system.rb
 - test/test_rendering.rb
 - test/test_rendering_extensions.rb
 - test/test_restful_routing.rb