diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2014-12-25 23:56:35 -0500 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2014-12-25 23:56:35 -0500 |
| commit | 122f55ced1592f96f12ba860797910e17dcf9741 (patch) | |
| tree | 25471419e3b7b2cbecc01ea5a00e204b443efcd6 | |
| parent | b273c04f15e13a668003b372cc7eedd76b6409f4 (diff) | |
| parent | 4761d81923fd9f5a39fb1fa051cbbad2b52c9615 (diff) | |
| download | rails-122f55ced1592f96f12ba860797910e17dcf9741.tar.gz rails-122f55ced1592f96f12ba860797910e17dcf9741.tar.bz2 rails-122f55ced1592f96f12ba860797910e17dcf9741.zip | |
Merge pull request #18194 from claudiob/remove-action-controller-model-naming
Remove ActionController::ModelNaming
| -rw-r--r-- | actionpack/lib/action_controller/model_naming.rb | 12 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/polymorphic_routes.rb | 4 |
2 files changed, 0 insertions, 16 deletions
diff --git a/actionpack/lib/action_controller/model_naming.rb b/actionpack/lib/action_controller/model_naming.rb deleted file mode 100644 index 2b33f67263..0000000000 --- a/actionpack/lib/action_controller/model_naming.rb +++ /dev/null @@ -1,12 +0,0 @@ -module ActionController - module ModelNaming - # Converts the given object to an ActiveModel compliant one. - def convert_to_model(object) - object.respond_to?(:to_model) ? object.to_model : object - end - - def model_name_from_record_or_class(record_or_class) - convert_to_model(record_or_class).model_name - end - end -end diff --git a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb index 0847842fa2..d9bd277d62 100644 --- a/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb +++ b/actionpack/lib/action_dispatch/routing/polymorphic_routes.rb @@ -1,5 +1,3 @@ -require 'action_controller/model_naming' - module ActionDispatch module Routing # Polymorphic URL helpers are methods for smart resolution to a named route call when @@ -55,8 +53,6 @@ module ActionDispatch # form_for([blog, @post]) # => "/blog/posts/1" # module PolymorphicRoutes - include ActionController::ModelNaming - # Constructs a call to a named RESTful route for the given record and returns the # resulting URL string. For example: # |