kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Support mapping of non-model classes

Browse source
This commit is contained in:
Andrew White 2017-02-21 08:49:15 +00:00
parent 80dcfd014b
commit 81a6761af2
2 changed files with 33 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
actionpack/lib/action_dispatch/routing/polymorphic_routes.rb
View file

@ -165,8 +165,11 @@ module ActionDispatch
end
def polymorphic_mapping(record)
return false unless record.respond_to?(:to_model)
_routes.polymorphic_mappings[record.to_model.model_name.name]
if record.respond_to?(:to_model)
_routes.polymorphic_mappings[record.to_model.model_name.name]
else
_routes.polymorphic_mappings[record.class.name]
end
end
class HelperMethodBuilder # :nodoc:
@ -321,7 +324,11 @@ module ActionDispatch
private
def polymorphic_mapping(target, record)
target._routes.polymorphic_mappings[record.to_model.model_name.name]
if record.respond_to?(:to_model)
target._routes.polymorphic_mappings[record.to_model.model_name.name]
else
target._routes.polymorphic_mappings[record.class.name]
end
end
def get_method_for_class(klass)

23
actionpack/test/dispatch/routing/direct_url_helpers_test.rb
View file

@ -40,12 +40,25 @@ class TestDirectUrlHelpers < ActionDispatch::IntegrationTest
class User < Model; end
class Video < Model; end
class Article
attr_reader :id
def self.name
"Article"
end
def initialize(id)
@id = id
end
end
Routes = ActionDispatch::Routing::RouteSet.new
Routes.draw do
default_url_options host: "www.example.com"
root to: "pages#index"
get "/basket", to: "basket#show", as: :basket
get "/posts/:id", to: "posts#show", as: :post
get "/profile", to: "users#profile", as: :profile
get "/media/:id", to: "media#show", as: :media
@ -66,6 +79,7 @@ class TestDirectUrlHelpers < ActionDispatch::IntegrationTest
direct(:options) { |options| [:products, options] }
direct(:defaults, size: 10) { |options| [:products, options] }
direct(class: "Article") { |article| [:post, { id: article.id }] }
direct(class: "Basket") { |basket| [:basket] }
direct(class: "User", anchor: "details") { |user, options| [:profile, options] }
direct(class: "Video") { |video| [:media, { id: video.id }] }
@ -86,6 +100,7 @@ class TestDirectUrlHelpers < ActionDispatch::IntegrationTest
@basket = Basket.new
@user = User.new
@video = Video.new("4")
@article = Article.new("5")
@path_params = { "controller" => "pages", "action" => "index" }
@unsafe_params = ActionController::Parameters.new(@path_params)
@safe_params = ActionController::Parameters.new(@path_params).permit(:controller, :action)
@ -139,6 +154,10 @@ class TestDirectUrlHelpers < ActionDispatch::IntegrationTest
assert_equal "/media/4", polymorphic_path(@video)
assert_equal "/media/4", Routes.url_helpers.polymorphic_path(@video)
assert_equal "/media/4", ActionDispatch::Routing::PolymorphicRoutes::HelperMethodBuilder.path.handle_model_call(self, @video)
assert_equal "/posts/5", polymorphic_path(@article)
assert_equal "/posts/5", Routes.url_helpers.polymorphic_path(@article)
assert_equal "/posts/5", ActionDispatch::Routing::PolymorphicRoutes::HelperMethodBuilder.path.handle_model_call(self, @article)
end
def test_direct_urls
@ -191,6 +210,10 @@ class TestDirectUrlHelpers < ActionDispatch::IntegrationTest
assert_equal "http://www.example.com/media/4", polymorphic_url(@video)
assert_equal "http://www.example.com/media/4", Routes.url_helpers.polymorphic_url(@video)
assert_equal "http://www.example.com/media/4", ActionDispatch::Routing::PolymorphicRoutes::HelperMethodBuilder.url.handle_model_call(self, @video)
assert_equal "http://www.example.com/posts/5", polymorphic_url(@article)
assert_equal "http://www.example.com/posts/5", Routes.url_helpers.polymorphic_url(@article)
assert_equal "http://www.example.com/posts/5", ActionDispatch::Routing::PolymorphicRoutes::HelperMethodBuilder.url.handle_model_call(self, @article)
end
def test_raises_argument_error